[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.6.0-beta-1-14-gd37a641

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 535b661c4e303b55583fb16f0503f8d8bbd8bd11
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 6 22:06:45 2016 +0300

    Drop fix_alsa_detection.patch, a different version applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/fix_alsa_detection.patch | 21 ---------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66a4907..36fce69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtmultimedia-opensource-src (5.6.0~rc-1) UNRELEASED; urgency=medium
   * Update debian/libqgsttools-p1.symbols from buildds’ logs.
   * Stop marking private symbols (we no longer need explicit marks).
   * Use recommended https URIs for Vcs fields.
+  * Drop fix_alsa_detection.patch, a different version applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 06 Mar 2016 17:20:39 +0300
 
diff --git a/debian/patches/fix_alsa_detection.patch b/debian/patches/fix_alsa_detection.patch
deleted file mode 100644
index cdd58de..0000000
--- a/debian/patches/fix_alsa_detection.patch
+++ /dev/null
@@ -1,21 +0,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
-
----
- config.tests/alsa/alsatest.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/config.tests/alsa/alsatest.cpp
-+++ b/config.tests/alsa/alsatest.cpp
-@@ -32,7 +32,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#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 --git a/debian/patches/series b/debian/patches/series
index 00e675a..1662367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_alsa_detection.patch
 rpath_nonlinux.diff

-- 
qtmultimedia packaging