[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.0-3-12-g4bd50bd

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit e8895e4b52394444c89044ba16ad606c93ec8eea
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Oct 13 13:04:45 2015 +0000

    Regenerate headers for the audio role API
---
 debian/changelog                        | 1 +
 debian/qtmultimedia5-dev.install-common | 3 +++
 debian/rules                            | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 660a1cf..57bb5c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtmultimedia-opensource-src (5.5.0-3ubuntu1) UNRELEASED; urgency=medium
     - The Audio role API and Playlist type patches were upstreamed for 
       Qt 5.6, use backported versions of those.
   * debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch
+  * Regenerate headers for the audio role API
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 17 Jul 2015 13:14:07 +0000
 
diff --git a/debian/qtmultimedia5-dev.install-common b/debian/qtmultimedia5-dev.install-common
index fc408f7..fea6df9 100644
--- a/debian/qtmultimedia5-dev.install-common
+++ b/debian/qtmultimedia5-dev.install-common
@@ -24,6 +24,7 @@ usr/include/*/qt5/QtMultimedia/QAudioOutput
 usr/include/*/qt5/QtMultimedia/QAudioOutputSelectorControl
 usr/include/*/qt5/QtMultimedia/QAudioProbe
 usr/include/*/qt5/QtMultimedia/QAudioRecorder
+usr/include/*/qt5/QtMultimedia/QAudioRoleControl
 usr/include/*/qt5/QtMultimedia/QAudioSystemFactoryInterface
 usr/include/*/qt5/QtMultimedia/QAudioSystemPlugin
 usr/include/*/qt5/QtMultimedia/QCamera
@@ -114,6 +115,7 @@ usr/include/*/qt5/QtMultimedia/qaudiooutput.h
 usr/include/*/qt5/QtMultimedia/qaudiooutputselectorcontrol.h
 usr/include/*/qt5/QtMultimedia/qaudioprobe.h
 usr/include/*/qt5/QtMultimedia/qaudiorecorder.h
+usr/include/*/qt5/QtMultimedia/qaudiorolecontrol.h
 usr/include/*/qt5/QtMultimedia/qaudiosystem.h
 usr/include/*/qt5/QtMultimedia/qaudiosystemplugin.h
 usr/include/*/qt5/QtMultimedia/qcamera.h
@@ -207,3 +209,4 @@ usr/lib/*/pkgconfig/Qt5MultimediaQuick_p.pc
 usr/lib/*/pkgconfig/Qt5MultimediaWidgets.pc
 usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
+
diff --git a/debian/rules b/debian/rules
index 34dc816..d747468 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debi
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
 
 override_dh_auto_configure:
+	# Regenerate headers for the upstream audio role patch backport
+	mkdir .git
 	qmake
 
 override_dh_auto_build-indep:

-- 
qtmultimedia packaging