[Python-modules-commits] [pyqt5] 02/02: Fix detection of D-Bus include directories.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Apr 25 08:21:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository pyqt5.
commit a86c80ee6ffa8fed2ef2ce6071aedf2d80596273
Merge: 29e6b83 c1ca9b8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Apr 25 10:53:06 2016 +0300
Fix detection of D-Bus include directories.
configure.py | 2 --
debian/.git-dpm | 4 ++--
debian/changelog | 1 +
...us-include-directories-returned-by-pkg-co.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
6 files changed, 26 insertions(+), 5 deletions(-)
diff --cc debian/.git-dpm
index cb65f9a,0000000..1f888dd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- a7b13e3af78fd6bf0e0e3e87db12884768306d62
- a7b13e3af78fd6bf0e0e3e87db12884768306d62
++c1ca9b88b7f817506f3967c87a28cc874d064f7f
++c1ca9b88b7f817506f3967c87a28cc874d064f7f
+a7b13e3af78fd6bf0e0e3e87db12884768306d62
+a7b13e3af78fd6bf0e0e3e87db12884768306d62
+pyqt5_5.6+dfsg.orig.tar.gz
+919ec6bf88ac0a9ec6fd3a2e0d193b634cb8e268
+3079879
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index bb8bd04,0000000..dc5aa57
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,424 -1,0 +1,425 @@@
+pyqt5 (5.6+dfsg-1) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Add missing newline before clean target in debian/rules.
+ * Updated debian/watch for the new tarballs naming scheme.
+ * Bump sip build-dependencies to 4.18, following configure.py.
+ * Drop custom get-orig-source target, it makes no sense.
+ * Bump Standards-Version to 3.9.8, no changes needed.
+ * Override Lintian false positive error about tiger.js file.
++ * Fix detection of D-Bus include directories.
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 24 Apr 2016 21:56:20 +0300
+
+pyqt5 (5.5.1+dfsg-3) unstable; urgency=medium
+
+ * Move pyuic5-related sed call to install-arch target, it should not
+ be run during indep builds.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 23:46:29 +0300
+
+pyqt5 (5.5.1+dfsg-2) unstable; urgency=medium
+
+ * Make pyuic5 shebang fixup really work.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 20:04:40 +0300
+
+pyqt5 (5.5.1+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Move fdupes from Build-Depends to Build-Depends-Indep, it is only
+ used to build pyqt5-examples package.
+ * Sort debian/pyqt5-dev-tools.manpages file.
+ * Remove examples/webkit/fancybrowser/__pycache__ from orig tarball,
+ it contains a compiled file without source.
+ * Remove uupdate call from debian/rules, not needed with git-dpm.
+
+ [ Matthias Klose ]
+ * pyuic5: Call the unversioned python3 interpreter.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 19:17:22 +0300
+
+pyqt5 (5.5+dfsg-2) unstable; urgency=medium
+
+ * Remove gstreamer 0.10 packages from build-depends, no longer needed.
+ * Update Vcs fields for Git migration.
+ * Add support for Qt 5.5.1 (0001-Add-support-for-Qt-5.5.1.patch).
+ * Move python3-sphinx from Build-Depends to Build-Depends-Indep.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 22 Oct 2015 13:11:35 +0300
+
+pyqt5 (5.5+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Build against Qt 5.5.0.
+ * Add explicit build-dependency on dh-python.
+ * Drop Enginio packages. QtEnginio is no longer developed and
+ pending deprecation.
+ * Build with Sphinx 1.3.
+ * Specify repacksuffix in debian/watch.
+ * Drop XS-Testsuite header, no longer needed with new dpkg versions.
+ * Bump year in debian/copyright.
+ * Add QtLocation library to QtPositioning packages.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 20 Aug 2015 12:59:06 +0300
+
+pyqt5 (5.4.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Add a temporary hack to use upstream stylesheet when building the
+ documentation with Sphinx 1.2.
+ * Build-depend on sip 4.16.8+dfsg-2, as the previous upload would
+ generate wrong dependencies for Python 3 packages.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 25 Jun 2015 14:30:12 +0300
+
+pyqt5 (5.4.1+dfsg-3) experimental; urgency=medium
+
+ * Update and unify descriptions of binary packages.
+ * Backport upstream change to add support for Qt 5.4.2.
+ * Let pyuic sort the import order (closes: #787251, thanks to Reiner
+ Herrmann for the patch).
+ * Build against Qt 5.4.2 to make sure we are ready for the transition.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 06 Jun 2015 12:10:46 +0300
+
+pyqt5 (5.4.1+dfsg-2) experimental; urgency=medium
+
+ * Backport some fixes to setZOrder() function from upstream
+ (uiparser_setzorder_fix.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 12 Mar 2015 10:49:35 +0300
+
+pyqt5 (5.4.1+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ - No longer inserts timestamps into generated files (closes: #774510).
+ - Require sip 4.16.6 for building.
+ * Build against Qt 5.4.1.
+ * Update list of possible options in pylupdate5 manpage.
+ * Add some Suggests to pyqt5-examples package (closes: #779369).
+ * No-op wrap and sort.
+ * Bump years in debian/copyright.
+ * Remove .pyc and .DS_Store files when cleaning.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 05 Mar 2015 22:14:15 +0300
+
+pyqt5 (5.4+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop add_dependency.diff, applied upstream.
+ * Bump required sip dependency to 4.16.4.
+ * Install QtXml module.
+ * Build against Qt 5.4.
+ * Fix descriptions of some binary packages (closes: #769468, #771713).
+ * Add missing licensing information to debian/copyright.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 28 Dec 2014 19:49:12 +0300
+
+pyqt5 (5.3.2+dfsg-3) unstable; urgency=medium
+
+ * Fix a typo in debian/tests/control.
+ * Test Enginio and QtWebSockets modules in autopkgtest.
+ * Add a patch from OpenSUSE to make pyqt5 build against Qt 5.3.2.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 24 Sep 2014 13:21:26 +0400
+
+pyqt5 (5.3.2+dfsg-2) unstable; urgency=medium
+
+ * Add new package for Enginio module.
+ * Add new package for QtWebSockets module.
+ * Fix Lintian warnings about too short and duplicate long descriptions.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 14 Sep 2014 14:40:11 +0400
+
+pyqt5 (5.3.2+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Test Python 2 versions in autopkgtest.
+ * Set X-Python-Version to >= 2.7 as the current code in debian/rules
+ builds only for that version.
+ * Remove all strip calls from generated Makefiles.
+ * Update my e-mail address.
+ * Update debian/copyright.
+
+ [ Scott Kitterman ]
+ * Set minimum python3-all-dev version to 3.3.2-5~ due to use of configdir in
+ debian/rules (LP: #1365814)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 13 Sep 2014 14:13:57 +0400
+
+pyqt5 (5.3.1+dfsg-4) unstable; urgency=medium
+
+ * Add support for python in addition to python3 because the upcoming calibre
+ 2.X series of releases will use PyQt5 with Python and not Python 3
+ - Add python build-depends to debian/control
+ - Add python-* equivalents of existing python3-* packages to debian/
+ control
+ - Update debian/rules to account for python as well as python3
+ - Set minimum python3 version to 3.3 since the revised debug configure
+ rule will not work for 3.2
+ - Replicate and update all python3-* .install files as python-*
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 03 Aug 2014 18:48:21 -0400
+
+pyqt5 (5.3.1+dfsg-3) unstable; urgency=medium
+
+ * debian/tests/import: Redirect stderr to stdout for debug interpreter.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 26 Jul 2014 21:57:58 +0400
+
+pyqt5 (5.3.1+dfsg-2) unstable; urgency=medium
+
+ * Workaround GCC bug #61918 by replacing -isystem with -I in Makefiles
+ (closes: #755767).
+ * Test importing from debug interpreters in autopkgtest.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 26 Jul 2014 09:59:30 +0400
+
+pyqt5 (5.3.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ - Drop debian/patches/fix_implicit_qtablewidget.patch, which had been
+ cherry picked from upstream
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 05 Jul 2014 00:05:42 -0400
+
+pyqt5 (5.3+dfsg-3) unstable; urgency=medium
+
+ * Added debian/patches/fix_implicit_qtablewidget.patch to fix a pyuic
+ regression in the handling of implicit QTableWidget dimensions
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 19 Jun 2014 00:20:35 -0400
+
+pyqt5 (5.3+dfsg-2) unstable; urgency=medium
+
+ * Bump Qt build-dependencies to 5.3, to make sure headers are in
+ correct (multi-arch) locations.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 08 Jun 2014 17:01:30 +0400
+
+pyqt5 (5.3+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fix uscan warning about trailing / in Files-Excluded.
+ * Use new --no-tools configure flag on non-default Python versions.
+ * Bump required sip4 version to 4.16.
+ * Install QtQuickWidgets.so if it is available.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 02 Jun 2014 15:16:52 +0400
+
+pyqt5 (5.2.1+dfsg-3) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Drop get-orig-source.sh in favour of Files-Excluded field in
+ debian/copyright.
+
+ [ Scott Kitterman ]
+ * Upload to unstable
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 09 May 2014 09:38:52 -0400
+
+pyqt5 (5.2.1+dfsg-2) experimental; urgency=medium
+
+ * Add new package for QtPositioning module.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 19 Apr 2014 23:25:04 +0400
+
+pyqt5 (5.2.1+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop all patches, applied upstream.
+ * Bump python3-sip-dev build-dependency to 4.15.5.
+ * Update licensing information for pylupdate and pyrcc modules.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 11 Mar 2014 12:45:18 +0400
+
+pyqt5 (5.2+dfsg-4) unstable; urgency=medium
+
+ * Build-depend on libqt5x11extras5-dev instead of libqt5x11extras-dev,
+ which is now a transitional package.
+ * Drop QMAKESPEC export, seems to be not needed anymore.
+ * Drop hack for alpha, it is no longer supported and qtwebkit is
+ not built there anyway.
+ * Backport upstream patch to fix licensing for dbus module.
+ * Update debian/copyright to use the machine-readable DEP-5 format.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 10 Feb 2014 09:24:20 +0400
+
+pyqt5 (5.2+dfsg-3) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Medium urgency for auto-qtbase-opensource-src transition
+ * No longer create sip symlinks in build directories, that does not
+ have any effect.
+ * debian/patches/fix_qreal_check.diff: Fix qreal check for Qt 5.2.
+ * Adjust dh_compress call to make exclude list not match the whole
+ pyqt5-examples package.
+
+ [ Scott Kitterman ]
+ * Update QMAKESPEC definition in debian/rules for new location (Thanks to
+ Lisandro Damián Nicanor Pérez Meyer for the fix)
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Fri, 31 Jan 2014 20:03:53 +0400
+
+pyqt5 (5.2+dfsg-2) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Add new package for QtX11Extras module.
+ * Autopkgtest improvements:
+ - Make import autopkgtest depend on python3-all.
+ - Don’t set -x in import autopkgtest.
+ - Test QtDBus and QtX11Extras modules as well.
+ * Split examples into their own package, pyqt5-examples.
+ * Rename qpair_old_qt.diff to old_qt.diff, and include a fix for
+ QtX11Extras module.
+
+ [ Scott Kitterman ]
+ * Update debian/copyright for 2014 references
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 19 Jan 2014 12:05:05 +0400
+
+pyqt5 (5.2+dfsg-1) unstable; urgency=low
+
+ * Upload to unstable.
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Backport a patch (qpair_old_qt.diff) to fix building against
+ Qt 5.1.
+ * Bump required sip version to 4.15.4.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Add XS-Testsuite header for autopkgtest.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 09 Jan 2014 11:48:59 +0400
+
+pyqt5 (5.1.1+dfsg-3) experimental; urgency=low
+
+ * Upload to experimental to build against Qt 5.2.
+ * Backport upstream patch (gluint64.sip) to disable GLuint64 on GL ES.
+ * Symlink duplicate files in examples using fdupes.
+ * Add an autopkgtest to make sure all packages are co-installable
+ and all modules are importable.
+ * Temporary build-depend on libudev-dev on Linux to workaround qmake
+ bug that adds -ludev when building QtSerialPort test code.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 22 Dec 2013 11:13:52 +0400
+
+pyqt5 (5.1.1+dfsg-2) unstable; urgency=low
+
+ * Add pyqt5.qtopengl-dbg Breaks/Conflicts to fix file overwrite error
+ (Closes: #729737)
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 16 Nov 2013 16:42:07 -0500
+
+pyqt5 (5.1.1+dfsg-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Add debian/get-orig-source.sh and explain how to use it in
+ README.source; add jquery_rc.py to list of non-free files.
+ * Use dh_link for linking jquery.js in examples.
+ * Install QOpenGLFunctions libraries in python3-pyqt5.qtopengl package.
+ * Call dh_install with --fail-missing option.
+ * Do not install Windows-specific activeqt examples.
+ * Add new packages for QtSerialPort and QtSensors modules.
+ * Make sure dpkg build flags are actually applied.
+ * Backport upstream patch to always apply passed qmake variables.
+ * Pass --debug option to configure.py when doing debug builds.
+ * Link with --as-needed.
+ * Simplify install code in debian/rules.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 09 Nov 2013 14:26:40 +0400
+
+pyqt5 (5.1+dfsg-1) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * New upstream release
+ * Install designer plugin in python3-pyqt5
+ * Move debug version of libpyqt5qmlplugin.so from python3-pyqt5-dbg to
+ python3-pyqt5.qtquick-dbg to match the regular file and avoid duplication
+ (Closes: #720679)
+ * Remove debian/patches/libpython_multiarch.diff, equivalent change
+ incorporated upstream (and debian/patches directory since there are no
+ other patches)
+ * Add README.source to document how to make DFSG tarball
+
+ [ Dmitry Shachnev ]
+ * Delete pycache directories in clean target.
+ * Regenerate resource files during build.
+ * Repack tarball to remove minified javascript from docs and fancybrowser
+ example (Closes: #722990).
+ * Update debian/watch to use dversionmangle.
+ * Build QML plugin only for the default Python version.
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 13 Oct 2013 07:53:00 -0400
+
+pyqt5 (5.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump python3-sip-dev build-dependency to 4.15.
+ * Drop all previous patches, applied upstream.
+ * Add new package, python3-pyqt5.qtquick, containing QtQuick and QtQml
+ extensions.
+ * Install QtMultimediaWidgets extension.
+ * Make pyqt5-doc recommend python3-pyqt5, because of the examples.
+ * Add a patch to support multiarch locations of libpython.
+ * Workaround useless warnings from dh_install --list-missing.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 22 Aug 2013 11:00:35 +0400
+
+pyqt5 (5.0-3) unstable; urgency=low
+
+ * Upload to unstable
+ * Set X-Python3-Version back to >= 3.2 as the work-around is not longer
+ neeeded (python3.2 is no longer supported in unstable)
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 12 Aug 2013 19:49:25 -0400
+
+pyqt5 (5.0-2) experimental; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Update debian/copyright, thanks Paul Tagliamonte for comments.
+ * Use xz compression for binary packages.
+ * Install files to python3-dbus.mainloop.pyqt5{,-dbg} directly instead of
+ generating .install files. This fixes a problem of the -dbg package being
+ not installable because of unwanted debug-id files (closes: #718551).
+
+ [ Scott Kitterman ]
+ * Add debian/patches/arm_compile.patch, cherry picked from upstream to
+ enable builds on arm (replaces qreal_float_support.diff that was used in
+ python-qt4)
+ * Remove pycache directories left over in pyqt5-doc
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 09 Aug 2013 17:44:19 -0400
+
+pyqt5 (5.0-1) experimental; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Initial release, based on python-qt4 packaging (closes: #712630).
+ * debian/patches/mainloop_rename.diff: upstream patch to rename
+ dbus.mainloop.qt module to dbus.mainloop.pyqt5, to prevent conflicts
+ with PyQt4.
+
+ [ Scott Kitterman ]
+ * Add call to dh_installdocs in debian/rules
+ * Added doc-base registration, debian/pyqt5-doc.doc-base
+ * Remove empty pyqt5-doc/examples/webkit/googlechat directory
+ * Add debian/pyqt5-doc.links to replace embedded copy of jquery.min.js in
+ the fancybrowser example with a symlink to the existing copy in the html
+ documentation
+ * Add debian/patches/fix-example-shebang to remove a buggy and unneeded
+ shebang in examples/sql/connection.py
+ * Set X-Python3-Version: >= 3.3 in debian/control as a temporary workaround
+ to a dh_python3 issue with extension renaming
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 28 Jul 2013 13:15:13 +0400
diff --cc debian/patches/0001-Use-all-D-Bus-include-directories-returned-by-pkg-co.patch
index 0000000,0000000..e39fab0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-all-D-Bus-include-directories-returned-by-pkg-co.patch
@@@ -1,0 -1,0 +1,22 @@@
++From c1ca9b88b7f817506f3967c87a28cc874d064f7f Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++Date: Mon, 25 Apr 2016 10:52:59 +0300
++Subject: Use all D-Bus include directories returned by pkg-config
++
++---
++ configure.py | 2 --
++ 1 file changed, 2 deletions(-)
++
++diff --git a/configure.py b/configure.py
++index ca753ee..95e88fc 100644
++--- a/configure.py
+++++ b/configure.py
++@@ -2140,8 +2140,6 @@ def check_dbus(target_config, verbose):
++ else:
++ dlist = target_config.dbus_inc_dirs
++
++- target_config.dbus_inc_dirs = []
++-
++ for d in dlist:
++ if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
++ if d not in target_config.dbus_inc_dirs:
diff --cc debian/patches/series
index 0000000,0000000..b3bc7ac
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-all-D-Bus-include-directories-returned-by-pkg-co.patch
diff --cc debian/rules
index 80f1e32,0000000..5295cca
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,324 -1,0 +1,323 @@@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DH_OPTIONS=${EXTRA_DH_OPTIONS}
+
+py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+py_dbusmoddir = $(shell python -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
+
+debian_version = $(word 2,$(shell dpkg-parsechangelog | grep ^Version:))
+upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
+upstream_version = $(subst ~,,$(firstword $(subst +, ,$(debian_version))))
+
+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 -Wl,--as-needed
+
+SPLIT=10
+
+PYTHON3S := $(shell py3versions -vr)
+DEFAULT_PYTHON := $(shell py3versions -vd)
+PYTHON := 2.7
+ALLPYTHONS := $(PYTHON3S) $(PYTHON)
+
+export QT_SELECT=qt5
+
+# LIBS_* is unset to avoid linking to too many libraries
+# STRIP is unset to let stripping be handled by dh_strip
+SHARED_CONFIGURE_OPTIONS=--confirm-license --verbose \
+ -q /usr/bin/qmake -c -j $(SPLIT) \
+ LIBDIR_QT=/usr/lib STRIP="" MOC=/usr/bin/moc \
+ LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
+ QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
+ QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
+ QMAKE_LFLAGS+="${LDFLAGS}"
+
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(ALLPYTHONS:%=build-%/configure-stamp) $(ALLPYTHONS:%=dbg-build-%/configure-stamp)
+
+build-%/configure-stamp:
+ dh_testdir
+ mkdir -p build-$*
+ cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+ -m $(shell python$*-config --configdir) \
+ -d /usr/lib/python$*/dist-packages \
+ --sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),m,) \
- --dbus /usr/include/dbus-1.0 \
+ $(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin --no-qml-plugin --no-tools)
+ sed -i '/strip/d' build-$*/*/Makefile
+ touch $@
+
+dbg-build-%/configure-stamp:
+ dh_testdir
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+ -m $(shell python$*-dbg-config --configdir) \
+ -l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
+ -d /usr/lib/python$*/dist-packages \
+ --sip-incdir /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
+ --debug --no-designer-plugin --no-qml-plugin --no-tools
+ sed -i '/strip/d' dbg-build-$*/*/Makefile
+ sed -i 's/-isystem/-I/' dbg-build-$*/*/Makefile
+ touch $@
+
+
+build: build-arch build-indep
+build-arch: $(ALLPYTHONS:%=build-%/build-stamp) $(ALLPYTHONS:%=dbg-build-%/build-stamp)
+build-indep: build-$(DEFAULT_PYTHON)/build-stamp
+
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ dh_auto_build --parallel -B build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ dh_auto_build --parallel -B dbg-build-$*
+ touch $@
+
+install-indep: build-indep
+ dh_testdir
+ dh_testroot
+ dh_prep -i
+ dh_installdirs -i
+ dh_install -i --fail-missing
+ dh_installexamples -Xactiveqt -i
+ # Use python3 shebangs and regenerate resource files
+ cd $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/; \
+ cp /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
+ find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +; \
+ find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \
+ $(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc5 {}.qrc -o {}_rc.py
+ # Symlink duplicate files in examples. Based on Andrew Starr-Bochicchio's
+ # code in ubuntu-packaging-guide.
+ cd $(CURDIR)/debian/pyqt5-examples && \
+ fdupes -r1nq usr/share/doc/pyqt5-examples/examples | while read s; do \
+ set -- $$(echo $$s | tr ' ' '\n' | sort); \
+ f=$$1; shift; for d; do \
+ echo "symlinking identical file $$d to $$f"; \
+ rm $$d; ln -s /$$f $$d; \
+ done; \
+ done
+ dh_link -i
+
+install-arch: build-arch
+ dh_testdir
+ dh_testroot
+ dh_prep -a
+ dh_installdirs -a
+ # This is needed to enforce that the install-arch-% rules are
+ # not run in parallel. Both rules install into the same directory,
+ # and therefore might try to access the same files at the same time.
+ # Therefore, instead of depending on the install-arch-% rules,
+ # we invoke them explicitly.
+ for p in $(ALLPYTHONS) ; do \
+ $(MAKE) -f debian/rules install-arch-$$p;\
+ done
+
+ dh_install -a --fail-missing
+ sed -i 's,/usr/bin/python3[.0-9]*,/usr/bin/python3,' debian/pyqt5-dev-tools/usr/bin/pyuic5
+
+ find debian/python*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_*d*.py' \) | xargs rm -f
+
+ for i in $$(find debian/python-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+
+d3_qt5_dbg = debian/python3-pyqt5-dbg
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.$* install INSTALL_ROOT=$(CURDIR)/$(d3_qt5_dbg) DESTDIR=$(CURDIR)/$(d3_qt5_dbg)
+ rm -rf $(CURDIR)/debian/tmp/usr/share/sip
+
+ mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/tmp$(py3_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python3-dbus.mainloop.pyqt5/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+
+ mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/python3-pyqt5-dbg$(py3_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python3-dbus.mainloop.pyqt5-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+
+ # Don't initiate the uic/widget-plugins
+ touch $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
+ for module in opengl sql webkit websockets xmlpatterns svg multimedia quick serialport sensors x11extras positioning; do \
+ mkdir -p debian/python3-pyqt5.qt$$module-dbg/usr/lib/python3.$*/dist-packages/PyQt5; \
+ done
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/*OpenGL*.so \
+ debian/python3-pyqt5.qtopengl-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSql.so \
+ debian/python3-pyqt5.qtsql-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebKit*.so \
+ debian/python3-pyqt5.qtwebkit-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtWebSockets.so \
+ debian/python3-pyqt5.qtwebsockets-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtXmlPatterns.so \
+ debian/python3-pyqt5.qtxmlpatterns-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSvg.so \
+ debian/python3-pyqt5.qtsvg-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtMultimedia*.so \
+ debian/python3-pyqt5.qtmultimedia-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQml.so \
+ $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtQuick*.so \
+ debian/python3-pyqt5.qtquick-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSerialPort.so \
+ debian/python3-pyqt5.qtserialport-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtSensors.so \
+ debian/python3-pyqt5.qtsensors-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtX11Extras.so \
+ debian/python3-pyqt5.qtx11extras-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+ mv $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtPositioning.so \
+ $(d3_qt5_dbg)/usr/lib/python3.$*/dist-packages/PyQt5/QtLocation.so \
+ debian/python3-pyqt5.qtpositioning-dbg/usr/lib/python3.$*/dist-packages/PyQt5
+
+d_qt5_dbg = debian/python-pyqt5-dbg
+
+install-arch-2.%:
+ $(MAKE) -C build-2.$* install INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-2.$* install INSTALL_ROOT=$(CURDIR)/$(d_qt5_dbg) DESTDIR=$(CURDIR)/$(d_qt5_dbg)
+ rm -rf $(CURDIR)/debian/tmp/usr/share/sip
+
+ mkdir -p $(CURDIR)/debian/python-dbus.mainloop.pyqt5/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/tmp$(py_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python-dbus.mainloop.pyqt5/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+
+ mkdir -p $(CURDIR)/debian/python-dbus.mainloop.pyqt5-dbg/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/python-pyqt5-dbg$(py_dbusmoddir)/pyqt5.so \
+ $(CURDIR)/debian/python-dbus.mainloop.pyqt5-dbg/usr/lib/python2.$*/dist-packages/dbus/mainloop; \
+
+ # Don't initiate the uic/widget-plugins
+ touch $(CURDIR)/debian/tmp/usr/lib/python2.$*/dist-packages/PyQt5/uic/widget-plugins/.noinit
+ for module in opengl sql webkit websockets xmlpatterns svg multimedia quick serialport sensors x11extras positioning; do \
+ mkdir -p debian/python-pyqt5.qt$$module-dbg/usr/lib/python2.$*/dist-packages/PyQt5; \
+ done
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/*OpenGL*.so \
+ debian/python-pyqt5.qtopengl-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSql.so \
+ debian/python-pyqt5.qtsql-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtWebKit*.so \
+ debian/python-pyqt5.qtwebkit-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtWebSockets.so \
+ debian/python-pyqt5.qtwebsockets-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtXmlPatterns.so \
+ debian/python-pyqt5.qtxmlpatterns-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSvg.so \
+ debian/python-pyqt5.qtsvg-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtMultimedia*.so \
+ debian/python-pyqt5.qtmultimedia-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtQml.so \
+ $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtQuick*.so \
+ debian/python-pyqt5.qtquick-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSerialPort.so \
+ debian/python-pyqt5.qtserialport-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtSensors.so \
+ debian/python-pyqt5.qtsensors-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtX11Extras.so \
+ debian/python-pyqt5.qtx11extras-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+ mv $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtPositioning.so \
+ $(d_qt5_dbg)/usr/lib/python2.$*/dist-packages/PyQt5/QtLocation.so \
+ debian/python-pyqt5.qtpositioning-dbg/usr/lib/python2.$*/dist-packages/PyQt5
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -rf $(ALLPYTHONS:%=build-%) $(ALLPYTHONS:%=dbg-build-%)
+ find . -type f -name .DS_Store -delete
+ find . -type f -name *.pyc -delete
+ find . -type d -name __pycache__ -delete
+ cd sip; rm -rf Qt opengl_types.sip pyqt-gpl.sip5
+ rm -f examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
+ dh_clean
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installman
+ dh_installchangelogs NEWS
+ dh_installdocs
+ifeq (,$(findstring -a, $(DH_OPTIONS)))
+ sphinx-build $(CURDIR)/doc/sphinx \
+ $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/html
+ dh_sphinxdoc
+endif
+ dh_sip
+ dh_sip3
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+ DH_OPTIONS= dh_strip -ppyqt5-dev-tools
+ set -e; \
+ for p in python3-pyqt5 \
+ python3-pyqt5.qtopengl python3-pyqt5.qtsql \
+ python3-pyqt5.qtwebkit python3-pyqt5.qtwebsockets \
+ python3-pyqt5.qtmultimedia \
+ python3-pyqt5.qtsvg python3-pyqt5.qtxmlpatterns \
+ python3-pyqt5.qtquick python3-pyqt5.qtserialport \
+ python3-pyqt5.qtsensors python3-pyqt5.qtx11extras \
+ python3-pyqt5.qtpositioning python3-dbus.mainloop.pyqt5 \
+ python-pyqt5 \
+ python-pyqt5.qtopengl python-pyqt5.qtsql \
+ python-pyqt5.qtwebkit python-pyqt5.qtwebsockets \
+ python-pyqt5.qtmultimedia \
+ python-pyqt5.qtsvg python-pyqt5.qtxmlpatterns \
+ python-pyqt5.qtquick python-pyqt5.qtserialport \
+ python-pyqt5.qtsensors python-pyqt5.qtx11extras \
+ python-pyqt5.qtpositioning python-dbus.mainloop.pyqt5; do \
+ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ mkdir -p debian/$$p-dbg/usr/share/doc; \
+ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ done
+endif
+ dh_python2 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
+ rm -rf $(CURDIR)/debian/python-pyqt5/usr/lib/python2.7/dist-packages/PyQt5/uic/port_v3
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/bin
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/share/sip
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/PyQt5/uic
+ rm -rf $(CURDIR)/debian/python-pyqt5-dbg/usr/lib/python2.7/dist-packages/dbus
+ dh_python3 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
+ rm -rf $(CURDIR)/debian/python3-pyqt5/usr/lib/python3/dist-packages/PyQt5/uic/port_v2
+ rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/bin
+ rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/share/sip
+ rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/PyQt5/uic
+ rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/dbus
+ rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/webkit/googlechat
+ rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/designer/plugins/python/__pycache__
+ rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/designer/plugins/widgets/__pycache__
+ dh_fixperms
+ dh_compress -X/examples
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb -- -Z xz
+
+# Build architecture independant packages using the common target.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS="-i ${EXTRA_DH_OPTIONS}" binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS="-a ${EXTRA_DH_OPTIONS}" binary-common
+
+
+binary: binary-arch binary-indep
+
+.PHONY: build-indep build-arch build clean binary-indep binary-arch binary configure
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git
More information about the Python-modules-commits
mailing list