diff options
42 files changed, 115 insertions, 112 deletions
diff --git a/debian/_base/libraries/python-trinity/debian/changelog b/debian/_base/libraries/python-trinity/debian/changelog index 12485eccd..43df2609a 100644 --- a/debian/_base/libraries/python-trinity/debian/changelog +++ b/debian/_base/libraries/python-trinity/debian/changelog @@ -1,4 +1,4 @@ -python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low +pytde (3.16.3-0ubuntu4) karmic; urgency=low * Karmic rebuild diff --git a/debian/_base/libraries/python-trinity/debian/control b/debian/_base/libraries/python-trinity/debian/control index d80664ba3..064f7462c 100644 --- a/debian/_base/libraries/python-trinity/debian/control +++ b/debian/_base/libraries/python-trinity/debian/control @@ -1,4 +1,4 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -8,24 +8,23 @@ Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python-pytde Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt -Replaces: python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-trinity-trinity (<< 4:14.0.0~) +Replaces: python-trinity-trinity (<< 4:14.1.0~) +Breaks: python-trinity-trinity (<< 4:14.1.0~) Provides: ${python:Provides} -Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. -Package: python-trinity-trinity-dbg +Package: python-pytde-dbg Priority: extra Architecture: any -Replaces: python-trinity-trinity-dbg (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dbg (<< 4:14.0.0~) -Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} +Replaces: python-trinity-trinity-dbg (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dbg (<< 4:14.1.0~) +Depends: python-pytde (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes @@ -33,11 +32,11 @@ Description: Trinity bindings for Python (debug extensions) [Trinity] . This package contains the extension built for the Python debug interpreter. -Package: python-trinity-trinity-dev +Package: pytde-dev Section: python Architecture: all -Replaces: python-trinity-trinity-dev (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dev (<< 4:14.0.0~) +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) Depends: pytqt-tools, ${python:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They @@ -46,11 +45,11 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit The package also contains tdepyuic, a wrapper script around PyTQt's user interface compiler. -Package: python-trinity-trinity-doc +Package: pytde-doc Section: doc Architecture: all -Replaces: python-trinity-trinity-doc (<< 4:14.0.0~) -Breaks: python-trinity-trinity-doc (<< 4:14.0.0~) +Replaces: python-trinity-trinity-doc (<< 4:14.1.0~) +Breaks: python-trinity-trinity-doc (<< 4:14.1.0~) Description: Documentation and examples for PyTDE [Trinity] General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. diff --git a/debian/_base/libraries/python-trinity/debian/pytde-dev.dirs b/debian/_base/libraries/python-trinity/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/debian/_base/libraries/python-trinity/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/debian/_base/libraries/python-trinity/debian/pytde-dev.install b/debian/_base/libraries/python-trinity/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/debian/_base/libraries/python-trinity/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/debian/_base/libraries/python-trinity/debian/pytde-doc.dirs b/debian/_base/libraries/python-trinity/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/debian/_base/libraries/python-trinity/debian/pytde-doc.dirs @@ -0,0 +1,3 @@ +usr/share/doc/pytde-doc +usr/share/doc/pytde-doc/examples +usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/debian/_base/libraries/python-trinity/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/debian/_base/libraries/python-trinity/debian/pytde-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API Section: Programming Format: HTML -Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html -Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html +Index: /usr/share/doc/pytde-doc/html/index.html +Files: /usr/share/doc/pytde-doc/html/*.html diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/debian/_base/libraries/python-trinity/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/debian/_base/libraries/python-trinity/debian/pytde-doc.examples diff --git a/debian/_base/libraries/python-trinity/debian/pytde-doc.install b/debian/_base/libraries/python-trinity/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/debian/_base/libraries/python-trinity/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/debian/_base/libraries/python-trinity/debian/python-pytde.install index facee2907..facee2907 100644 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity.install +++ b/debian/_base/libraries/python-trinity/debian/python-pytde.install diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs deleted file mode 100644 index 62e887ce2..000000000 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -opt/trinity/share/sip-tqt/trinity diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install deleted file mode 100644 index 17b8480ab..000000000 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* opt/trinity/share/sip-tqt/trinity -contrib/tdepyuic opt/trinity/bin/ diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs deleted file mode 100644 index 96235463f..000000000 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/doc/python-trinity-trinity-doc -usr/share/doc/python-trinity-trinity-doc/examples -usr/share/doc/python-trinity-trinity-doc/html diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install deleted file mode 100644 index 20b273acb..000000000 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/* usr/share/doc/python-trinity-trinity-doc/html diff --git a/debian/_base/libraries/python-trinity/debian/rules b/debian/_base/libraries/python-trinity/debian/rules index 532c74f7f..35fab1aba 100755 --- a/debian/_base/libraries/python-trinity/debian/rules +++ b/debian/_base/libraries/python-trinity/debian/rules @@ -56,7 +56,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -65,7 +65,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp) @@ -106,13 +106,15 @@ install-indep: dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' for version in ${PYTHONS};\ do\ - mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\ - cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ - cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ + mkdir -p debian/pytde-dev/$$pylib;\ + install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\ + install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ + install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ done install-arch: @@ -127,14 +129,14 @@ install-arch: done set -e; \ - for version in ${DBG_PYTHONS}; do \ - $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ - done + for version in ${DBG_PYTHONS}; do \ + $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-pytde-dbg;\ + done dh_install -a --sourcedir=$(CURDIR)/debian/tmp - mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ - ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ + mkdir -p $(CURDIR)/debian/python-pytde/opt/trinity/lib/ + ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-pytde/opt/trinity/lib/ for i in $$(find debian/python-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ @@ -156,7 +158,7 @@ binary-common: dh_installexamples dh_link ifeq (,$(findstring -i, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg + DH_OPTIONS= dh_strip -ppython-pytde #--dbg-package=python-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/python-trinity/debian/changelog index 12485eccd..43df2609a 100644 --- a/dilos/libraries/python-trinity/debian/changelog +++ b/dilos/libraries/python-trinity/debian/changelog @@ -1,4 +1,4 @@ -python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low +pytde (3.16.3-0ubuntu4) karmic; urgency=low * Karmic rebuild diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/python-trinity/debian/control index 9834eb085..0c73b601f 100644 --- a/dilos/libraries/python-trinity/debian/control +++ b/dilos/libraries/python-trinity/debian/control @@ -1,4 +1,4 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -8,24 +8,23 @@ Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-all, python-all-de Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python-pytde Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt -Replaces: python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-trinity-trinity (<< 4:14.0.0~) +Replaces: python-trinity-trinity (<< 4:14.1.0~) +Breaks: python-trinity-trinity (<< 4:14.1.0~) Provides: ${python:Provides} -Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. -Package: python-trinity-trinity-dbg +Package: python-pytde-dbg Priority: extra Architecture: linux-any -Replaces: python-trinity-trinity-dbg (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dbg (<< 4:14.0.0~) -Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} +Replaces: python-trinity-trinity-dbg (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dbg (<< 4:14.1.0~) +Depends: python-pytde (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes @@ -33,11 +32,11 @@ Description: Trinity bindings for Python (debug extensions) [Trinity] . This package contains the extension built for the Python debug interpreter. -Package: python-trinity-trinity-dev +Package: pytde-dev Section: python Architecture: all -Replaces: python-trinity-trinity-dev (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dev (<< 4:14.0.0~) +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) Depends: pytqt-tools, ${python:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They @@ -46,11 +45,11 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit The package also contains tdepyuic, a wrapper script around PyTQt's user interface compiler. -Package: python-trinity-trinity-doc +Package: pytde-doc Section: doc Architecture: all -Replaces: python-trinity-trinity-doc (<< 4:14.0.0~) -Breaks: python-trinity-trinity-doc (<< 4:14.0.0~) +Replaces: python-trinity-trinity-doc (<< 4:14.1.0~) +Breaks: python-trinity-trinity-doc (<< 4:14.1.0~) Description: Documentation and examples for PyTDE [Trinity] General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. diff --git a/dilos/libraries/python-trinity/debian/pytde-dev.dirs b/dilos/libraries/python-trinity/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/dilos/libraries/python-trinity/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/dilos/libraries/python-trinity/debian/pytde-dev.install b/dilos/libraries/python-trinity/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/dilos/libraries/python-trinity/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/python-trinity/debian/pytde-doc.dirs b/dilos/libraries/python-trinity/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/dilos/libraries/python-trinity/debian/pytde-doc.dirs @@ -0,0 +1,3 @@ +usr/share/doc/pytde-doc +usr/share/doc/pytde-doc/examples +usr/share/doc/pytde-doc/html diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/dilos/libraries/python-trinity/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/dilos/libraries/python-trinity/debian/pytde-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API Section: Programming Format: HTML -Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html -Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html +Index: /usr/share/doc/pytde-doc/html/index.html +Files: /usr/share/doc/pytde-doc/html/*.html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/dilos/libraries/python-trinity/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/dilos/libraries/python-trinity/debian/pytde-doc.examples diff --git a/dilos/libraries/python-trinity/debian/pytde-doc.install b/dilos/libraries/python-trinity/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/dilos/libraries/python-trinity/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install b/dilos/libraries/python-trinity/debian/python-pytde.install index facee2907..facee2907 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install +++ b/dilos/libraries/python-trinity/debian/python-pytde.install diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs deleted file mode 100644 index be8aad160..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/trinity diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install deleted file mode 100644 index c523f227e..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/trinity -contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs deleted file mode 100644 index 96235463f..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/doc/python-trinity-trinity-doc -usr/share/doc/python-trinity-trinity-doc/examples -usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install deleted file mode 100644 index 20b273acb..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/* usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/python-trinity/debian/rules index 3bae8384b..eb6d1475f 100755 --- a/dilos/libraries/python-trinity/debian/rules +++ b/dilos/libraries/python-trinity/debian/rules @@ -60,7 +60,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib/$(DEB_HOST_MULTIARCH) \ -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -69,7 +69,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib \ -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) @@ -109,15 +109,17 @@ install-indep: dh_clean -k -i dh_installdirs -i dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' - for version in ${PYTHONS};\ + for version in ${DBG_PYTHONS};\ do\ - mkdir -p debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages;\ - cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/;\ - cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ + mkdir -p debian/pytde-dev/$$pylib;\ + install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\ + install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\ done # for version in ${DBG_PYTHONS};\ # do\ -# cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_d.py;\ +# pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ +# install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ # done install-arch: @@ -132,14 +134,14 @@ install-arch: done # set -e; \ -# for version in ${DBG_PYTHONS}; do \ -# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ -# done +# for version in ${DBG_PYTHONS}; do \ +# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-pytde-dbg;\ +# done dh_install -a --sourcedir=$(CURDIR)/debian/tmp - mkdir -p $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) + mkdir -p $(CURDIR)/debian/python-pytde/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python-pytde/usr/lib/$(DEB_HOST_MULTIARCH) # for i in $$(find debian/python-*-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ @@ -160,7 +162,7 @@ binary-common: dh_installexamples dh_link ifeq (,$(findstring -i, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg + DH_OPTIONS= dh_strip -ppython-pytde #--dbg-package=python-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms diff --git a/ubuntu/_base/libraries/python-trinity/debian/changelog b/ubuntu/_base/libraries/python-trinity/debian/changelog index 12485eccd..43df2609a 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/changelog +++ b/ubuntu/_base/libraries/python-trinity/debian/changelog @@ -1,4 +1,4 @@ -python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low +pytde (3.16.3-0ubuntu4) karmic; urgency=low * Karmic rebuild diff --git a/ubuntu/_base/libraries/python-trinity/debian/control b/ubuntu/_base/libraries/python-trinity/debian/control index 67a12135c..064f7462c 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/control +++ b/ubuntu/_base/libraries/python-trinity/debian/control @@ -1,4 +1,4 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> @@ -8,24 +8,23 @@ Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-support (>= 0.7.1) Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python-pytde Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-pytqt -Replaces: python-kde3-kde3 (<< 4:14.0.0~), python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-kde3-kde3 (<< 4:14.0.0~), python-trinity-trinity (<< 4:14.0.0~) +Replaces: python-trinity-trinity (<< 4:14.1.0~) +Breaks: python-trinity-trinity (<< 4:14.1.0~) Provides: ${python:Provides} -Conflicts: python-trinity-trinity Description: Trinity bindings for Python [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. -Package: python-trinity-trinity-dbg +Package: python-pytde-dbg Priority: extra Architecture: any -Replaces: python-kde3-kde3-dbg (<< 4:14.0.0~), python-trinity-trinity-dbg (<< 4:14.0.0~) -Breaks: python-kde3-kde3-dbg (<< 4:14.0.0~), python-trinity-trinity-dbg (<< 4:14.0.0~) -Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} +Replaces: python-trinity-trinity-dbg (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dbg (<< 4:14.1.0~) +Depends: python-pytde (= ${binary:Version}), python-all-dbg, python-pytqt-dbg, ${shlibs:Depends} Description: Trinity bindings for Python (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes @@ -33,11 +32,11 @@ Description: Trinity bindings for Python (debug extensions) [Trinity] . This package contains the extension built for the Python debug interpreter. -Package: python-trinity-trinity-dev +Package: pytde-dev Section: python Architecture: all -Replaces: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:14.0.0~) -Breaks: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:14.0.0~) +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) Depends: pytqt-tools, ${python:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They @@ -46,11 +45,11 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit The package also contains tdepyuic, a wrapper script around PyTQt's user interface compiler. -Package: python-trinity-trinity-doc +Package: pytde-doc Section: doc Architecture: all -Replaces: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~) -Breaks: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~) +Replaces: python-trinity-trinity-doc (<< 4:14.1.0~) +Breaks: python-trinity-trinity-doc (<< 4:14.1.0~) Description: Documentation and examples for PyTDE [Trinity] General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.install b/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.dirs b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.dirs @@ -0,0 +1,3 @@ +usr/share/doc/pytde-doc +usr/share/doc/pytde-doc/examples +usr/share/doc/pytde-doc/html diff --git a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/debian/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API Section: Programming Format: HTML -Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html -Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html +Index: /usr/share/doc/pytde-doc/html/index.html +Files: /usr/share/doc/pytde-doc/html/*.html diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.examples diff --git a/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.install b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/ubuntu/_base/libraries/python-trinity/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install b/ubuntu/_base/libraries/python-trinity/debian/python-pytde.install index facee2907..facee2907 100644 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity.install +++ b/ubuntu/_base/libraries/python-trinity/debian/python-pytde.install diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs deleted file mode 100644 index 62e887ce2..000000000 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -opt/trinity/share/sip-tqt/trinity diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install deleted file mode 100644 index 17b8480ab..000000000 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* opt/trinity/share/sip-tqt/trinity -contrib/tdepyuic opt/trinity/bin/ diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs deleted file mode 100644 index 96235463f..000000000 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/doc/python-trinity-trinity-doc -usr/share/doc/python-trinity-trinity-doc/examples -usr/share/doc/python-trinity-trinity-doc/html diff --git a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install deleted file mode 100644 index 20b273acb..000000000 --- a/ubuntu/_base/libraries/python-trinity/debian/python-trinity-trinity-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/* usr/share/doc/python-trinity-trinity-doc/html diff --git a/ubuntu/_base/libraries/python-trinity/debian/rules b/ubuntu/_base/libraries/python-trinity/debian/rules index 532c74f7f..5cf2cd446 100755 --- a/ubuntu/_base/libraries/python-trinity/debian/rules +++ b/ubuntu/_base/libraries/python-trinity/debian/rules @@ -56,7 +56,7 @@ build-%/configure-stamp: cd build-$* && python$* ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -65,7 +65,7 @@ dbg-build-%/configure-stamp: cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \ -e python$* \ - -v /opt/trinity/share/sip-tqt/trinity -j $(SPLIT) + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) $(DBG_PYTHONS:%=dbg-build-%/build-stamp) @@ -106,13 +106,15 @@ install-indep: dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' for version in ${PYTHONS};\ do\ - mkdir -p debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages;\ - cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/;\ - cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ + mkdir -p debian/pytde-dev/$$pylib;\ + install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\ + install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\ done for version in ${DBG_PYTHONS};\ do\ - cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/opt/trinity/lib/python-$$version/site-packages/pytdeconfig_d.py;\ + pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())');\ + install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ done install-arch: @@ -127,14 +129,14 @@ install-arch: done set -e; \ - for version in ${DBG_PYTHONS}; do \ - $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ - done + for version in ${DBG_PYTHONS}; do \ + $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-pytde-dbg;\ + done dh_install -a --sourcedir=$(CURDIR)/debian/tmp - mkdir -p $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ - ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/opt/trinity/lib/ + mkdir -p $(CURDIR)/debian/python-pytde/opt/trinity/lib/ + ln -s /opt/trinity/lib/trinity/libkonsolepart.so $(CURDIR)/debian/python-ptde/opt/trinity/lib/ for i in $$(find debian/python-*-dbg -name '*.so'); do \ b=$$(basename $$i .so); \ mv $$i $$(dirname $$i)/$${b}_d.so; \ @@ -156,7 +158,7 @@ binary-common: dh_installexamples dh_link ifeq (,$(findstring -i, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg + DH_OPTIONS= dh_strip -ppython-pytde #--dbg-package=python-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms |