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

[kitterman at users.alioth.debian.org]

    Date: Wednesday, December 28, 2011 @ 18:15:05
  Author: kitterman
Revision: 19764

Update for PyQt4 4.9 - Add QtDbus to python-qt4 and python3-pyqt4.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/python-qt4.install
  packages/python-qt4/trunk/debian/python3-pyqt4.install
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2011-12-28 15:10:10 UTC (rev 19763)
+++ packages/python-qt4/trunk/debian/changelog	2011-12-28 18:15:05 UTC (rev 19764)
@@ -1,11 +1,17 @@
-python-qt4 (4.8.6-3) UNRELEASED; urgency=low
+python-qt4 (4.9-1) unstable; urgency=low
 
   * Team upload
 
   [ Scott Kitterman ]
-  * New upstream release
-    - Drop debian/patches/fix_uiparser_buttonbox.diff (was from upstream)
-  * Build for python3 (except for dbus)
+  * New upstream release (Closes: #653293)
+    - Adds QtDbus module support (in python-qt4 - the existing python-qt4-dbus
+      is still provided for python)
+    - Add relevant QtDbus.so to python-qt4.install and python3-pyqt4.install
+    - Update relevant package descriptionts to mention QtDBus
+    - Bump minimum python-sip-dev and python3-sip-dev version required to
+      4.13.1
+    - Add Breaks for python[3]-sip4 (<< 4.13.1~)
+  * Build for python3 (Closes: #558389) (LP: #400826)
     - Add python3-all-dev/dbg and python3-sip-dev/dbg to build-depends
     - Add python3-qt4-* packages
     - Add X-Python-Version to debian/rules
@@ -13,7 +19,7 @@
     - Add .install files for new packages
     - Adjust .install files for python packages to install python2* and not
       python* files to avoid python3 files
-  * Use --no-dbg-cleaning for dh_python2
+  * Use --no-dbg-cleaning for dh_python2 and dh_python3
   * Drop obsolete Conflicts/Replaces
   * Update debian/copyright
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-12-28 15:10:10 UTC (rev 19763)
+++ packages/python-qt4/trunk/debian/control	2011-12-28 18:15:05 UTC (rev 19764)
@@ -19,9 +19,9 @@
                python-dbus (>= 0.84.0-2),
                python-dbus-dbg,
                python-sip-dbg,
-               python-sip-dev (>= 4.12.1),
+               python-sip-dev (>= 4.13.1),
                python3-sip-dbg,
-               python3-sip-dev
+               python3-sip-dev (>= 4.13.1)
 Build-Conflicts: python-xml, python-xml-dbg
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.4
@@ -45,10 +45,12 @@
         python-qt4-sql (<< 4.8.3-3),
         python-qt4-phonon-dbg (<< 4.8.3-3),
         python-qt4-gl-dbg (<< 4.8.3-3),
-        python-qt4-phonon (<< 4.8.3-3)
+        python-qt4-phonon (<< 4.8.3-3),
+        python-sip4 (<< 4.13.1~)
 Description: Python bindings for Qt4
  PyQt4 exposes the Qt4 API to Python. The following modules are supported:
   * QtCore
+  * QtDBus
   * QtGui
   * QtNetwork
   * QtXml
@@ -66,9 +68,11 @@
 Provides: ${python3:Provides}
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}
 Suggests: python3-pyqt4-dbg
+Breaks: python3-sip4 (<< 4.13.1~)
 Description: Python3 bindings for Qt4
  PyQt4 exposes the Qt4 API to Python3. The following modules are supported:
   * QtCore
+  * QtDBus
   * QtGui
   * QtNetwork
   * QtXml

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2011-12-28 15:10:10 UTC (rev 19763)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2011-12-28 18:15:05 UTC (rev 19764)
@@ -1,6 +1,7 @@
 usr/lib/python2*/*-packages/PyQt4/Qt.so
 usr/lib/python2*/*-packages/PyQt4/QtAssistant.so
 usr/lib/python2*/*-packages/PyQt4/QtCore.so
+usr/lib/python2*/*-packages/PyQt4/QtDBus.so
 usr/lib/python2*/*-packages/PyQt4/QtDeclarative.so
 usr/lib/python2*/*-packages/PyQt4/QtDesigner.so
 usr/lib/python2*/*-packages/PyQt4/QtGui.so

Modified: packages/python-qt4/trunk/debian/python3-pyqt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-pyqt4.install	2011-12-28 15:10:10 UTC (rev 19763)
+++ packages/python-qt4/trunk/debian/python3-pyqt4.install	2011-12-28 18:15:05 UTC (rev 19764)
@@ -1,6 +1,7 @@
 usr/lib/python3*/*-packages/PyQt4/Qt.so
 usr/lib/python3*/*-packages/PyQt4/QtAssistant.so
 usr/lib/python3*/*-packages/PyQt4/QtCore.so
+usr/lib/python3*/*-packages/PyQt4/QtDBus.so
 usr/lib/python3*/*-packages/PyQt4/QtDeclarative.so
 usr/lib/python3*/*-packages/PyQt4/QtDesigner.so
 usr/lib/python3*/*-packages/PyQt4/QtGui.so

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2011-12-28 15:10:10 UTC (rev 19763)
+++ packages/python-qt4/trunk/debian/rules	2011-12-28 18:15:05 UTC (rev 19764)
@@ -102,7 +102,6 @@
 	dh_prep -a
 	dh_installdirs -a
 	sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
-	rm -f $(CURDIR)/debian/python-qt4-dbus.install
 	# This is needed to enforce that the install-arch-% rules are
 	# not run in parallel. Both rules install into the same directory,
 	# and therefore might try to access the same files at the same time.
@@ -221,7 +220,6 @@
 endif
 	dh_python2 --no-dbg-cleaning
 	dh_python3 --no-dbg-cleaning
-	rm -r debian/python3-pyqt4/usr/lib/python3/dist-packages/PyQt4/uic/port_v2
 	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
 	dh_installdeb