[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-45-gdc11a87

Fathi Boudra fabo at alioth.debian.org
Thu Dec 29 09:27:55 UTC 2011


The following commit has been merged in the experimental branch:
commit 2d9312df693b8e702ebcf4922855970bcaa37147
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Dec 29 11:19:12 2011 +0200

    * Add mv-qt4-bin-dbg.sh script: with debhelper compat 9, dh_strip puts
      separated debug symbols in a location based on their build-id. The script
      moves the debug files for the binaries in the qt4-bin-dbg package.
      - build-depends on elfutils for mv-qt4-bin-dbg.sh script.
      - call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
---
 debian/changelog         |    5 +++++
 debian/control           |    1 +
 debian/mv-qt4-bin-dbg.sh |   16 ++++++++++++++++
 debian/rules             |    5 +----
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5011d7..5528669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,14 +33,19 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
     - mark Qt libraries as Multi-Arch.
     - build-depends on firebird-dev package. (Closes: #653378)
     - suggests libthai0 to libqtcore4. (Closes: #652712)
+    - build-depends on elfutils for mv-qt4-bin-dbg.sh script.
   * Update debian/rules:
     - add DEB_HOST_MULTIARCH support for libdir/plugindir.
     - remove -qt-gif configure option - removed upstream.
     - use ts-all target. The ts target has been removed.
+    - call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
   * Update debian/*.install files:
     - update paths for multiarch.
     - headers, translations, qmlplugindump.
   * Update debian/*.symbol files.
+  * Add mv-qt4-bin-dbg.sh script: with debhelper compat 9, dh_strip puts
+    separated debug symbols in a location based on their build-id. The script
+    moves the debug files for the binaries in the qt4-bin-dbg package.
 
   [ Pino Toscano ]
   * Use the hurd-g++ mkspec when building on Hurd:
diff --git a/debian/control b/debian/control
index dc00aee..630dd82 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Sune Vuorela <debian at pusling.com>,
            Pino Toscano <pino at debian.org>
 Build-Depends: debhelper (>= 7.4.13),
+               elfutils,
                firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
                flex,
                freetds-dev,
diff --git a/debian/mv-qt4-bin-dbg.sh b/debian/mv-qt4-bin-dbg.sh
new file mode 100755
index 0000000..c842a4f
--- /dev/null
+++ b/debian/mv-qt4-bin-dbg.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+src_dir="debian/libqt4-dbg/usr/lib/debug/.build-id"
+dest_dir="debian/qt4-bin-dbg/usr/lib/debug/.build-id"
+
+for binary in `find debian/tmp/usr/bin -type f -print`; do
+  build_id=`eu-readelf --notes ${binary} | grep Build.ID: | awk '{print $3}'`
+  build_id_dir=`echo ${build_id} | cut -c1-2`
+  build_id_file=`echo ${build_id} | cut -c3-`
+  base_file=${src_dir}/${build_id_dir}/${build_id_file}.debug
+  if [ -f ${base_file} ] ; then
+    mkdir -p ${dest_dir}/${build_id_dir}
+    mv ${base_file} ${dest_dir}/${build_id_dir}
+    rmdir --ignore-fail-on-non-empty ${src_dir}/${build_id_dir}
+  fi
+done
diff --git a/debian/rules b/debian/rules
index d36dafb..2754164 100755
--- a/debian/rules
+++ b/debian/rules
@@ -319,10 +319,7 @@ override_dh_strip:
 	dh_strip -plibqt4-phonon
 	dh_strip --remaining-packages --dbg-package=libqt4-dbg
 	# Move binaries in qt4-bin-dbg package
-	# FIXME: with debhelper compat 9, dh_strip puts separated debug symbols
-	#        in a location based on their build-id.
-	#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/
+	sh debian/mv-qt4-bin-dbg.sh
 
 override_dh_makeshlibs:
 	# Specific shlibs version (e.g.: 4:4.5.2)

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list