[SCM] qtsvg packaging branch, experimental, updated. debian/5.5.0-1-4-g65e91ca

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 2cd4a902483661be11f5049f7519012154346c52
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 18 21:42:34 2015 +0300

    Make marking private symbols really work.
    
    Move them to a temporary directory like done in qtmultimedia.
---
 debian/changelog |  4 ++++
 debian/rules     | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbb723b..f67a94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtsvg-opensource-src (5.5.0-2) UNRELEASED; urgency=medium
   * Remove libqt5svg5-private-dev. Nothing in the stack is using it and
     according to dak there are no rdeps (Closes: #790769).
 
+  [ Dmitry Shachnev ]
+  * Move private headers to a temporary directory so that we can really
+    mark them (based on code in qtmultimedia).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Oct 2015 16:21:16 -0300
 
 qtsvg-opensource-src (5.5.0-1) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index bdab56f..9a0c403 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,9 +39,13 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
-	# Remove private stuff.
-	rm -rfv usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtSvg/*/QtSvg/private/
-	rm -fv usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_svg_private.pri
+	# Move private headers out of debian/tmp
+	mkdir -p debian/private-headers
+	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtSvg/*/QtSvg/private \
+		debian/private-headers/QtSvg
+
+	# Remove other private stuff
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_svg_private.pri
 
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
@@ -52,4 +56,8 @@ override_dh_install:
 override_dh_makeshlibs:
 	dh_makeshlibs
 	# Check for private symbols not marked as such.
-	pkgkde-mark-private-symbols debian/libqt5svg5-private-dev/usr/include
+	pkgkde-mark-private-symbols debian/private-headers
+
+override_dh_clean:
+	dh_clean
+	rm -rfv debian/private-headers

-- 
qtsvg packaging