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

warsaw-guest at users.alioth.debian.org warsaw-guest at users.alioth.debian.org
Thu Jul 28 20:55:05 UTC 2011


    Date: Thursday, July 28, 2011 @ 20:55:04
  Author: warsaw-guest
Revision: 17924

Applied Jos?\195?\169 Manuel Santamar?\195?\173a Lema's patch to switch to dh_python2.  Also
used wrap-and-sort for sanity in control file sections.

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/copyright
  packages/python-qt4/trunk/debian/python-qt4-dev.install
  packages/python-qt4/trunk/debian/python-qt4.install
  packages/python-qt4/trunk/debian/pyversions
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/changelog	2011-07-28 20:55:04 UTC (rev 17924)
@@ -1,3 +1,9 @@
+python-qt4 (4.8.3-3) UNRELEASED; urgency=low
+
+  * Switch to dh_python2.
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 16 Jul 2011 20:42:15 +0200
+
 python-qt4 (4.8.3-2) unstable; urgency=low
 
   [ Scott Kitterman ]

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/control	2011-07-28 20:55:04 UTC (rev 17924)
@@ -2,10 +2,25 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 7), python-all-dev, libqt4-dev (>= 4:4.7.0), libqtwebkit-dev, libqtassistantclient-dev, python-sip-dev (>= 4.12.1), python-support (>= 0.7.1), python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
+Uploaders: Torsten Marek <shlomme at debian.org>,
+           Michael Casadevall <mcasadevall at debian.org>,
+           Bernd Zeimetz <bzed at debian.org>
+Build-Depends: debhelper (>= 7),
+               libdbus-1-dev (>= 1.0.2),
+               libphonon-dev (>= 4:4.2.0-2),
+               libqt4-dev (>= 4:4.7.0),
+               libqt4-opengl-dev,
+               libqtassistantclient-dev,
+               libqtwebkit-dev,
+               python-all-dbg,
+               python-all-dev (>= 2.6.6-3~),
+               python-dbus (>= 0.84.0-2~),
+               python-dbus-dbg,
+               python-sip-dbg,
+               python-sip-dev (>= 4.12.1)
 Build-Conflicts: python-xml, python-xml-dbg
 Standards-Version: 3.9.1
+X-Python-Version: >= 2.4
 Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-qt4/trunk/
@@ -13,9 +28,9 @@
 Package: python-qt4
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${sip:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${sip:Depends}
 Suggests: python-qt4-dbg
-Replaces: python-qt4-dev (<< 4.4.4-3~), python-qt4-common
+Replaces: python-qt4-common, python-qt4-dev (<< 4.4.4-3~)
 Conflicts: python-qt4-common
 Description: Python bindings for Qt4
  PyQt4 exposes the Qt4 API to Python. The following modules are supported:
@@ -36,7 +51,11 @@
 Priority: extra
 Section: debug
 Architecture: any
-Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip-dbg, ${shlibs:Depends}, ${misc:Depends}
+Depends: python-dbg,
+         python-qt4 (= ${binary:Version}),
+         python-sip-dbg,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for Qt4 (debug extensions)
  PyQt4 exposes the Qt4 API to Python.
  .
@@ -45,7 +64,10 @@
 Package: python-qt4-phonon
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}, python-qt4 (= ${binary:Version}), ${misc:Depends}
+Depends: python-qt4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Suggests: python-phonon-dbg
 Description: Python bindings for Phonon
  The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
@@ -56,17 +78,24 @@
 Section: debug
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, python-dbg, python-qt4-phonon (= ${binary:Version}),  python-qt4-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: python-dbg,
+         python-qt4-dbg (= ${binary:Version}),
+         python-qt4-phonon (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for Phonon (debug extensions)
  The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
  to Python.
- . 
+ .
  This package contains the extensions built for the Python debug interpreter.
 
 Package: python-qt4-dbus
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-dbus (>= 0.80.0)
+Depends: python-dbus (>= 0.80.0),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: DBus Support for PyQt4
  The DBus module of PyQt4 provides integration of PyQt4 applications
  with the DBus main loop.
@@ -76,7 +105,11 @@
 Priority: extra
 Section: debug
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, python-dbg, python-qt4-dbus (= ${binary:Version}), python-dbus-dbg, ${misc:Depends}
+Depends: python-dbg,
+         python-dbus-dbg,
+         python-qt4-dbus (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: DBus Support for PyQt4 (debug extensions)
  The DBus module of PyQt4 provides integration of PyQt4 applications
  with the DBus main loop.
@@ -86,7 +119,11 @@
 Package: python-qt4-gl
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2)
+Depends: python-opengl (>= 2.0.1.09-2.2),
+         python-qt4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for Qt4's OpenGL module
  The OpenGL module of PyQt4 provides widgets and utility classes
  for OpenGL rendering in a PyQt4 application.
@@ -95,7 +132,11 @@
 Priority: extra
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qt4-gl (= ${binary:Version}), python-qt4-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: python-dbg,
+         python-qt4-dbg (= ${binary:Version}),
+         python-qt4-gl (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for Qt4's OpenGL module (debug extension)
  The OpenGL module of PyQt4 provides widgets and utility classes
  for OpenGL rendering in a PyQt4 application.
@@ -105,28 +146,35 @@
 Package: python-qt4-sql
 Architecture: any
 Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version})
