[SCM] Qt 4 Debian packaging. branch, experimental-snapshots, updated. debian/4.5.3-1-7-gb8557fd
Fathi Boudra
fabo at alioth.debian.org
Thu Oct 8 08:25:51 UTC 2009
The following commit has been merged in the experimental-snapshots branch:
commit b8557fd8f73d7a58b734d16115197e4a3ee3dfbd
Author: Fathi Boudra <fabo at debian.org>
Date: Thu Oct 8 10:25:16 2009 +0200
Build with --no-separate-debug-info. Adjust debian/rules accordingly.
---
debian/changelog | 1 +
debian/rules | 25 ++++++++++++++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 84cba76..9c71224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshots; urgency=l
- Add libqt4-multimedia package.
* Update installed files and related lintian files.
* Rewrite debian/rules, converted to dh usage.
+ * Build with --no-separate-debug-info.
-- Fathi Boudra <fabo at debian.org> Sun, 04 Oct 2009 21:53:47 +0200
diff --git a/debian/rules b/debian/rules
index 73d321d..0b3b3f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
# workaround to use qhelpgenerator.
export QT_PLUGIN_PATH := $(QTDIR)/plugins
-pkgs_dbg := $(filter %-dbg,$(shell dh_listpackages))
+#pkgs_dbg := $(filter %-dbg,$(shell dh_listpackages))
+pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e '/phonon-dbg/d; /libqt4-dbg/d; s|-dbg||')
pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
# Upstream changelog
upstream_changes := $(wildcard changes-*)
@@ -98,6 +99,7 @@ endif
-exceptions \
-dbus \
-pch \
+ -no-separate-debug-info \
-phonon \
-no-phonon-backend \
-svg \
@@ -230,10 +232,11 @@ override_dh_auto_install:
debian/desktop/qtconfig.png.uu
override_dh_install:
- # Run dh_install without the exclude argument to install the *.debug files
- $(foreach pkg,$(pkgs_dbg),dh_install -p$(pkg) --sourcedir=debian/tmp;)
- # Ensure the *.debug files aren't included in any package other than *-dbg
- dh_install --remaining-packages --sourcedir=debian/tmp --exclude=.debug
+# # Run dh_install without the exclude argument to install the *.debug files
+# $(foreach pkg,$(pkgs_dbg),dh_install -p$(pkg) --sourcedir=debian/tmp;)
+# # Ensure the *.debug files aren't included in any package other than *-dbg
+# dh_install --remaining-packages --sourcedir=debian/tmp --exclude=.debug
+ dh_install --list-missing --sourcedir=debian/tmp
override_dh_installdocs:
dh_installdocs --all LGPL_EXCEPTION.txt
@@ -242,8 +245,12 @@ override_dh_installchangelogs:
dh_installchangelogs $(upstream_changes)
override_dh_strip:
- $(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --exclude=.debug;)
- dh_strip --remaining-packages
+# $(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --exclude=.debug;)
+# dh_strip --remaining-packages
+ $(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
+ dh_strip -plibphonon4 --dbg-package=phonon-dbg
+ dh_strip --remaining-packages --dbg-package=libqt4-dbg
+ # Generate libphonon4 symbols file
pkgkde-symbolshelper symbolfile -p libphonon4 -o debian/libphonon4.symbols
override_dh_makeshlibs:
@@ -256,7 +263,7 @@ override_dh_makeshlibs:
fi \
done
-override_dh_shlibdeps:
- dh_shlibdeps --exclude=.debug
+#override_dh_shlibdeps:
+# dh_shlibdeps --exclude=.debug
.PHONY: override_dh_auto_test
--
Qt 4 Debian packaging.
More information about the pkg-kde-commits
mailing list