diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/changelog qtbase-opensource-src-5.5.1+dfsg/debian/changelog --- qtbase-opensource-src-5.5.1+dfsg/debian/changelog 2016-03-04 10:01:36.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/changelog 2016-03-07 09:18:08.000000000 +0000 @@ -1,3 +1,15 @@ +qtbase-opensource-src (5.5.1+dfsg-16ubuntu1) xenial; urgency=medium + + * Merge with Debian 5.5.1+dfsg-16. + + -- Timo Jyrinki Mon, 07 Mar 2016 09:17:45 +0000 + +qtbase-opensource-src (5.5.1+dfsg-16) unstable; urgency=medium + + * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection. + + -- Lisandro Damián Nicanor Pérez Meyer Sat, 05 Mar 2016 10:24:48 -0300 + qtbase-opensource-src (5.5.1+dfsg-15ubuntu1) xenial; urgency=medium * Merge with Debian 5.5.1+dfsg-15. diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/patches/fix_alsa_detection.patch qtbase-opensource-src-5.5.1+dfsg/debian/patches/fix_alsa_detection.patch --- qtbase-opensource-src-5.5.1+dfsg/debian/patches/fix_alsa_detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/patches/fix_alsa_detection.patch 2016-03-07 09:18:08.000000000 +0000 @@ -0,0 +1,21 @@ +Description: alsatest: fix the check to treat alsalib 1.1.x as correct version +Author: Lisandro Damián Nicanor Pérez Meyer +Author: Dmitry Shachnev +Bug: https://bugreports.qt.io/browse/QTBUG-51681 +Last-Update: 2016-03-05 + +--- + config.tests/unix/alsa/alsatest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/config.tests/unix/alsa/alsatest.cpp ++++ b/config.tests/unix/alsa/alsatest.cpp +@@ -32,7 +32,7 @@ + ****************************************************************************/ + + #include +-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) ++#if SND_LIB_VERSION < 0x1000a // 1.0.10 + #error "Alsa version found too old, require >= 1.0.10" + #endif + diff -Nru qtbase-opensource-src-5.5.1+dfsg/debian/patches/series qtbase-opensource-src-5.5.1+dfsg/debian/patches/series --- qtbase-opensource-src-5.5.1+dfsg/debian/patches/series 2016-03-04 10:01:36.000000000 +0000 +++ qtbase-opensource-src-5.5.1+dfsg/debian/patches/series 2016-03-07 09:18:08.000000000 +0000 @@ -35,6 +35,7 @@ no_htmlinfo_example.diff remove_privacy_breachs.diff link_fbclient.diff +fix_alsa_detection.patch # Ubuntu specific. qt5-qmake-arm-linux-gnueabihf