+Depends: python-qt4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for PyQt4's SQL module
- The SQL module of PyQt4 provides widgets and utility classes for 
+ The SQL module of PyQt4 provides widgets and utility classes for
  SQL database access.
 
 Package: python-qt4-sql-dbg
 Priority: extra
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qt4-sql (= ${binary:Version}), python-qt4-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: python-dbg,
+         python-qt4-dbg (= ${binary:Version}),
+         python-qt4-sql (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Python bindings for PyQt4's SQL module (debug extension)
- The SQL module of PyQt4 provides widgets and utility classes for 
+ The SQL module of PyQt4 provides widgets and utility classes for
  SQL database access.
  .
  This package contains the extension built for the Python debug interpreter.
 
 Package: python-qt4-dev
 Architecture: all
-Depends: ${python:Depends}, python-sip-dev, ${misc:Depends}
+Depends: python-sip-dev, ${misc:Depends}, ${python:Depends}
 Replaces: python-qt4 (<< 4.3)
 Description: Development files for PyQt4
- This package contains the source SIP files from which the Python 
+ This package contains the source SIP files from which the Python
  bindings for Qt4 are created. They are needed for building PyQt4
  as well as creating bindings for own Qt4 widgets written in C++.
 
@@ -134,7 +182,7 @@
 Architecture: all
 Section: doc
 Suggests: qt4-doc
-Depends: ${misc:Depends}, libjs-jquery
+Depends: libjs-jquery, ${misc:Depends}
 Description: Documentation and examples for PyQt4
  PyQt4 exposes the Qt4 GUI toolkit in Python.
  .
@@ -142,7 +190,10 @@
  the Qt example programs ported to Python.
 
 Package: pyqt4-dev-tools
-Depends: ${shlibs:Depends}, python, python-qt4 (= ${binary:Version}), ${misc:Depends}
+Depends: python,
+         python-qt4 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Architecture: any
 Description: Development tools for PyQt4
  This package contains various support tools for PyQt4 developers:

Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/copyright	2011-07-28 20:55:04 UTC (rev 17924)
@@ -20,7 +20,7 @@
 
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
   Fifth Floor, Boston, MA  02110-1301 USA
 
   On Debian systems, the complete text of the GNU General Public
@@ -99,7 +99,7 @@
 
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St, 
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
   Fifth Floor, Boston, MA  02110-1301 USA
 
   On Debian systems, the complete text of the GNU General Public

Modified: packages/python-qt4/trunk/debian/python-qt4-dev.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dev.install	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/python-qt4-dev.install	2011-07-28 20:55:04 UTC (rev 17924)
@@ -1,2 +1,2 @@
+
 sip/* usr/share/sip/PyQt4
-

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2011-07-28 20:55:04 UTC (rev 17924)
@@ -13,6 +13,7 @@
 usr/lib/python*/*-packages/PyQt4/QtWebKit.so
 usr/lib/python*/*-packages/PyQt4/QtXml.so
 usr/lib/python*/*-packages/PyQt4/QtXmlPatterns.so
+usr/lib/python*/*-packages/PyQt4/__init__.py
+usr/lib/python*/*-packages/PyQt4/pyqtconfig.py
 usr/lib/python*/*-packages/PyQt4/uic/*
-usr/lib/python*/*-packages/PyQt4/pyqtconfig.py
 usr/lib/qt4/*

Modified: packages/python-qt4/trunk/debian/pyversions
===================================================================
--- packages/python-qt4/trunk/debian/pyversions	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/pyversions	2011-07-28 20:55:04 UTC (rev 17924)
@@ -1 +0,0 @@
-2.4-

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2011-07-28 13:51:47 UTC (rev 17923)
+++ packages/python-qt4/trunk/debian/rules	2011-07-28 20:55:04 UTC (rev 17924)
@@ -188,7 +188,7 @@
 		ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	done
 endif
-	dh_pysupport
+	dh_python2
 	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