diff options
59 files changed, 306 insertions, 272 deletions
diff --git a/debian/_base/dependencies/python-tqt/debian/README.Debian b/debian/_base/dependencies/python-tqt/debian/README.Debian index 33603ec40..201336f3a 100644 --- a/debian/_base/dependencies/python-tqt/debian/README.Debian +++ b/debian/_base/dependencies/python-tqt/debian/README.Debian @@ -1,4 +1,3 @@ DOCUMENTATION ------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - +You can find doc and examples about PyTQt in the package pytqt-doc diff --git a/debian/_base/dependencies/python-tqt/debian/changelog b/debian/_base/dependencies/python-tqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/debian/_base/dependencies/python-tqt/debian/changelog +++ b/debian/_base/dependencies/python-tqt/debian/changelog @@ -1,4 +1,4 @@ -python-tqt (3.18.1-4ubuntu0) lucid; urgency=low +pytqt (3.18.1-4ubuntu0) lucid; urgency=low * Initial build diff --git a/debian/_base/dependencies/python-tqt/debian/control b/debian/_base/dependencies/python-tqt/debian/control index 577566cd9..8f36817c3 100644 --- a/debian/_base/dependencies/python-tqt/debian/control +++ b/debian/_base/dependencies/python-tqt/debian/control @@ -1,4 +1,4 @@ -Source: python-tqt +Source: pytqt Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -9,12 +9,12 @@ Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-tqt +Package: python-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends} -Replaces: python-tqt (<< 4:14.0.0~) -Breaks: python-tqt (<< 4:14.0.0~) -Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +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. @@ -26,13 +26,13 @@ Description: TQt bindings for 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-tqt-dbg +Package: python-pytqt-dbg Architecture: any Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) +Replaces: python-tqt-dbg +Breaks: python-tqt-dbg Section: debug -Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} +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 @@ -40,11 +40,13 @@ Description: TQt bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt +Package: python3-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} -Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} +Replaces: python3-tqt +Breaks: python3-tqt 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 @@ -55,11 +57,13 @@ Description: TQt bindings for Python 3 (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 +Package: python3-pytqt-dbg Architecture: any Priority: extra Section: debug -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Replaces: python3-tqt-dbg +Breaks: python3-tqt-dbg 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 @@ -67,12 +71,12 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqt-gl +Package: python-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc +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 @@ -80,13 +84,13 @@ Description: TQt OpenGL bindings for Python portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). -Package: python-tqt-gl-dbg +Package: python-pytqt-gl-dbg Priority: extra Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) +Replaces: python-tqt-gl-dbg +Breaks: python-tqt-gl-dbg Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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 @@ -95,22 +99,26 @@ Description: TQt OpenGL bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt-gl +Package: python3-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends} -Suggests: python-tqt-doc +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +Suggests: pytqt-doc Provides: ${python3:Provides} +Replaces: python3-tqt-gl +Breaks: python3-tqt-gl 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 +Package: python3-pytqt-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} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqt-gl-dbg +Breaks: python3-tqt-gl-dbg 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 @@ -119,11 +127,11 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqtext +Package: python-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) +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: @@ -131,34 +139,38 @@ Description: TQt extensions for PyTQt * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python-tqtext-dbg +Package: python-pytqtext-dbg Priority: extra Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) +Replaces: python-tqtext-dbg +Breaks: python-tqtext-dbg Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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-tqtext +Package: python3-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} Provides: ${python3:Provides} +Replaces: python3-tqtext +Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python3-tqtext-dbg +Package: python3-pytqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqtext-dbg +Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . @@ -177,24 +189,24 @@ Description: pyuic and pylupdate for TQt pylupdate is the counterpart for TQt's lupdate. It updates TQt Linguist translation files from Python code. -Package: python-tqt-dev -Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends} +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${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~) +Replaces: python-tqt-dev +Breaks: python-tqt-dev Architecture: all Description: TQt bindings for Python - Development files Development .sip files with definitions of PyTQt classes. They are needed to build PyTQt, but also as building blocks of other packages based on them, like PyTDE. -Package: python-tqt-doc +Package: pytqt-doc Section: doc Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) +Replaces: python-tqt-doc +Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python-tqt +Suggests: python3-pytqt | python-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/python-tqt/debian/python-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python-pytqt-gl.install index 75cf3ddfb..75cf3ddfb 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-gl.install +++ b/debian/_base/dependencies/python-tqt/debian/python-pytqt-gl.install diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt.install b/debian/_base/dependencies/python-tqt/debian/python-pytqt.install index d515b0bb8..d515b0bb8 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt.install +++ b/debian/_base/dependencies/python-tqt/debian/python-pytqt.install diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python-pytqtext.install index 09cdba01b..09cdba01b 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqtext.install +++ b/debian/_base/dependencies/python-tqt/debian/python-pytqtext.install diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index bd57734b2..000000000 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ /dev/null @@ -1,14 +0,0 @@ -# lintian test overriden as the files tripping this error are put into the source -# of the generated package. This is a false-positive - -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/python-tqt-doc/html -usr/share/doc/python-tqt-doc/examples diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/PyQt.html usr/share/doc/python-tqt-doc/html diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install b/debian/_base/dependencies/python-tqt/debian/python3-pytqt-gl.install index bf01fb211..bf01fb211 100644 --- a/debian/_base/dependencies/python-tqt/debian/python3-tqt-gl.install +++ b/debian/_base/dependencies/python-tqt/debian/python3-pytqt-gl.install diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqt.install b/debian/_base/dependencies/python-tqt/debian/python3-pytqt.install index fa8e86b21..fa8e86b21 100644 --- a/debian/_base/dependencies/python-tqt/debian/python3-tqt.install +++ b/debian/_base/dependencies/python-tqt/debian/python3-pytqt.install diff --git a/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install b/debian/_base/dependencies/python-tqt/debian/python3-pytqtext.install index 9f79185f4..9f79185f4 100644 --- a/debian/_base/dependencies/python-tqt/debian/python3-tqtext.install +++ b/debian/_base/dependencies/python-tqt/debian/python3-pytqtext.install diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.dirs index 735874a93..735874a93 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.dirs diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.install index 0f144be95..0f144be95 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-dev.install +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.install diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..35f9687f5 --- /dev/null +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides @@ -0,0 +1,14 @@ +# lintian test overriden as the files tripping this error are put into the source +# of the generated package. This is a false-positive + +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-doc.dirs b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/pytqt-doc/html +usr/share/doc/pytqt-doc/examples diff --git a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.examples index c48447a3e..c48447a3e 100644 --- a/debian/_base/dependencies/python-tqt/debian/python-tqt-doc.examples +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.examples diff --git a/debian/_base/dependencies/python-tqt/debian/pytqt-doc.install b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.install new file mode 100644 index 000000000..b5337b3a3 --- /dev/null +++ b/debian/_base/dependencies/python-tqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyQt.html usr/share/doc/pytqt-doc/html diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules index 95feb680c..c9ff8c22f 100755 --- a/debian/_base/dependencies/python-tqt/debian/rules +++ b/debian/_base/dependencies/python-tqt/debian/rules @@ -24,7 +24,7 @@ py_libdir_sh = $(py_libdir) endif -DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc INSTDIR=$(CURDIR)/debian export TQTDIR=/usr/share/tqt3 @@ -98,8 +98,8 @@ install-indep: configure dh_installdirs -i for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/PyTQt;\ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + mkdir -p debian/pytqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/pytqt-dev/$$pylib;\ done dh_install -i @@ -133,29 +133,29 @@ install-arch: build 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)/PyTQt + $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg + mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt - mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt - mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py + mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ + debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + 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-tqt-dbg - mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt + $(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-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ + 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 @@ -178,7 +178,8 @@ binary-common: ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppytqt-tools set -e; \ - for p in python-tqt python-tqt-gl python-tqtext; do \ + for p in python-pytqt python-pytqt-gl python-pytqtext \ + 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; \ diff --git a/dilos/dependencies/python-tqt/debian/README.Debian b/dilos/dependencies/python-tqt/debian/README.Debian index 33603ec40..201336f3a 100644 --- a/dilos/dependencies/python-tqt/debian/README.Debian +++ b/dilos/dependencies/python-tqt/debian/README.Debian @@ -1,4 +1,3 @@ DOCUMENTATION ------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - +You can find doc and examples about PyTQt in the package pytqt-doc diff --git a/dilos/dependencies/python-tqt/debian/changelog b/dilos/dependencies/python-tqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/dilos/dependencies/python-tqt/debian/changelog +++ b/dilos/dependencies/python-tqt/debian/changelog @@ -1,4 +1,4 @@ -python-tqt (3.18.1-4ubuntu0) lucid; urgency=low +pytqt (3.18.1-4ubuntu0) lucid; urgency=low * Initial build diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/python-tqt/debian/control index 7af5607d6..c08ecdd64 100644 --- a/dilos/dependencies/python-tqt/debian/control +++ b/dilos/dependencies/python-tqt/debian/control @@ -1,4 +1,4 @@ -Source: python-tqt +Source: pytqt Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -9,12 +9,12 @@ Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-tqt +Package: python-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends} -Replaces: python-tqt (<< 4:14.0.0~) -Breaks: python-tqt (<< 4:14.0.0~) -Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +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. @@ -26,13 +26,13 @@ Description: TQt bindings for 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-tqt-dbg +Package: python-pytqt-dbg Architecture: linux-any Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) +Replaces: python-tqt-dbg +Breaks: python-tqt-dbg Section: debug -Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} +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 @@ -40,11 +40,13 @@ Description: TQt bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt +Package: python3-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} -Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} +Replaces: python3-tqt +Breaks: python3-tqt 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 @@ -55,11 +57,13 @@ Description: TQt bindings for Python 3 (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 +Package: python3-pytqt-dbg Architecture: any Priority: extra Section: debug -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Replaces: python3-tqt-dbg +Breaks: python3-tqt-dbg 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 @@ -67,12 +71,12 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqt-gl +Package: python-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc +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 @@ -80,13 +84,13 @@ Description: TQt OpenGL bindings for Python portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). -Package: python-tqt-gl-dbg +Package: python-pytqt-gl-dbg Priority: extra Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) +Replaces: python-tqt-gl-dbg +Breaks: python-tqt-gl-dbg Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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 @@ -95,22 +99,26 @@ Description: TQt OpenGL bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt-gl +Package: python3-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends} -Suggests: python-tqt-doc +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +Suggests: pytqt-doc Provides: ${python3:Provides} +Replaces: python3-tqt-gl +Breaks: python3-tqt-gl 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 +Package: python3-pytqt-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} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqt-gl-dbg +Breaks: python3-tqt-gl-dbg 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 @@ -119,11 +127,11 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqtext +Package: python-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) +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: @@ -131,34 +139,38 @@ Description: TQt extensions for PyTQt * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python-tqtext-dbg +Package: python-pytqtext-dbg Priority: extra Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) +Replaces: python-tqtext-dbg +Breaks: python-tqtext-dbg Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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-tqtext +Package: python3-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} Provides: ${python3:Provides} +Replaces: python3-tqtext +Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python3-tqtext-dbg +Package: python3-pytqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqtext-dbg +Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . @@ -177,24 +189,24 @@ Description: pyuic and pylupdate for TQt pylupdate is the counterpart for TQt's lupdate. It updates TQt Linguist translation files from Python code. -Package: python-tqt-dev -Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends} +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${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~) +Replaces: python-tqt-dev +Breaks: python-tqt-dev Architecture: all Description: TQt bindings for Python - Development files Development .sip files with definitions of PyTQt classes. They are needed to build PyTQt, but also as building blocks of other packages based on them, like PyTDE. -Package: python-tqt-doc +Package: pytqt-doc Section: doc Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) +Replaces: python-tqt-doc +Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python-tqt +Suggests: python3-pytqt | python-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/python-tqt/debian/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-pytqt-gl.install index 75cf3ddfb..75cf3ddfb 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install +++ b/dilos/dependencies/python-tqt/debian/python-pytqt-gl.install diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-pytqt.install index d515b0bb8..d515b0bb8 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqt.install +++ b/dilos/dependencies/python-tqt/debian/python-pytqt.install diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-pytqtext.install index 09cdba01b..09cdba01b 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqtext.install +++ b/dilos/dependencies/python-tqt/debian/python-pytqtext.install diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs deleted file mode 100644 index ae635cbcd..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/tqt diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install b/dilos/dependencies/python-tqt/debian/python-tqt-dev.install deleted file mode 100644 index 7b6aca191..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/tqt - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index 36e6c1349..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ /dev/null @@ -1,15 +0,0 @@ -# lintian test overriden as the files tripping this error are put into the source -# of the generated package. This is a false-positive - -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip - diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs b/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/python-tqt-doc/html -usr/share/doc/python-tqt-doc/examples diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install b/dilos/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/PyQt.html usr/share/doc/python-tqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python3-pytqt-gl.install index bf01fb211..bf01fb211 100644 --- a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install +++ b/dilos/dependencies/python-tqt/debian/python3-pytqt-gl.install diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt.install b/dilos/dependencies/python-tqt/debian/python3-pytqt.install index fa8e86b21..fa8e86b21 100644 --- a/dilos/dependencies/python-tqt/debian/python3-tqt.install +++ b/dilos/dependencies/python-tqt/debian/python3-pytqt.install diff --git a/dilos/dependencies/python-tqt/debian/python3-tqtext.install b/dilos/dependencies/python-tqt/debian/python3-pytqtext.install index 9f79185f4..9f79185f4 100644 --- a/dilos/dependencies/python-tqt/debian/python3-tqtext.install +++ b/dilos/dependencies/python-tqt/debian/python3-pytqtext.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs b/dilos/dependencies/python-tqt/debian/pytqt-dev.dirs index 735874a93..735874a93 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.dirs +++ b/dilos/dependencies/python-tqt/debian/pytqt-dev.dirs diff --git a/dilos/dependencies/python-tqt/debian/pytqt-dev.install b/dilos/dependencies/python-tqt/debian/pytqt-dev.install new file mode 100644 index 000000000..de146d1b0 --- /dev/null +++ b/dilos/dependencies/python-tqt/debian/pytqt-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/tqt + diff --git a/dilos/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides b/dilos/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..35f9687f5 --- /dev/null +++ b/dilos/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides @@ -0,0 +1,14 @@ +# lintian test overriden as the files tripping this error are put into the source +# of the generated package. This is a false-positive + +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/dilos/dependencies/python-tqt/debian/pytqt-doc.dirs b/dilos/dependencies/python-tqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/dilos/dependencies/python-tqt/debian/pytqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/pytqt-doc/html +usr/share/doc/pytqt-doc/examples diff --git a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples b/dilos/dependencies/python-tqt/debian/pytqt-doc.examples index c48447a3e..c48447a3e 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples +++ b/dilos/dependencies/python-tqt/debian/pytqt-doc.examples diff --git a/dilos/dependencies/python-tqt/debian/pytqt-doc.install b/dilos/dependencies/python-tqt/debian/pytqt-doc.install new file mode 100644 index 000000000..b5337b3a3 --- /dev/null +++ b/dilos/dependencies/python-tqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyQt.html usr/share/doc/pytqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/python-tqt/debian/rules index 2cb036b1b..730a3e36f 100755 --- a/dilos/dependencies/python-tqt/debian/rules +++ b/dilos/dependencies/python-tqt/debian/rules @@ -26,7 +26,7 @@ py_libdir_sh = $(py_libdir) endif -DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc INSTDIR=$(CURDIR)/debian export TQTDIR=/usr/share/tqt3 @@ -61,7 +61,7 @@ build-%/configure-stamp: -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$* \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config \ -z \ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP="" @@ -76,7 +76,7 @@ dbg-build-%/configure-stamp: -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ -d /usr/lib/python$*/$(call py_sitename,$*)/PyTQt \ -l /usr/include/python$*_d \ - -v /usr/share/sip/tqt \ + -v /usr/share/sip-tqt/tqt \ -m /usr/lib/python$*/config_d \ -z \ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g -I/usr/include/tqt" STRIP="" @@ -103,8 +103,8 @@ install-indep: configure dh_installdirs -i for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/PyTQt;\ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + mkdir -p debian/pytqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/pytqt-dev/$$pylib;\ done dh_install -i @@ -130,29 +130,29 @@ install-arch: build 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)/PyTQt +# $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg + mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py -# mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ -# debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ -# mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ -# debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py +# mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ +# debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ +# mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt +# 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-tqt-dbg - mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt +# $(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-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py -# mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ -# debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ -# mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ -# debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ + 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 diff --git a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian index 33603ec40..201336f3a 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/README.Debian +++ b/ubuntu/_base/dependencies/python-tqt/debian/README.Debian @@ -1,4 +1,3 @@ DOCUMENTATION ------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - +You can find doc and examples about PyTQt in the package pytqt-doc diff --git a/ubuntu/_base/dependencies/python-tqt/debian/changelog b/ubuntu/_base/dependencies/python-tqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/changelog +++ b/ubuntu/_base/dependencies/python-tqt/debian/changelog @@ -1,4 +1,4 @@ -python-tqt (3.18.1-4ubuntu0) lucid; urgency=low +pytqt (3.18.1-4ubuntu0) lucid; urgency=low * Initial build diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/python-tqt/debian/control index 577566cd9..8f36817c3 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/control +++ b/ubuntu/_base/dependencies/python-tqt/debian/control @@ -1,4 +1,4 @@ -Source: python-tqt +Source: pytqt Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -9,12 +9,12 @@ Standards-Version: 3.8.4 XS-Python-Version: >= 2.3 X-Python3-Version: >= 3.0 -Package: python-tqt +Package: python-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends} -Replaces: python-tqt (<< 4:14.0.0~) -Breaks: python-tqt (<< 4:14.0.0~) -Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +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. @@ -26,13 +26,13 @@ Description: TQt bindings for 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-tqt-dbg +Package: python-pytqt-dbg Architecture: any Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) +Replaces: python-tqt-dbg +Breaks: python-tqt-dbg Section: debug -Depends: ${shlibs:Depends}, python-all-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} +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 @@ -40,11 +40,13 @@ Description: TQt bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt +Package: python3-pytqt Architecture: any Depends: ${shlibs:Depends}, ${python3:Depends}, ${sip3-tqt:Depends}, ${misc:Depends} -Suggests: python3-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql Provides: ${python3:Provides} +Replaces: python3-tqt +Breaks: python3-tqt 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 @@ -55,11 +57,13 @@ Description: TQt bindings for Python 3 (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 +Package: python3-pytqt-dbg Architecture: any Priority: extra Section: debug -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} +Replaces: python3-tqt-dbg +Breaks: python3-tqt-dbg 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 @@ -67,12 +71,12 @@ Description: TQt bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqt-gl +Package: python-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc +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 @@ -80,13 +84,13 @@ Description: TQt OpenGL bindings for Python portable graphics-capable scripts (there are PyTQt versions for Linux, Windows and MacOS X). -Package: python-tqt-gl-dbg +Package: python-pytqt-gl-dbg Priority: extra Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) +Replaces: python-tqt-gl-dbg +Breaks: python-tqt-gl-dbg Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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 @@ -95,22 +99,26 @@ Description: TQt OpenGL bindings for Python (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python3-tqt-gl +Package: python3-pytqt-gl Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends} -Suggests: python-tqt-doc +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +Suggests: pytqt-doc Provides: ${python3:Provides} +Replaces: python3-tqt-gl +Breaks: python3-tqt-gl 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 +Package: python3-pytqt-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} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqt-gl (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqt-gl-dbg +Breaks: python3-tqt-gl-dbg 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 @@ -119,11 +127,11 @@ Description: TQt OpenGL bindings for Python 3 (debug extension) . This package contains the extension built for the Python debug interpreter. -Package: python-tqtext +Package: python-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) +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: @@ -131,34 +139,38 @@ Description: TQt extensions for PyTQt * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python-tqtext-dbg +Package: python-pytqtext-dbg Priority: extra Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) +Replaces: python-tqtext-dbg +Breaks: python-tqtext-dbg Architecture: any -Depends: ${shlibs:Depends}, python-all-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} +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-tqtext +Package: python3-pytqtext Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), ${misc:Depends} Provides: ${python3:Provides} +Replaces: python3-tqtext +Breaks: python3-tqtext Description: TQt extensions for PyTQt PyTQt Extensions. Contains: . * QScintilla: a featureful TQt source code editing component based on Scintilla. -Package: python3-tqtext-dbg +Package: python3-pytqtext-dbg Priority: extra Section: debug Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} +Depends: ${shlibs:Depends}, python3-all-dbg, python3-pytqtext (= ${binary:Version}), python3-pytqt-dbg (= ${binary:Version}), ${misc:Depends} +Replaces: python3-tqtext-dbg +Breaks: python3-tqtext-dbg Description: TQt debug extensions for PyTQt PyTQt debug Extensions. Contains: . @@ -177,24 +189,24 @@ Description: pyuic and pylupdate for TQt pylupdate is the counterpart for TQt's lupdate. It updates TQt Linguist translation files from Python code. -Package: python-tqt-dev -Depends: python3-tqt (= ${binary:Version}) | python-tqt (= ${binary:Version}), ${python:Depends}, ${misc:Depends} +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}) | python-pytqt (= ${binary:Version}), ${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~) +Replaces: python-tqt-dev +Breaks: python-tqt-dev Architecture: all Description: TQt bindings for Python - Development files Development .sip files with definitions of PyTQt classes. They are needed to build PyTQt, but also as building blocks of other packages based on them, like PyTDE. -Package: python-tqt-doc +Package: pytqt-doc Section: doc Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) +Replaces: python-tqt-doc +Breaks: python-tqt-doc Depends: ${misc:Depends} -Suggests: python-tqt +Suggests: python3-pytqt | python-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/python-tqt/debian/python-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqt-gl.install index 75cf3ddfb..75cf3ddfb 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-gl.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqt-gl.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqt.install index d515b0bb8..d515b0bb8 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqt.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqtext.install index 09cdba01b..09cdba01b 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqtext.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python-pytqtext.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides deleted file mode 100644 index bd57734b2..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides +++ /dev/null @@ -1,14 +0,0 @@ -# lintian test overriden as the files tripping this error are put into the source -# of the generated package. This is a false-positive - -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip -python-tqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs deleted file mode 100644 index 43a4fa9fa..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/python-tqt-doc/html -usr/share/doc/python-tqt-doc/examples diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install b/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install deleted file mode 100644 index 65f82036b..000000000 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/PyQt.html usr/share/doc/python-tqt-doc/html diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqt-gl.install index bf01fb211..bf01fb211 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt-gl.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqt-gl.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqt.install index fa8e86b21..fa8e86b21 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqt.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqt.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqtext.install index 9f79185f4..9f79185f4 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python3-tqtext.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/python3-pytqtext.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.dirs b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.dirs new file mode 100644 index 000000000..735874a93 --- /dev/null +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/tqt diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.install index 0f144be95..0f144be95 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-dev.install +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.install diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..35f9687f5 --- /dev/null +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-dev.lintian-overrides @@ -0,0 +1,14 @@ +# lintian test overriden as the files tripping this error are put into the source +# of the generated package. This is a false-positive + +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/qtxml/copying.sip diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.dirs b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/pytqt-doc/html +usr/share/doc/pytqt-doc/examples diff --git a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.examples index c48447a3e..c48447a3e 100644 --- a/ubuntu/_base/dependencies/python-tqt/debian/python-tqt-doc.examples +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.examples diff --git a/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.install b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.install new file mode 100644 index 000000000..b5337b3a3 --- /dev/null +++ b/ubuntu/_base/dependencies/python-tqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyQt.html usr/share/doc/pytqt-doc/html diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules index 95feb680c..c9ff8c22f 100755 --- a/ubuntu/_base/dependencies/python-tqt/debian/rules +++ b/ubuntu/_base/dependencies/python-tqt/debian/rules @@ -24,7 +24,7 @@ py_libdir_sh = $(py_libdir) endif -DOC=$(CURDIR)/debian/python-tqt-doc/usr/share/doc/python-tqt-doc +DOC=$(CURDIR)/debian/pytqt-doc/usr/share/doc/pytqt-doc INSTDIR=$(CURDIR)/debian export TQTDIR=/usr/share/tqt3 @@ -98,8 +98,8 @@ install-indep: configure dh_installdirs -i for version in ${PYTHONS}; do\ pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/PyTQt;\ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + mkdir -p debian/pytqt-dev/$$pylib;\ + install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/pytqt-dev/$$pylib;\ done dh_install -i @@ -133,29 +133,29 @@ install-arch: build 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)/PyTQt + $(MAKE) -C dbg-build-3.* install DESTDIR=$(CURDIR)/debian/python3-pytqt-dbg + mkdir -p debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py \ - debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt - mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt - mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + debian/python3-pytqt/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/__init__.py + mkdir -p debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + mv debian/python3-pytqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ + debian/python3-pytqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ + mkdir -p debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt + 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-tqt-dbg - mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt + $(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-tqt/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/__init__.py - mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtgl.so \ - debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ - mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt - mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/qtext.so \ - debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/PyTQt/ + 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 @@ -178,7 +178,8 @@ binary-common: ifeq (,$(findstring -i, $(DH_OPTIONS))) DH_OPTIONS= dh_strip -ppytqt-tools set -e; \ - for p in python-tqt python-tqt-gl python-tqtext; do \ + for p in python-pytqt python-pytqt-gl python-pytqtext \ + 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; \ |