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

Mon Apr 6 14:30:15 UTC 2009

Date: Monday, April 6, 2009 @ 14:30:14
  Author: bzed
Revision: 8132

* UNTESTED DO NOT UPLOAD !!!!!!!!!!!!!!!1
* debian/control:
  - Switch to python-support.
* debian/rules:
  - Avoid all insane hacks which were messing with
    /var/lib/python-support. This was prone to fail in any case,
    and will result in FTBFS as soon as python-support 1.0 will
    hit unstable.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/python-qt4-dbus.install
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/README.source
  packages/python-qt4/trunk/debian/pycompat

Deleted: packages/python-qt4/trunk/debian/README.source
===================================================================

--- packages/python-qt4/trunk/debian/README.source	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/README.source	2009-04-06 14:30:14 UTC (rev 8132)
@@ -1,4 +0,0 @@
-python-qt4 package uses pycentral, while you'll find some installation
-directory being under .../python-support/...: this is because that file will
-have to be "injected" in other packages (for example python-dbus) that uses
-python-support.

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/changelog	2009-04-06 14:30:14 UTC (rev 8132)
@@ -1,3 +1,16 @@
+python-qt4 (4.4.4-5) unstable; urgency=low
+
+  * UNTESTED DO NOT UPLOAD !!!!!!!!!!!!!!!1
+  * debian/control:
+    - Switch to python-support.
+  * debian/rules:
+    - Avoid all insane hacks which were messing with
+      /var/lib/python-support. This was prone to fail in any case,
+      and will result in FTBFS as soon as python-support 1.0 will
+      hit unstable.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Mon, 06 Apr 2009 16:24:02 +0200
+
 python-qt4 (4.4.4-4) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/control	2009-04-06 14:30:14 UTC (rev 8132)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.9), python-sip4-dev (>= 4.7.8), python-central (>= 0.6), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
+Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.9), python-sip4-dev (>= 4.7.8), python-support, dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
 Build-Conflicts: python-xml, python-xml-dbg
 Standards-Version: 3.8.1
 Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/

Deleted: packages/python-qt4/trunk/debian/pycompat
===================================================================
--- packages/python-qt4/trunk/debian/pycompat	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/pycompat	2009-04-06 14:30:14 UTC (rev 8132)
@@ -1 +0,0 @@
-2

Modified: packages/python-qt4/trunk/debian/python-qt4-dbus.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dbus.install	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/python-qt4-dbus.install	2009-04-06 14:30:14 UTC (rev 8132)
@@ -1,2 +1 @@
-var/lib/python-support/python*/dbus/mainloop/*
-
+usr/lib/pymodules/python*/dbus/mainloop/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-04-06 09:17:16 UTC (rev 8131)
+++ packages/python-qt4/trunk/debian/rules	2009-04-06 14:30:14 UTC (rev 8132)
@@ -115,8 +115,6 @@
 		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;\
-		mkdir -p debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\
-		mv $$d//var/lib/python-support/python$$v/dbus/mainloop/qt.so debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\
 		mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
 		mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
 	done
@@ -129,27 +127,11 @@
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
 
-	: # make the dbus extension available in /var
-	set -e; \
-	for v in ${PYTHONS}; do \
-	  d=debian/python-qt4-dbus; \
-	  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/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; \
-	  d=debian/python-qt4-dbus-dbg; \
-	  mkdir -p $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop; \
-	  mv $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so \
-	    $$d/usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/; \
-	  ln -sf /usr/lib/python$$v/site-packages/PyQt4/_dbus/mainloop/qt_d.so \
-	    $$d/var/lib/python-support/python$$v/dbus/mainloop/qt_d.so; \
-	done
-
 	find debian/python-*-dbg ! -type d \
 		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
 	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
 
+	#FIXME.
 	cp pyuic/uic/pyuic.py debian/pyqt4-dev-tools/usr/bin/pyuic4
 	rm debian/*/usr/lib/*/site-packages/PyQt4/uic/pyuic.py
 
@@ -188,7 +170,8 @@
 	dh_fixperms
 	# DH_PYCENTRAL=nomove is set in binary-indep since only
 	# python-qt4-dev contains files that may not be moved.
-	dh_pycentral
+	#dh_pycentral
+	dh_pysupport
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -197,7 +180,7 @@
 
 # Build architecture independant packages using the common target.
 binary-indep: install-indep
-	DH_PYCENTRAL=nomove $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
 binary-arch: install-arch


