[Python-modules-commits] r28229 - in packages/python-qt4/trunk/debian (7 files)
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Tue Mar 18 07:29:24 UTC 2014
Date: Tuesday, March 18, 2014 @ 07:29:23
Author: mitya57-guest
Revision: 28229
* New upstream bugfix release.
* Bump sip version requirement to 4.15.5.
* debian/patches/config_extra_headers.diff: drop, applied upstream.
* debian/patches/phonon_cfgtest.diff: drop, fixed differently upstream.
* Refresh and rebase other patches.
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/patches/config_flags.diff
packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
packages/python-qt4/trunk/debian/patches/series
Deleted:
packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/changelog 2014-03-18 07:29:23 UTC (rev 28229)
@@ -4,6 +4,11 @@
* Removing myself from Uploaders.
[ Dmitry Shachnev ]
+ * New upstream bugfix release.
+ * Bump sip version requirement to 4.15.5.
+ * debian/patches/config_extra_headers.diff: drop, applied upstream.
+ * debian/patches/phonon_cfgtest.diff: drop, fixed differently upstream.
+ * Refresh and rebase other patches.
* debian/watch: Fix DFSG version mangling.
-- Bernd Zeimetz <bzed at debian.org> Thu, 13 Feb 2014 23:21:10 +0100
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/control 2014-03-18 07:29:23 UTC (rev 28229)
@@ -26,9 +26,9 @@
python3-dbus-dbg,
python-dbus-dev,
python-sip-dbg,
- python-sip-dev (>= 4.15),
+ python-sip-dev (>= 4.15.5),
python3-sip-dbg,
- python3-sip-dev (>= 4.15),
+ python3-sip-dev (>= 4.15.5),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python3.2-dev (<< 3.2.3-8~), python2.7-dev (<< 2.7.5-2~)
Standards-Version: 3.9.4
Deleted: packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2014-03-18 07:29:23 UTC (rev 28229)
@@ -1,43 +0,0 @@
-Description: Include additional Python header directories
- This patch makes is so that additional header directories used in python3.3
- due to multiarch are searched when PyQt is building.
-
-Origin: vendor
-Forwarded: http://www.riverbankcomputing.com/pipermail/pyqt/2012-October/032049.html
-Reviewed-By: Scott Kitterman <scott at kitterman.cm>
-Last-Update: <2012-10-21>
-
-Index: python-qt4-4.10.3/configure.py
-===================================================================
---- python-qt4-4.10.3.orig/configure.py 2013-08-21 23:31:38.072871657 -0400
-+++ python-qt4-4.10.3/configure.py 2013-08-21 23:31:38.064871658 -0400
-@@ -797,6 +797,9 @@
- if sipcfg.py_conf_inc_dir != sipcfg.py_inc_dir:
- inc_path.insert(0, sipcfg.py_conf_inc_dir)
-
-+ if sipcfg.py_inc_dir != sipcfg.py_conf_inc_dir:
-+ inc_path.insert(0, sipcfg.py_conf_inc_dir)
-+
- if opts.bigqt:
- api_dir = "../../_qt"
- else:
-@@ -948,7 +951,10 @@
- dynamic_pylib = "--enable-shared" in config_args
-
- if dynamic_pylib:
-- if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
-+ if 'MULTIARCH' in ducfg and glob.glob("%s/lib/%s/libpython%d.%d*" % (
-+ ducfg["exec_prefix"], ducfg["MULTIARCH"], py_major, py_minor)):
-+ lib_dir_flag = quote("-L%s/lib/%s" % (ducfg["exec_prefix"], ducfg["MULTIARCH"]))
-+ elif glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
- elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
- lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
-@@ -979,7 +985,6 @@
- prj = fin.read()
- fin.close()
-
-- prj = prj.replace("@PYINCDIR@", quote(sipcfg.py_inc_dir))
- prj = prj.replace("@PYINCDIR@", " ".join((quote(sipcfg.py_conf_inc_dir), quote(sipcfg.py_inc_dir))))
- prj = prj.replace("@PYLINK@", link)
- prj = prj.replace("@PYSHLIB@", pysh_lib)
Modified: packages/python-qt4/trunk/debian/patches/config_flags.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_flags.diff 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/patches/config_flags.diff 2014-03-18 07:29:23 UTC (rev 28229)
@@ -5,7 +5,7 @@
--- a/configure.py
+++ b/configure.py
-@@ -1004,6 +1004,10 @@
+@@ -1001,6 +1001,10 @@
if src_dir != os.path.curdir:
fout.write("VPATH = %s\n" % os.path.join(src_dir, "designer"))
@@ -16,7 +16,7 @@
fout.write(prj)
fout.close()
-@@ -2257,6 +2261,7 @@
+@@ -2251,6 +2255,7 @@
sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
global opts
Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2014-03-18 07:29:23 UTC (rev 28229)
@@ -1,10 +1,10 @@
Description: disable elementtree and pyuic4 wrapper
Forwarded: not-needed
-Last-Update: 2013-11-20
+Last-Update: 2014-03-18
--- a/configure.py
+++ b/configure.py
-@@ -863,31 +863,6 @@
+@@ -863,35 +863,6 @@
makefile.generate()
tool.append("dbus")
@@ -28,7 +28,11 @@
-
- if sys.platform == 'darwin':
- gui = True
-- use_arch = opts.use_arch
+-
+- if opts.use_arch is None:
+- use_arch = ''
+- else:
+- use_arch = ' '.join(opts.use_arch)
- else:
- gui = False
- use_arch = ''
@@ -36,7 +40,7 @@
# The pyuic directory may not exist if we are building away from the
# source directory.
try:
-@@ -896,7 +871,6 @@
+@@ -900,7 +871,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -44,7 +48,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -905,7 +879,6 @@
+@@ -909,7 +879,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Deleted: packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff 2014-03-18 07:29:23 UTC (rev 28229)
@@ -1,16 +0,0 @@
-Description: fix detection of Phonon ≥ 4.7
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: no
-Last-Update: 2013-11-10
-
---- a/configure.py
-+++ b/configure.py
-@@ -1256,6 +1256,8 @@
- qt = [mname]
- if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"):
- qt.append("QtCore")
-+ if mname == "phonon":
-+ qt.append("QtGui")
-
- makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
- opengl=opengl, debug=opts.debug, arch=sipcfg.arch,
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2014-03-18 07:02:46 UTC (rev 28228)
+++ packages/python-qt4/trunk/debian/patches/series 2014-03-18 07:29:23 UTC (rev 28229)
@@ -1,5 +1,3 @@
debian_configure_changes.diff
-config_extra_headers.diff
qreal_float_support.diff
-phonon_cfgtest.diff
config_flags.diff
More information about the Python-modules-commits
mailing list