[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-15-3-g1034911

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1034911584daa0021a07624acd56bb63e1d31877
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Mar 5 10:35:29 2016 +0300

    Use a better version of fix_alsa_detection.patch that doesn't require bumping B-Ds.
---
 debian/patches/fix_alsa_detection.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix_alsa_detection.patch b/debian/patches/fix_alsa_detection.patch
index 20182f4..1acad03 100644
--- a/debian/patches/fix_alsa_detection.patch
+++ b/debian/patches/fix_alsa_detection.patch
@@ -1,7 +1,6 @@
-Description: pseudo-fix for ALSA version detection
- The current test fails for 1.1.x with x < 10, so just bump it
- to 1.1.0.
+Description: alsatest: fix the check to treat alsalib 1.1.x as correct version
 Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Author: Dmitry Shachnev <mitya57 at debian.org>
 Bug: https://bugreports.qt.io/browse/QTBUG-51681
 Last-Update: 2016-03-05
 
@@ -16,7 +15,7 @@ Last-Update: 2016-03-05
  
  #include <alsa/asoundlib.h>
 -#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR >= 1 && SND_LIB_SUBMINOR >= 0))
++#if SND_LIB_VERSION < 0x1000a  // 1.0.10
  #error "Alsa version found too old, require >= 1.0.10"
  #endif
  

-- 
qtbase packaging