[Python-modules-commits] r24410 - in packages/python-qt4/trunk/debian (11 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Thu May 16 15:49:13 UTC 2013
Date: Thursday, May 16, 2013 @ 15:49:11
Author: kitterman
Revision: 24410
* Upload to unstable
* Fix compiling Qt Designer plugin with multiarched python.
* Enable DEB_BUILD_OPTIONS compliant parallel build.
* New upstream release
- Refresh patches
- Update debian/rules to work with python3.2 and 3.3 (Closes: #707157)
- Bump minimum required sip4 build-dep versions to 4.14.4
* Adjust pyqtconfig.py references in debian/python3-pyqt4.install to cover
all variants now shipped
* Fix find command in install-arch so pyqtconfig files for debug packages
aren't removed
* Additional minor cleanups to get files installed properly for pyqtconifg
and .so files in python3-dbus.mainloop.qt/-dbg
* Add debian/patches/config_extra_headers.diff so additional header
directories used in python3.3 due to multiarch are found during build
* Update debian/rules to account for different layout of python3.3 in
anicipation of multiarched python3.3
* Add specific build-dep on python2.7-dev >=2.7.5-2~ for python2.7-config
configdir support
* Update python3-all-dev minimum version due to bug fixes in 3.2.3-6 for
building with multiple python3 versions
* Generate a multi-version pyqtconfig.py for python3 variants to account
for multiple files installed into the same directory as is done with
sipconfig in python3-sip (Closes: #707734)
* Add removal of qpy/QtCore/qpycore_post_init.cpp to clean rule
* Drop unused python:Provides
* Bump standards version to 3.9.4 without further change
* Fine adjustments to debian/rules
Added:
packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
packages/python-qt4/trunk/debian/pyqtconfig_py3.header
packages/python-qt4/trunk/debian/pyqtconfig_py3.py
packages/python-qt4/trunk/debian/pyqtconfig_py3.snippet
Modified:
packages/python-qt4/trunk/debian/changelog
packages/python-qt4/trunk/debian/control
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/python3-pyqt4.install
packages/python-qt4/trunk/debian/rules
Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/changelog 2013-05-16 15:49:11 UTC (rev 24410)
@@ -1,9 +1,45 @@
-python-qt4 (4.9.6-2) UNRELEASED; urgency=low
+python-qt4 (4.10.1-1) unstable; urgency=low
+ * Upload to unstable
+
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:03:17 +0200
+ [ Dmitrijs Ledkovs ]
+ * Fix compiling Qt Designer plugin with multiarched python.
+ * Enable DEB_BUILD_OPTIONS compliant parallel build.
+ [ Scott Kitterman ]
+ * New upstream release
+ - Refresh patches
+ - Update debian/rules to work with python3.2 and 3.3 (Closes: #707157)
+ - Bump minimum required sip4 build-dep versions to 4.14.4
+ * Adjust pyqtconfig.py references in debian/python3-pyqt4.install to cover
+ all variants now shipped
+ * Fix find command in install-arch so pyqtconfig files for debug packages
+ aren't removed
+ * Additional minor cleanups to get files installed properly for pyqtconifg
+ and .so files in python3-dbus.mainloop.qt/-dbg
+ * Add debian/patches/config_extra_headers.diff so additional header
+ directories used in python3.3 due to multiarch are found during build
+ * Update debian/rules to account for different layout of python3.3 in
+ anicipation of multiarched python3.3
+ * Add specific build-dep on python2.7-dev >=2.7.5-2~ for python2.7-config
+ configdir support
+ * Update python3-all-dev minimum version due to bug fixes in 3.2.3-6 for
+ building with multiple python3 versions
+ * Generate a multi-version pyqtconfig.py for python3 variants to account
+ for multiple files installed into the same directory as is done with
+ sipconfig in python3-sip (Closes: #707734)
+ * Add removal of qpy/QtCore/qpycore_post_init.cpp to clean rule
+ * Drop unused python:Provides
+ * Bump standards version to 3.9.4 without further change
+
+ [ Steve Langasek ]
+ * Fine adjustments to debian/rules
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 16 May 2013 09:34:47 -0400
+
python-qt4 (4.9.6-1) experimental; urgency=low
* New upstream release
Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/control 2013-05-16 15:49:11 UTC (rev 24410)
@@ -17,20 +17,21 @@
libqtwebkit-dev,
python-all-dbg,
python-all-dev (>= 2.7.2-5~),
+ python2.7-dev (>= 2.7.5-2~),
python3-all-dbg,
- python3-all-dev (>= 3.2.2~rc1-1~),
+ python3-all-dev (>= 3.2.3-6~),
python-dbus (>= 1.0.0~),
python-dbus-dbg,
python3-dbus,
python3-dbus-dbg,
python-dbus-dev,
python-sip-dbg,
- python-sip-dev (>= 4.14),
+ python-sip-dev (>= 4.14.4),
python3-sip-dbg,
- python3-sip-dev (>= 4.14),
+ python3-sip-dev (>= 4.14.4),
python-sphinx (>= 1.0.7+dfsg-1~)
Build-Conflicts: python-xml, python-xml-dbg
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: >= 2.4
X-Python3-Version: >= 3.0
Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
@@ -39,7 +40,6 @@
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~)
Added: packages/python-qt4/trunk/debian/patches/config_extra_headers.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/config_extra_headers.diff (rev 0)
+++ packages/python-qt4/trunk/debian/patches/config_extra_headers.diff 2013-05-16 15:49:11 UTC (rev 24410)
@@ -0,0 +1,43 @@
+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.1/configure.py
+===================================================================
+--- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:04:06.603388925 -0400
++++ python-qt4-4.10.1/configure.py 2013-05-08 01:04:06.599388925 -0400
+@@ -795,6 +795,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:
+@@ -950,7 +953,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"])
+@@ -981,7 +987,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/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff 2013-05-16 15:49:11 UTC (rev 24410)
@@ -1,8 +1,8 @@
-Index: python-qt4-4.9.5/configure.py
+Index: python-qt4-4.10.1/configure.py
===================================================================
---- python-qt4-4.9.5.orig/configure.py 2012-10-01 17:16:26.757130858 -0400
-+++ python-qt4-4.9.5/configure.py 2012-10-01 17:17:21.917129227 -0400
-@@ -898,31 +898,6 @@
+--- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:03:59.523389111 -0400
++++ python-qt4-4.10.1/configure.py 2013-05-08 01:03:59.519389111 -0400
+@@ -861,31 +861,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:
-@@ -931,7 +906,6 @@
+@@ -894,7 +869,6 @@
pass
uicdir=os.path.join(pyqt_modroot, "uic")
@@ -42,7 +42,7 @@
sipconfig.inform("Creating pyuic4 Makefile...")
-@@ -940,7 +914,6 @@
+@@ -903,7 +877,6 @@
dstdir=uicdir,
srcdir=os.path.join(src_dir, "pyuic", "uic"),
dir="pyuic",
Modified: packages/python-qt4/trunk/debian/patches/qreal_float_support.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/patches/qreal_float_support.diff 2013-05-16 15:49:11 UTC (rev 24410)
@@ -1,9 +1,9 @@
## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmctails at gmail.com>
-Index: python-qt4-4.9.5/configure.py
+Index: python-qt4-4.10.1/configure.py
===================================================================
---- python-qt4-4.9.5.orig/configure.py 2012-09-29 07:34:33.000000000 -0400
-+++ python-qt4-4.9.5/configure.py 2012-10-01 17:16:26.757130858 -0400
-@@ -2157,8 +2157,9 @@
+--- python-qt4-4.10.1.orig/configure.py 2013-05-08 01:03:51.043389333 -0400
++++ python-qt4-4.10.1/configure.py 2013-05-08 01:03:51.035389333 -0400
+@@ -2161,8 +2161,9 @@
out << "PyQt_NoOpenGLES\\n";
#endif
@@ -14,10 +14,10 @@
return 0;
}
-Index: python-qt4-4.9.5/sip/QtCore/qlist.sip
+Index: python-qt4-4.10.1/sip/QtCore/qlist.sip
===================================================================
---- python-qt4-4.9.5.orig/sip/QtCore/qlist.sip 2012-09-29 07:35:01.000000000 -0400
-+++ python-qt4-4.9.5/sip/QtCore/qlist.sip 2012-10-01 17:16:26.761130858 -0400
+--- python-qt4-4.10.1.orig/sip/QtCore/qlist.sip 2013-05-08 01:03:51.043389333 -0400
++++ python-qt4-4.10.1/sip/QtCore/qlist.sip 2013-05-08 01:03:51.039389333 -0400
@@ -807,3 +807,227 @@
return sipGetState(sipTransferObj);
%End
Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/patches/series 2013-05-16 15:49:11 UTC (rev 24410)
@@ -1,2 +1,3 @@
qreal_float_support.diff
debian_configure_changes.diff
+config_extra_headers.diff
Added: packages/python-qt4/trunk/debian/pyqtconfig_py3.header
===================================================================
--- packages/python-qt4/trunk/debian/pyqtconfig_py3.header (rev 0)
+++ packages/python-qt4/trunk/debian/pyqtconfig_py3.header 2013-05-16 15:49:11 UTC (rev 24410)
@@ -0,0 +1,5 @@
+# Import the pyqtconfig.py for the correct python3 version and normal or debug
+# build.
+
+import sys
+
Added: packages/python-qt4/trunk/debian/pyqtconfig_py3.py
===================================================================
--- packages/python-qt4/trunk/debian/pyqtconfig_py3.py (rev 0)
+++ packages/python-qt4/trunk/debian/pyqtconfig_py3.py 2013-05-16 15:49:11 UTC (rev 24410)
@@ -0,0 +1,5 @@
+# Import the pyqtconfig.py for the correct python3 version and normal or debug
+# build.
+
+import sys
+
Added: packages/python-qt4/trunk/debian/pyqtconfig_py3.snippet
===================================================================
--- packages/python-qt4/trunk/debian/pyqtconfig_py3.snippet (rev 0)
+++ packages/python-qt4/trunk/debian/pyqtconfig_py3.snippet 2013-05-16 15:49:11 UTC (rev 24410)
@@ -0,0 +1,11 @@
+if sys.version_info[1] == @MINORVERS@:
+ if 'd' in sys.abiflags:
+ try:
+ from PyQt4.pyqtconfig_d at MINORVERS@ import *
+ from PyQt4.pyqtconfig_d at MINORVERS@ import _pkg_config, _default_macros
+ except ImportError as msg:
+ raise ImportError('No module named pyqtconfig; package python3-pyqt4-dbg not installed')
+ else:
+ from PyQt4.pyqtconfig_nd at MINORVERS@ import *
+ from PyQt4.pyqtconfig_nd at MINORVERS@ import _pkg_config, _default_macros
+
Modified: packages/python-qt4/trunk/debian/python3-pyqt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python3-pyqt4.install 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/python3-pyqt4.install 2013-05-16 15:49:11 UTC (rev 24410)
@@ -15,6 +15,6 @@
usr/lib/python3*/*-packages/PyQt4/QtXml.so
usr/lib/python3*/*-packages/PyQt4/QtXmlPatterns.so
usr/lib/python3*/*-packages/PyQt4/__init__.py
-usr/lib/python3*/*-packages/PyQt4/pyqtconfig.py
+usr/lib/python3*/*-packages/PyQt4/pyqtconfig*.py
usr/lib/python3*/*-packages/PyQt4/uic/*
#usr/lib/qt4/*
Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules 2013-05-16 15:40:55 UTC (rev 24409)
+++ packages/python-qt4/trunk/debian/rules 2013-05-16 15:49:11 UTC (rev 24410)
@@ -39,6 +39,7 @@
SPLIT=10
PYTHONS := $(shell pyversions -vr) $(shell py3versions -vr)
+PYTHON3S := $(shell py3versions -vr)
DEFAULT_PYTHON := $(shell pyversions -vd)
@@ -53,43 +54,58 @@
LFLAGS_RELEASE="${LDFLAGS}"
-.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+.PRECIOUS: pyqtconfig-% build-%/configure-stamp dbg-build-%/configure-stamp
-configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+configure: $(PYTHON3S:%=pyqtconfig-%) $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+pyqtconfig-3.%:
+ cat $(CURDIR)/debian/pyqtconfig_py3.py $(CURDIR)/debian/pyqtconfig_py3.snippet \
+ > $(CURDIR)/debian/pyqtconfig_py3.py.tmp
+ sed -e "s/@MINORVERS@/$*/g" <$(CURDIR)/debian/pyqtconfig_py3.py.tmp \
+ > $(CURDIR)/debian/pyqtconfig_py3.py
+ touch $@
+
build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
- -m /usr/lib/python$*/config \
+ -m $(shell python$*-config --configdir) \
-d /usr/lib/python$*/$(call py_sitename, $*) \
--dbus /usr/include/dbus-1.0 \
$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin)
touch $@
+dbg-build-3.3/configure-stamp:
+ dh_testdir
+ mkdir -p dbg-build-3.3
+ cd dbg-build-3.3 && python3.3-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
+ -m $(shell python3.3-dbg-config --configdir) \
+ -l /usr/include/python3.3dm \
+ -d /usr/lib/python3.3/$(call py_sitename, 3.3) \
+ --no-designer-plugin
+ touch $@
+
dbg-build-%/configure-stamp:
dh_testdir
mkdir -p dbg-build-$*
cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
- -m /usr/lib/python$*/config_d \
+ -m $(shell python$*-dbg-config --configdir) \
-l /usr/include/python$*_d \
- -d /usr/lib/python$*/$(call py_sitename, $*) \
- --no-designer-plugin
- touch $@
+ -d /usr/lib/python$*/$(call py_sitename, $*) \
+ --no-designer-plugin
-
build: build-arch build-indep
-build-arch: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+build-arch: $(PYTHON3S:%=pyqtconfig-%) $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
build-indep: build-$(DEFAULT_PYTHON)/build-stamp
build-%/build-stamp: build-%/configure-stamp
dh_testdir
- $(MAKE) -C build-$*
+ dh_auto_build --parallel -B build-$*
touch $@
dbg-build-%/build-stamp: dbg-build-%/configure-stamp
dh_testdir
- $(MAKE) -C dbg-build-$*
+ dh_auto_build --parallel -B dbg-build-$*
touch $@
install-indep: build-indep
@@ -126,7 +142,7 @@
done
find debian/python*-dbg ! -type d \
- ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ ! \( -name '*.so' -o -name '*config_*d*.py' \) | xargs rm -f
find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
#FIXME - copying the file to /usr/bin is not the best way,
@@ -134,19 +150,32 @@
# probably like ipython handles it.
cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
-d3_qt4_dbg = debian/python3-dbus.mainloop.qt
+d3_qt4_dbg = debian/python3-pyqt4-dbg
install-arch-3.%:
$(MAKE) -C build-3.$* install \
INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
+ if [ -e $(CURDIR)/debian/tmp$(call py3_dbusmoddir,3.$*)/qt.so ]; then \
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/tmp$(call py3_dbusmoddir,3.$*)/qt.so \
+ $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ echo 'usr/lib/python3.$*/dist-packages/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
+ fi
+ ls $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4 > ../list
+ mv $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
+ $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_nd$*.py
$(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/$(d3_qt4_dbg)
+ if [ -e $(CURDIR)/$(d3_qt4_dbg)$(call py3_dbusmoddir,3.$*)/qt.so ]; then \
+ mkdir -p $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ mv $(CURDIR)/debian/python3-pyqt4-dbg$(call py3_dbusmoddir,3.$*)/qt.so \
+ $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
+ fi
# Don't initiate the uic/widget-plugins
touch $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/uic/widget-plugins/.noinit
-
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
- $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_d.py
+ $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_d$*.py
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.qtopengl-dbg/usr/lib/python3.$*/dist-packages/PyQt4
@@ -156,14 +185,8 @@
mkdir -p debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
mv $(d3_qt4_dbg)/usr/lib/python3.$*/dist-packages/PyQt4/phonon.so \
debian/python3-pyqt4.phonon-dbg/usr/lib/python3.$*/dist-packages/PyQt4
+ install -Dm 644 -o root -g root debian/pyqtconfig_py3.py debian/python3-pyqt4/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py
- if [ -e $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so ]; then \
- mkdir -p debian/python3-dbus.mainloop.qt-dbg/$(call py3_dbusmoddir,$*);\
- mv $(d3_qt4_dbg)$(call py3_dbusmoddir,$*)/qt.so \
- debian/python3-dbus.mainloop.qt-dbg$(call py3_dbusmoddir,$*);\
- echo '$(call py3_dbusmoddir,$*)/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
- fi
-
d_qt4_dbg = debian/python-qt4-dbg
install-arch-%:
@@ -200,6 +223,10 @@
dh_testroot
-cd designer && make distclean
rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
+ cp $(CURDIR)/debian/pyqtconfig_py3.header $(CURDIR)/debian/pyqtconfig_py3.py
+ rm -rf $(CURDIR)/debian/pyqtconfig_py3.py.tmp
+ rm -rf $(CURDIR)/pyqtconfig-*
+ rm -rf $(CURDIR)/qpy/QtCore/qpycore_post_init.cpp
dh_clean
# Must not depend on anything. This is to be called by
@@ -235,6 +262,7 @@
ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
done
endif
+ rm -rf $(CURDIR)/debian/python-qt4-dbg/usr/lib/python3*
dh_python2 --no-dbg-cleaning
dh_python3 --no-dbg-cleaning -N pyqt4-dev-tools
rm -rf $(CURDIR)/debian/python-qt4-dbus/usr/share/pyshared
@@ -245,12 +273,14 @@
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/bin
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip
rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/PyQt4/uic
- rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus/mainloop/
+ rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/lib/python3/dist-packages/dbus
rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/bin
rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/share/sip
rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/lib/python3/dist-packages/PyQt4
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt/usr/lib/python3.*/dist-packages/PyQt4
rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/bin
rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/lib/python3/dist-packages/PyQt4
+ rm -rf $(CURDIR)/debian/python3-dbus.mainloop.qt-dbg/usr/lib/debug/usr/lib/python3.*/dist-packages/PyQt4
dh_fixperms
dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml -X.qml -X.xpm -X.mng -X.qss. -X.xbel -Xchilling
More information about the Python-modules-commits
mailing list