[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-11-g75eaa41

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 75eaa41321495f53523813a26d48ad1666956713
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 7 23:42:24 2017 +0300

    Drop the code to symlink private QmlDevTools headers.
    
    These headers are no longer installed.
---
 debian/changelog |  1 +
 debian/rules     | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da962d0..e3741d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ qtdeclarative-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
     following upstream (see commit 4a4a8e911cfafcff).
   * Update debian/copyright.
   * Mark two symbols as optional to fix build with GCC 7 (closes: #853631).
+  * Drop the code to symlink private QmlDevTools headers, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Jun 2017 23:08:37 -0500
 
diff --git a/debian/rules b/debian/rules
index db90352..cc710df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-PRIVATE_HEADERS = debian/qtdeclarative5-private-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -52,17 +51,6 @@ override_dh_auto_install-indep:
 override_dh_install:
 	dh_install --fail-missing
 
-override_dh_link:
-	dh_link
-	@VERSION=$$(ls $(PRIVATE_HEADERS)/QtQml); \
-	set -e; for h in $$(ls $(PRIVATE_HEADERS)/QtQmlDevTools/$$VERSION/QtQmlDevTools/private/); do \
-		if [ -f $(PRIVATE_HEADERS)/QtQml/$$VERSION/QtQml/private/$$h ]; then \
-			echo "Symlinking QtQmlDevTools/private/$$h -> QtQml/private/$$h"; \
-			ln -sf ../../../../QtQml/$$VERSION/QtQml/private/$$h \
-				$(PRIVATE_HEADERS)/QtQmlDevTools/$$VERSION/QtQmlDevTools/private/$$h; \
-		fi; \
-	done
-
 override_dh_makeshlibs:
 	dh_makeshlibs -V
 

-- 
qtdeclarative packaging