[Python-modules-commits] r3255 - in /packages/python-qt4/trunk/debian: changelog rules

[shlomme at users.alioth.debian.org]

Author: shlomme
Date: Sat Sep 15 22:39:43 2007
New Revision: 3255

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3255
Log:
* prepare new release to unstable

Modified:
    packages/python-qt4/trunk/debian/changelog
    packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/changelog?rev=3255&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/changelog (original)
+++ packages/python-qt4/trunk/debian/changelog Sat Sep 15 22:39:43 2007
@@ -1,8 +1,9 @@
-python-qt4 (4.3-7) UNRELEASED; urgency=low
+python-qt4 (4.3-7) unstable; urgency=low
 
   * Added watch file.
+  * python-qt4-{sql,gl}-dbg now really contain debug extensions.
 
- -- Torsten Marek <shlomme at debian.org>  Sat, 15 Sep 2007 20:59:37 +0200
+ -- Torsten Marek <shlomme at debian.org>  Sun, 16 Sep 2007 00:02:37 +0200
 
 python-qt4 (4.3-6) experimental; urgency=low
 

Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3255&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Sat Sep 15 22:39:43 2007
@@ -100,17 +100,16 @@
 		$(MAKE) -C dbg-build-$$v install DESTDIR=$(CURDIR)/$$d; \
 		mv $$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig.py \
 			$$d/usr/lib/python$$v/site-packages/PyQt4/pyqtconfig_d.py; \
+		mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\
+		mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtOpenGL.so debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\
+		mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
+		mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtSql.so debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
 	done
 
-	cp -p debian/python-qt4-gl.install debian/python-qt4-gl-dbg.install
-	cp -p debian/python-qt4-sql.install debian/python-qt4-sql-dbg.install
 # we need python-dbus-dbg for that!
 #	cp -p debian/python-qt4-dbus.install debian/python-qt4-dbus-dbg.install
 
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
-	find debian/python-qt4-dbg \
-                \( -name 'QtOpenGL.so' -o -name 'QtSql.so' \) | xargs rm -f
 
 	for i in $$(find debian/python-*-dbg -name '*.so'); do \
           b=$$(basename $$i .so); \
@@ -148,7 +147,7 @@
 	dh_testroot
 	-cd designer && make distclean
 	-cd qpy/QtDesigner && make distclean
-	rm -f designer/python.pro designer/Makefile *-stamp debian/python-*-dbg.install
+	rm -f designer/python.pro designer/Makefile *-stamp
 	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
 	dh_clean
 
@@ -163,22 +162,21 @@
 	dh_installdocs -A NEWS THANKS
 	dh_installexamples
 	dh_link
-#	these are the packages to be stripped
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+	DH_OPTIONS= dh_strip -ppyqt4-dev-tools
+	DH_OPTIONS= dh_strip -python-qt4-dbus
 	set -e; \
-	for p in python-qt4 python-qt4-gl python-qt4-sql python-qt4-dbus pyqt4-dev-tools; do \
-		DH_OPTIONS= dh_strip -p$$p; \
-        done
-	set -e; \
-# 	these are the packages that have debugging packages and whose doc dirs should be merged
 	for p in python-qt4 python-qt4-gl python-qt4-sql; do \
+		DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
 		rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 		mkdir -p debian/$$p-dbg/usr/share/doc; \
 		ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
         done
+endif
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
         # DH_PYCENTRAL=nomove is set in binary-indep since only
-        # python-sip4-dev contains files that may not be moved.
+        # python-qt4-dev contains files that may not be moved.
 	dh_pycentral
 	dh_installdeb
 	dh_shlibdeps