[SCM] gammaray packaging branch, master, updated. debian/2.1.0-3-7-gd510475

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 1c59ddf905ddcef2e340ad79f61d1d2e0467e79e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Dec 12 21:10:06 2014 +0100

    Drop build dependency on libqt4-private-dev
---
 debian/changelog | 11 +++++++++--
 debian/control   |  1 -
 debian/rules     | 15 +--------------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa2f33b..0fe6bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-gammaray (2.1.0-4) UNRELEASED; urgency=medium
+gammaray (2.1.0-4) unstable; urgency=medium
 
+  [ Felix Geyer ]
   * Fix FTBFS on ppc64el (Closes: #765672).
   * Let xvfb-run choose a free server number so it doesn't fail when one is
     already taken.
 
- -- Felix Geyer <fgeyer at debian.org>  Mon, 28 Jul 2014 19:27:29 +0200
+  [ Jakub Adam ]
+  * Drop build dependency on libqt4-private-dev (Closes: #763852)
+    - gammaray is the last package still using it and has the needed Qt4 private
+      headers already bundled with the source code. Dropping the dependency will
+      allow libqt4-private-dev to be removed from Debian.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 12 Dec 2014 21:28:26 +0100
 
 gammaray (2.1.0-3.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8ff91ec..31ea087 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
                libqt5webkit5-dev,
                qtdeclarative5-private-dev,
                libqt4-dev,
-               libqt4-private-dev,
                libqtwebkit-dev,
                libgraphviz-dev,
                gdb,
diff --git a/debian/rules b/debian/rules
index 9e7fe62..e716a9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip override_dh_clean
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
@@ -10,11 +10,6 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 	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 -B obj-qt5
 	dh_auto_configure -B obj-qt4 -- -DGAMMARAY_ENFORCE_QT4_BUILD=ON -DGAMMARAY_PROBE_ONLY_BUILD=ON
 
@@ -44,11 +39,3 @@ 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