[Python-modules-commits] r8742 - in packages/python-qt4/trunk/debian (7 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Sat Jun 6 21:17:45 UTC 2009
Date: Saturday, June 6, 2009 @ 21:17:45
Author: shlomme
Revision: 8742
Update for new upstream release
* build qpy support libraries in object dirs, too
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/patches/02_htmllinks.dpatch
packages/python-qt4/trunk/debian/patches/04_widget-plugins_location.dpatch
packages/python-qt4/trunk/debian/python-qt4.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/changelog 2009-06-06 21:17:45 UTC (rev 8742)
@@ -1,3 +1,9 @@
+python-qt4 (4.5-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Torsten Marek <shlomme at debian.org> Sat, 06 Jun 2009 20:40:59 +0200
+
python-qt4 (4.4.4-6) unstable; urgency=medium
* medium urgency as we are fixing a RC bug which makes
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/control 2009-06-06 21:17:45 UTC (rev 8742)
@@ -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>, Michael Casadevall <mcasadevall at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.7.9), python-sip4-dev (>= 4.7.8), python-support (>= 0.7.1), 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-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.8), python-sip4-dev (>= 4.8), python-support (>= 0.7.1), 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.1
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
@@ -13,7 +13,7 @@
Package: python-qt4
Architecture: any
Provides: ${python:Provides}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.7.9), python-sip4 (<< 4.8), python-elementtree | python (>= 2.5), python-qt4-common (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.8), python-sip4 (<< 4.9), python-elementtree | python (>= 2.5), python-qt4-common (= ${source:Version})
Suggests: python-qt4-dbg
Replaces: python-qt4-dev (<< 4.4.4-3~)
Description: Python bindings for Qt4
@@ -35,7 +35,7 @@
Priority: extra
Section: debug
Architecture: any
-Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.7), ${shlibs:Depends}
+Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.8), ${shlibs:Depends}
Description: Python bindings for Qt4 (debug extensions)
PyQt4 exposes the Qt4 API to Python.
.
Modified: packages/python-qt4/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2009-06-06 21:17:45 UTC (rev 8742)
@@ -4,9 +4,9 @@
## DP: Make PyQt4 objectdir-buildable
@DPATCH@
-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
+diff -urNad python-qt4-4.5~/configure.py python-qt4-4.5/configure.py
+--- python-qt4-4.5~/configure.py 2009-06-06 22:28:09.000000000 +0200
++++ python-qt4-4.5/configure.py 2009-06-06 22:28:29.000000000 +0200
@@ -33,6 +33,8 @@
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -15,8 +15,8 @@
+
import sys
import os
- import string
-@@ -42,6 +44,23 @@
+ import glob
+@@ -41,6 +43,23 @@
import sipconfig
@@ -39,8 +39,18 @@
+ return filename
# Initialise the globals.
- pyqt_version = 0x040404
-@@ -316,6 +335,7 @@
+ pyqt_version = 0x040500
+@@ -255,7 +274,8 @@
+ sipconfig.ProgramMakefile.__init__(self, configuration=sipcfg,
+ build_file="pyrcc.sbf", dir="pyrcc",
+ install_dir=opts.pyqtbindir, console=1, qt=["QtCore", "QtXml"],
+- debug=opts.debug, warnings=1, universal=sipcfg.universal)
++ debug=opts.debug, warnings=1, universal=sipcfg.universal,
++ topsrcdir=topsrcdir)
+
+ def generate_target_default(self, mfile):
+ """Generate the default target."""
+@@ -352,6 +372,7 @@
check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
extra_libs=["QAxContainer"])
@@ -48,17 +58,8 @@
if os.path.isdir("dbus"):
check_dbus()
-@@ -400,7 +420,7 @@
- generate_code("QtAssistant")
+@@ -469,10 +490,10 @@
- if "QtDesigner" in pyqt_modules:
-- qpy_dir = os.path.abspath(os.path.join("qpy", "QtDesigner"))
-+ qpy_dir = os.path.abspath(srcPath(os.path.join("qpy", "QtDesigner")))
-
- if sys.platform == "win32":
- if opts.debug:
-@@ -426,10 +446,10 @@
-
# Generate the composite module.
qtmod_sipdir = os.path.join("sip", "Qt")
- mk_clean_dir(qtmod_sipdir)
@@ -70,36 +71,71 @@
f.write("""%CompositeModule PyQt4.Qt
-@@ -604,7 +624,7 @@
+@@ -584,7 +605,7 @@
+
+ mname is the name of the module.
+ """
+- qpy_dir = os.path.abspath(os.path.join("qpy", mname))
++ qpy_dir = os.path.join("qpy", mname)
+
+ if sys.platform == "win32":
+ if opts.debug:
+@@ -594,7 +615,7 @@
+ else:
+ qpy_lib_dir = qpy_dir
+
+- return qpy_dir, qpy_lib_dir
++ return srcPath(qpy_dir), os.path.abspath(qpy_lib_dir)
+
+ def _static_plugins(self, mname):
+ """Return a tuple of the libraries (in platform neutral format) and the
+@@ -665,7 +686,7 @@
return libs, libdirs
def module_installs(self):
- return ["__init__.py", "pyqtconfig.py"]
+ return [srcPath("__init__.py"), "pyqtconfig.py"]
- def qpylibs(self):
- # See which QPy libraries to build.
-@@ -620,8 +640,8 @@
- for qpy, pro in qpylibs.iteritems():
- sipconfig.inform("Creating QPy library for %s Makefile..." % qpy)
+ def qpy_libs(self):
+ # See which QPy support libraries to build.
+@@ -684,8 +705,12 @@
+ qmake_args = fix_qmake_args()
+ cwd = os.getcwd()
-- os.chdir(os.path.join("qpy", qpy))
--
-+ os.chdir(srcPath(os.path.join("qpy", qpy)))
++ makeDir("qpy")
++
+ for qpy, pro in qpylibs.items():
+ sipconfig.inform("Creating QPy support library for %s Makefile..." % qpy)
+
- if sipcfg.universal:
- upro = "u_" + pro
++ makeDir(os.path.join("qpy", qpy))
-@@ -645,6 +665,8 @@
+ os.chdir(os.path.join("qpy", qpy))
- sipconfig.inform("Creating QPy libraries Makefile...")
+@@ -718,14 +743,21 @@
+ else:
+ pro_config = 'release'
-+ makeDir("qpy")
-+ os.system("ln -s %s qpy/QtDesigner" % (srcPath("qpy/QtDesigner"),))
- sipconfig.ParentMakefile(
- configuration=sipcfg,
- dir="qpy",
-@@ -666,6 +688,7 @@
++ if topsrcdir:
++ pro = srcPath(os.path.join("qpy", qpy, pro))
++ extra = "VPATH = %s" % (srcPath(os.path.join("qpy", qpy)), )
++ inc_path.append(srcPath(os.path.join("qpy", qpy)))
++ else:
++ extra = ""
++
+ f.write(
+ """# Tell the original .pro file about additional directories.
+ INCLUDEPATH = %s
+-
+ CONFIG += %s
++%s
+
+ include(%s)
+-""" % (" ".join(inc_path), pro_config, pro))
++""" % (" ".join(inc_path), pro_config, extra, pro))
+
+ f.close()
+
+@@ -755,6 +787,7 @@
install_dir=pydbusmoddir,
qt=["QtCore"],
debug=opts.debug,
@@ -107,7 +143,7 @@
universal=sipcfg.universal
)
-@@ -674,18 +697,19 @@
+@@ -763,18 +796,19 @@
makefile.generate()
tool.append("dbus")
@@ -137,7 +173,7 @@
# Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
# previews work properly and normal console use will work anyway), but
-@@ -693,16 +717,18 @@
+@@ -782,16 +816,18 @@
sipconfig.inform("Creating pyuic4 wrapper...")
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -159,7 +195,7 @@
)
makefile.generate()
-@@ -710,7 +736,7 @@
+@@ -799,7 +835,7 @@
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
@@ -168,7 +204,7 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pylupdate.sbf",
-@@ -720,14 +746,15 @@
+@@ -809,14 +845,15 @@
qt=["QtCore", "QtGui", "QtXml"],
debug=opts.debug,
warnings=1,
@@ -183,18 +219,10 @@
sipconfig.inform("Creating pyrcc4 Makefile...")
-
+ makeDir("pyrcc")
- makefile = sipconfig.ProgramMakefile(
- configuration=sipcfg,
- build_file="pyrcc.sbf",
-@@ -737,6 +764,7 @@
- qt=["QtCore", "QtXml"],
- debug=opts.debug,
- warnings=1,
-+ topsrcdir=topsrcdir,
- universal=sipcfg.universal
- )
-
-@@ -778,7 +806,7 @@
+ makefile = pyrccMakefile()
+ makefile.generate()
+ tool.append("pyrcc")
+@@ -856,7 +893,7 @@
# Run qmake to generate the Makefile.
qmake_args = fix_qmake_args()
cwd = os.getcwd()
@@ -203,7 +231,7 @@
# Create the qmake project file.
fin = open("python.pro-in")
-@@ -803,7 +831,7 @@
+@@ -881,7 +918,7 @@
run_command("%s %s" % (opts.qmake, qmake_args))
os.chdir(cwd)
@@ -212,7 +240,7 @@
return tool
-@@ -952,7 +980,6 @@
+@@ -1030,7 +1067,6 @@
add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
exe, build = makefile.build_command(name)
@@ -220,7 +248,7 @@
# Make sure the executable file doesn't exist.
remove_file(exe)
run_command(build)
-@@ -1102,7 +1129,7 @@
+@@ -1181,7 +1217,7 @@
return
# Check the module's main .sip file exists.
@@ -229,7 +257,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):
-@@ -1308,10 +1335,14 @@
+@@ -1392,10 +1428,13 @@
argv.append(buildfile)
argv.append("-I")
@@ -237,16 +265,15 @@
+ argv.append(srcPath("sip"))
# SIP assumes POSIX style path separators.
-- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
+- argv.append("/".join(["sip", mname, mname + "mod.sip"]))
+ if topsrcdir is not None:
-+ argv.append(string.join([topsrcdir, "sip", mname, mname + "mod.sip"], "/"))
++ argv.append("/".join([topsrcdir, "sip", mname, mname + "mod.sip"]))
+ else:
-+ argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
-+
++ argv.append("/".join(["sip", mname, mname + "mod.sip"]))
- cmd = string.join(argv)
+ cmd = " ".join(argv)
-@@ -1333,7 +1364,11 @@
+@@ -1417,7 +1456,11 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -259,7 +286,7 @@
installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
-@@ -1813,7 +1848,7 @@
+@@ -1904,7 +1947,7 @@
).generate()
# Install the configuration module.
Modified: packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/patches/02_htmllinks.dpatch 2009-06-06 21:17:45 UTC (rev 8742)
@@ -4,15 +4,15 @@
## DP: Fix the links in the documentation HTML files.
@DPATCH@
-diff -urNad python-qt4-4.1~/doc/pyqt4ref.html python-qt4-4.1/doc/pyqt4ref.html
---- python-qt4-4.1~/doc/pyqt4ref.html 2006-11-05 00:51:19.000000000 +0100
-+++ python-qt4-4.1/doc/pyqt4ref.html 2006-11-21 23:35:52.000000000 +0100
-@@ -85,7 +85,7 @@
- <p>This is the reference guide for PyQt 4.1. PyQt v4 is a set of
- <a class="reference" href="http://www.python.org">Python</a> bindings for v4 of the Qt application
- framework from <a class="reference" href="http://www.trolltech.com">Trolltech</a>.</p>
--<p>There is a separate <a class="reference" href="html/classes.html">PyQt API Reference</a>.</p>
-+<p>There is a separate <a class="reference" href="classes.html">PyQt API Reference</a>.</p>
+diff -urNad python-qt4-4.5~/doc/pyqt4ref.html python-qt4-4.5/doc/pyqt4ref.html
+--- python-qt4-4.5~/doc/pyqt4ref.html 2009-06-05 10:50:40.000000000 +0200
++++ python-qt4-4.5/doc/pyqt4ref.html 2009-06-06 20:59:46.000000000 +0200
+@@ -388,7 +388,7 @@
+ <p>This is the reference guide for PyQt 4.5. PyQt v4 is a set of
+ <a class="reference external" href="http://www.python.org">Python</a> bindings for v4 of the Qt application
+ framework from <a class="reference external" href="http://www.trolltech.com">Trolltech</a>.</p>
+-<p>There is a separate <a class="reference external" href="html/classes.html">PyQt API Reference</a>.</p>
++<p>There is a separate <a class="reference external" href="classes.html">PyQt API Reference</a>.</p>
<p>Qt is a set of C++ libraries and development tools that includes platform
independent abstractions for graphical user interfaces, networking, threads,
Unicode, regular expressions, SQL databases, SVG, OpenGL, XML, and user and
Modified: packages/python-qt4/trunk/debian/patches/04_widget-plugins_location.dpatch
===================================================================
--- packages/python-qt4/trunk/debian/patches/04_widget-plugins_location.dpatch 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/patches/04_widget-plugins_location.dpatch 2009-06-06 21:17:45 UTC (rev 8742)
@@ -8,12 +8,11 @@
diff -urNad python-qt4~/pyuic/uic/objcreator.py python-qt4/pyuic/uic/objcreator.py
--- python-qt4~/pyuic/uic/objcreator.py 2008-11-08 12:55:56.000000000 +0100
+++ python-qt4/pyuic/uic/objcreator.py 2009-04-09 01:26:57.000000000 +0200
-@@ -22,8 +22,7 @@
+@@ -22,8 +22,8 @@
self._modules = [self._cpolicy.createQtGuiWrapper()]
# Get the optional plugins.
-- plugindir = os.path.join(os.path.split(__file__)[0],
-- "widget-plugins")
+- plugindir = os.path.join(os.path.split(__file__)[0], "widget-plugins")
+ plugindir = '/usr/share/python-qt4/widget-plugins'
try:
Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/python-qt4.install 2009-06-06 21:17:45 UTC (rev 8742)
@@ -6,6 +6,7 @@
usr/lib/python*/*-packages/PyQt4/QtHelp.so
usr/lib/python*/*-packages/PyQt4/QtNetwork.so
usr/lib/python*/*-packages/PyQt4/QtScript.so
+usr/lib/python*/*-packages/PyQt4/QtScriptTools.so
usr/lib/python*/*-packages/PyQt4/QtSvg.so
usr/lib/python*/*-packages/PyQt4/QtTest.so
usr/lib/python*/*-packages/PyQt4/QtWebKit.so
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2009-06-06 18:37:31 UTC (rev 8741)
+++ packages/python-qt4/trunk/debian/rules 2009-06-06 21:17:45 UTC (rev 8742)
@@ -31,8 +31,10 @@
else
ifneq (,$(filter $(GCCVER),4.2))
CXXFLAGS += -O1
+ SPLIT=40
else
CXXFLAGS += -Os
+ SPLIT=10
endif
endif
@@ -40,19 +42,12 @@
DEFAULT_PYTHON := $(shell pyversions -vd)
-ifneq (,$(filter $(GCCVER),4.2))
- SPLIT=40
-else
- SPLIT=10
-endif
-
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
build-%/configure-stamp: patch-stamp
dh_testdir
- # echo yes is needed because of the license question in configure.py
# LIBS_* is unset to avoid linking to too many libraries
# STRIP is unset to let stripping be handled by dh_strip
mkdir -p build-$*
More information about the Python-modules-commits
mailing list