summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-07-25 16:25:47 +0200
committerSlávek Banko <slavek.banko@axis.cz>2022-07-28 00:50:50 +0200
commit0cf60c5ecf09f0feddd412da48e54d03fa8e6120 (patch)
tree3dec02cc36a7fcffab6abbf3dc4c727008afea64
parent7cacc26b4b234a6d806213021593d5fb8a3a8682 (diff)
downloadtde-packaging-0cf60c5ecf09f0feddd412da48e54d03fa8e6120.tar.gz
tde-packaging-0cf60c5ecf09f0feddd412da48e54d03fa8e6120.zip
DEB python-tqt: Add packages for Python3 support.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 712603377ea86a8d0facace67bea9ef82deeacc9)
-rw-r--r--debian/_base/dependencies/python-tqt/debian/control80
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqt.install14
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python-tqtext.install2
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install1
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqt.install7
-rw-r--r--debian/_base/dependencies/python-tqt/debian/python3-tqtext.install1
-rwxr-xr-xdebian/_base/dependencies/python-tqt/debian/rules78
-rw-r--r--dilos/dependencies/python-tqt/debian/control80
-rw-r--r--dilos/dependencies/python-tqt/debian/python-tqt-gl.install2
-rw-r--r--dilos/dependencies/python-tqt/debian/python-tqt.install14
-rw-r--r--dilos/dependencies/python-tqt/debian/python-tqtext.install2
-rw-r--r--dilos/dependencies/python-tqt/debian/python3-tqt-gl.install1
-rw-r--r--dilos/dependencies/python-tqt/debian/python3-tqt.install7
-rw-r--r--dilos/dependencies/python-tqt/debian/python3-tqtext.install1
-rwxr-xr-xdilos/dependencies/python-tqt/debian/rules70
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/control80
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install2
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install14
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install2
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install1
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install7
-rw-r--r--ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install1
-rwxr-xr-xubuntu/_base/dependencies/python-tqt/debian/rules78
24 files changed, 435 insertions, 112 deletions
diff --git a/debian/_base/dependencies/python-tqt/debian/control b/debian/_base/dependencies/python-tqt/debian/control
index 8af7946c1..704bbca00 100644
--- a/debian/_base/dependencies/python-tqt/debian/control
+++ b/debian/_base/dependencies/python-tqt/debian/control
@@ -4,8 +4,10 @@ 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), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python, python-all-dbg
+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
Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
Package: python-tqt
Architecture: any
@@ -38,6 +40,33 @@ Description: TQt bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ 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: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (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: python-tqt-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
@@ -66,6 +95,30 @@ Description: TQt OpenGL bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ 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: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (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: python-tqtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
@@ -91,6 +144,27 @@ Description: TQt debug extensions for PyTQt
* QScintilla: a featureful TQt source code editing component based
on Scintilla.
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+ * QScintilla: a featureful TQt source code editing component based
+ on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-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: pytqt-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -104,8 +178,8 @@ Description: pyuic and pylupdate for TQt
Linguist translation files from Python code.
Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
Replaces: python-tqt-dev (<< 4:14.0.0~)
Breaks: python-tqt-dev (<< 4:14.0.0~)
Architecture: all
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
index 288f3cb88..d58e26ab5 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt.install b/debian/_base/dependencies/python-tqt/debian/python-tqt.install
index 61a9363d0..4ec8f4d19 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqt.install
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqt.install
@@ -1,7 +1,7 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
index 582be1bb1..00345e2e7 100644
--- a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ b/debian/_base/dependencies/python-tqt/debian/python-tqtext.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt.install b/debian/_base/dependencies/python-tqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/debian/_base/dependencies/python-tqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules
index cf228c2b5..1759d32a5 100755
--- a/debian/_base/dependencies/python-tqt/debian/rules
+++ b/debian/_base/dependencies/python-tqt/debian/rules
@@ -37,34 +37,29 @@ else
endif
CXXFLAGS += "-I/usr/include/tqt"
-PYTHONS := $(shell pyversions -vr debian/control)
+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)
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
- SPLIT=40
-else
- SPLIT=10
-endif
+DEB_PARALLEL_JOBS ?= 40
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
-c -n /usr/include/tqt3 \
- -e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
@@ -74,12 +69,12 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
-c -n /usr/include/tqt3 \
- -e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
@@ -102,7 +97,7 @@ install-indep: configure
dh_clean -k -i
dh_installdirs -i
for version in ${PYTHONS}; do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
+ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
mkdir -p debian/python-tqt-dev/$$pylib;\
install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
@@ -113,21 +108,9 @@ install-arch: build
dh_testroot
dh_clean -k -a
dh_installdirs -a
- for version in ${PYTHONS}; do \
- $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
- done
- for version in ${PYTHONS}; do \
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
- $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
- mkdir -p debian/python-tqt/$$pylib;\
- cp -a debian/tmp/$$pylib/__init__.py \
- debian/python-tqt/$$pylib/__init__.py;\
- mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
- mv debian/python-tqt-dbg/$$pylib/qtgl.so \
- debian/python-tqt-gl-dbg/$$pylib/;\
- mkdir -p debian/python-tqtext-dbg/$$pylib;\
- mv debian/python-tqt-dbg/$$pylib/qtext.so \
- debian/python-tqtext-dbg/$$pylib/;\
+
+ for p in $(PYTHONS) ; do \
+ $(MAKE) -f debian/rules install-arch-$$p;\
done
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
@@ -140,6 +123,40 @@ install-arch: build
! \( -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; \
+ done
+ find debian/python3-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+ mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+ mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+ debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+ mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+ debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+ $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+ mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+ mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+ debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+ mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+ debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
clean:
dh_testdir
dh_testroot
@@ -170,7 +187,12 @@ 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_lintian
dh_installdeb
diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/python-tqt/debian/control
index 9fc68128b..91a6636d9 100644
--- a/dilos/dependencies/python-tqt/debian/control
+++ b/dilos/dependencies/python-tqt/debian/control
@@ -4,8 +4,10 @@ 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), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-all-dbg [!solaris-any], dh-python
+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
Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
Package: python-tqt
Architecture: any
@@ -38,6 +40,33 @@ Description: TQt bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ 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: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (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: python-tqt-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
@@ -66,6 +95,30 @@ Description: TQt OpenGL bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ 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: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (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: python-tqtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
@@ -91,6 +144,27 @@ Description: TQt debug extensions for PyTQt
* QScintilla: a featureful TQt source code editing component based
on Scintilla.
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+ * QScintilla: a featureful TQt source code editing component based
+ on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-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: pytqt-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -104,8 +178,8 @@ Description: pyuic and pylupdate for TQt
Linguist translation files from Python code.
Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
Replaces: python-tqt-dev (<< 4:14.0.0~)
Breaks: python-tqt-dev (<< 4:14.0.0~)
Architecture: all
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install
index 288f3cb88..d58e26ab5 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install
+++ b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-tqt.install
index 61a9363d0..4ec8f4d19 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqt.install
+++ b/dilos/dependencies/python-tqt/debian/python-tqt.install
@@ -1,7 +1,7 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-tqtext.install
index 582be1bb1..00345e2e7 100644
--- a/dilos/dependencies/python-tqt/debian/python-tqtext.install
+++ b/dilos/dependencies/python-tqt/debian/python-tqtext.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt.install b/dilos/dependencies/python-tqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/dilos/dependencies/python-tqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/dilos/dependencies/python-tqt/debian/python3-tqtext.install b/dilos/dependencies/python-tqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/dilos/dependencies/python-tqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/python-tqt/debian/rules
index 7c6c39af2..f918e78c8 100755
--- a/dilos/dependencies/python-tqt/debian/rules
+++ b/dilos/dependencies/python-tqt/debian/rules
@@ -39,23 +39,18 @@ else
endif
CXXFLAGS += "-I/usr/include/tqt"
-PYTHONS := $(shell pyversions -vr debian/control)
+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)
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
- SPLIT=40
-else
- SPLIT=10
-endif
+DEB_PARALLEL_JOBS ?= 40
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
#configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
configure: $(PYTHONS:%=build-%/configure-stamp)
+
build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
@@ -63,11 +58,12 @@ build-%/configure-stamp:
| python$* ../configure.py \
-c -n /usr/include/tqt3 \
-e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
@@ -77,12 +73,12 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
-c -n /usr/include/tqt3 \
- -e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
@@ -106,7 +102,7 @@ install-indep: configure
dh_clean -k -i
dh_installdirs -i
for version in ${PYTHONS}; do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
+ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
mkdir -p debian/python-tqt-dev/$$pylib;\
install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
@@ -117,18 +113,47 @@ install-arch: build
dh_testroot
dh_clean -k -a
dh_installdirs -a
- for version in ${PYTHONS}; do \
- $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
- done
- for version in ${PYTHONS}; do \
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
- mkdir -p debian/python-tqt/$$pylib;\
- cp -a debian/tmp/$$pylib/__init__.py \
- debian/python-tqt/$$pylib/__init__.py;\
+
+ for p in $(PYTHONS) ; do \
+ $(MAKE) -f debian/rules install-arch-$$p;\
done
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+ for i in $$(find debian/python3-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+ find debian/python3-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+# $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+ mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+# mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+# debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+# mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+# debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+ $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+ mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+# mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+# debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+# mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+# debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
clean:
dh_testdir
dh_testroot
@@ -150,7 +175,12 @@ 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_lintian
dh_installdeb
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/python-tqt/debian/control
index 8af7946c1..704bbca00 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/control
+++ b/ubuntu/_base/dependencies/python-tqt/debian/control
@@ -4,8 +4,10 @@ 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), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-tqt-dev, python-sip-tqt-dbg, libtqscintilla-dev, python-support (>= 0.7.1) | dh-python, python-all-dbg
+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
Standards-Version: 3.8.4
+XS-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
Package: python-tqt
Architecture: any
@@ -38,6 +40,33 @@ Description: TQt bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
+Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
+Provides: ${python3:Provides}
+Description: TQt bindings for Python 3
+ 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: python3-tqt-dbg
+Architecture: any
+Priority: extra
+Section: debug
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends}
+Description: TQt bindings for Python 3 (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: python-tqt-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
@@ -66,6 +95,30 @@ Description: TQt OpenGL bindings for Python (debug extension)
.
This package contains the extension built for the Python debug interpreter.
+Package: python3-tqt-gl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends}
+Suggests: python-tqt-doc
+Provides: ${python3:Provides}
+Description: TQt OpenGL bindings for Python 3
+ 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: python3-tqt-gl-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends}
+Description: TQt OpenGL bindings for Python 3 (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: python-tqtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends}
@@ -91,6 +144,27 @@ Description: TQt debug extensions for PyTQt
* QScintilla: a featureful TQt source code editing component based
on Scintilla.
+Package: python3-tqtext
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends}
+Provides: ${python3:Provides}
+Description: TQt extensions for PyTQt
+ PyTQt Extensions. Contains:
+ .
+ * QScintilla: a featureful TQt source code editing component based
+ on Scintilla.
+
+Package: python3-tqtext-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-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: pytqt-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -104,8 +178,8 @@ Description: pyuic and pylupdate for TQt
Linguist translation files from Python code.
Package: python-tqt-dev
-Depends: python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
-Suggests: python-sip-tqt-dev
+Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Suggests: python3-sip-tqt-dev | python-sip-tqt-dev
Replaces: python-tqt-dev (<< 4:14.0.0~)
Breaks: python-tqt-dev (<< 4:14.0.0~)
Architecture: all
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
index 288f3cb88..d58e26ab5 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtgl.so
+usr/lib/python2.*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
index 61a9363d0..4ec8f4d19 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install
@@ -1,7 +1,7 @@
-usr/lib/python*/*-packages/python_tqt/qtcanvas.so
-usr/lib/python*/*-packages/python_tqt/qtnetwork.so
-usr/lib/python*/*-packages/python_tqt/qtsql.so
-usr/lib/python*/*-packages/python_tqt/qttable.so
-usr/lib/python*/*-packages/python_tqt/qtui.so
-usr/lib/python*/*-packages/python_tqt/qtxml.so
-usr/lib/python*/*-packages/python_tqt/qt.so
+usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python2.*/*-packages/python_tqt/qtsql.so
+usr/lib/python2.*/*-packages/python_tqt/qttable.so
+usr/lib/python2.*/*-packages/python_tqt/qtui.so
+usr/lib/python2.*/*-packages/python_tqt/qtxml.so
+usr/lib/python2.*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
index 582be1bb1..00345e2e7 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install
@@ -1 +1 @@
-usr/lib/python*/*-packages/python_tqt/qtext.so
+usr/lib/python2.*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
new file mode 100644
index 000000000..ead3920cf
--- /dev/null
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtgl.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install
new file mode 100644
index 000000000..4ceda8c75
--- /dev/null
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install
@@ -0,0 +1,7 @@
+usr/lib/python3*/*-packages/python_tqt/qtcanvas.so
+usr/lib/python3*/*-packages/python_tqt/qtnetwork.so
+usr/lib/python3*/*-packages/python_tqt/qtsql.so
+usr/lib/python3*/*-packages/python_tqt/qttable.so
+usr/lib/python3*/*-packages/python_tqt/qtui.so
+usr/lib/python3*/*-packages/python_tqt/qtxml.so
+usr/lib/python3*/*-packages/python_tqt/qt.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install
new file mode 100644
index 000000000..4d58d8a28
--- /dev/null
+++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/python_tqt/qtext.so
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules
index cf228c2b5..1759d32a5 100755
--- a/ubuntu/_base/dependencies/python-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/python-tqt/debian/rules
@@ -37,34 +37,29 @@ else
endif
CXXFLAGS += "-I/usr/include/tqt"
-PYTHONS := $(shell pyversions -vr debian/control)
+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)
-
-GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
-ifneq (,$(filter $(GCCVER),4.2 4.3))
- SPLIT=40
-else
- SPLIT=10
-endif
+DEB_PARALLEL_JOBS ?= 40
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+
build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
cd build-$* && echo yes \
| python$* ../configure.py \
-c -n /usr/include/tqt3 \
- -e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$* \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
@@ -74,12 +69,12 @@ dbg-build-%/configure-stamp:
cd dbg-build-$* && echo yes \
| python$*-dbg ../configure.py \
-c -n /usr/include/tqt3 \
- -e python$* \
- -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \
+ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \
-d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \
-l /usr/include/python$*_d \
-v /usr/share/sip/tqt \
-m /usr/lib/python$*/config_d \
+ -z \
CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP=""
touch $@
@@ -102,7 +97,7 @@ install-indep: configure
dh_clean -k -i
dh_installdirs -i
for version in ${PYTHONS}; do\
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
+ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\
mkdir -p debian/python-tqt-dev/$$pylib;\
install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\
done
@@ -113,21 +108,9 @@ install-arch: build
dh_testroot
dh_clean -k -a
dh_installdirs -a
- for version in ${PYTHONS}; do \
- $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
- done
- for version in ${PYTHONS}; do \
- pylib=$$(python$$version -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')/python_tqt; \
- $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-tqt-dbg;\
- mkdir -p debian/python-tqt/$$pylib;\
- cp -a debian/tmp/$$pylib/__init__.py \
- debian/python-tqt/$$pylib/__init__.py;\
- mkdir -p debian/python-tqt-gl-dbg/$$pylib;\
- mv debian/python-tqt-dbg/$$pylib/qtgl.so \
- debian/python-tqt-gl-dbg/$$pylib/;\
- mkdir -p debian/python-tqtext-dbg/$$pylib;\
- mv debian/python-tqt-dbg/$$pylib/qtext.so \
- debian/python-tqtext-dbg/$$pylib/;\
+
+ for p in $(PYTHONS) ; do \
+ $(MAKE) -f debian/rules install-arch-$$p;\
done
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
@@ -140,6 +123,40 @@ install-arch: build
! \( -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; \
+ done
+ find debian/python3-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-tqt-dbg
+ mkdir -p debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+ mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+ debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+ mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+ debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/
+
+install-arch-%:
+ $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg
+ mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \
+ debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py
+ mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \
+ debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+ mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt
+ mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \
+ debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/
+
clean:
dh_testdir
dh_testroot
@@ -170,7 +187,12 @@ 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_lintian
dh_installdeb