[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.5.0-1-5-g286f954

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 286f954f6fbbfd869de839320e6a7480e453111c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 22 11:32:37 2015 +0300

    Symlink duplicate private headers in QtQml and QtQmlDevTools directories.
---
 debian/changelog |  1 +
 debian/rules     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7bd745f..afeeb53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdeclarative-opensource-src (5.5.0-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Update symbols files with buildds’ logs.
+  * Symlink duplicate private headers in QtQml and QtQmlDevTools directories.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Aug 2015 16:59:47 +0300
 
diff --git a/debian/rules b/debian/rules
index bc19cd8..12ee958 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 #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)
@@ -49,6 +50,17 @@ 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
 	# Check for private symbols not marked as such. Be verbose.

-- 
qtdeclarative packaging