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

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit e113fafdc83d843a6c5a510392747b135d675d30
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jan 4 22:20:08 2012 +0200

    * Revert debian/compat to 8:
      - drop mv-qt4-bin-dbg.sh script.
      - drop elfutils build dependency.
---
 debian/changelog         |    4 +++-
 debian/compat            |    2 +-
 debian/control           |    1 -
 debian/mv-qt4-bin-dbg.sh |   16 ----------------
 debian/rules             |    3 ++-
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c41c148..29566cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low
 
-  * 
+  * Revert debian/compat to 8:
+    - drop mv-qt4-bin-dbg.sh script.
+    - drop elfutils build dependency.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 Jan 2012 22:15:56 +0200
 
diff --git a/debian/compat b/debian/compat
index ec63514..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+8
diff --git a/debian/control b/debian/control
index d76775d..f6bad73 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Pino Toscano <pino at debian.org>
 Build-Depends: debhelper (>= 8.9.13),
                dpkg-dev (>= 1.16.1),
-               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
deleted file mode 100755
index c842a4f..0000000
--- a/debian/mv-qt4-bin-dbg.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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 1f4c3bb..4027b73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -320,7 +320,8 @@ override_dh_strip:
 	dh_strip -plibqt4-phonon
 	dh_strip --remaining-packages --dbg-package=libqt4-dbg
 	# Move binaries in qt4-bin-dbg package
-	sh debian/mv-qt4-bin-dbg.sh
+	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