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

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Dec 4 22:30:14 UTC 2011 

    Date: Sunday, December 4, 2011 @ 22:30:13
  Author: piotr
Revision: 19509

rename python3-* packages

Added:
  packages/python-qt4/trunk/debian/python3-pyqt4.install
    (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4.install)
  packages/python-qt4/trunk/debian/python3-pyqt4.phonon.install
    (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4-phonon.install)
  packages/python-qt4/trunk/debian/python3-pyqt4.qtsql.install
    (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4-sql.install)
Modified:
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/python3-qt4-phonon.install
  packages/python-qt4/trunk/debian/python3-qt4-sql.install
  packages/python-qt4/trunk/debian/python3-qt4.install

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-12-04 21:11:10 UTC (rev 19508)
+++ packages/python-qt4/trunk/debian/control	2011-12-04 22:30:13 UTC (rev 19509)
@@ -62,11 +62,11 @@
   * QtSql (in python-qt4-sql)
   * phonon (in python-qt4-phonon)
 
-Package: python3-qt4
+Package: python3-pyqt4
 Architecture: any
 Provides: ${python3:Provides}
 Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}
-Suggests: python3-qt4-dbg
+Suggests: python3-pyqt4-dbg
 Description: Python3 bindings for Qt4
  PyQt4 exposes the Qt4 API to Python3. The following modules are supported:
   * QtCore
@@ -78,8 +78,8 @@
   * QtTest
   * QtAssistant
   * QtWebKit
-  * QtSql (in python3-qt4-sql)
-  * phonon (in python3-qt4-phonon)
+  * QtSql (in python3-pyqt4.qtsql)
+  * phonon (in python3-pyqt4.phonon)
 
 Package: python-qt4-dbg
 Priority: extra
@@ -95,12 +95,12 @@
  .
  This package contains the extensions built for the Python debug interpreter.
 
-Package: python3-qt4-dbg
+Package: python3-pyqt4-dbg
 Priority: extra
 Section: debug
 Architecture: any
 Depends: python3-dbg,
-         python3-qt4 (= ${binary:Version}),
+         python3-pyqt4 (= ${binary:Version}),
          python3-sip-dbg,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -121,10 +121,10 @@
  The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
  to Python.
 
-Package: python3-qt4-phonon
+Package: python3-pyqt4.phonon
 Architecture: any
 Provides: ${python3:Provides}
