[Python-modules-commits] r8193 - in packages/python-qt4/trunk/debian (changelog control rules)

[bzed at users.alioth.debian.org]

    Date: Wednesday, April 8, 2009 @ 21:12:46
  Author: bzed
Revision: 8193

* medium urgency as we are fixing a RC bug which makes
  several other packages FTBFS.
  - Install .noinit into pyuic4's widget-plugins directory as
    pyuic4 fails if __init__.py exists in the directory. Thanks
    to Pierre Chifflier for the bugreport (Closes: #523059).
  - pyqt4-dev-tools: make the dependency on python-qt a
    versioned one.

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

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-04-08 15:11:56 UTC (rev 8192)
+++ packages/python-qt4/trunk/debian/changelog	2009-04-08 21:12:46 UTC (rev 8193)
@@ -1,17 +1,23 @@
-python-qt4 (4.4.4-6) UNRELEASED; urgency=low
+python-qt4 (4.4.4-6) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * medium urgency as we are fixing a RC bug which makes
+    several other packages FTBFS.
   * debian/rules:
     - Prepare build-process for Python 2.6.
     - Install the python-qt4-dbus debug extensions properly again,
       they were forgotten during the migration to python-support.
+    - Install .noinit into pyuic4's widget-plugins directory as
+      pyuic4 fails if __init__.py exists in the directory. Thanks
+      to Pierre Chifflier for the bugreport (Closes: #523059).
   * debian/*.install:
     - Handle *-package directories to support Python 2.6.
   * debian/control:
     - Use versioned dependencies on python-qt4-common,
       thanks to Zed Pobre for the bug report (Closes: #505572).
+    - pyqt4-dev-tools: make the dependency on python-qt a
+      versioned one.
 
- -- Bernd Zeimetz <bzed at debian.org>  Tue, 07 Apr 2009 21:55:21 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Wed, 08 Apr 2009 23:14:23 +0200
 
 python-qt4 (4.4.4-5) unstable; urgency=low
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2009-04-08 15:11:56 UTC (rev 8192)
+++ packages/python-qt4/trunk/debian/control	2009-04-08 21:12:46 UTC (rev 8193)
@@ -148,7 +148,7 @@
  the Qt example programs ported to Python.
 
 Package: pyqt4-dev-tools
-Depends: ${shlibs:Depends}, python, python-qt4
+Depends: ${shlibs:Depends}, python, python-qt4 (= ${binary:Version})
 Architecture: any
 Description: Development tools for PyQt4
  This package contains various support tools for PyQt4 developers:

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-04-08 15:11:56 UTC (rev 8192)
+++ packages/python-qt4/trunk/debian/rules	2009-04-08 21:12:46 UTC (rev 8193)
@@ -195,9 +195,18 @@
 		ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	done
 endif
+	dh_pysupport
+	# work around the broken way to handle widget plugins by shipping
+	# .noinit in the directory.
+	# we try to be compatible to older python-support versions to make
+	# backports more easy - but this was not tested.
+	if [ -d $(curdir)/debian/python-qt4/usr/share/pyshared/PyQt4/uic/widget-plugins ]; then \
+	  touch $(curdir)/debian/python-qt4/usr/share/pyshared/PyQt4/uic/widget-plugins/.noinit; \
+	else \
+	  touch $(curdir)/debian/python-qt4/usr/share/python-support/PyQt4/uic/widget-plugins/.noinit ;\
+	fi
+	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql
-	dh_fixperms
-	dh_pysupport
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol