[Python-modules-commits] r6933 - in packages/python-qt4/trunk/debian (4 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Sat Nov 22 20:54:52 UTC 2008
Date: Saturday, November 22, 2008 @ 20:54:51
Author: shlomme
Revision: 6933
* prepare new upload
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/01_configure.dpatch
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2008-11-22 20:18:59 UTC (rev 6932)
+++ packages/python-qt4/trunk/debian/changelog 2008-11-22 20:54:51 UTC (rev 6933)
@@ -1,10 +1,24 @@
-python-qt4 (4.4.3-2) UNRELEASED; urgency=low
+python-qt4 (4.4.4-1) experimental; urgency=low
+ [ Sandro Tosi ]
* debian/control
- switch Vcs-Browser field to viewsvn
- -- Sandro Tosi <morph at debian.org> Mon, 03 Nov 2008 22:15:49 +0100
+ [ Torsten Marek ]
+ * New upstream release
+ * debian/control
+ - add build-dependency to libphonon-dev
+ - new packages python-qt4-phonon{-dbg} with bindings to Phonon
+ - bump build-dependency on sip to 4.7.8
+ - cleanup dependencies of debug packages
+ * debian/rules
+ - adapt to changes in configure.py
+ * debian/patches/01_configure.py
+ - disabling Designer plugin build is supported by upstream configure
+ script now, remove own configuration option
+ -- Torsten Marek <shlomme at debian.org> Sat, 22 Nov 2008 19:32:27 +0100
+
python-qt4 (4.4.3-1) experimental; urgency=low
* New upstream release
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2008-11-22 20:18:59 UTC (rev 6932)
+++ packages/python-qt4/trunk/debian/control 2008-11-22 20:54:51 UTC (rev 6933)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Torsten Marek <shlomme at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.6), python-sip4-dev (>= 4.7.6), python-central (>= 0.6), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev
+Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-central (>= 0.6), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev, libphonon-dev
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.8.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
@@ -14,7 +14,7 @@
Package: python-qt4
Architecture: any
Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.7.6), python-sip4 (<< 4.8), python-elementtree, python-qt4-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.7.6), python-sip4 (<< 4.8), python-elementtree | python (>= 2.5), python-qt4-common
Suggests: python-qt4-dbg
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4
@@ -30,6 +30,7 @@
* QtWebKit
* QtOpenGL (in python-qt4-gl)
* QtSql (in python-qt4-sql)
+ * phonon (in python-qt4-phonon)
Package: python-qt4-dbg
Priority: extra
@@ -41,6 +42,28 @@
.
This package contains the extensions built for the Python debug interpreter.
+Package: python-qt4-phonon
+Architecture: any
+Provides: ${python:Provides}
+Depends: ${python:Depends}, ${shlibs:Depends}, python-qt4 (= ${binary:Version})
+Suggests: python-phonon-dbg
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for Phonon
+ The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
+ to Python.
+
+Package: python-qt4-phonon-dbg
+Priority: extra
+Architecture: any
+Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, python-dbg, python-qt4-phonon (= ${binary:Version}), python-qt4-dbg (= ${binary:Version})
+XB-Python-Version: ${python:Versions}
+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}
@@ -54,7 +77,7 @@
Architecture: any
Priority: extra
Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4-dbus, python-dbus-dbg
+Depends: ${shlibs:Depends}, python-dbg, python-qt4-dbus (= ${binary:Version}), python-dbus-dbg
XB-Python-Version: ${python:Versions}
Description: DBus Support for PyQt4 (debug extensions)
The DBus module of PyQt4 provides integration of PyQt4 applications
@@ -65,7 +88,7 @@
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), libqt4-opengl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2)
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4's OpenGL module
The OpenGL module of PyQt4 provides widgets and utility classes
@@ -74,7 +97,7 @@
Package: python-qt4-gl-dbg
Priority: extra
Architecture: any
-Depends: python-qt4-gl (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+Depends: python-dbg, python-qt4-gl (= ${binary:Version}), python-qt4-dbg (= ${binary:Version})
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4's OpenGL module (debug extension)
The OpenGL module of PyQt4 provides widgets and utility classes
@@ -94,7 +117,7 @@
Package: python-qt4-sql-dbg
Priority: extra
Architecture: any
-Depends: python-qt4-sql (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, python-dbg, python-qt4-sql (= ${binary:Version}), python-qt4-dbg (= ${binary:Version})
XB-Python-Version: ${python:Versions}
Description: Python bindings for PyQt4's SQL module (debug extension)
The SQL module of PyQt4 provides widgets and utility classes for
@@ -140,4 +163,3 @@
* a user interface compiler (pyuic4)
* a resource file generator (pyrcc4)
* a translation string finder (pylupdate)
-
Modified: packages/python-qt4/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2008-11-22 20:18:59 UTC (rev 6932)
+++ packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2008-11-22 20:54:51 UTC (rev 6933)
@@ -40,15 +40,6 @@
# Initialise the globals.
pyqt_version = 0x040402
-@@ -146,6 +165,8 @@
- p.add_option("-g", "--consolidate", action="store_true", default=False,
- dest="bigqt", help="create a single module which links against "
- "all the Qt libraries")
-+ p.add_option("--disable-designer-plugin", action="store_true", default=False,
-+ help="do not build the Qt Designer plugin")
-
- # These are internal options used to build the mega Windows GPL package.
- p.add_option("--mwg-odbc", action="store_true", default=False,
@@ -296,7 +317,7 @@
check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
check_module("QtXml", "qdom.h", "new QDomDocument()")
@@ -219,15 +210,6 @@
universal=sipcfg.universal
)
-@@ -742,7 +772,7 @@
- sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
-
- if "QtDesigner" in pyqt_modules:
-- enabled = True
-+ enabled = not opts.disable_designer_plugin
-
- py_major = sipcfg.py_version >> 16
- py_minor = (sipcfg.py_version >> 8) & 0x0ff
@@ -776,7 +806,7 @@
# Run qmake to generate the Makefile.
qmake_args = fix_qmake_args()
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2008-11-22 20:18:59 UTC (rev 6932)
+++ packages/python-qt4/trunk/debian/rules 2008-11-22 20:54:51 UTC (rev 6933)
@@ -50,7 +50,7 @@
--confirm-license \
-q /usr/bin/qmake-qt4 -c \
-j $(SPLIT) -m /usr/lib/python$*/config \
- $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
+ $(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) \
LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
touch $@
@@ -63,7 +63,7 @@
-q /usr/bin/qmake-qt4 -c \
-j $(SPLIT) -l /usr/include/python$*_d \
-m /usr/lib/python$*/config_d \
- $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
+ $(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) \
LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
touch $@
@@ -118,10 +118,10 @@
mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtSql.so debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
mkdir -p debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\
mv $$d//var/lib/python-support/python$$v/dbus/mainloop/qt.so debian/python-qt4-dbus-dbg/var/lib/python-support/python$$v/dbus/mainloop;\
+ mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
+ mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
done
-# mkdir -p debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
-# mv $$d/usr/lib/python$$v/site-packages/PyQt4/phonon.so debian/python-qt4-phonon-dbg/usr/lib/python$$v/site-packages/PyQt4;\
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
@@ -177,9 +177,8 @@
dh_link
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
-# add python-qt4-phonon again!
set -e; \
- for p in python-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql ; do \
+ for p in python-qt4 python-qt4-dbus python-qt4-gl python-qt4-sql python-qt4-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; \
More information about the Python-modules-commits
mailing list