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

[kitterman at users.alioth.debian.org]

    Date: Monday, January 30, 2012 @ 21:45:48
  Author: kitterman
Revision: 20197

Final updates before reupload.

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	2012-01-30 21:35:13 UTC (rev 20196)
+++ packages/python-qt4/trunk/debian/changelog	2012-01-30 21:45:48 UTC (rev 20197)
@@ -2,15 +2,16 @@
 
   [ Scott Kitterman ]
   * Add myself to uploaders
-  * Add missing build-depends on qtmobility-dev and libicu-dev
+  * Add missing build-depends on python-dbus-dev, qtmobility-dev and
+    libicu-dev
   * Feedback changes from Ubuntu
   * Adjust install path in debian/python-qt4.install for multiarched qt4-x11
     and bump minimum build-dep version to 4:4.8.0-1~
   * Use dh_sip3 for generating SIP depends instead of hard coded version now
     that dh_sip3 is available
     - Add dh_sip3 in debian/rules
-  * Build python-pyqt4-dbus/-dbg packages now that python3 port of dbus-python
-    is availalble
+  * Build python3-dbus.mainloop.qt/-dbg packages now that python3 port of
+    dbus-python is availalble
     - Add packages to debian/control
     - Add python3-dbus and python3-dbus-dbg to build-depends
     - Adjust debian/rules to support python-pyqt4-dbus-dbg

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2012-01-30 21:35:13 UTC (rev 20196)
+++ packages/python-qt4/trunk/debian/control	2012-01-30 21:45:48 UTC (rev 20197)
@@ -19,6 +19,7 @@
                python-all-dev (>= 2.6.6-3~),
                python3-all-dbg,
                python3-all-dev,
+               python-dbus-dev,
                python-dbus (>= 0.84.0-2),
                python-dbus-dbg,
                python3-dbus,
@@ -200,7 +201,7 @@
  .
  This package contains the extensions built for the Python debug interpreter.
 
-Package: python3-pyqt4-dbus
+Package: python3-dbus.mainloop.qt
 Architecture: any
 Provides: ${python3:Provides}
 Depends: python3-dbus,
@@ -211,14 +212,14 @@
  The DBus module of PyQt4 provides integration of PyQt4 applications
  with the DBus main loop for Python 3
 
-Package: python3-pyqt4-dbus-dbg
+Package: python3-dbus.mainloop.qt-dbg
 Architecture: any
 Priority: extra
 Section: debug
 Provides: ${python3:Provides}
 Depends: python3-dbg,
          python3-dbus-dbg,
-         python3-pyqt4-dbus (= ${binary:Version}),
+         python3-dbus.mainloop.qt (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: DBus Support for PyQt4 (debug extensions for Python 3)

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2012-01-30 21:35:13 UTC (rev 20196)
+++ packages/python-qt4/trunk/debian/rules	2012-01-30 21:45:48 UTC (rev 20197)
@@ -105,7 +105,7 @@
 	dh_installdirs -a
 	sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile
 	rm -f $(CURDIR)/debian/python-qt4-dbus.install
-	rm -f $(CURDIR)/debian/python3-pyqt4-dbus.install
+	rm -f $(CURDIR)/debian/python3-dbus.mainloop.qt.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.
@@ -131,7 +131,7 @@
 	# probably like ipython handles it.
 	cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
 
-d3_qt4_dbg = debian/python3-pyqt4-dbg
+d3_qt4_dbg = debian/python3-dbus.mainloop.qt-dbg
 
 install-arch-3.%:
 	$(MAKE) -C build-3.$* install \
@@ -158,7 +158,7 @@
 		mkdir -p debian/python3-pyqt4-dbus-dbg/$(call py3_dbusmoddir,$*);\
 		mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
 			debian/python3-pyqt4-dbus-dbg$(call py3_dbusmoddir,$*);\
-		echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-pyqt4-dbus.install;\
+		echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
 	fi
 
 d_qt4_dbg = debian/python-qt4-dbg
@@ -215,7 +215,7 @@
 	DH_OPTIONS= dh_strip -ppyqt4-dev-tools
 	set -e; \
 	for p in python-qt4 python3-pyqt4 \
-		python-qt4-dbus python3-pyqt4-dbus \
+		python-qt4-dbus python3-dbus.mainloop.qt \
 		python-qt4-gl \
 		python-qt4-sql python3-pyqt4.qtsql \
 		python-qt4-phonon python3-pyqt4.phonon \
@@ -236,7 +236,10 @@
 	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/bin
 	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip
 	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/PyQt4/uic
-	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop/
+	rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop
+	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/python3
+	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/share/sip
+	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/bin
 	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
 	dh_installdeb