[Python-modules-commits] r8139 - in packages/python-qt4/trunk/debian (3 files)

[bzed at users.alioth.debian.org]

    Date: Monday, April 6, 2009 @ 16:30:48
  Author: bzed
Revision: 8139

debian/python-qt4-dbus.install: create file on the fly as
directories may change depending on the used python-support version.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/python-qt4-dbus.install

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-04-06 16:00:37 UTC (rev 8138)
+++ packages/python-qt4/trunk/debian/changelog	2009-04-06 16:30:48 UTC (rev 8139)
@@ -12,8 +12,10 @@
       (Closes: #512739)
   * debian/README.source, debian/pycompat:
     - Dropping file, not needed anymore.
+  * debian/python-qt4-dbus.install: create file on the fly as
+    directories may change depending on the used python-support version.
 
- -- Bernd Zeimetz <bzed at debian.org>  Mon, 06 Apr 2009 16:24:02 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Mon, 06 Apr 2009 18:32:37 +0200
 
 python-qt4 (4.4.4-4) unstable; urgency=low
 

Deleted: packages/python-qt4/trunk/debian/python-qt4-dbus.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dbus.install	2009-04-06 16:00:37 UTC (rev 8138)
+++ packages/python-qt4/trunk/debian/python-qt4-dbus.install	2009-04-06 16:30:48 UTC (rev 8139)
@@ -1 +0,0 @@
-usr/lib/pymodules/python*/dbus/mainloop/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-04-06 16:00:37 UTC (rev 8138)
+++ packages/python-qt4/trunk/debian/rules	2009-04-06 16:30:48 UTC (rev 8139)
@@ -119,7 +119,9 @@
 		mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
 	done
 
-
+	#create python-qt4-dbus.install on the fly.
+	find $(CURDIR)/debian/tmp -type d -name mainloop | sed 's,^.*/tmp/,,;s,$,/*,' \
+	    > $(CURDIR)/debian/python-qt4-dbus.install
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
 	for i in $$(find debian/python-*-dbg -name '*.so'); do \
@@ -131,18 +133,21 @@
 		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
 	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
 
-	#FIXME.
+	#FIXME - copying the file to /usr/bin is not the best way,
+	# it should be imported properly instead.
 	cp pyuic/uic/pyuic.py debian/pyqt4-dev-tools/usr/bin/pyuic4
 	rm debian/*/usr/lib/*/site-packages/PyQt4/uic/pyuic.py
 
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched: 
 	dh_testdir
 	dh_testroot
 	-cd designer && make distclean
 	-cd qpy/QtDesigner && make distclean
 	rm -f designer/python.pro designer/Makefile *-stamp
 	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
+	rm -f $(CURDIR)/debian/python-qt4-dbus.install
 	dh_clean
 
 # Must not depend on anything. This is to be called by