[SCM] qtquick1 packaging branch, experimental, updated. debian/5.5.0-1-8-g5180c55

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 5180c5591f5ef7a68639a48da1ccc931713306a0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Oct 19 14:40:35 2015 -0300

    Keep marking private symbols as such.
---
 debian/changelog |  1 +
 debian/rules     | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 18aac4c..80cfe53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtquick1-opensource-src (5.5.1-1) UNRELEASED; urgency=medium
     from othe package.
   * Do not ship private headers anymore. We are not using them.
     - Do not create qtquick1-abi-x-y-x anymore.
+    - Keep marking private symbols as such. It makes maintaining them easier.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Oct 2015 14:06:09 -0300
 
diff --git a/debian/rules b/debian/rules
index 1f707c9..0b4036b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,25 @@ export QT_SELECT := qt5
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtquick1-5-dbg
 
+override_dh_clean:
+	dh_clean
+	# Remove private headers.
+	rm -rfv debian/private-headers
+
 override_dh_auto_configure:
 	qmake 
 
 override_dh_auto_install:
 	dh_auto_install
 
+	# Move private headers out of debian/tmp
+	mkdir -p debian/private-headers
+	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtDeclarative/*/QtDeclarative/private/ \
+	      debian/private-headers
+
+	# Remove some other private stuff.
+	rm -fv usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_declarative_private.pri
+
 	# libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
@@ -33,4 +46,4 @@ override_dh_install:
 override_dh_makeshlibs:
 	dh_makeshlibs
 	# Check for private symbols not marked as such.
-	pkgkde-mark-private-symbols debian/qtquick1-5-private-dev/usr/include
+	pkgkde-mark-private-symbols debian/private-headers

-- 
qtquick1 packaging