diff -pruN 4.12.1+dfsg-3/debian/changelog 4.12.1+dfsg-4/debian/changelog --- 4.12.1+dfsg-3/debian/changelog 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/changelog 2019-12-03 14:15:42.000000000 +0000 @@ -1,3 +1,10 @@ +python-qt4 (4.12.1+dfsg-4) unstable; urgency=medium + + * Use Python 3 interpreter for pyuic4. + * Drop the Python 2 packages (closes: #938114). + + -- Dmitry Shachnev Tue, 03 Dec 2019 17:15:42 +0300 + python-qt4 (4.12.1+dfsg-3) unstable; urgency=medium [ Ondřej Nový ] diff -pruN 4.12.1+dfsg-3/debian/control 4.12.1+dfsg-4/debian/control --- 4.12.1+dfsg-3/debian/control 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/control 2019-12-03 14:15:42.000000000 +0000 @@ -12,12 +12,8 @@ Build-Depends: debhelper-compat (= 10), libqt4-dev (>= 4:4.8.0-1~), libqt4-opengl-dev, libqtassistantclient-dev, - python-all-dbg, - python-all-dev (>= 2.7.5-1~), python3-all-dbg, python3-all-dev (>= 3.3), - python-sip-dbg, - python-sip-dev (>= 4.19.1+dfsg-2~), python3-sip-dbg, python3-sip-dev (>= 4.19.1+dfsg-2~) Standards-Version: 4.4.1 @@ -25,25 +21,6 @@ Homepage: http://www.riverbankcomputing. Vcs-Git: https://salsa.debian.org/python-team/modules/python-qt4.git Vcs-Browser: https://salsa.debian.org/python-team/modules/python-qt4 -Package: python-qt4 -Architecture: any -Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${sip:Depends} -Suggests: python-qt4-dbg -Breaks: python-qgis (<< 2.14.3+dfsg-2~) -Description: Python bindings for Qt4 - PyQt4 exposes the Qt4 API to Python. The following modules are supported: - * QtCore - * QtDBus - * QtGui - * QtNetwork - * QtXml - * QtScript - * QtSvg - * QtTest - * QtAssistant - * QtOpenGL (in python-qt4-gl) - * QtSql (in python-qt4-sql) - Package: python3-pyqt4 Architecture: any Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, ${sip3:Depends} @@ -63,19 +40,6 @@ Description: Python3 bindings for Qt4 * QtOpenGL (in python3-pyqt4.qtopengl) * QtSql (in python3-pyqt4.qtsql) -Package: python-qt4-dbg -Section: debug -Architecture: any -Depends: python-dbg, - python-qt4 (= ${binary:Version}), - python-sip-dbg, - ${misc:Depends}, - ${shlibs:Depends} -Description: Python bindings for Qt4 (debug extensions) - PyQt4 exposes the Qt4 API to Python. - . - This package contains the extensions built for the Python debug interpreter. - Package: python3-pyqt4-dbg Section: debug Architecture: any @@ -89,30 +53,6 @@ Description: Python3 bindings for Qt4 (d . This package contains the extensions built for the Python3 debug interpreter. -Package: python-qt4-gl -Architecture: any -Depends: python-qt4 (= ${binary:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Python bindings for Qt4's OpenGL module - The OpenGL module of PyQt4 provides widgets and utility classes - for OpenGL rendering in a PyQt4 application. - -Package: python-qt4-gl-dbg -Section: debug -Architecture: any -Depends: python-dbg, - python-qt4-dbg (= ${binary:Version}), - python-qt4-gl (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: Python bindings for Qt4's OpenGL module (debug extension) - The OpenGL module of PyQt4 provides widgets and utility classes - for OpenGL rendering in a PyQt4 application. - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pyqt4.qtopengl Architecture: any Depends: python3-pyqt4 (= ${binary:Version}), @@ -137,16 +77,6 @@ Description: Python 3 bindings for Qt4's . This package contains the extension built for the Python 3 debug interpreter. -Package: python-qt4-sql -Architecture: any -Depends: python-qt4 (= ${binary:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Description: Python bindings for PyQt4's SQL module - The SQL module of PyQt4 provides widgets and utility classes for - SQL database access. - Package: python3-pyqt4.qtsql Architecture: any Depends: python3-pyqt4 (= ${binary:Version}), @@ -157,20 +87,6 @@ Description: Python3 bindings for PyQt4' The SQL module of PyQt4 provides widgets and utility classes for Python3 SQL database access. -Package: python-qt4-sql-dbg -Section: debug -Architecture: any -Depends: python-dbg, - python-qt4-dbg (= ${binary:Version}), - python-qt4-sql (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: Python bindings for PyQt4's SQL module (debug extension) - The SQL module of PyQt4 provides widgets and utility classes for - SQL database access. - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pyqt4.qtsql-dbg Section: debug Architecture: any @@ -187,15 +103,15 @@ Description: Python3 bindings for PyQt4' Package: python-qt4-dev Architecture: all -Depends: python-sip-dev, ${misc:Depends}, ${python:Depends} +Depends: python-sip-dev, ${misc:Depends} Description: Development files for PyQt4 This package contains the source SIP files from which the Python bindings for Qt4 are created. They are needed for building PyQt4 as well as creating bindings for own Qt4 widgets written in C++. Package: pyqt4-dev-tools -Depends: python, - python-qt4 (= ${binary:Version}), +Depends: python3, + python3-pyqt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Architecture: any diff -pruN 4.12.1+dfsg-3/debian/python-qt4-gl.install 4.12.1+dfsg-4/debian/python-qt4-gl.install --- 4.12.1+dfsg-3/debian/python-qt4-gl.install 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/python-qt4-gl.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2*/*-packages/PyQt4/QtOpenGL.so diff -pruN 4.12.1+dfsg-3/debian/python-qt4.install 4.12.1+dfsg-4/debian/python-qt4.install --- 4.12.1+dfsg-3/debian/python-qt4.install 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/python-qt4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -usr/lib/python2*/*-packages/PyQt4/Qt.so -usr/lib/python2*/*-packages/PyQt4/QtAssistant.so -usr/lib/python2*/*-packages/PyQt4/QtCore.so -usr/lib/python2*/*-packages/PyQt4/QtDBus.so -usr/lib/python2*/*-packages/PyQt4/QtDeclarative.so -usr/lib/python2*/*-packages/PyQt4/QtDesigner.so -usr/lib/python2*/*-packages/PyQt4/QtGui.so -usr/lib/python2*/*-packages/PyQt4/QtHelp.so -usr/lib/python2*/*-packages/PyQt4/QtNetwork.so -usr/lib/python2*/*-packages/PyQt4/QtScript.so -usr/lib/python2*/*-packages/PyQt4/QtScriptTools.so -usr/lib/python2*/*-packages/PyQt4/QtSvg.so -usr/lib/python2*/*-packages/PyQt4/QtTest.so -usr/lib/python2*/*-packages/PyQt4/QtXml.so -usr/lib/python2*/*-packages/PyQt4/QtXmlPatterns.so -usr/lib/python2*/*-packages/PyQt4/__init__.py -usr/lib/python2*/*-packages/PyQt4/pyqtconfig.py -usr/lib/python2*/*-packages/PyQt4/uic/* -usr/lib/*/qt4/* diff -pruN 4.12.1+dfsg-3/debian/python-qt4.pyremove 4.12.1+dfsg-4/debian/python-qt4.pyremove --- 4.12.1+dfsg-3/debian/python-qt4.pyremove 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/python-qt4.pyremove 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -PyQt4/uic/port_v3 diff -pruN 4.12.1+dfsg-3/debian/python-qt4-sql.install 4.12.1+dfsg-4/debian/python-qt4-sql.install --- 4.12.1+dfsg-3/debian/python-qt4-sql.install 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/python-qt4-sql.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2*/*-packages/PyQt4/QtSql.so diff -pruN 4.12.1+dfsg-3/debian/pyuic4 4.12.1+dfsg-4/debian/pyuic4 --- 4.12.1+dfsg-3/debian/pyuic4 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/pyuic4 2019-12-03 14:15:42.000000000 +0000 @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # there's no main function, so just import the module import PyQt4.uic.pyuic diff -pruN 4.12.1+dfsg-3/debian/rules 4.12.1+dfsg-4/debian/rules --- 4.12.1+dfsg-3/debian/rules 2019-10-31 09:32:01.000000000 +0000 +++ 4.12.1+dfsg-4/debian/rules 2019-12-03 14:15:42.000000000 +0000 @@ -27,10 +27,7 @@ ifeq ($(DEB_BUILD_ARCH),alpha) endif SPLIT=10 -PYTHONS := $(shell pyversions -vr) $(shell py3versions -vr) -PYTHON3S := $(shell py3versions -vr) - -DEFAULT_PYTHON := $(shell pyversions -vd) +PYTHONS := $(shell py3versions -vr) # LIBS_* is unset to avoid linking to too many libraries # STRIP is unset to let stripping be handled by dh_strip @@ -45,7 +42,7 @@ SHARED_CONFIGURE_OPTIONS=--confirm-licen .PRECIOUS: pyqtconfig-% build-%/configure-stamp dbg-build-%/configure-stamp -configure: $(PYTHON3S:%=pyqtconfig-%) $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) +configure: $(PYTHONS:%=pyqtconfig-%) $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp) pyqtconfig-3.%: cat $(CURDIR)/debian/pyqtconfig_py3.py $(CURDIR)/debian/pyqtconfig_py3.snippet \ @@ -60,7 +57,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \ -m $(shell python$*-config --configdir) \ -d /usr/lib/python$*/dist-packages \ - $(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) + --no-designer-plugin touch $@ dbg-build-%/configure-stamp: @@ -74,8 +71,7 @@ dbg-build-%/configure-stamp: build: build-arch build-indep -build-arch: $(PYTHON3S:%=pyqtconfig-%) $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) -build-indep: build-$(DEFAULT_PYTHON)/build-stamp +build-arch: $(PYTHONS:%=pyqtconfig-%) $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp) build-%/build-stamp: build-%/configure-stamp dh_testdir @@ -100,7 +96,6 @@ install-arch: build-arch dh_testroot dh_prep -a dh_installdirs -a - sed -i -e '/strip/ d' $(CURDIR)/build-$(DEFAULT_PYTHON)/designer/Makefile # 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. @@ -112,14 +107,8 @@ install-arch: build-arch dh_install -a - for i in $$(find debian/python-*-dbg -name '*.so'); do \ - b=$$(basename $$i .so); \ - mv $$i $$(dirname $$i)/$${b}_d.so; \ - done - find debian/python*-dbg ! -type d \ ! \( -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, # it should be imported properly instead. @@ -150,28 +139,14 @@ install-arch-3.%: debian/python3-pyqt4.qtsql-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 -d_qt4_dbg = debian/python-qt4-dbg - install-arch-%: $(MAKE) -C build-$* install \ INSTALL_ROOT=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp - $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/$(d_qt4_dbg) - # Don't initiate the uic/widget-plugins touch $(CURDIR)/debian/tmp/usr/lib/python$*/dist-packages/PyQt4/uic/widget-plugins/.noinit rm $(CURDIR)/debian/tmp/usr/lib/python$*/dist-packages/PyQt4/uic/widget-plugins/qtwebkit.py - mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/pyqtconfig.py \ - $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/pyqtconfig_d.py - mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$*/dist-packages/PyQt4 - mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/QtOpenGL.so \ - debian/python-qt4-gl-dbg/usr/lib/python$*/dist-packages/PyQt4 - mkdir -p debian/python-qt4-sql-dbg/usr/lib/python$*/dist-packages/PyQt4 - mv $(d_qt4_dbg)/usr/lib/python$*/dist-packages/PyQt4/QtSql.so \ - debian/python-qt4-sql-dbg/usr/lib/python$*/dist-packages/PyQt4 - - clean: dh_testdir dh_testroot @@ -192,14 +167,11 @@ binary-common: dh_installman dh_installchangelogs NEWS dh_installdocs -A THANKS - dh_sip dh_sip3 ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppyqt4-dev-tools set -e; \ - for p in python-qt4 python3-pyqt4 \ - python-qt4-gl \ - python-qt4-sql python3-pyqt4.qtsql \ + for p in python3-pyqt4 python3-pyqt4.qtsql \ python3-pyqt4.qtopengl \ ; do \ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ @@ -208,9 +180,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS))) 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 + dh_python3 --no-dbg-cleaning rm -rf $(CURDIR)/debian/python3-pyqt4/usr/lib/python3/dist-packages/PyQt4/uic/port_v2 rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/bin rm -rf $(CURDIR)/debian/python3-pyqt4-dbg/usr/share/sip