[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

[Didier Raboud]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=313bcd1

The following commit has been merged in the experimental branch:
commit 313bcd1008753c7b34470a8887ab286716ea6650
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon Mar 5 18:25:17 2012 +0100

    Add a dh_strip call for qt4-bin-dbg instead of moving the debug files manually.
    
    This allows us to switch to compat level v9 again.
    
    Reviewed-by: Didier Raboud <odyx at debian.org>
---
 debian/changelog |    7 ++++---
 debian/compat    |    2 +-
 debian/rules     |    9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de28c9f..ced9852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
   * New upstream release.
 
   [ Fathi Boudra ]
-  * Revert debian/compat to 8:
-    - drop mv-qt4-bin-dbg.sh script.
-    - drop elfutils build dependency.
   * Use multiarch for importsdir:
     - update debian/libqt4-declarative-*.install files.
     - mark QML plugin packages as Multi-Arch: same.
@@ -24,6 +21,10 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
     - Move binaries from libqt4-dev into the new package libqt4-dev-bin.
     - Mark libqt4-dev-bin, qt4-qmake and qt4-linguist-tools as
       Multi-Arch: foreign.
+  * Add a dh_strip call for qt4-bin-dbg instead of moving the debug files
+    manually.
+    - drop mv-qt4-bin-dbg.sh script.
+    - drop elfutils build dependency.
 
   [ Didier Raboud ]
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/rules b/debian/rules
index 3694c94..3520454 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,12 @@ export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 # workaround to use qhelpgenerator.
 export QT_PLUGIN_PATH := $(QTDIR)/plugins
 
+# Packages with own debug package
 pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e '/libqt4-dbg/d; s|-dbg||')
+# Packages whose debug symbols belong to qt4-bin-dbg
+pkgs_dbgbin := libqt4-dev-bin $(filter-out %-dbg lib% $(pkgs_dbg),$(shell dh_listpackages))
 # Library package list for override_dh_makeshlibs, excludes libqt4-phonon
-pkgs_lib := $(filter-out %-dev %-dbg libqt4-phonon,$(filter lib%,$(shell dh_listpackages)))
+pkgs_lib := $(filter-out %-dev %-dbg libqt4-phonon libqt4-dev-bin,$(filter lib%,$(shell dh_listpackages)))
 # Upstream changelog
 upstream_changes := $(wildcard changes-*)
 # Current debian version (e.g.: 4:4.5.2-1)
@@ -344,11 +347,9 @@ override_dh_installchangelogs:
 
 override_dh_strip:
 	$(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
+	dh_strip $(foreach pkg,$(pkgs_dbgbin),-p$(pkg)) --dbg-package=qt4-bin-dbg
 	dh_strip -plibqt4-phonon
 	dh_strip --remaining-packages --dbg-package=libqt4-dbg
-	# Move binaries in qt4-bin-dbg package
-	mkdir -p debian/qt4-bin-dbg/usr/lib/debug/usr
-	mv debian/libqt4-dbg/usr/lib/debug/usr/bin debian/qt4-bin-dbg/usr/lib/debug/usr/
 
 override_dh_makeshlibs:
 	# Specific shlibs version (e.g.: 4:4.5.2)

-- 
Qt 4 packaging