[Python-modules-commits] r3233 - in /packages/python-qt4/trunk/debian: changelog python-qt4-dbus.install rules

[shlomme at users.alioth.debian.org]

Author: shlomme
Date: Tue Sep 11 17:21:07 2007
New Revision: 3233

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3233
Log:
* more dbus module moving

Modified:
    packages/python-qt4/trunk/debian/changelog
    packages/python-qt4/trunk/debian/python-qt4-dbus.install
    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=3233&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/changelog (original)
+++ packages/python-qt4/trunk/debian/changelog Tue Sep 11 17:21:07 2007
@@ -2,8 +2,9 @@
 
   * Merged back changes from Ubuntu:
   * Added debug packages. (Closes: #435652)
-	
- -- Torsten Marek <shlomme at debian.org>  Mon, 03 Sep 2007 23:23:47 +0200
+  * Move dbus mainloop modules to other location. (Closes: #439359)
+
+ -- Torsten Marek <shlomme at debian.org>  Tue, 11 Sep 2007 19:20:26 +0200
 
 python-qt4 (4.3-5) unstable; urgency=low
 

Modified: packages/python-qt4/trunk/debian/python-qt4-dbus.install
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/python-qt4-dbus.install?rev=3233&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dbus.install (original)
+++ packages/python-qt4/trunk/debian/python-qt4-dbus.install Tue Sep 11 17:21:07 2007
@@ -1,1 +1,1 @@
-usr/lib/python*/dbus/mainloop/*
+var/lib/python-support/python*/dbus/mainloop/*

Modified: packages/python-qt4/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt4/trunk/debian/rules?rev=3233&op=diff
==============================================================================
--- packages/python-qt4/trunk/debian/rules (original)
+++ packages/python-qt4/trunk/debian/rules Tue Sep 11 17:21:07 2007
@@ -104,7 +104,7 @@
 
 	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
-# need python-dbus-dbg for that!
+# 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
@@ -121,12 +121,13 @@
 	set -e; \
 	for v in ${PYTHONS}; do \
 	  d=debian/python-qt4-dbus; \
-	  mkdir -p $$d/usr/lib/python$$v/dbus/mainloop; \
+	  mkdir -p $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop; \
 	  mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so \
-	    $$d/usr/lib/python$$v/dbus/mainloop/; \
-	  ln -sf /usr/lib/python$$v/dbus/mainloop/qt.so \
+	    $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/; \
+	  ln -sf /usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/qt.so \
 	    $$d/var/lib/python-support/python$$v/dbus/mainloop/qt.so; \
 	done
+# we need python-dbus-dbg for that!
 #	  d=debian/python-qt4-dbus-dbg; \
 #	  mkdir -p $$d/usr/lib/python$$v/dbus/mainloop; \
 #	  mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so \
@@ -162,9 +163,14 @@
 	dh_installdocs -A NEWS THANKS
 	dh_installexamples
 	dh_link
-	set -e; \
+#	these are the packages to be stripped
+	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; \
 		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; \