[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.0-4-2-gcd0ed43

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit cd0ed434de80eebe30f2050b8cc8c1917c13cdef
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jun 20 10:08:39 2014 +0400

    Third try to fix building on Hurd: make some files in qtmultimedia5-dev.install Linux/kFreeBSD-specific.
---
 debian/changelog                                                      | 3 +++
 .../{qtmultimedia5-dev.install => qtmultimedia5-dev.install-common}   | 4 ----
 debian/qtmultimedia5-dev.install-kfreebsd                             | 4 ++++
 debian/qtmultimedia5-dev.install-linux                                | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a459353..0ccfd50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtmultimedia-opensource-src (5.3.0-5) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Third try to fix building on Hurd: make some files in
+    qtmultimedia5-dev.install Linux/kFreeBSD-specific.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Jun 2014 10:06:42 +0400
 
diff --git a/debian/qtmultimedia5-dev.install b/debian/qtmultimedia5-dev.install-common
similarity index 97%
rename from debian/qtmultimedia5-dev.install
rename to debian/qtmultimedia5-dev.install-common
index 0553262..88eb3c8 100644
--- a/debian/qtmultimedia5-dev.install
+++ b/debian/qtmultimedia5-dev.install-common
@@ -185,10 +185,6 @@ usr/include/*/qt5/QtMultimediaWidgets/qvideowidget.h
 usr/include/*/qt5/QtMultimediaWidgets/qvideowidgetcontrol.h
 usr/lib/*/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 usr/lib/*/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake
 usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QM3uPlaylistPlugin.cmake
 usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QPulseAudioPlugin.cmake
 usr/lib/*/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
diff --git a/debian/qtmultimedia5-dev.install-kfreebsd b/debian/qtmultimedia5-dev.install-kfreebsd
new file mode 100644
index 0000000..73b9717
--- /dev/null
+++ b/debian/qtmultimedia5-dev.install-kfreebsd
@@ -0,0 +1,4 @@
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake
diff --git a/debian/qtmultimedia5-dev.install-linux b/debian/qtmultimedia5-dev.install-linux
new file mode 100644
index 0000000..73b9717
--- /dev/null
+++ b/debian/qtmultimedia5-dev.install-linux
@@ -0,0 +1,4 @@
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
+usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake

-- 
qtmultimedia packaging