[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.1-2-6-g37d4616

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 4dd55280543272f84567528232229827f691eb89
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jul 12 11:00:39 2014 -0300

    Fix install files accordingly.
---
 debian/changelog                                  | 1 +
 debian/libqt5multimedia5-plugins.install-common   | 3 +++
 debian/libqt5multimedia5-plugins.install-hurd     | 1 -
 debian/libqt5multimedia5-plugins.install-kfreebsd | 3 ---
 debian/libqt5multimedia5-plugins.install-linux    | 3 ---
 debian/qtmultimedia5-dev.install-common           | 5 +++++
 debian/qtmultimedia5-dev.install-hurd             | 1 -
 debian/qtmultimedia5-dev.install-kfreebsd         | 5 -----
 debian/qtmultimedia5-dev.install-linux            | 5 -----
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4245aee..5cf619e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtmultimedia-opensource-src (5.3.1-3) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport test_v4l.patch to allow GStreamer stuff to be built on Hurd
     (Closes: #753835).
+    - Fix install files accordingly.
   * Update symbols files with buildds' logs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 08 Jul 2014 15:05:28 -0300
diff --git a/debian/libqt5multimedia5-plugins.install-common b/debian/libqt5multimedia5-plugins.install-common
index b3c1e67..46be172 100644
--- a/debian/libqt5multimedia5-plugins.install-common
+++ b/debian/libqt5multimedia5-plugins.install-common
@@ -1,2 +1,5 @@
 usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
+usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
+usr/lib/*/qt5/plugins/mediaservice/libgstmediacapture.so
+usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
 usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
diff --git a/debian/libqt5multimedia5-plugins.install-hurd b/debian/libqt5multimedia5-plugins.install-hurd
deleted file mode 100644
index 1b69f66..0000000
--- a/debian/libqt5multimedia5-plugins.install-hurd
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/mediaservice/libqtmedia_audioengine.so
diff --git a/debian/libqt5multimedia5-plugins.install-kfreebsd b/debian/libqt5multimedia5-plugins.install-kfreebsd
index 390ed02..376232c 100644
--- a/debian/libqt5multimedia5-plugins.install-kfreebsd
+++ b/debian/libqt5multimedia5-plugins.install-kfreebsd
@@ -1,4 +1 @@
-usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
 usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
-usr/lib/*/qt5/plugins/mediaservice/libgstmediacapture.so
-usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
diff --git a/debian/libqt5multimedia5-plugins.install-linux b/debian/libqt5multimedia5-plugins.install-linux
index 390ed02..376232c 100644
--- a/debian/libqt5multimedia5-plugins.install-linux
+++ b/debian/libqt5multimedia5-plugins.install-linux
@@ -1,4 +1 @@
-usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
 usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
-usr/lib/*/qt5/plugins/mediaservice/libgstmediacapture.so
-usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
diff --git a/debian/qtmultimedia5-dev.install-common b/debian/qtmultimedia5-dev.install-common
index 9b7a719..f0f1c51 100644
--- a/debian/qtmultimedia5-dev.install-common
+++ b/debian/qtmultimedia5-dev.install-common
@@ -185,6 +185,9 @@ 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_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
@@ -195,6 +198,8 @@ usr/lib/*/libQt5MultimediaQuick_p.prl
 usr/lib/*/libQt5MultimediaQuick_p.so
 usr/lib/*/libQt5MultimediaWidgets.prl
 usr/lib/*/libQt5MultimediaWidgets.so
+usr/lib/*/libqgsttools_p.prl
+usr/lib/*/libqgsttools_p.so
 usr/lib/*/pkgconfig/Qt5Multimedia.pc
 usr/lib/*/pkgconfig/Qt5MultimediaQuick_p.pc
 usr/lib/*/pkgconfig/Qt5MultimediaWidgets.pc
diff --git a/debian/qtmultimedia5-dev.install-hurd b/debian/qtmultimedia5-dev.install-hurd
deleted file mode 100644
index e77e5cf..0000000
--- a/debian/qtmultimedia5-dev.install-hurd
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_AudioCaptureServicePlugin.cmake
diff --git a/debian/qtmultimedia5-dev.install-kfreebsd b/debian/qtmultimedia5-dev.install-kfreebsd
index 3615881..b1427d5 100644
--- a/debian/qtmultimedia5-dev.install-kfreebsd
+++ b/debian/qtmultimedia5-dev.install-kfreebsd
@@ -1,6 +1 @@
 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/*/libqgsttools_p.prl
-usr/lib/*/libqgsttools_p.so
diff --git a/debian/qtmultimedia5-dev.install-linux b/debian/qtmultimedia5-dev.install-linux
index 3615881..b1427d5 100644
--- a/debian/qtmultimedia5-dev.install-linux
+++ b/debian/qtmultimedia5-dev.install-linux
@@ -1,6 +1 @@
 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/*/libqgsttools_p.prl
-usr/lib/*/libqgsttools_p.so

-- 
qtmultimedia packaging