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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Thu May 3 16:41:39 UTC 2012 

    Date: Thursday, May 3, 2012 @ 16:41:34
  Author: kitterman
Revision: 21518

Drop python3-pyqt4-dbus for upload to unstable since the required
dbus-python version is not available in unstable yet

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-05-03 16:10:42 UTC (rev 21517)
+++ packages/python-qt4/trunk/debian/changelog	2012-05-03 16:41:34 UTC (rev 21518)
@@ -1,6 +1,8 @@
-python-qt4 (4.9.1-3) UNRELEASED; urgency=low
+python-qt4 (4.9.1-3) unstable; urgency=low
 
   * Upload to unstable for qt4-x11 multiarch transition
+  * Drop python3-pyqt4-dbus for upload to unstable since the required
+    dbus-python version is not available in unstable yet
   * Fix dbus related PyQt application crashes (LP: #334757)
     - Add debian/patches/dbus.patch from upstream
   * Do not compress .qml, .xpm, .mng, .qss., and .xbel file types as well as
@@ -13,7 +15,7 @@
     (Closes: #602721) (LP: #955004)
   * Bump standards version to 3.9.3 without further change
 
- -- Scott Kitterman <scott at kitterman.com>  Sat, 14 Apr 2012 16:12:34 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 03 May 2012 10:26:27 -0400
 
 python-qt4 (4.9.1-2) experimental; urgency=low
 

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2012-05-03 16:10:42 UTC (rev 21517)
+++ packages/python-qt4/trunk/debian/control	2012-05-03 16:41:34 UTC (rev 21518)
@@ -20,9 +20,6 @@
                python3-all-dev,
                python-dbus (>= 0.84.0-2),
                python-dbus-dbg,
-               python3-dbus,
-               python3-dbus-dbg,
-               python-dbus-dev,
                python-sip-dbg,
                python-sip-dev (>= 4.13.1),
                python3-sip-dbg,
@@ -201,33 +198,33 @@
  .
  This package contains the extensions built for the Python debug interpreter.
 
-Package: python3-dbus.mainloop.qt
-Architecture: any
-Provides: ${python3:Provides}
-Depends: python3-dbus,
-         ${misc:Depends},
-         ${python3:Depends},
-         ${shlibs:Depends}
-Description: DBus Support for PyQt4 with Python 3
- The DBus module of PyQt4 provides integration of PyQt4 applications
- with the DBus main loop for Python 3
+#Package: python3-dbus.mainloop.qt
+#Architecture: any
+#Provides: ${python3:Provides}
+#Depends: python3-dbus,
+#         ${misc:Depends},
+#         ${python3:Depends},
+#         ${shlibs:Depends}
+#Description: DBus Support for PyQt4 with Python 3
+# The DBus module of PyQt4 provides integration of PyQt4 applications
+# with the DBus main loop for Python 3
+#
+#Package: python3-dbus.mainloop.qt-dbg
+#Architecture: any
+#Priority: extra
+#Section: debug
+#Provides: ${python3:Provides}
+#Depends: python3-dbg,
+#         python3-dbus-dbg,
+#         python3-dbus.mainloop.qt (= ${binary:Version}),
+#         ${misc:Depends},
+#         ${shlibs:Depends}
+#Description: DBus Support for PyQt4 (debug extensions for Python 3)
+# The DBus module of PyQt4 provides integration of PyQt4 applications
+# with the DBus main loop for Python 3
+# .
+# This package contains the extensions built for the Python debug interpreter.
 
-Package: python3-dbus.mainloop.qt-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Provides: ${python3:Provides}
-Depends: python3-dbg,
-         python3-dbus-dbg,
-         python3-dbus.mainloop.qt (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: DBus Support for PyQt4 (debug extensions for Python 3)
- The DBus module of PyQt4 provides integration of PyQt4 applications
- with the DBus main loop for Python 3
- .
- This package contains the extensions built for the Python debug interpreter.
-
 Package: python-qt4-gl
 Architecture: any
 Provides: ${python:Provides}

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2012-05-03 16:10:42 UTC (rev 21517)
+++ packages/python-qt4/trunk/debian/rules	2012-05-03 16:41:34 UTC (rev 21518)
@@ -13,7 +13,7 @@
 endif
 
 py_dbusmoddir = $(shell python$(1) -c 'import dbus.mainloop; print dbus.mainloop.__path__[0]')
-py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+#py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
 
 export QMAKESPEC=linux-g++
 
@@ -154,12 +154,12 @@
 	mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
 		debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
 
-	if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
-		mkdir -p debian/python3-dbus.mainloop.qt-dbg/$(call py3_dbusmoddir,$*);\
-		mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
-			debian/python3-dbus.mainloop.qt-dbg$(call py3_dbusmoddir,$*);\
-		echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
-	fi
+	#if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
+	#	mkdir -p debian/python3-dbus.mainloop.qt-dbg/$(call py3_dbusmoddir,$*);\
+	#	mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
+	#		debian/python3-dbus.mainloop.qt-dbg$(call py3_dbusmoddir,$*);\
+	#	echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
+	#fi
 
 d_qt4_dbg = debian/python-qt4-dbg
 
@@ -220,7 +220,7 @@
 	DH_OPTIONS= dh_strip -ppyqt4-dev-tools
 	set -e; \
 	for p in python-qt4 python3-pyqt4 \
-		python-qt4-dbus python3-dbus.mainloop.qt \
+		python-qt4-dbus \
 		python-qt4-gl \
 		python-qt4-sql python3-pyqt4.qtsql \
 		python-qt4-phonon python3-pyqt4.phonon \
@@ -242,11 +242,6 @@
 	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-dbus.mainloop.qt/usr/bin
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/share/sip
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/lib/python3/dist-packages/PyQt4
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/bin
-	rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/lib/python3/dist-packages/PyQt4
 
 	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml -X.qml -X.xpm -X.mng -X.qss. -X.xbel -Xchilling

More information about the Python-modules-commits mailing list