-Depends: python3-qt4 (= ${binary:Version}),
+Depends: python3-pyqt4 (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
@@ -149,14 +149,14 @@
  .
  This package contains the extensions built for the Python debug interpreter.
 
-Package: python3-qt4-phonon-dbg
+Package: python3-pyqt4.phonon-dbg
 Priority: extra
 Section: debug
 Architecture: any
 Provides: ${python3:Provides}
 Depends: python3-dbg,
-         python3-qt4-dbg (= ${binary:Version}),
-         python3-qt4-phonon (= ${binary:Version}),
+         python3-pyqt4-dbg (= ${binary:Version}),
+         python3-pyqt4.phonon (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Python3 bindings for Phonon (debug extensions)
@@ -230,10 +230,10 @@
  The SQL module of PyQt4 provides widgets and utility classes for
  SQL database access.
 
-Package: python3-qt4-sql
+Package: python3-pyqt4.qtsql
 Architecture: any
 Provides: ${python3:Provides}
-Depends: python3-qt4 (= ${binary:Version}),
+Depends: python3-pyqt4 (= ${binary:Version}),
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
@@ -256,13 +256,13 @@
  .
  This package contains the extension built for the Python debug interpreter.
 
-Package: python3-qt4-sql-dbg
+Package: python3-pyqt4.qtsql-dbg
 Priority: extra
 Section: debug
 Architecture: any
 Depends: python3-dbg,
-         python3-qt4-dbg (= ${binary:Version}),
-         python3-qt4-sql (= ${binary:Version}),
+         python3-pyqt4-dbg (= ${binary:Version}),
+         python3-pyqt4.qtsql (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Python3 bindings for PyQt4's SQL module (debug extension)

Copied: packages/python-qt4/trunk/debian/python3-pyqt4.install (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4.install)
===================================================================
--- packages/python-qt4/trunk/debian/python3-pyqt4.install	                        (rev 0)
+++ packages/python-qt4/trunk/debian/python3-pyqt4.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -0,0 +1,19 @@
+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/QtDeclarative.so
+usr/lib/python3*/*-packages/PyQt4/QtDesigner.so
+usr/lib/python3*/*-packages/PyQt4/QtGui.so
+usr/lib/python3*/*-packages/PyQt4/QtHelp.so
+usr/lib/python3*/*-packages/PyQt4/QtNetwork.so
+usr/lib/python3*/*-packages/PyQt4/QtScript.so
+usr/lib/python3*/*-packages/PyQt4/QtScriptTools.so
+usr/lib/python3*/*-packages/PyQt4/QtSvg.so
+usr/lib/python3*/*-packages/PyQt4/QtTest.so
+usr/lib/python3*/*-packages/PyQt4/QtWebKit.so
+usr/lib/python3*/*-packages/PyQt4/QtXml.so
+usr/lib/python3*/*-packages/PyQt4/QtXmlPatterns.so
+usr/lib/python3*/*-packages/PyQt4/__init__.py
+usr/lib/python3*/*-packages/PyQt4/pyqtconfig.py
+usr/lib/python3*/*-packages/PyQt4/uic/*
+#usr/lib/qt4/*

Copied: packages/python-qt4/trunk/debian/python3-pyqt4.phonon.install (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4-phonon.install)
===================================================================
--- packages/python-qt4/trunk/debian/python3-pyqt4.phonon.install	                        (rev 0)
+++ packages/python-qt4/trunk/debian/python3-pyqt4.phonon.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyQt4/phonon.so

Copied: packages/python-qt4/trunk/debian/python3-pyqt4.qtsql.install (from rev 19504, packages/python-qt4/trunk/debian/python3-qt4-sql.install)
===================================================================
--- packages/python-qt4/trunk/debian/python3-pyqt4.qtsql.install	                        (rev 0)
+++ packages/python-qt4/trunk/debian/python3-pyqt4.qtsql.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/PyQt4/QtSql.so

Deleted: packages/python-qt4/trunk/debian/python3-qt4-phonon.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-qt4-phonon.install	2011-12-04 21:11:10 UTC (rev 19508)
+++ packages/python-qt4/trunk/debian/python3-qt4-phonon.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -1 +0,0 @@
-usr/lib/python3*/*-packages/PyQt4/phonon.so

Deleted: packages/python-qt4/trunk/debian/python3-qt4-sql.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-qt4-sql.install	2011-12-04 21:11:10 UTC (rev 19508)
+++ packages/python-qt4/trunk/debian/python3-qt4-sql.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -1 +0,0 @@
-usr/lib/python3*/*-packages/PyQt4/QtSql.so

Deleted: packages/python-qt4/trunk/debian/python3-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-qt4.install	2011-12-04 21:11:10 UTC (rev 19508)
+++ packages/python-qt4/trunk/debian/python3-qt4.install	2011-12-04 22:30:13 UTC (rev 19509)
@@ -1,19 +0,0 @@
-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/QtDeclarative.so
-usr/lib/python3*/*-packages/PyQt4/QtDesigner.so
-usr/lib/python3*/*-packages/PyQt4/QtGui.so
-usr/lib/python3*/*-packages/PyQt4/QtHelp.so
-usr/lib/python3*/*-packages/PyQt4/QtNetwork.so
-usr/lib/python3*/*-packages/PyQt4/QtScript.so
-usr/lib/python3*/*-packages/PyQt4/QtScriptTools.so
-usr/lib/python3*/*-packages/PyQt4/QtSvg.so
-usr/lib/python3*/*-packages/PyQt4/QtTest.so
-usr/lib/python3*/*-packages/PyQt4/QtWebKit.so
-usr/lib/python3*/*-packages/PyQt4/QtXml.so
-usr/lib/python3*/*-packages/PyQt4/QtXmlPatterns.so
-usr/lib/python3*/*-packages/PyQt4/__init__.py
-usr/lib/python3*/*-packages/PyQt4/pyqtconfig.py
-usr/lib/python3*/*-packages/PyQt4/uic/*
-#usr/lib/qt4/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2011-12-04 21:11:10 UTC (rev 19508)
+++ packages/python-qt4/trunk/debian/rules	2011-12-04 22:30:13 UTC (rev 19509)
@@ -128,7 +128,7 @@
 	# probably like ipython handles it.
 	cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
 
-d3_qt4_dbg = debian/python3-qt4-dbg
+d3_qt4_dbg = debian/python3-pyqt4-dbg
 
 install-arch-3.%:
 	$(MAKE) -C build-3.$* install \
@@ -142,22 +142,22 @@
 	mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
 		$(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_d.py
 	# No python3 opengl yet
-	#mkdir -p debian/python3-qt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+	#mkdir -p debian/python3-pyqt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
 	#mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtOpenGL.so \
-	#	debian/python3-qt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
-	mkdir -p debian/python3-qt4-sql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+	#	debian/python3-pyqt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+	mkdir -p debian/python3-pyqt4.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
 	mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtSql.so \
-		debian/python3-qt4-sql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
-	mkdir -p debian/python3-qt4-phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+		debian/python3-pyqt4.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+	mkdir -p debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
 	mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
-		debian/python3-qt4-phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+		debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
 
 	# No python3 DBUS yet
 	#if [ -e $(d3_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so ]; then \
 	#	mkdir -p debian/python-qt4-dbus-dbg/$(call py_dbusmoddir,$*);\
 	#	mv $(d_qt4_dbg)$(call py_dbusmoddir,$*)/qt.so \
 	#		debian/python-qt4-dbus-dbg$(call py_dbusmoddir,$*);\
-	#	echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-qt4-dbus.install;\
+	#	echo '$(call py_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-pyqt4.dbus.install;\
 	#fi
 
 d_qt4_dbg = debian/python-qt4-dbg
@@ -212,8 +212,8 @@
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppyqt4-dev-tools
 	set -e; \
-	for p in python-qt4 python3-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql \
-		python3-qt4-sql python-qt4-phonon python3-qt4-phonon ; do \
+	for p in python-qt4 python3-pyqt4 python-qt4-dbus python-qt4-gl python-qt4-sql \
+		python3-pyqt4.qtsql python-qt4-phonon python3-pyqt4.phonon ; do \
 		DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
 		rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 		mkdir -p debian/$$p-dbg/usr/share/doc; \
@@ -221,7 +221,7 @@
 	done
 endif
 	dh_python2 --no-dbg-cleaning
-	dh_python3
+	dh_python3 --no-dbg-cleaning
 	dh_fixperms
 	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
 	dh_installdeb

More information about the Python-modules-commits mailing list