[SCM] qtmultimedia packaging branch, kubuntu_unstable, updated. debian/5.5.0-3

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit fdb12871904499718e8824d0f1a8be2923b7b123
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 26 17:18:00 2015 +0300

    Make marking private symbols really work.
    
    To achieve that, move all headers to debian/private-headers, and
    call pkgkde-mark-private-symbols once against that directory.
---
 debian/changelog |  3 +++
 debian/rules     | 25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d045502..fa4ce6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtmultimedia-opensource-src (5.5.0-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move all private headers to debian/private-headers during build.
+  * Call pkgkde-mark-private-symbols only once, to make it really work.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Aug 2015 17:07:35 +0300
 
diff --git a/debian/rules b/debian/rules
index 931d843..34dc816 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,16 +29,15 @@ override_dh_auto_build-indep:
 override_dh_auto_install-arch:
 	dh_auto_install
 
-	# Check for private symbols not marked as such. Be verbose.
-	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private
-	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private
-	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaQuick_p
-
-	# Remove private headers.
-	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private
-	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/
-	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaQuick_p/
-	# And some other private stuff.
+	# Move private headers out of debian/tmp.
+	mkdir -p debian/private-headers
+	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private \
+		debian/private-headers/QtMultimedia
+	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private \
+		debian/private-headers/QtMultimediaWidgets
+	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaQuick_p debian/private-headers/
+
+	# Remove some other private stuff.
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia_private.pri
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
@@ -77,8 +76,14 @@ override_dh_install:
 	# and/or .install.OS files.
 	dh_install --fail-missing
 
+override_dh_makeshlibs:
+	dh_makeshlibs
+	# Check for private symbols not marked as such.
+	pkgkde-mark-private-symbols debian/private-headers
+
 override_dh_clean:
 	dh_clean
+	rm -rfv debian/private-headers
 
 	# Don't forget to remove the .install files we generated.
 	for pkg in $(pkgs_with_common); do \

-- 
qtmultimedia packaging