[Python-modules-commits] r5739 - in packages/python-qt4/trunk/debian (6 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Wed Jun 25 00:58:04 UTC 2008
Date: Wednesday, June 25, 2008 @ 00:58:03
Author: shlomme
Revision: 5739
* more updates, include phonon support
Added:
packages/python-qt4/trunk/debian/python-qt4-phonon.install
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/python-qt4-dbus.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2008-06-25 00:03:01 UTC (rev 5738)
+++ packages/python-qt4/trunk/debian/changelog 2008-06-25 00:58:03 UTC (rev 5739)
@@ -1,13 +1,17 @@
python-qt4 (4.4.2-2) unstable; urgency=medium
-
+
+ * Fix build failure on Mips(el) architectures
+ * Added Phonon bindings
+ * urgency=medium to speed up QScintilla2 migration to testing
* debian/patches
- drop qreal fixes for Mips(el) to fix build failures
- * urgency=medium to help QScintilla2 migration to testing
* debian/control
- fix GCC version detection
- only split into 10 parts for non-4.2 GCCs
- set optimization to -O2
-
+ - added packages python-qt4-phonon and python-qt4-phonon-dbg
+ - added build dependency on libphonon-dev
+
-- Torsten Marek <shlomme at debian.org> Wed, 25 Jun 2008 01:33:43 +0200
python-qt4 (4.4.2-1) unstable; urgency=low
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2008-06-25 00:03:01 UTC (rev 5738)
+++ packages/python-qt4/trunk/debian/control 2008-06-25 00:58:03 UTC (rev 5739)
@@ -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.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, libphonon-dev
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.8.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
@@ -65,8 +65,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), libqt4-opengl
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4's OpenGL module
- The OpenGL module of Qt4 provides widgets and utility classes
- for OpenGL rendering in a Qt4 application.
+ The OpenGL module of PyQt4 provides widgets and utility classes
+ for OpenGL rendering in a PyQt4 application.
Package: python-qt4-gl-dbg
Priority: extra
@@ -74,8 +74,8 @@
Depends: python-qt4-gl (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings for Qt4's OpenGL module (debug extension)
- The OpenGL module of Qt4 provides widgets and utility classes
- for OpenGL rendering in a Qt4 application.
+ The OpenGL module of PyQt4 provides widgets and utility classes
+ for OpenGL rendering in a PyQt4 application.
.
This package contains the extension built for the Python debug interpreter.
@@ -84,8 +84,8 @@
Provides: ${python:Provides}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version})
XB-Python-Version: ${python:Versions}
-Description: Python bindings for Qt4's SQL module
- The SQL module of Qt4 provides widgets and utility classes for
+Description: Python bindings for PyQt4's SQL module
+ The SQL module of PyQt4 provides widgets and utility classes for
SQL database access.
Package: python-qt4-sql-dbg
@@ -93,12 +93,34 @@
Architecture: any
Depends: python-qt4-sql (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
XB-Python-Version: ${python:Versions}
-Description: Python bindings for Qt4's SQL module (debug extension)
- The SQL module of Qt4 provides widgets and utility classes for
+Description: Python bindings for PyQt4's SQL module (debug extension)
+ 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-phonon
+Architecture: any
+Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4 (= ${binary:Version})
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for the Phonon multimedia framework
+ Phonon is the Qt4 multimedia API, which provides a task-oriented abstraction
+ layer for capturing, mixing, processing, and playing audio and video content.
+
+
+Package: python-qt4-phonon-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt4-phonon (= ${binary:Version}), python-dbg, python-qt4-dbg (= ${binary:Version}), ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
+Description: Python bindings for Phonon multimedia framework (debug extension)
+ Phonon is the Qt4 multimedia API, which provides a task-oriented abstraction
+ layer for capturing, mixing, processing, and playing audio and video content.
+ .
+ This package contains the extension built for the Python debug interpreter.
+
+
Package: python-qt4-dev
Architecture: all
Depends: ${python:Depends}, python-sip4-dev, python-qt4-common
@@ -137,3 +159,4 @@
* 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-06-25 00:03:01 UTC (rev 5738)
+++ packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2008-06-25 00:58:03 UTC (rev 5739)
@@ -4,11 +4,11 @@
## DP: Make PyQt4 objectdir-buildable
@DPATCH@
-diff -urNad python-qt4-4.2+snapshot20070727~/configure.py python-qt4-4.2+snapshot20070727/configure.py
---- python-qt4-4.2+snapshot20070727~/configure.py 2007-07-29 23:58:48.000000000 +0200
-+++ python-qt4-4.2+snapshot20070727/configure.py 2007-07-30 00:00:17.000000000 +0200
-@@ -20,6 +20,8 @@
- # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+diff -urNad python-qt4-4.4.2~/configure.py python-qt4-4.4.2/configure.py
+--- python-qt4-4.4.2~/configure.py 2008-06-25 02:45:17.000000000 +0200
++++ python-qt4-4.4.2/configure.py 2008-06-25 02:45:44.000000000 +0200
+@@ -33,6 +33,8 @@
+ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# Modified for Debian by Torsten Marek <shlomme at gmx.net>
@@ -16,7 +16,7 @@
import sys
import os
import string
-@@ -29,6 +31,23 @@
+@@ -42,6 +44,23 @@
import sipconfig
@@ -39,8 +39,8 @@
+ return filename
# Initialise the globals.
- pyqt_version = 0x040200
-@@ -134,6 +153,8 @@
+ 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")
@@ -48,8 +48,17 @@
+ help="do not build the Qt Designer plugin")
# These are internal options used to build the mega Windows GPL package.
- p.add_option("--mwg-openssl", action="callback", default=None,
-@@ -282,6 +303,7 @@
+ 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()")
+ check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+- check_module("phonon", "phonon", "new Phonon::VideoWidget()")
++ check_module("phonon", "videowidget.h", "new Phonon::VideoWidget()", extra_include_dirs=["/usr/include/phonon"])
+ check_module("QtAssistant", "qassistantclient.h",
+ "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
+ extra_libs=ass_libs)
+@@ -312,6 +333,7 @@
check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
extra_libs=["QAxContainer"])
@@ -57,7 +66,14 @@
if os.path.isdir("dbus"):
check_dbus()
-@@ -354,7 +376,7 @@
+@@ -390,13 +412,13 @@
+ generate_code("QtXmlPatterns")
+
+ if "phonon" in pyqt_modules:
+- generate_code("phonon")
++ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
+
+ if "QtAssistant" in pyqt_modules:
generate_code("QtAssistant")
if "QtDesigner" in pyqt_modules:
@@ -66,7 +82,7 @@
if sys.platform == "win32":
if opts.debug:
-@@ -380,10 +402,10 @@
+@@ -422,10 +444,10 @@
# Generate the composite module.
qtmod_sipdir = os.path.join("sip", "Qt")
@@ -79,7 +95,7 @@
f.write("""%CompositeModule PyQt4.Qt
-@@ -555,7 +577,7 @@
+@@ -600,7 +622,7 @@
return libs, libdirs
def module_installs(self):
@@ -88,7 +104,7 @@
def qpylibs(self):
# See which QPy libraries to build.
-@@ -571,8 +593,8 @@
+@@ -616,8 +638,8 @@
for qpy, pro in qpylibs.iteritems():
sipconfig.inform("Creating QPy library for %s Makefile..." % qpy)
@@ -99,7 +115,7 @@
if sipcfg.universal:
upro = "u_" + pro
-@@ -596,6 +618,8 @@
+@@ -641,6 +663,8 @@
sipconfig.inform("Creating QPy libraries Makefile...")
@@ -108,7 +124,7 @@
sipconfig.ParentMakefile(
configuration=sipcfg,
dir="qpy",
-@@ -617,6 +641,7 @@
+@@ -662,6 +686,7 @@
install_dir=pydbusmoddir,
qt=["QtCore"],
debug=opts.debug,
@@ -116,7 +132,7 @@
universal=sipcfg.universal
)
-@@ -625,18 +650,19 @@
+@@ -670,18 +695,19 @@
makefile.generate()
tool.append("dbus")
@@ -146,7 +162,7 @@
# Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
# previews work properly and normal console use will work anyway), but
-@@ -644,16 +670,18 @@
+@@ -689,16 +715,18 @@
sipconfig.inform("Creating pyuic4 wrapper...")
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -168,7 +184,7 @@
)
makefile.generate()
-@@ -661,7 +689,7 @@
+@@ -706,7 +734,7 @@
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
@@ -177,7 +193,7 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pylupdate.sbf",
-@@ -671,14 +699,15 @@
+@@ -716,14 +744,15 @@
qt=["QtCore", "QtGui", "QtXml"],
debug=opts.debug,
warnings=1,
@@ -195,7 +211,7 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pyrcc.sbf",
-@@ -688,6 +717,7 @@
+@@ -733,6 +762,7 @@
qt=["QtCore", "QtXml"],
debug=opts.debug,
warnings=1,
@@ -203,7 +219,7 @@
universal=sipcfg.universal
)
-@@ -697,7 +727,7 @@
+@@ -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:
@@ -212,7 +228,7 @@
py_major = sipcfg.py_version >> 16
py_minor = (sipcfg.py_version >> 8) & 0x0ff
-@@ -731,7 +761,7 @@
+@@ -776,7 +806,7 @@
# Run qmake to generate the Makefile.
qmake_args = fix_qmake_args()
cwd = os.getcwd()
@@ -221,7 +237,7 @@
# Create the qmake project file.
fin = open("python.pro-in")
-@@ -755,7 +785,7 @@
+@@ -800,7 +830,7 @@
run_command("%s %s" % (opts.qmake, qmake_args))
os.chdir(cwd)
@@ -230,7 +246,7 @@
return tool
-@@ -899,7 +929,6 @@
+@@ -947,7 +977,6 @@
add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
exe, build = makefile.build_command(name)
@@ -238,7 +254,7 @@
# Make sure the executable file doesn't exist.
remove_file(exe)
run_command(build)
-@@ -1025,7 +1054,7 @@
+@@ -1097,7 +1126,7 @@
return
# Check the module's main .sip file exists.
@@ -247,7 +263,7 @@
sipconfig.inform("Checking to see if the %s module should be built..." % mname)
if check_api(incfile, test, mname, extra_include_dirs=extra_include_dirs, extra_lib_dirs=extra_lib_dirs, extra_libs=extra_libs):
-@@ -1226,10 +1255,14 @@
+@@ -1303,10 +1332,14 @@
argv.append(buildfile)
argv.append("-I")
@@ -264,7 +280,7 @@
cmd = string.join(argv)
-@@ -1251,7 +1284,11 @@
+@@ -1328,7 +1361,11 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -277,7 +293,7 @@
installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
-@@ -1835,7 +1872,7 @@
+@@ -1799,7 +1836,7 @@
).generate()
# Install the configuration module.
Modified: packages/python-qt4/trunk/debian/python-qt4-dbus.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-dbus.install 2008-06-25 00:03:01 UTC (rev 5738)
+++ packages/python-qt4/trunk/debian/python-qt4-dbus.install 2008-06-25 00:58:03 UTC (rev 5739)
@@ -1 +1,2 @@
var/lib/python-support/python*/dbus/mainloop/*
+
Added: packages/python-qt4/trunk/debian/python-qt4-phonon.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-phonon.install (rev 0)
+++ packages/python-qt4/trunk/debian/python-qt4-phonon.install 2008-06-25 00:58:03 UTC (rev 5739)
@@ -0,0 +1 @@
+usr/lib/python*/site-packages/PyQt4/phonon.so
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2008-06-25 00:03:01 UTC (rev 5738)
+++ packages/python-qt4/trunk/debian/rules 2008-06-25 00:58:03 UTC (rev 5739)
@@ -108,6 +108,8 @@
mv $$d/usr/lib/python$$v/site-packages/PyQt4/QtOpenGL.so debian/python-qt4-gl-dbg/usr/lib/python$$v/site-packages/PyQt4;\
mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$$v/site-packages/PyQt4;\
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-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;\
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;\
done
@@ -167,7 +169,7 @@
ifeq (,$(findstring -i, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppyqt4-dev-tools
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