diff options
16 files changed, 44 insertions, 400 deletions
diff --git a/debian/_base/dependencies/pytqt/debian/control b/debian/_base/dependencies/pytqt/debian/control index 8f36817c3..c736eccdf 100644 --- a/debian/_base/dependencies/pytqt/debian/control +++ b/debian/_base/dependencies/pytqt/debian/control @@ -4,45 +4,14 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python +Build-Depends: debhelper (>= 9~), python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, libtqscintilla-dev, dh-python Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-pytqt -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends} -Replaces: python-tqt -Breaks: python-tqt -Suggests: python-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python:Provides} -Description: TQt bindings for Python - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python-pytqt-dbg -Architecture: any -Priority: extra -Replaces: python-tqt-dbg -Breaks: python-tqt-dbg -Section: debug -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} Replaces: python3-tqt @@ -71,34 +40,6 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl -Breaks: python-tqt-gl -Suggests: pytqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python-pytqt-gl-dbg -Priority: extra -Section: debug -Replaces: python-tqt-gl-dbg -Breaks: python-tqt-gl-dbg -Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqt-gl (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt-gl Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} @@ -127,31 +68,6 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext -Breaks: python-tqtext -Provides: ${python:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python-pytqtext-dbg -Priority: extra -Section: debug -Replaces: python-tqtext-dbg -Breaks: python-tqtext-dbg -Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqtext (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - Package: python3-pytqtext Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} @@ -161,7 +77,7 @@ Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: python3-pytqtext-dbg @@ -174,7 +90,7 @@ Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: pytqt-tools @@ -190,8 +106,8 @@ Description: pyuic and pylupdate for TQt Linguist translation files from Python code. Package: pytqt-dev -Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${misc:Depends} -Suggests: python3-sip-tqt-dev | python-sip-tqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev Replaces: python-tqt-dev Breaks: python-tqt-dev Architecture: all @@ -206,7 +122,7 @@ Architecture: all Replaces: python-tqt-doc Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python3-pytqt | python-pytqt +Suggests: python3-pytqt Description: TQt bindings for Python - Documentation and examples Documentation and examples for the PyTQt (bindings that allow the use of TQt library from within a Python script). diff --git a/debian/_base/dependencies/pytqt/debian/python-pytqt-gl.install b/debian/_base/dependencies/pytqt/debian/python-pytqt-gl.install deleted file mode 100644 index 75cf3ddfb..000000000 --- a/debian/_base/dependencies/pytqt/debian/python-pytqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtgl.so diff --git a/debian/_base/dependencies/pytqt/debian/python-pytqt.install b/debian/_base/dependencies/pytqt/debian/python-pytqt.install deleted file mode 100644 index d515b0bb8..000000000 --- a/debian/_base/dependencies/pytqt/debian/python-pytqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtcanvas.so -usr/lib/python2.*/*-packages/PyTQt/qtnetwork.so -usr/lib/python2.*/*-packages/PyTQt/qtsql.so -usr/lib/python2.*/*-packages/PyTQt/qttable.so -usr/lib/python2.*/*-packages/PyTQt/qtui.so -usr/lib/python2.*/*-packages/PyTQt/qtxml.so -usr/lib/python2.*/*-packages/PyTQt/qt.so diff --git a/debian/_base/dependencies/pytqt/debian/python-pytqtext.install b/debian/_base/dependencies/pytqt/debian/python-pytqtext.install deleted file mode 100644 index 09cdba01b..000000000 --- a/debian/_base/dependencies/pytqt/debian/python-pytqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtext.so diff --git a/debian/_base/dependencies/pytqt/debian/rules b/debian/_base/dependencies/pytqt/debian/rules index c9ff8c22f..08f03fd27 100755 --- a/debian/_base/dependencies/pytqt/debian/rules +++ b/debian/_base/dependencies/pytqt/debian/rules @@ -13,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -37,10 +41,7 @@ else endif CXXFLAGS += "-I/usr/include/tqt" -PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vd) DEB_PARALLEL_JOBS ?= 40 @@ -115,14 +116,6 @@ install-arch: build dh_install -a --sourcedir=$(CURDIR)/debian/tmp - 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 {} \; - for i in $$(find debian/python3-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ @@ -144,19 +137,6 @@ install-arch-3.%: mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp - $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-pytqt-dbg - mkdir -p debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - clean: dh_testdir dh_testroot @@ -178,8 +158,7 @@ binary-common: ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppytqt-tools set -e; \ - for p in python-pytqt python-pytqt-gl python-pytqtext \ - python3-pytqt python3-pytqt-gl python3-pytqtext; do \ + for p in python3-pytqt python3-pytqt-gl python3-pytqtext; do \ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \ @@ -188,14 +167,8 @@ endif # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning - dh_sip_tqt - dh_sip3_tqt + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps diff --git a/dilos/dependencies/pytqt/debian/control b/dilos/dependencies/pytqt/debian/control index c08ecdd64..1bbf94a2c 100644 --- a/dilos/dependencies/pytqt/debian/control +++ b/dilos/dependencies/pytqt/debian/control @@ -4,45 +4,14 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | dh-python +Build-Depends: debhelper (>= 9~), python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, dh-python Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-pytqt -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends} -Replaces: python-tqt -Breaks: python-tqt -Suggests: python-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python:Provides} -Description: TQt bindings for Python - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python-pytqt-dbg -Architecture: linux-any -Priority: extra -Replaces: python-tqt-dbg -Breaks: python-tqt-dbg -Section: debug -Depends: ${shlibs:Depends}, python-dbg, python-pytqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} Replaces: python3-tqt @@ -71,34 +40,6 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl -Breaks: python-tqt-gl -Suggests: pytqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python-pytqt-gl-dbg -Priority: extra -Section: debug -Replaces: python-tqt-gl-dbg -Breaks: python-tqt-gl-dbg -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-pytqt-gl (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt-gl Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} @@ -127,31 +68,6 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext -Breaks: python-tqtext -Provides: ${python:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python-pytqtext-dbg -Priority: extra -Section: debug -Replaces: python-tqtext-dbg -Breaks: python-tqtext-dbg -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-pytqtext (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - Package: python3-pytqtext Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} @@ -161,7 +77,7 @@ Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: python3-pytqtext-dbg @@ -174,7 +90,7 @@ Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: pytqt-tools @@ -190,8 +106,8 @@ Description: pyuic and pylupdate for TQt Linguist translation files from Python code. Package: pytqt-dev -Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${misc:Depends} -Suggests: python3-sip-tqt-dev | python-sip-tqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev Replaces: python-tqt-dev Breaks: python-tqt-dev Architecture: all @@ -206,7 +122,7 @@ Architecture: all Replaces: python-tqt-doc Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python3-pytqt | python-pytqt +Suggests: python3-pytqt Description: TQt bindings for Python - Documentation and examples Documentation and examples for the PyTQt (bindings that allow the use of TQt library from within a Python script). diff --git a/dilos/dependencies/pytqt/debian/python-pytqt-gl.install b/dilos/dependencies/pytqt/debian/python-pytqt-gl.install deleted file mode 100644 index 75cf3ddfb..000000000 --- a/dilos/dependencies/pytqt/debian/python-pytqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtgl.so diff --git a/dilos/dependencies/pytqt/debian/python-pytqt.install b/dilos/dependencies/pytqt/debian/python-pytqt.install deleted file mode 100644 index d515b0bb8..000000000 --- a/dilos/dependencies/pytqt/debian/python-pytqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtcanvas.so -usr/lib/python2.*/*-packages/PyTQt/qtnetwork.so -usr/lib/python2.*/*-packages/PyTQt/qtsql.so -usr/lib/python2.*/*-packages/PyTQt/qttable.so -usr/lib/python2.*/*-packages/PyTQt/qtui.so -usr/lib/python2.*/*-packages/PyTQt/qtxml.so -usr/lib/python2.*/*-packages/PyTQt/qt.so diff --git a/dilos/dependencies/pytqt/debian/python-pytqtext.install b/dilos/dependencies/pytqt/debian/python-pytqtext.install deleted file mode 100644 index 09cdba01b..000000000 --- a/dilos/dependencies/pytqt/debian/python-pytqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtext.so diff --git a/dilos/dependencies/pytqt/debian/rules b/dilos/dependencies/pytqt/debian/rules index 730a3e36f..2db7dbaaf 100755 --- a/dilos/dependencies/pytqt/debian/rules +++ b/dilos/dependencies/pytqt/debian/rules @@ -3,8 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -15,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -39,10 +41,7 @@ else endif CXXFLAGS += "-I/usr/include/tqt" -PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vd) DEB_PARALLEL_JOBS ?= 40 @@ -141,19 +140,6 @@ install-arch-3.%: # mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ # debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-pytqt-dbg - mkdir -p debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py -# mkdir -p debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ -# debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ -# mkdir -p debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ -# debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - clean: dh_testdir dh_testroot @@ -175,14 +161,8 @@ binary-common: # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning - dh_sip_tqt - dh_sip3_tqt + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/dependencies/pytqt/debian/watch b/dilos/dependencies/pytqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/dilos/dependencies/pytqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.com/software/pyqt/download3 \ - /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz diff --git a/ubuntu/_base/dependencies/pytqt/debian/control b/ubuntu/_base/dependencies/pytqt/debian/control index 8f36817c3..c736eccdf 100644 --- a/ubuntu/_base/dependencies/pytqt/debian/control +++ b/ubuntu/_base/dependencies/pytqt/debian/control @@ -4,45 +4,14 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python +Build-Depends: debhelper (>= 9~), python3-all-dev, python3-all-dbg, libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, libtqscintilla-dev, dh-python Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-pytqt -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends} -Replaces: python-tqt -Breaks: python-tqt -Suggests: python-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql -Provides: ${python:Provides} -Description: TQt bindings for Python - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python-pytqt-dbg -Architecture: any -Priority: extra -Replaces: python-tqt-dbg -Breaks: python-tqt-dbg -Section: debug -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} Replaces: python3-tqt @@ -71,34 +40,6 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl -Breaks: python-tqt-gl -Suggests: pytqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python-pytqt-gl-dbg -Priority: extra -Section: debug -Replaces: python-tqt-gl-dbg -Breaks: python-tqt-gl-dbg -Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqt-gl (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - Package: python3-pytqt-gl Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} @@ -127,31 +68,6 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-pytqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext -Breaks: python-tqtext -Provides: ${python:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python-pytqtext-dbg -Priority: extra -Section: debug -Replaces: python-tqtext-dbg -Breaks: python-tqtext-dbg -Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-pytqtext (= ${binary:Version}), python-pytqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - Package: python3-pytqtext Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} @@ -161,7 +77,7 @@ Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: python3-pytqtext-dbg @@ -174,7 +90,7 @@ Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . - * QScintilla: a featureful TQt source code editing component based + * TQScintilla: a featureful TQt source code editing component based on Scintilla. Package: pytqt-tools @@ -190,8 +106,8 @@ Description: pyuic and pylupdate for TQt Linguist translation files from Python code. Package: pytqt-dev -Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${misc:Depends} -Suggests: python3-sip-tqt-dev | python-sip-tqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev Replaces: python-tqt-dev Breaks: python-tqt-dev Architecture: all @@ -206,7 +122,7 @@ Architecture: all Replaces: python-tqt-doc Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python3-pytqt | python-pytqt +Suggests: python3-pytqt Description: TQt bindings for Python - Documentation and examples Documentation and examples for the PyTQt (bindings that allow the use of TQt library from within a Python script). diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-pytqt-gl.install b/ubuntu/_base/dependencies/pytqt/debian/python-pytqt-gl.install deleted file mode 100644 index 75cf3ddfb..000000000 --- a/ubuntu/_base/dependencies/pytqt/debian/python-pytqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtgl.so diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-pytqt.install b/ubuntu/_base/dependencies/pytqt/debian/python-pytqt.install deleted file mode 100644 index d515b0bb8..000000000 --- a/ubuntu/_base/dependencies/pytqt/debian/python-pytqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtcanvas.so -usr/lib/python2.*/*-packages/PyTQt/qtnetwork.so -usr/lib/python2.*/*-packages/PyTQt/qtsql.so -usr/lib/python2.*/*-packages/PyTQt/qttable.so -usr/lib/python2.*/*-packages/PyTQt/qtui.so -usr/lib/python2.*/*-packages/PyTQt/qtxml.so -usr/lib/python2.*/*-packages/PyTQt/qt.so diff --git a/ubuntu/_base/dependencies/pytqt/debian/python-pytqtext.install b/ubuntu/_base/dependencies/pytqt/debian/python-pytqtext.install deleted file mode 100644 index 09cdba01b..000000000 --- a/ubuntu/_base/dependencies/pytqt/debian/python-pytqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/PyTQt/qtext.so diff --git a/ubuntu/_base/dependencies/pytqt/debian/rules b/ubuntu/_base/dependencies/pytqt/debian/rules index c9ff8c22f..08f03fd27 100755 --- a/ubuntu/_base/dependencies/pytqt/debian/rules +++ b/ubuntu/_base/dependencies/pytqt/debian/rules @@ -13,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -37,10 +41,7 @@ else endif CXXFLAGS += "-I/usr/include/tqt" -PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vd) DEB_PARALLEL_JOBS ?= 40 @@ -115,14 +116,6 @@ install-arch: build dh_install -a --sourcedir=$(CURDIR)/debian/tmp - 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 {} \; - for i in $$(find debian/python3-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ @@ -144,19 +137,6 @@ install-arch-3.%: mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp - $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-pytqt-dbg - mkdir -p debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python-pytqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python-pytqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-pytqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python-pytqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - clean: dh_testdir dh_testroot @@ -178,8 +158,7 @@ binary-common: ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppytqt-tools set -e; \ - for p in python-pytqt python-pytqt-gl python-pytqtext \ - python3-pytqt python3-pytqt-gl python3-pytqtext; do \ + for p in python3-pytqt python3-pytqt-gl python3-pytqtext; do \ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \ @@ -188,14 +167,8 @@ endif # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning - dh_sip_tqt - dh_sip3_tqt + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps |