[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.3.2-5-10-g13b1eca

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 13b1ecafd01e2e2167990ae50ecddaaf72a2060e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 22 14:09:00 2014 +0300

    Drop also_build_alsa_plugin.patch, applied upstream.
---
 debian/changelog                            |  1 +
 debian/patches/also_build_alsa_plugin.patch | 27 ---------------------------
 debian/patches/series                       |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 333fb82..c414978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtmultimedia-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
     those similar to how it's done in qtbase.
 
   [ Dmitry Shachnev ]
+  * Drop also_build_alsa_plugin.patch, applied upstream.
   * Update debian/copyright to reflect LGPL v3 addition.
   * Update Vcs-Browser field to point to cgit interface.
   * Add qtbase5-doc-html to Build-Depends-Indep to make sure docs
diff --git a/debian/patches/also_build_alsa_plugin.patch b/debian/patches/also_build_alsa_plugin.patch
deleted file mode 100644
index f6cd706..0000000
--- a/debian/patches/also_build_alsa_plugin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Build alsa plugin in addition to pulseaudio.
- Even if pulse audio is present, we still want to build the alsa plugin.
- .
- qtmultimedia-opensource-src (5.3.2-2~bpo70+2.1) wheezy-backports; urgency=medium
- .
-   * Build alsa plugin in addition to pulseaudio.
-Author: Chris Ruvolo <cruvolo+deb at gmail.com>
-Bug-Debian: http://bugs.debian.org/771391
-Last-Update: 2014-12-02
-
----
- src/plugins/plugins.pro |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/src/plugins/plugins.pro
-+++ b/src/plugins/plugins.pro
-@@ -38,7 +38,9 @@ unix:!mac:!android {
- 
-     config_pulseaudio {
-         SUBDIRS += pulseaudio
--    } else:config_alsa {
-+    }
-+
-+    config_alsa {
-         SUBDIRS += alsa
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 57d8747..1662367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-also_build_alsa_plugin.patch
 rpath_nonlinux.diff

-- 
qtmultimedia packaging