[SCM] qtpim packaging branch, master, updated. 078f0aee378019e70cbeeba1078b86f84bb0b63d

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit a719152b144b557a21878655534ebd84855ded03
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Jul 17 10:52:58 2014 +0000

    Remove private headers
---
 debian/qtpim5-private-dev.install |  4 ----
 debian/rules                      | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/qtpim5-private-dev.install b/debian/qtpim5-private-dev.install
deleted file mode 100644
index 5887e96..0000000
--- a/debian/qtpim5-private-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/qt5/QtContacts/*/QtContacts/private/*
-usr/include/qt5/QtOrganizer/*/QtOrganizer/private/*
-usr/include/qt5/QtVersit/*/QtVersit/private/*
-usr/include/qt5/QtVersitOrganizer/*/QtVersitOrganizer/private/*
diff --git a/debian/rules b/debian/rules
index 5c84a1b..025e411 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,18 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install
+	
+	# Remove private stuff
+	rm -rfv debian/tmp/usr/include/*/qt5/QtContacts/*/QtContacts/private/
+	rm -rfv debian/tmp/usr/include/*/qt5/QtOrganizer/*/QtOrganizer/private/
+	rm -rfv debian/tmp/usr/include/*/qt5/QtVersit/*/QtVersit/private/
+	rm -rfv debian/tmp/usr/include/*/qt5/QtVersitOrganizer/*/QtVersitOrganizer/private/
+	rm -fv $(CURDIR)/debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_*_private.pri
+	
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	# Don't install the skeleton plugin
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/organizer/libqtorganizer_skeleton.so
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
qtpim packaging