[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.2-3-4-g8a434fa

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit dc47ee47a64519dd7b3ccd1400fc2dccad58996c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Dec 3 10:14:56 2014 -0300

    Add a patch from Chris Ruvolo to also build the ALSA plugin
    
    Even if we are building with pulseaudio support.
---
 debian/changelog                            |  4 ++++
 debian/patches/also_build_alsa_plugin.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b81a2aa..6d79c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtmultimedia-opensource-src (5.3.2-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add a patch from Chris Ruvolo to also build the ALSA plugin even if we
+    are building with pulseaudio support (Closes: #771391).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Dec 2014 10:07:57 -0300
 
 qtmultimedia-opensource-src (5.3.2-3) unstable; urgency=medium
diff --git a/debian/patches/also_build_alsa_plugin.patch b/debian/patches/also_build_alsa_plugin.patch
new file mode 100644
index 0000000..f6cd706
--- /dev/null
+++ b/debian/patches/also_build_alsa_plugin.patch
@@ -0,0 +1,27 @@
+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 1662367..57d8747 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+also_build_alsa_plugin.patch
 rpath_nonlinux.diff

-- 
qtmultimedia packaging