[Python-modules-commits] r22288 - in packages/python-qt4/trunk/debian (10 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sun Jun 24 20:07:49 UTC 2012
Date: Sunday, June 24, 2012 @ 20:07:47
Author: kitterman
Revision: 22288
* New upstream release
- Bump minimum sip4 build-depends requirement to 4.13.3
- Refresh patches and adapt debian/patches/fix_qthelp_ftbfs.diff to
upstream configure.py changes
- Drop debian/patches/dbus.patch - originally backported from upstream
- Drop debian/patches/fix_qthelp_ftbfs.diff and
fix_the_QAssitant_ftbfs.diff - incorporated upstream
- Update debian/copyright
* Remove Suggests on non-existant python-phonon-dbg and python3-
phonon-dbg packages
* Drop hard coded depends on python-opengl in python-qt4-gl, not
needed
* Add new python3-pyqt4.qtopengl and python3-pyqt4.qtopengl-dbg
packages (Closes: #673925)
- Uncomment package in debian/control
- Correct -dbg package name in debian/rules
- Add debian/python3-pyqt4.gtopengl.install
* Add support for dpkg-buildflags in debian/rules
- Drop special optimization for GCC 4.2
- Add build-depends on dpkg-dev (>= 1.16.1~)
* Drop unneeded python:Provides
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
packages/python-qt4/trunk/debian/copyright
packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
packages/python-qt4/trunk/debian/patches/series
packages/python-qt4/trunk/debian/rules
Deleted:
packages/python-qt4/trunk/debian/patches/dbus.patch
packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff
packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/changelog 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,8 +1,29 @@
-python-qt4 (4.9.1-6) UNRELEASED; urgency=low
+python-qt4 (4.9.3-1) unstable; urgency=low
+ * New upstream release
+ - Bump minimum sip4 build-depends requirement to 4.13.3
+ - Refresh patches and adapt debian/patches/fix_qthelp_ftbfs.diff to
+ upstream configure.py changes
+ - Drop debian/patches/dbus.patch - originally backported from upstream
+ - Drop debian/patches/fix_qthelp_ftbfs.diff and
+ fix_the_QAssitant_ftbfs.diff - incorporated upstream
+ - Update debian/copyright
+ * Remove Suggests on non-existant python-phonon-dbg and python3-
+ phonon-dbg packages
+ * Drop hard coded depends on python-opengl in python-qt4-gl, not
+ needed
+ * Add new python3-pyqt4.qtopengl and python3-pyqt4.qtopengl-dbg
+ packages (Closes: #673925)
+ - Uncomment package in debian/control
+ - Correct -dbg package name in debian/rules
+ - Add debian/python3-pyqt4.gtopengl.install
+ * Add support for dpkg-buildflags in debian/rules
+ - Drop special optimization for GCC 4.2
+ - Add build-depends on dpkg-dev (>= 1.16.1~)
* Correct DBus to read D-Bus in package descriptions
+ * Drop unneeded python:Provides
- -- Scott Kitterman <scott at kitterman.com> Mon, 21 May 2012 22:09:28 -0400
+ -- Scott Kitterman <scott at kitterman.com> Sun, 24 Jun 2012 12:06:10 -0400
python-qt4 (4.9.1-5) unstable; urgency=low
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/control 2012-06-24 20:07:47 UTC (rev 22288)
@@ -6,7 +6,8 @@
Michael Casadevall <mcasadevall at debian.org>,
Bernd Zeimetz <bzed at debian.org>,
Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 7),
+Build-Depends: dpkg-dev (>= 1.16.1~),
+ debhelper (>= 7),
libicu-dev,
libdbus-1-dev (>= 1.0.2),
libphonon-dev (>= 4:4.2.0-2),
@@ -24,20 +25,20 @@
python3-dbus-dbg,
python-dbus-dev,
python-sip-dbg,
- python-sip-dev (>= 4.13.1),
+ python-sip-dev (>= 4.13.3-2~),
python3-sip-dbg,
- python3-sip-dev (>= 4.13.1-3~),
+ python3-sip-dev (>= 4.13.3-2~),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python-xml, python-xml-dbg
Standards-Version: 3.9.3
X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-qt4/trunk/
Package: python-qt4
Architecture: any
-Provides: ${python:Provides}
Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${sip:Depends}
Suggests: python-qt4-dbg
Replaces: python-qt4-dev (<< 4.4.4-3~)
@@ -71,7 +72,6 @@
Package: python3-pyqt4
Architecture: any
-Provides: ${python3:Provides}
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends}
Suggests: python3-pyqt4-dbg
Breaks: python3-sip (<< 4.13.1~)
@@ -87,6 +87,7 @@
* QtTest
* QtAssistant
* QtWebKit
+ * QtOpenGL (in python3-pyqt4.qtopengl)
* QtSql (in python3-pyqt4.qtsql)
* phonon (in python3-pyqt4.phonon)
@@ -120,24 +121,20 @@
Package: python-qt4-phonon
Architecture: any
-Provides: ${python:Provides}
Depends: python-qt4 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Suggests: python-phonon-dbg
Description: Python bindings for Phonon
The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
to Python.
Package: python3-pyqt4.phonon
Architecture: any
-Provides: ${python3:Provides}
Depends: python3-pyqt4 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Suggests: python3-phonon-dbg
Description: Python3 bindings for Phonon
The Phonon module of PyQt4 provides bindings for the Phonon Multimedia library
to Python3.
@@ -146,7 +143,6 @@
Priority: extra
Section: debug
Architecture: any
-Provides: ${python:Provides}
Depends: python-dbg,
python-qt4-dbg (= ${binary:Version}),
python-qt4-phonon (= ${binary:Version}),
@@ -162,7 +158,6 @@
Priority: extra
Section: debug
Architecture: any
-Provides: ${python3:Provides}
Depends: python3-dbg,
python3-pyqt4-dbg (= ${binary:Version}),
python3-pyqt4.phonon (= ${binary:Version}),
@@ -176,7 +171,6 @@
Package: python-qt4-dbus
Architecture: any
-Provides: ${python:Provides}
Depends: python-dbus (>= 0.84.0-2~),
${misc:Depends},
${python:Depends},
@@ -189,7 +183,6 @@
Architecture: any
Priority: extra
Section: debug
-Provides: ${python:Provides}
Depends: python-dbg,
python-dbus-dbg,
python-qt4-dbus (= ${binary:Version}),
@@ -203,7 +196,6 @@
Package: python3-dbus.mainloop.qt
Architecture: any
-Provides: ${python3:Provides}
Depends: python3-dbus,
${misc:Depends},
${python3:Depends},
@@ -216,7 +208,6 @@
Architecture: any
Priority: extra
Section: debug
-Provides: ${python3:Provides}
Depends: python3-dbg,
python3-dbus-dbg,
python3-dbus.mainloop.qt (= ${binary:Version}),
@@ -230,9 +221,7 @@
Package: python-qt4-gl
Architecture: any
-Provides: ${python:Provides}
-Depends: python-opengl (>= 2.0.1.09-2.2),
- python-qt4 (= ${binary:Version}),
+Depends: python-qt4 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
@@ -255,35 +244,33 @@
.
This package contains the extension built for the Python debug interpreter.
-#Package: python3-pyqt4.gtopengl
-#Architecture: any
-#Depends: python3-pyqt4 (= ${binary:Version}),
-# python3-opengl,
-# ${misc:Depends},
-# ${python3:Depends},
-# ${shlibs:Depends}
-#Description: Python 3 bindings for Qt4's OpenGL module
-# The OpenGL module of PyQt4 provides widgets and utility classes
-# for OpenGL rendering in a Python3 PyQt4 application.
+Package: python3-pyqt4.qtopengl
+Architecture: any
+Depends: python3-pyqt4 (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python 3 bindings for Qt4's OpenGL module
+ The OpenGL module of PyQt4 provides widgets and utility classes
+ for OpenGL rendering in a Python3 PyQt4 application.
-#Package: python3-pyqt4.gtopengl-dbg
-#Priority: extra
-#Section: debug
-#Architecture: any
-#Depends: python3-dbg,
-# python3-pyqt4-dbg (= ${binary:Version}),
-# python3-pyqt4.gtopengl (= ${binary:Version}),
-# ${misc:Depends},
-# ${shlibs:Depends}
-#Description: Python 3 bindings for Qt4's OpenGL module (debug extension)
-# The OpenGL module of PyQt4 provides widgets and utility classes
-# for OpenGL rendering in a Python3 PyQt4 application.
-# .
-# This package contains the extension built for the Python 3 debug interpreter.
+Package: python3-pyqt4.qtopengl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: python3-dbg,
+ python3-pyqt4-dbg (= ${binary:Version}),
+ python3-pyqt4.qtopengl (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Python 3 bindings for Qt4's OpenGL module (debug extension)
+ The OpenGL module of PyQt4 provides widgets and utility classes
+ for OpenGL rendering in a Python3 PyQt4 application.
+ .
+ This package contains the extension built for the Python 3 debug interpreter.
Package: python-qt4-sql
Architecture: any
-Provides: ${python:Provides}
Depends: python-qt4 (= ${binary:Version}),
${misc:Depends},
${python:Depends},
@@ -294,7 +281,6 @@
Package: python3-pyqt4.qtsql
Architecture: any
-Provides: ${python3:Provides}
Depends: python3-pyqt4 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
Modified: packages/python-qt4/trunk/debian/copyright
===================================================================
--- packages/python-qt4/trunk/debian/copyright 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/copyright 2012-06-24 20:07:47 UTC (rev 22288)
@@ -3,7 +3,7 @@
It was downloaded from http://www.riverbankcomputing.co.uk
-Copyright (c) 2007,2010,2011 Riverbank Computing Limited
+Copyright (c) 2007,2010,2011,2012 Riverbank Computing Limited
License:
@@ -130,7 +130,7 @@
The files dbus/dbus.cpp and dbus/dbus.h are:
-// Copyright (c) 2007 Phil Thompson
+// Copyright (c) 2012 Riverbank Computing Limited
//
// Licensed under the Academic Free License version 2.1
//
@@ -148,6 +148,20 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+Copyright and licensing for contrib/sandbox/sandbox.* are:
+Copyright (c) 2007-9 Mark Summerfield. All rights reserved.</font>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, version 2 of the License, or version 3 of the
+License or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+<i>without any warranty</i>; without even the implied warranty of
+<i>merchantability</i> or <i>fitness for a particular purpose</i>.
+See the <a href="http://www.gnu.org/licenses/">GNU General Public
+License</a> for more details."""
+
The Debian packaging is © 2006-2008, Torsten Marek <shlomme at debian.org>
and licensed under the GPL.
Deleted: packages/python-qt4/trunk/debian/patches/dbus.patch
===================================================================
--- packages/python-qt4/trunk/debian/patches/dbus.patch 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/dbus.patch 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,78 +0,0 @@
-Patch from upstream to fix dbus related crashes in PyQt applications like
-PyKDE.
-
-diff -r ec219159004e dbus/dbus.cpp
---- a/dbus/dbus.cpp Sat Apr 14 14:56:28 2012 +0100
-+++ b/dbus/dbus.cpp Sat Apr 14 18:14:47 2012 +0100
-@@ -1,7 +1,7 @@
- // This is the SIP interface definition for the Qt support for the standard
- // Python DBus bindings.
- //
--// Copyright (c) 2012 Phil Thompson
-+// Copyright (c) 2012 Riverbank Computing Limited
- //
- // Licensed under the Academic Free License version 2.1
- //
-@@ -271,7 +271,11 @@
- {
- watcher.read->setEnabled(false);
- dbus_watch_handle(watcher.watch, DBUS_WATCH_READABLE);
-- watcher.read->setEnabled(true);
-+
-+ // The notifier could have just been destroyed.
-+ if (watcher.read)
-+ watcher.read->setEnabled(true);
-+
- break;
- }
-
-@@ -295,7 +299,11 @@
- {
- watcher.write->setEnabled(false);
- dbus_watch_handle(watcher.watch, DBUS_WATCH_WRITABLE);
-- watcher.write->setEnabled(true);
-+
-+ // The notifier could have just been destroyed.
-+ if (watcher.write)
-+ watcher.write->setEnabled(true);
-+
- break;
- }
-
-diff -r ec219159004e dbus/helper.h
---- a/dbus/helper.h Sat Apr 14 14:56:28 2012 +0100
-+++ b/dbus/helper.h Sat Apr 14 18:14:47 2012 +0100
-@@ -1,7 +1,7 @@
- // This is the declaration of the helper class for the Qt specific support for
- // the standard Python DBus bindings.
- //
--// Copyright (c) 2007 Phil Thompson
-+// Copyright (c) 2012 Riverbank Computing Limited
- //
- // Licensed under the Academic Free License version 2.1
- //
-@@ -24,11 +24,12 @@
- #include <QList>
- #include <QMultiHash>
- #include <QObject>
-+#include <QPointer>
-+#include <QSocketNotifier>
-
- #include <dbus/dbus.h>
-
-
--class QSocketNotifier;
- class QTimerEvent;
-
-
-@@ -42,8 +43,8 @@
- Watcher() : watch(0), read(0), write(0) {}
-
- DBusWatch *watch;
-- QSocketNotifier *read;
-- QSocketNotifier *write;
-+ QPointer<QSocketNotifier> read;
-+ QPointer<QSocketNotifier> write;
- };
-
- typedef QMultiHash<int, Watcher> Watchers;
Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.9.1/configure.py
+Index: python-qt4-4.9.3/configure.py
===================================================================
---- python-qt4-4.9.1.orig/configure.py 2012-02-11 17:02:46.626548495 -0500
-+++ python-qt4-4.9.1/configure.py 2012-02-11 21:58:02.088063515 -0500
-@@ -870,31 +870,6 @@
+--- python-qt4-4.9.3.orig/configure.py 2012-06-24 12:08:05.388125143 -0400
++++ python-qt4-4.9.3/configure.py 2012-06-24 12:08:08.788125044 -0400
+@@ -876,31 +876,6 @@
makefile.generate()
tool.append("dbus")
@@ -34,7 +34,7 @@
# The pyuic directory may not exist if we are building away from the
# source directory.
try:
-@@ -903,7 +878,6 @@
+@@ -909,7 +884,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -912,7 +886,6 @@
+@@ -918,7 +892,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Deleted: packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/fix_qthelp_ftbfs.diff 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,17 +0,0 @@
-Description: Fix QtHelp FTBFS with ld --no-add-needed.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-
-Index: python-qt4-4.9/configure.py
-===================================================================
---- python-qt4-4.9.orig/configure.py 2011-12-28 14:01:23.211142955 -0500
-+++ python-qt4-4.9/configure.py 2011-12-28 14:01:29.783142761 -0500
-@@ -356,7 +356,8 @@
- pyqt_modules.append("QtCore")
-
- check_module("QtGui", "qwidget.h", "new QWidget()")
-- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
-+ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")",
-+ extra_libs=["QtCore"])
- check_module("QtMultimedia", "QAudioDeviceInfo",
- "new QAudioDeviceInfo()")
- check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
Deleted: packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/fix_the_QAssitant_ftbfs.diff 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,26 +0,0 @@
-From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Tue, 1 Mar 2011 21:49:23 +0100
-Subject: [PATCH] * fix the QAssitant ftbfs
-
----
- configure.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: python-qt4-4.9/configure.py
-===================================================================
---- python-qt4-4.9.orig/configure.py 2011-12-28 14:01:29.783142761 -0500
-+++ python-qt4-4.9/configure.py 2011-12-28 14:01:35.419142594 -0500
-@@ -346,10 +346,10 @@
-
- if opts.mwg_ssl_dir:
- ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")]
-- ass_libs = ["ssleay32", "libeay32"]
-+ ass_libs = ["ssleay32", "libeay32", "QtCore"]
- else:
- ass_lib_dirs = None
-- ass_libs = None
-+ ass_libs = ["QtCore"]
-
- # Note that the order in which we check is important for the
- # consolidated module - a module's dependencies must be checked first.
Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,9 +1,9 @@
## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.9.1/configure.py
+Index: python-qt4-4.9.3/configure.py
===================================================================
---- python-qt4-4.9.1.orig/configure.py 2012-02-11 16:59:33.402554204 -0500
-+++ python-qt4-4.9.1/configure.py 2012-02-11 17:02:46.626548495 -0500
-@@ -2072,8 +2072,9 @@
+--- python-qt4-4.9.3.orig/configure.py 2012-06-24 12:11:01.272119947 -0400
++++ python-qt4-4.9.3/configure.py 2012-06-24 12:11:04.236119859 -0400
+@@ -2114,8 +2114,9 @@
out << "PyQt_NoOpenGLES\\n";
#endif
@@ -14,10 +14,10 @@
return 0;
}
-Index: python-qt4-4.9.1/sip/QtCore/qlist.sip
+Index: python-qt4-4.9.3/sip/QtCore/qlist.sip
===================================================================
---- python-qt4-4.9.1.orig/sip/QtCore/qlist.sip 2012-02-11 16:59:33.422554203 -0500
-+++ python-qt4-4.9.1/sip/QtCore/qlist.sip 2012-02-11 17:05:31.546543622 -0500
+--- python-qt4-4.9.3.orig/sip/QtCore/qlist.sip 2012-06-24 12:11:01.280119947 -0400
++++ python-qt4-4.9.3/sip/QtCore/qlist.sip 2012-06-24 12:11:04.240119860 -0400
@@ -807,3 +807,227 @@
return sipGetState(sipTransferObj);
%End
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/patches/series 2012-06-24 20:07:47 UTC (rev 22288)
@@ -1,5 +1,2 @@
qreal_float_support.diff
debian_configure_changes.diff
-fix_qthelp_ftbfs.diff
-fix_the_QAssitant_ftbfs.diff
-dbus.patch
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2012-06-24 20:06:47 UTC (rev 22287)
+++ packages/python-qt4/trunk/debian/rules 2012-06-24 20:07:47 UTC (rev 22288)
@@ -17,26 +17,27 @@
export QMAKESPEC=linux-g++
-GCCVER := $(shell gcc -dumpversion | sed -e 's/.[0-9]$$//')
+CFLAGS=
+CPPFLAGS=
+CXXFLAGS=
+LDFLAGS=
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0 -g
+ CXXFLAGS += -O0
+else
+ CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+ CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+ CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
+ LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+endif
LDFLAGS += -Wl,-O1
ifeq ($(DEB_BUILD_ARCH),alpha)
LDFLAGS += -Wl,--no-relax
endif
+SPLIT=10
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
-ifneq (,$(filter $(GCCVER),4.2))
- CXXFLAGS += -O1
- SPLIT=40
-else
- CXXFLAGS += -Os
- SPLIT=10
-endif
-endif
-
PYTHONS := $(shell pyversions -vr) $(shell py3versions -vr)
DEFAULT_PYTHON := $(shell pyversions -vd)
@@ -47,7 +48,9 @@
-q /usr/bin/qmake-qt4 -c -j $(SPLIT) \
LIBDIR_QT=/usr/lib STRIP="" MOC=moc-qt4 \
LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
- LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" LFLAGS_RELEASE="${LDFLAGS}"
+ CFLAGS="" CFLAGS_RELEASE="${CFLAGS} ${CPPFLAGS}" \
+ LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS} ${CPPFLAGS}" \
+ LFLAGS_RELEASE="${LDFLAGS}"
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
@@ -144,9 +147,9 @@
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
$(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_d.py
- mkdir -p debian/python3-pyqt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ mkdir -p debian/python3-pyqt4.qtopengl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtOpenGL.so \
- debian/python3-pyqt4-gl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ debian/python3-pyqt4.qtopengl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
mkdir -p debian/python3-pyqt4.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/QtSql.so \
debian/python3-pyqt4.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt4
@@ -224,6 +227,7 @@
python-qt4-gl \
python-qt4-sql python3-pyqt4.qtsql \
python-qt4-phonon python3-pyqt4.phonon \
+ python3-pyqt4.qtopengl \
; do \
DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
More information about the Python-modules-commits
mailing list