[Python-modules-commits] r6937 - in packages/python-qt4/trunk/debian (3 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Sat Nov 22 22:14:40 UTC 2008
Date: Saturday, November 22, 2008 @ 22:14:39
Author: shlomme
Revision: 6937
updates for latest libphonon-dev
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/01_configure.dpatch
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2008-11-22 21:58:42 UTC (rev 6936)
+++ packages/python-qt4/trunk/debian/changelog 2008-11-22 22:14:39 UTC (rev 6937)
@@ -7,7 +7,7 @@
[ Torsten Marek ]
* New upstream release
* debian/control
- - add build-dependency to libphonon-dev
+ - add build-dependency to libphonon-dev 4:4.2.0-2
- new packages python-qt4-phonon{-dbg} with bindings to Phonon
- bump build-dependency on sip to 4.7.8
- cleanup dependencies of debug packages
@@ -16,6 +16,8 @@
* debian/patches/01_configure.py
- disabling Designer plugin build is supported by upstream configure
script now, remove own configuration option
+ - libphonon-dev 4:4.2.0-2 is compatible with Phonon distributed
+ with Qt 4.4, no need for workarounds any more
-- Torsten Marek <shlomme at debian.org> Sat, 22 Nov 2008 19:32:27 +0100
@@ -31,9 +33,9 @@
* debian/control
- build with -Wl,--no-relax on alpha
- link with -Wl,-O1 to speed up dynamic loading
- - build with -Os, decreases size of so's by about 10%
+ - build with -Os, decreases size of so's by about 10%
- don't overwrite CXXFLAGS
-
+
-- Torsten Marek <shlomme at debian.org> Thu, 03 Jul 2008 22:45:26 +0200
python-qt4 (4.4.2-3) unstable; urgency=medium
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2008-11-22 21:58:42 UTC (rev 6936)
+++ packages/python-qt4/trunk/debian/control 2008-11-22 22:14:39 UTC (rev 6937)
@@ -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.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-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 (>= 4:4.2.0-2)
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.8.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
Modified: packages/python-qt4/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2008-11-22 21:58:42 UTC (rev 6936)
+++ packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2008-11-22 22:14:39 UTC (rev 6937)
@@ -4,9 +4,9 @@
## DP: Make PyQt4 objectdir-buildable
@DPATCH@
-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
+diff -urNad python-qt4-4.4.4~/configure.py python-qt4-4.4.4/configure.py
+--- python-qt4-4.4.4~/configure.py 2008-11-22 23:08:27.000000000 +0100
++++ python-qt4-4.4.4/configure.py 2008-11-22 23:09:05.000000000 +0100
@@ -33,6 +33,8 @@
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -39,17 +39,8 @@
+ return filename
# Initialise the globals.
- pyqt_version = 0x040402
-@@ -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 @@
+ pyqt_version = 0x040404
+@@ -316,6 +335,7 @@
check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
extra_libs=["QAxContainer"])
@@ -57,14 +48,7 @@
if os.path.isdir("dbus"):
check_dbus()
-@@ -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:
+@@ -400,7 +420,7 @@
generate_code("QtAssistant")
if "QtDesigner" in pyqt_modules:
@@ -73,7 +57,7 @@
if sys.platform == "win32":
if opts.debug:
-@@ -422,10 +444,10 @@
+@@ -426,10 +446,10 @@
# Generate the composite module.
qtmod_sipdir = os.path.join("sip", "Qt")
@@ -86,7 +70,7 @@
f.write("""%CompositeModule PyQt4.Qt
-@@ -600,7 +622,7 @@
+@@ -604,7 +624,7 @@
return libs, libdirs
def module_installs(self):
@@ -95,7 +79,7 @@
def qpylibs(self):
# See which QPy libraries to build.
-@@ -616,8 +638,8 @@
+@@ -620,8 +640,8 @@
for qpy, pro in qpylibs.iteritems():
sipconfig.inform("Creating QPy library for %s Makefile..." % qpy)
@@ -106,7 +90,7 @@
if sipcfg.universal:
upro = "u_" + pro
-@@ -641,6 +663,8 @@
+@@ -645,6 +665,8 @@
sipconfig.inform("Creating QPy libraries Makefile...")
@@ -115,7 +99,7 @@
sipconfig.ParentMakefile(
configuration=sipcfg,
dir="qpy",
-@@ -662,6 +686,7 @@
+@@ -666,6 +688,7 @@
install_dir=pydbusmoddir,
qt=["QtCore"],
debug=opts.debug,
@@ -123,7 +107,7 @@
universal=sipcfg.universal
)
-@@ -670,18 +695,19 @@
+@@ -674,18 +697,19 @@
makefile.generate()
tool.append("dbus")
@@ -153,7 +137,7 @@
# Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
# previews work properly and normal console use will work anyway), but
-@@ -689,16 +715,18 @@
+@@ -693,16 +717,18 @@
sipconfig.inform("Creating pyuic4 wrapper...")
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -175,7 +159,7 @@
)
makefile.generate()
-@@ -706,7 +734,7 @@
+@@ -710,7 +736,7 @@
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
@@ -184,7 +168,7 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pylupdate.sbf",
-@@ -716,14 +744,15 @@
+@@ -720,14 +746,15 @@
qt=["QtCore", "QtGui", "QtXml"],
debug=opts.debug,
warnings=1,
@@ -202,7 +186,7 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pyrcc.sbf",
-@@ -733,6 +762,7 @@
+@@ -737,6 +764,7 @@
qt=["QtCore", "QtXml"],
debug=opts.debug,
warnings=1,
@@ -210,7 +194,7 @@
universal=sipcfg.universal
)
-@@ -776,7 +806,7 @@
+@@ -778,7 +806,7 @@
# Run qmake to generate the Makefile.
qmake_args = fix_qmake_args()
cwd = os.getcwd()
@@ -219,7 +203,7 @@
# Create the qmake project file.
fin = open("python.pro-in")
-@@ -800,7 +830,7 @@
+@@ -803,7 +831,7 @@
run_command("%s %s" % (opts.qmake, qmake_args))
os.chdir(cwd)
@@ -228,7 +212,7 @@
return tool
-@@ -947,7 +977,6 @@
+@@ -952,7 +980,6 @@
add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
exe, build = makefile.build_command(name)
@@ -236,7 +220,7 @@
# Make sure the executable file doesn't exist.
remove_file(exe)
run_command(build)
-@@ -1097,7 +1126,7 @@
+@@ -1102,7 +1129,7 @@
return
# Check the module's main .sip file exists.
@@ -245,7 +229,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):
-@@ -1303,10 +1332,14 @@
+@@ -1308,10 +1335,14 @@
argv.append(buildfile)
argv.append("-I")
@@ -262,7 +246,7 @@
cmd = string.join(argv)
-@@ -1328,7 +1361,11 @@
+@@ -1333,7 +1364,11 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -275,7 +259,7 @@
installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
-@@ -1799,7 +1836,7 @@
+@@ -1813,7 +1848,7 @@
).generate()
# Install the configuration module.
@@ -284,3 +268,36 @@
###############################################################################
+diff -urNad python-qt4-4.4.4~/configure.py.rej python-qt4-4.4.4/configure.py.rej
+--- python-qt4-4.4.4~/configure.py.rej 1970-01-01 01:00:00.000000000 +0100
++++ python-qt4-4.4.4/configure.py.rej 2008-11-22 23:08:39.000000000 +0100
+@@ -0,0 +1,29 @@
++***************
++*** 394,406 ****
++ generate_code("QtXmlPatterns")
++
++ if "phonon" in pyqt_modules:
++ generate_code("phonon")
++
++ if "QtAssistant" in pyqt_modules:
++ generate_code("QtAssistant")
++
++ if "QtDesigner" in pyqt_modules:
++- qpy_dir = os.path.abspath(os.path.join("qpy", "QtDesigner"))
++
++ if sys.platform == "win32":
++ if opts.debug:
++--- 416,428 ----
++ generate_code("QtXmlPatterns")
++
++ if "phonon" in pyqt_modules:
++ generate_code("phonon")
++
++ if "QtAssistant" in pyqt_modules:
++ generate_code("QtAssistant")
++
++ if "QtDesigner" in pyqt_modules:
+++ qpy_dir = os.path.abspath(srcPath(os.path.join("qpy", "QtDesigner")))
++
++ if sys.platform == "win32":
++ if opts.debug:
More information about the Python-modules-commits
mailing list