[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.1-3-6-ga7233ab

Thu Jul 24 05:23:19 UTC 2014

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

The following commit has been merged in the master branch:
commit a7233abe5b9f412f42b870c6c944d9266fe26366
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 24 02:22:48 2014 -0300

    Use a better version of test_v4l.patch.
    
    And fix install files accordingly.
---
 debian/changelog                                   |  2 ++
 debian/libqt5multimedia5-plugins.install           | 11 +++++++++++
 debian/libqt5multimedia5-plugins.install-common    |  5 -----
 debian/libqt5multimedia5-plugins.install-kfreebsd  |  1 -
 debian/libqt5multimedia5-plugins.install-linux     |  1 -
 ...ev.install-common => qtmultimedia5-dev.install} |  1 +
 debian/qtmultimedia5-dev.install-kfreebsd          |  1 -
 debian/qtmultimedia5-dev.install-linux             |  1 -
 debian/rules                                       | 22 ----------------------
 9 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cfe8fb..39d01d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtmultimedia-opensource-src (5.3.1-4) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Make libqgsttools-p1 Architecture: any, as it now builds on Hurd.
+  * Use a better version of test_v4l.patch.
+    - Fix install files, we now do not have exceptions for Hurd.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Jul 2014 21:08:23 -0300
 
diff --git a/debian/libqt5multimedia5-plugins.install b/debian/libqt5multimedia5-plugins.install
new file mode 100644
index 0000000..4e2b6da
--- /dev/null
+++ b/debian/libqt5multimedia5-plugins.install
@@ -0,0 +1,11 @@
+usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
+usr/lib/*/qt5/plugins/audio/libqtmedia_pulse.so
+usr/lib/*/qt5/plugins/mediaservice/libgstaudiodecoder.so
+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/libgstmediacapture.so
+usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
+usr/lib/*/qt5/plugins/mediaservice/libgstmediaplayer.so
+usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
+usr/lib/*/qt5/plugins/playlistformats/libqtmultimedia_m3u.so
diff --git a/debian/libqt5multimedia5-plugins.install-common b/debian/libqt5multimedia5-plugins.install-common
deleted file mode 100644
index 46be172..0000000
--- a/debian/libqt5multimedia5-plugins.install-common
+++ /dev/null
@@ -1,5 +0,0 @@
-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-kfreebsd b/debian/libqt5multimedia5-plugins.install-kfreebsd
deleted file mode 100644
index 376232c..0000000
--- a/debian/libqt5multimedia5-plugins.install-kfreebsd
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
diff --git a/debian/libqt5multimedia5-plugins.install-linux b/debian/libqt5multimedia5-plugins.install-linux
deleted file mode 100644
index 376232c..0000000
--- a/debian/libqt5multimedia5-plugins.install-linux
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/mediaservice/libgstcamerabin.so
diff --git a/debian/qtmultimedia5-dev.install-common b/debian/qtmultimedia5-dev.install
similarity index 99%
rename from debian/qtmultimedia5-dev.install-common
rename to debian/qtmultimedia5-dev.install
index f0f1c51..0553262 100644
--- a/debian/qtmultimedia5-dev.install-common
+++ b/debian/qtmultimedia5-dev.install
@@ -185,6 +185,7 @@ 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
diff --git a/debian/qtmultimedia5-dev.install-kfreebsd b/debian/qtmultimedia5-dev.install-kfreebsd
deleted file mode 100644
index b1427d5..0000000
--- a/debian/qtmultimedia5-dev.install-kfreebsd
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
diff --git a/debian/qtmultimedia5-dev.install-linux b/debian/qtmultimedia5-dev.install-linux
deleted file mode 100644
index b1427d5..0000000
--- a/debian/qtmultimedia5-dev.install-linux
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
diff --git a/debian/rules b/debian/rules
index 66bc37c..7436eba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,6 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-# Retrieve packages that have a .install-common file
-pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
-# Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
-pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
-
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
 
@@ -46,22 +41,5 @@ override_dh_auto_install-arch:
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
-override_dh_clean:
-	# Don't forget to remove the .install files we generated.
-	for pkg in $(pkgs_with_common); do \
-		rm -f debian/$$pkg.install ; \
-	done
-	for pkg in $(pkgs_with_os); do \
-		rm -f debian/$$pkg.install ; \
-	done
-	dh_clean
-
 override_dh_install:
-	# Now flush all the .install-* files as .install files.
-	set -e; for pkg in $(pkgs_with_common); do \
-		cat debian/$$pkg.install-common >> debian/$$pkg.install ; \
-	done
-	set -e; for pkg in $(pkgs_with_os); do \
-		cat debian/$$pkg.install-$(DEB_HOST_ARCH_OS) >> debian/$$pkg.install ; \
-	done
 	dh_install --fail-missing

-- 
qtmultimedia packaging

