[SCM] qtwebchannel packaging branch, master, updated. debian/5.6.1-1-17-g81ac67a

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 9d5f8ee8f97fe3fa5354c0d9b0e2db82e91386c3
Author: Sandro Knauß <hefee at debian.org>
Date:   Sun Oct 30 15:47:26 2016 +0100

    Remove also directory that holds private headers.
---
 debian/changelog | 1 +
 debian/rules     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a9640b7..5c9f53c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtwebchannel-opensource-src (5.7.1~20161021-0) UNRELEASED; urgency=medium
   * Update build-deps. Tighten to Qt5.7.1.
   * Update patches (only hunk updates needed).
   * Update symbol files.
+  * Remove also directory that holds private headers.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Oct 2016 14:23:25 +0100
 
diff --git a/debian/rules b/debian/rules
index f7ffe6f..8b4926f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,12 +2,15 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+include /usr/share/dpkg/default.mk
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+VERSION_CLEAN_UPSTREAM = $(call dpkg_late_eval,VERSION_CLEAN_UPSTREAM,echo '$(DEB_VERSION_UPSTREAM)' | sed -e 's/~.*//')
+
 %:
 	dh $@ --with pkgkde_symbolshelper
 
@@ -30,7 +33,7 @@ override_dh_auto_install-arch:
 	dh_auto_install
 
 	# Remove private headers
-	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebChannel/*/QtWebChannel
+	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebChannel/$(VERSION_CLEAN_UPSTREAM)
 	# And associated files
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webchannel_private.pri
 

-- 
qtwebchannel packaging