[Python-modules-commits] r9965 - in packages/python-qt4/trunk/debian (3 files)
ncommander-guest at users.alioth.debian.org
ncommander-guest at users.alioth.debian.org
Wed Oct 7 14:54:28 UTC 2009
Date: Wednesday, October 7, 2009 @ 14:54:27
Author: ncommander-guest
Revision: 9965
* New upstream release
* debian/control:
- Updated for new release of sip4
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 2009-10-07 14:50:33 UTC (rev 9964)
+++ packages/python-qt4/trunk/debian/changelog 2009-10-07 14:54:27 UTC (rev 9965)
@@ -1,10 +1,16 @@
-python-qt4 (4.5.4-2) UNRELEASED; urgency=low
+python-qt4 (4.6-1) UNRELEASED; urgency=low
+ [ Torsten Marek ]
* debian/rules
- Fix .noinit creation for Python 2.6 by using py_sitename in install-arch-%
- -- Torsten Marek <shlomme at debian.org> Sun, 30 Aug 2009 15:56:12 +0200
+ [ Michael Casadevall ]
+ * New upstream release
+ * debian/control:
+ - Updated for new release of sip4
+ -- Michael Casadevall <mcasadevall at debian.org> Wed, 07 Oct 2009 09:53:11 -0400
+
python-qt4 (4.5.4-1) unstable; urgency=low
[ Torsten Marek ]
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2009-10-07 14:50:33 UTC (rev 9964)
+++ packages/python-qt4/trunk/debian/control 2009-10-07 14:54:27 UTC (rev 9965)
@@ -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 (>= 7), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.8.2), python-sip4-dev (>= 4.8.2), 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 (>= 7), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.9), python-sip4-dev (>= 4.9), 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.3
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.8.1), python-sip4 (<< 4.9), python-elementtree | python (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.9), python-sip4 (<< 4.10), python-elementtree | python (>= 2.5)
Suggests: python-qt4-dbg
Replaces: python-qt4-dev (<< 4.4.4-3~), python-qt4-common
Conflicts: python-qt4-common
@@ -36,7 +36,7 @@
Priority: extra
Section: debug
Architecture: any
-Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.8.1), ${shlibs:Depends}
+Depends: python-qt4 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.9), ${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-10-07 14:50:33 UTC (rev 9964)
+++ packages/python-qt4/trunk/debian/patches/01_configure.dpatch 2009-10-07 14:54:27 UTC (rev 9965)
@@ -4,10 +4,10 @@
## DP: Make PyQt4 objectdir-buildable
@DPATCH@
-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 @@
+diff -urNad python-qt4-4.6~/configure.py python-qt4-4.6/configure.py
+--- python-qt4-4.6~/configure.py 2009-09-26 11:19:41.000000000 -0400
++++ python-qt4-4.6/configure.py 2009-10-07 10:03:11.173526146 -0400
+@@ -28,6 +28,8 @@
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -16,7 +16,7 @@
import sys
import os
import glob
-@@ -41,6 +43,23 @@
+@@ -36,6 +38,23 @@
import sipconfig
@@ -39,18 +39,17 @@
+ return filename
# Initialise the globals.
- pyqt_version = 0x040500
-@@ -255,7 +274,8 @@
- sipconfig.ProgramMakefile.__init__(self, configuration=sipcfg,
+ pyqt_version = 0x040600
+@@ -260,7 +279,7 @@
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)
+ debug=opts.debug, warnings=1, universal=sipcfg.universal,
+- arch=sipcfg.arch)
++ topsrcdir=topsrcdir, arch=sipcfg.arch)
def generate_target_default(self, mfile):
"""Generate the default target."""
-@@ -352,6 +372,7 @@
+@@ -357,6 +376,7 @@
check_module("QAxContainer", "qaxobject.h", "new QAxObject()",
extra_libs=["QAxContainer"])
@@ -58,7 +57,7 @@
if os.path.isdir("dbus"):
check_dbus()
-@@ -469,10 +490,10 @@
+@@ -474,10 +494,10 @@
# Generate the composite module.
qtmod_sipdir = os.path.join("sip", "Qt")
@@ -71,16 +70,16 @@
f.write("""%CompositeModule PyQt4.Qt
-@@ -584,7 +605,7 @@
+@@ -589,7 +609,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 sys.platform == 'win32':
if opts.debug:
-@@ -594,7 +615,7 @@
+@@ -599,7 +619,7 @@
else:
qpy_lib_dir = qpy_dir
@@ -89,7 +88,7 @@
def _static_plugins(self, mname):
"""Return a tuple of the libraries (in platform neutral format) and the
-@@ -665,7 +686,7 @@
+@@ -670,7 +690,7 @@
return libs, libdirs
def module_installs(self):
@@ -98,7 +97,7 @@
def qpy_libs(self):
# See which QPy support libraries to build.
-@@ -684,8 +705,12 @@
+@@ -689,8 +709,12 @@
qmake_args = fix_qmake_args()
cwd = os.getcwd()
@@ -111,7 +110,7 @@
os.chdir(os.path.join("qpy", qpy))
-@@ -718,14 +743,21 @@
+@@ -721,14 +745,21 @@
else:
pro_config = 'release'
@@ -135,15 +134,15 @@
f.close()
-@@ -755,6 +787,7 @@
+@@ -758,6 +789,7 @@
install_dir=pydbusmoddir,
qt=["QtCore"],
debug=opts.debug,
+ topsrcdir=topsrcdir,
- universal=sipcfg.universal
+ universal=sipcfg.universal,
+ arch=sipcfg.arch
)
-
-@@ -763,18 +796,19 @@
+@@ -767,18 +799,19 @@
makefile.generate()
tool.append("dbus")
@@ -173,14 +172,14 @@
# Create the pyuic4 wrapper. Use the GUI version on MacOS (so that
# previews work properly and normal console use will work anyway), but
-@@ -782,16 +816,18 @@
- sipconfig.inform("Creating pyuic4 wrapper...")
+@@ -793,16 +826,18 @@
+ use_arch = ''
uicdir=os.path.join(pyqt_modroot, "uic")
-- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
+- wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
+ makeDir("pyuic")
-+ # Wrapper script is not needed on Debian
-+ #wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), (sys.platform == "darwin"))
++ # Wrapper not needed in Debian
++ #wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch)
sipconfig.inform("Creating pyuic4 Makefile...")
@@ -195,7 +194,7 @@
)
makefile.generate()
-@@ -799,7 +835,7 @@
+@@ -810,7 +845,7 @@
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
@@ -204,14 +203,15 @@
makefile = sipconfig.ProgramMakefile(
configuration=sipcfg,
build_file="pylupdate.sbf",
-@@ -809,14 +845,15 @@
+@@ -820,15 +855,17 @@
qt=["QtCore", "QtGui", "QtXml"],
debug=opts.debug,
warnings=1,
+ topsrcdir=topsrcdir,
- universal=sipcfg.universal
+ universal=sipcfg.universal,
+ arch=sipcfg.arch
)
--
+
+ makefile.extra_include_dirs.append(srcPath("pylupdate"))
makefile.generate()
tool.append("pylupdate")
@@ -222,7 +222,7 @@
makefile = pyrccMakefile()
makefile.generate()
tool.append("pyrcc")
-@@ -856,7 +893,7 @@
+@@ -868,7 +905,7 @@
# Run qmake to generate the Makefile.
qmake_args = fix_qmake_args()
cwd = os.getcwd()
@@ -231,7 +231,7 @@
# Create the qmake project file.
fin = open("python.pro-in")
-@@ -881,7 +918,7 @@
+@@ -895,7 +932,7 @@
run_command("%s %s" % (opts.qmake, qmake_args))
os.chdir(cwd)
@@ -240,7 +240,7 @@
return tool
-@@ -1030,7 +1067,6 @@
+@@ -1061,7 +1098,6 @@
add_makefile_extras(makefile, extra_include_dirs, extra_lib_dirs, extra_libs)
exe, build = makefile.build_command(name)
@@ -248,7 +248,7 @@
# Make sure the executable file doesn't exist.
remove_file(exe)
run_command(build)
-@@ -1181,7 +1217,7 @@
+@@ -1212,7 +1248,7 @@
return
# Check the module's main .sip file exists.
@@ -257,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):
-@@ -1392,10 +1428,13 @@
+@@ -1423,10 +1459,13 @@
argv.append(buildfile)
argv.append("-I")
@@ -273,7 +273,7 @@
cmd = " ".join(argv)
-@@ -1417,7 +1456,11 @@
+@@ -1448,7 +1487,11 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -286,7 +286,7 @@
installs.append([sipfiles, os.path.join(opts.pyqtsipdir, mname)])
-@@ -1904,7 +1947,7 @@
+@@ -1948,7 +1991,7 @@
).generate()
# Install the configuration module.
More information about the Python-modules-commits
mailing list