[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-14ubuntu3-16-gb196b8e

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b19d101

The following commit has been merged in the ubuntu branch:
commit b19d1016185479cb9c98f79a33d12d5f1b3257b1
Merge: 6ac150f9afb571be0775bb2aecefbc345dc018e4 22bf0050e58c30674c0576e84d27ac7a678e2e89
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 7 09:17:27 2016 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                        |  6 ++++++
 debian/patches/fix_alsa_detection.patch | 21 +++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 28 insertions(+)

diff --cc debian/changelog
index 9541f8a,bed3f79..0beeb0c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ 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 <lisandro at debian.org>  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.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 04 Mar 2016 10:01:08 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-15) unstable; urgency=medium
  
    [ Timo Jyrinki ]
diff --cc debian/patches/series
index eb6caf4,b2111e5..f4a5d53
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -35,12 -26,4 +35,13 @@@ gnukfreebsd.dif
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
  link_fbclient.diff
+ fix_alsa_detection.patch
 +
 +# Ubuntu specific.
 +qt5-qmake-arm-linux-gnueabihf
 +Add-workaround-for-GL-on-Android-emulator.patch
 +enable-tests.patch
 +skip-largefile-test-s390x.patch
 +net-bearer-nm-disconnect-ap-signals7.patch
 +qnam-ubuntu-fix6.patch
 +disable_overlay_scrollbars.diff

-- 
qtbase packaging