[SCM] gammaray packaging branch, master, updated. upstream/1.2.1-42-g5a8ac5f

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=5a8ac5f

The following commit has been merged in the master branch:
commit 5a8ac5f53aea5b4c68ab83f9886a36702ca34374
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Aug 20 20:52:43 2012 +0200

    Ensure bundled private Qt headers are not used.
---
 debian/rules |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index f7e5f9a..f09ea19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,18 @@
 #!/usr/bin/make -f
 
-.PHONY: override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip
+.PHONY: override_dh_auto_configure override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip override_dh_clean
 
 %:
 	dh $@ --parallel
 
+override_dh_auto_configure:
+	# Move away bundled Qt private headers so that system versions are used
+	if [ -d 3rdparty/qt/private ]; then \
+		mv 3rdparty/qt/private 3rdparty/qt/private.dont.use; \
+	fi
+
+	dh_auto_configure
+
 override_dh_auto_test:
 	xvfb-run dh_auto_test
 
@@ -17,3 +25,11 @@ override_dh_installdocs:
 
 override_dh_strip:
 	dh_strip --dbg-package=gammaray-dbg
+
+override_dh_clean:
+	dh_clean
+
+	# Put back bundled Qt private headers to restore sources into original state
+	if [ -d 3rdparty/qt/private.dont.use ]; then \
+		mv 3rdparty/qt/private.dont.use 3rdparty/qt/private; \
+	fi

-- 
gammaray packaging