diff options
Diffstat (limited to 'dilos')
265 files changed, 980 insertions, 1724 deletions
diff --git a/dilos/common/cmake/debian/compat b/dilos/common/cmake/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/common/cmake/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/core/tde-i18n/debian/compat b/dilos/core/tde-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tde-i18n/debian/compat +++ b/dilos/core/tde-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tde-i18n/debian/control b/dilos/core/tde-i18n/debian/control index f5b6bb982..33461f159 100644 --- a/dilos/core/tde-i18n/debian/control +++ b/dilos/core/tde-i18n/debian/control @@ -2,7 +2,7 @@ Source: tde-i18n-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Package: tde-i18n-trinity @@ -10,7 +10,7 @@ Architecture: all Section: tde Replaces: kde-i18n-trinity (<< 4:14.0.0~) Breaks: kde-i18n-trinity (<< 4:14.0.0~) -Depends: tdelibs14-trinity +Depends: tdelibs-trinity Suggests: tde-trinity Provides: tde-i18n-trinity Description: All languages (all) internationalized (i18n) files for TDE diff --git a/dilos/core/tde-i18n/debian/control-lang b/dilos/core/tde-i18n/debian/control-lang index 5d409c28d..2fce8baf8 100644 --- a/dilos/core/tde-i18n/debian/control-lang +++ b/dilos/core/tde-i18n/debian/control-lang @@ -4,7 +4,7 @@ Architecture: all Section: tde Replaces: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~) Breaks: kde-i18n-@pkg_lang@-trinity (<< 4:14.0.0~) -Depends: tdelibs14-trinity +Depends: tdelibs-trinity Suggests: tde-trinity Provides: tde-i18n-trinity Description: @lang_desc@ (@lang@) internationalized (i18n) files for TDE diff --git a/dilos/core/tde-i18n/debian/control-source b/dilos/core/tde-i18n/debian/control-source index 984fed2a5..b959dad00 100644 --- a/dilos/core/tde-i18n/debian/control-source +++ b/dilos/core/tde-i18n/debian/control-source @@ -2,5 +2,5 @@ Source: tde-i18n-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 diff --git a/dilos/core/tde-i18n/debian/rules b/dilos/core/tde-i18n/debian/rules index 1631906ea..0303b4496 100755 --- a/dilos/core/tde-i18n/debian/rules +++ b/dilos/core/tde-i18n/debian/rules @@ -149,6 +149,7 @@ binary-indep: build install dh_installdocs dh_installmenu dh_installchangelogs + dh_link dh_strip $(if $(wildcard /usr/bin/dh_strip_nondeterminism),\ dh_strip_nondeterminism) diff --git a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaccessibility/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeaccessibility/debian/compat b/dilos/core/tdeaccessibility/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeaccessibility/debian/compat +++ b/dilos/core/tdeaccessibility/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeaccessibility/debian/control b/dilos/core/tdeaccessibility/debian/control index ab53ac888..6d60485f1 100644 --- a/dilos/core/tdeaccessibility/debian/control +++ b/dilos/core/tdeaccessibility/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libakode-dev, libxtst-dev Standards-Version: 3.8.4 Package: tdeaccessibility-trinity diff --git a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk b/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeaddons/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeaddons/debian/compat b/dilos/core/tdeaddons/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeaddons/debian/compat +++ b/dilos/core/tdeaddons/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeaddons/debian/control b/dilos/core/tdeaddons/debian/control index 4bae36960..c4c057425 100644 --- a/dilos/core/tdeaddons/debian/control +++ b/dilos/core/tdeaddons/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb4.8++-dev | libdb++-dev, libogg-dev, libiconv-dev [solaris-any] +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, atlantik-trinity-dev, tdebase-trinity-dev, tdemultimedia-trinity-dev, libtdegames-trinity-dev, libkonq4-trinity-dev, tdepim-trinity-dev, libsdl1.2-dev (>= 1.2.2-3.3), libssl-dev (>= 0.9.6), libdb++-dev | libdb5.3++-dev | libdb4.8++-dev, libogg-dev, dh-python, libiconv-dev [solaris-any] Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl +Depends: ${perl:Depends}, ${python3:Depends}, libfinance-quote-perl, libmime-tools-perl, libnews-nntpclient-perl, libwww-perl Recommends: knewsticker-trinity Enhances: knewsticker-trinity Description: scripts for KNewsTicker, the Trinity news ticker @@ -171,7 +171,7 @@ Architecture: any Section: tde Replaces: konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, libjpeg-turbo-progs | libjpeg-progs, python-all, rsync, unison +Depends: ${shlibs:Depends}, ${python3:Depends}, libjpeg-turbo-progs | libjpeg-progs, rsync, unison Recommends: akregator-trinity, ark-trinity, imagemagick Suggests: khelpcenter-trinity, tdeaddons-trinity-doc-html Enhances: konqueror-trinity, akregator-trinity diff --git a/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian b/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian deleted file mode 100644 index 705d74139..000000000 --- a/dilos/core/tdeaddons/debian/kicker-applets-trinity.lintian +++ /dev/null @@ -1,3 +0,0 @@ -# Call is inserted by debhelper and is correct. -kicker-applets-trinity: postinst-has-useless-call-to-ldconfig -kicker-applets-trinity: postrm-has-useless-call-to-ldconfig diff --git a/dilos/core/tdeaddons/debian/rules b/dilos/core/tdeaddons/debian/rules index 4417239b1..7d022babb 100755 --- a/dilos/core/tdeaddons/debian/rules +++ b/dilos/core/tdeaddons/debian/rules @@ -33,11 +33,15 @@ DOC_HTML_PRUNE := konq-plugins-trinity/smbmounter binary-install/tdeaddons-tdefile-plugins-trinity:: install -p -D -m644 renamedlgplugins/README \ - debian/tdeaddons-tdefile-plugins-trinity/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/usr/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/usr/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/usr/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/imagerotation diff --git a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk b/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeadmin/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeadmin/debian/compat b/dilos/core/tdeadmin/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeadmin/debian/compat +++ b/dilos/core/tdeadmin/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeadmin/debian/control b/dilos/core/tdeadmin/debian/control index b534daf54..0d4352b3f 100644 --- a/dilos/core/tdeadmin/debian/control +++ b/dilos/core/tdeadmin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpam0g-dev, docbook-to-man Standards-Version: 3.8.4 Package: tdeadmin-trinity diff --git a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk b/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeartwork/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeartwork/debian/compat b/dilos/core/tdeartwork/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeartwork/debian/compat +++ b/dilos/core/tdeartwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeartwork/debian/control b/dilos/core/tdeartwork/debian/control index 5dade582e..a394efd28 100644 --- a/dilos/core/tdeartwork/debian/control +++ b/dilos/core/tdeartwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any] +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, twin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies [!solaris-any] Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 diff --git a/dilos/core/tdebase/debian/cdbs/debian-tde.mk b/dilos/core/tdebase/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdebase/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdebase/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdebase/debian/compat b/dilos/core/tdebase/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdebase/debian/compat +++ b/dilos/core/tdebase/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdebase/debian/control b/dilos/core/tdebase/debian/control index f0e692dc5..eec4f7d2f 100644 --- a/dilos/core/tdebase/debian/control +++ b/dilos/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev [!solaris-any], libudev-dev [!solaris-any], libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev, libcpp [solaris-any] Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Build-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 @@ -324,6 +324,7 @@ Architecture: any Replaces: kicker-trinity (<< 4:14.0.0~) Breaks: kicker-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, kcontrol-trinity (>= ${source:Version}), tdebase-data-trinity (>> ${TDE-Version3}~), tdebase-data-trinity (<< ${TDE-Next-Version3}~) +Recommends: desktop-file-utils Suggests: khelpcenter-trinity, kicker-applets-trinity, menu Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kcontrol-trinity (<< 4:14.0.8~) Description: desktop panel for TDE diff --git a/dilos/core/tdebase/debian/kdesktop-trinity.postinst b/dilos/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 65da715e5..000000000 --- a/dilos/core/tdebase/debian/kdesktop-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdesktop-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.install b/dilos/core/tdebase/debian/khelpcenter-trinity.install index 06d3a6618..29e4df751 100644 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.install +++ b/dilos/core/tdebase/debian/khelpcenter-trinity.install @@ -36,6 +36,7 @@ debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/man9.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/Manpages/mann.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/support.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/quickstart.desktop +debian/tmp/usr/share/apps/khelpcenter/plugins/releasenotes.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/visualdict.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/userguide.desktop debian/tmp/usr/share/apps/khelpcenter/plugins/welcome.desktop @@ -99,6 +100,9 @@ debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/common debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook +debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/shadow1.png debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/support.docbook debian/tmp/usr/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian index 4266f0f44..a45804dd0 100644 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/dilos/core/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1 @@ khelpcenter-trinity: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so diff --git a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst b/dilos/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index 4a906880c..000000000 --- a/dilos/core/tdebase/debian/khelpcenter-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for khelpcenter-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/klipper-trinity.lintian b/dilos/core/tdebase/debian/klipper-trinity.lintian index 4aacfafd0..8c37b9b6e 100644 --- a/dilos/core/tdebase/debian/klipper-trinity.lintian +++ b/dilos/core/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1 @@ klipper-trinity: no-shlibs-control-file usr/lib/libtdeinit_klipper.so -klipper-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so -klipper-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so diff --git a/dilos/core/tdebase/debian/klipper-trinity.postinst b/dilos/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index adf32323b..000000000 --- a/dilos/core/tdebase/debian/klipper-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for klipper-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian index f085ffc8c..d3b412257 100644 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/dilos/core/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,2 @@ kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so kmenuedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so -kmenuedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so -kmenuedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so diff --git a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst b/dilos/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index 29bc5b6b5..000000000 --- a/dilos/core/tdebase/debian/kmenuedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kmenuedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/konqueror-trinity.docs b/dilos/core/tdebase/debian/konqueror-trinity.docs index c023d564b..e00f630aa 100644 --- a/dilos/core/tdebase/debian/konqueror-trinity.docs +++ b/dilos/core/tdebase/debian/konqueror-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/dilos/core/tdebase/debian/konsole-trinity.lintian b/dilos/core/tdebase/debian/konsole-trinity.lintian index 6a55d9e64..218aec8fe 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.lintian +++ b/dilos/core/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1 @@ konsole-trinity: no-shlibs-control-file usr/lib/libtdeinit_konsole.so -konsole-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so -konsole-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so diff --git a/dilos/core/tdebase/debian/konsole-trinity.postinst b/dilos/core/tdebase/debian/konsole-trinity.postinst index 6e38c4939..dc2328977 100644 --- a/dilos/core/tdebase/debian/konsole-trinity.postinst +++ b/dilos/core/tdebase/debian/konsole-trinity.postinst @@ -24,9 +24,6 @@ case "$1" in configure) update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /usr/bin/konsole 35 \ --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /usr/share/man/man1/konsole.1 - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.lintian b/dilos/core/tdebase/debian/ksmserver-trinity.lintian index a6dfd1fe6..2126fe400 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.lintian +++ b/dilos/core/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1 @@ ksmserver-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so -ksmserver-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so diff --git a/dilos/core/tdebase/debian/ksmserver-trinity.postinst b/dilos/core/tdebase/debian/ksmserver-trinity.postinst index f4b160056..e40921e73 100644 --- a/dilos/core/tdebase/debian/ksmserver-trinity.postinst +++ b/dilos/core/tdebase/debian/ksmserver-trinity.postinst @@ -26,9 +26,6 @@ case "$1" in x-session-manager /usr/bin/starttde 40 \ --slave /usr/share/man/man1/x-session-manager.1 \ x-session-manager.1 "/usr/share/man/man1/starttde.1" - - # force ldconfig due to tdeinit library -# ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/dilos/core/tdebase/debian/libkonq4-trinity.docs b/dilos/core/tdebase/debian/libkonq4-trinity.docs index c023d564b..e00f630aa 100644 --- a/dilos/core/tdebase/debian/libkonq4-trinity.docs +++ b/dilos/core/tdebase/debian/libkonq4-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/dilos/core/tdebase/debian/rules b/dilos/core/tdebase/debian/rules index ebe24bc5c..dcc4fcba5 100755 --- a/dilos/core/tdebase/debian/rules +++ b/dilos/core/tdebase/debian/rules @@ -44,6 +44,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="OFF" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_SFTP="ON" \ -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="OFF" \ -DWITH_OPENEXR="ON" \ @@ -91,6 +92,9 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg \ -Xtdm -Xtdm_config -Xtdm_greet -Xtdmctl -Xtwin -Xtwin_killer_helper \ -Xtwin_resumer_helper -Xtwin_rules_dialog +DEB_DH_INSTALLINIT_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade +DEB_DH_SYSTEMD_START_ARGS := --no-start --no-stop-on-upgrade --no-restart-after-upgrade + DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install index 2ff6aeb6e..f67986932 100644 --- a/dilos/core/tdebase/debian/tdebase-data-trinity.install +++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install @@ -88,20 +88,26 @@ debian/tmp/usr/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/EveX.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/Human.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Keramik.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/Lizard.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Next.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Plastik.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/Platinum.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/Sienna.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Storm.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/System.kcsrc +debian/tmp/usr/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc debian/tmp/usr/share/apps/tdedisplay/color-schemes/Windows95.kcsrc diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.install b/dilos/core/tdebase/debian/tdebase-trinity-bin.install index 8fe01a835..de6d9579d 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.install +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.install @@ -1,6 +1,8 @@ debian/tmp/usr/bin/migratekde3 debian/tmp/usr/bin/r14-xdg-update debian/tmp/usr/bin/tde_release_notes +debian/tmp/usr/bin/tde_license_info +debian/tmp/usr/bin/tde_show_license_info debian/tmp/usr/bin/krootbacking debian/tmp/usr/bin/tdeinit_phase1 debian/tmp/usr/bin/tdeinit_displayconfig @@ -75,7 +77,9 @@ debian/tmp/usr/share/apps/kdcop/kdcopui.rc debian/tmp/usr/share/apps/khotkeys/trinity2b1.khotkeys debian/tmp/usr/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys debian/tmp/usr/share/apps/khotkeys/printscreen.khotkeys +debian/tmp/usr/share/apps/kxkb/eventsrc debian/tmp/usr/share/autostart/tde_release_notes.desktop +debian/tmp/usr/share/autostart/tde_license_info.desktop debian/tmp/usr/share/doc/tde/HTML/en/kdcop/common debian/tmp/usr/share/doc/tde/HTML/en/kdcop/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/kdcop/index.docbook diff --git a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian index f24713727..24f59f525 100644 --- a/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/dilos/core/tdebase/debian/tdebase-trinity-bin.lintian @@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary usr/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so -tdebase-bin-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so -tdebase-bin-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.lintian b/dilos/core/tdebase/debian/tdeprint-trinity.lintian index 79ef87ff2..99109cc72 100644 --- a/dilos/core/tdebase/debian/tdeprint-trinity.lintian +++ b/dilos/core/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,2 @@ tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so tdeprint-trinity: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so -tdeprint-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so -tdeprint-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so diff --git a/dilos/core/tdebase/debian/tdeprint-trinity.postinst b/dilos/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index a2fa0876f..000000000 --- a/dilos/core/tdebase/debian/tdeprint-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdeprint-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdebase/debian/tdm-trinity.postrm b/dilos/core/tdebase/debian/tdm-trinity.postrm index 2454461f4..881d73298 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.postrm +++ b/dilos/core/tdebase/debian/tdm-trinity.postrm @@ -42,9 +42,6 @@ fi # update-rc.d tdm remove >/dev/null || true # fi #fi -#if [ -d /run/systemd/system ] ; then -# systemctl --system daemon-reload >/dev/null || true -#fi #DEBHELPER# diff --git a/dilos/core/tdebase/debian/tdm-trinity.prerm b/dilos/core/tdebase/debian/tdm-trinity.prerm index 0c1ee9e5d..a5c530e08 100644 --- a/dilos/core/tdebase/debian/tdm-trinity.prerm +++ b/dilos/core/tdebase/debian/tdm-trinity.prerm @@ -184,4 +184,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi fi +#DEBHELPER# + exit 0 diff --git a/dilos/core/tdebase/debian/twin-trinity.install b/dilos/core/tdebase/debian/twin-trinity.install index 92755cb44..8dc19e80e 100644 --- a/dilos/core/tdebase/debian/twin-trinity.install +++ b/dilos/core/tdebase/debian/twin-trinity.install @@ -11,24 +11,24 @@ debian/tmp/usr/lib/*/trinity/kcm_twinoptions.la debian/tmp/usr/lib/*/trinity/kcm_twinoptions.so debian/tmp/usr/lib/*/trinity/kcm_twinrules.la debian/tmp/usr/lib/*/trinity/kcm_twinrules.so -debian/tmp/usr/lib/*/trinity/twin3_b2.la -debian/tmp/usr/lib/*/trinity/twin3_b2.so -debian/tmp/usr/lib/*/trinity/twin3_default.la -debian/tmp/usr/lib/*/trinity/twin3_default.so -debian/tmp/usr/lib/*/trinity/twin3_keramik.la -debian/tmp/usr/lib/*/trinity/twin3_keramik.so -debian/tmp/usr/lib/*/trinity/twin3_laptop.la -debian/tmp/usr/lib/*/trinity/twin3_laptop.so -debian/tmp/usr/lib/*/trinity/twin3_modernsys.la -debian/tmp/usr/lib/*/trinity/twin3_modernsys.so -debian/tmp/usr/lib/*/trinity/twin3_plastik.la -debian/tmp/usr/lib/*/trinity/twin3_plastik.so -debian/tmp/usr/lib/*/trinity/twin3_quartz.la -debian/tmp/usr/lib/*/trinity/twin3_quartz.so -debian/tmp/usr/lib/*/trinity/twin3_redmond.la -debian/tmp/usr/lib/*/trinity/twin3_redmond.so -debian/tmp/usr/lib/*/trinity/twin3_web.la -debian/tmp/usr/lib/*/trinity/twin3_web.so +debian/tmp/usr/lib/*/trinity/twin_b2.la +debian/tmp/usr/lib/*/trinity/twin_b2.so +debian/tmp/usr/lib/*/trinity/twin_default.la +debian/tmp/usr/lib/*/trinity/twin_default.so +debian/tmp/usr/lib/*/trinity/twin_keramik.la +debian/tmp/usr/lib/*/trinity/twin_keramik.so +debian/tmp/usr/lib/*/trinity/twin_laptop.la +debian/tmp/usr/lib/*/trinity/twin_laptop.so +debian/tmp/usr/lib/*/trinity/twin_modernsys.la +debian/tmp/usr/lib/*/trinity/twin_modernsys.so +debian/tmp/usr/lib/*/trinity/twin_plastik.la +debian/tmp/usr/lib/*/trinity/twin_plastik.so +debian/tmp/usr/lib/*/trinity/twin_quartz.la +debian/tmp/usr/lib/*/trinity/twin_quartz.so +debian/tmp/usr/lib/*/trinity/twin_redmond.la +debian/tmp/usr/lib/*/trinity/twin_redmond.so +debian/tmp/usr/lib/*/trinity/twin_web.la +debian/tmp/usr/lib/*/trinity/twin_web.so debian/tmp/usr/lib/*/trinity/twin_b2_config.la debian/tmp/usr/lib/*/trinity/twin_b2_config.so debian/tmp/usr/lib/*/trinity/twin_default_config.la @@ -54,12 +54,11 @@ debian/tmp/usr/share/applications/tde/twindecoration.desktop debian/tmp/usr/share/applications/tde/twinoptions.desktop debian/tmp/usr/share/applications/tde/twinrules.desktop debian/tmp/usr/share/applnk/.hidden/twinactions.desktop +debian/tmp/usr/share/applnk/.hidden/twinactiveborders.desktop debian/tmp/usr/share/applnk/.hidden/twinadvanced.desktop debian/tmp/usr/share/applnk/.hidden/twinfocus.desktop debian/tmp/usr/share/applnk/.hidden/twinmoving.desktop debian/tmp/usr/share/applnk/.hidden/twintranslucency.desktop -debian/tmp/usr/share/apps/tdeconf_update/twin3_plugin.pl -debian/tmp/usr/share/apps/tdeconf_update/twin3_plugin.upd debian/tmp/usr/share/apps/tdeconf_update/twin_focus1.sh debian/tmp/usr/share/apps/tdeconf_update/twin_focus1.upd debian/tmp/usr/share/apps/tdeconf_update/twin_focus2.sh diff --git a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk b/dilos/core/tdebindings/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdebindings/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdebindings/debian/compat b/dilos/core/tdebindings/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdebindings/debian/compat +++ b/dilos/core/tdebindings/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdebindings/debian/control b/dilos/core/tdebindings/debian/control index c9b846391..334f78d76 100644 --- a/dilos/core/tdebindings/debian/control +++ b/dilos/core/tdebindings/debian/control @@ -1,8 +1,8 @@ Source: tdebindings-trinity -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~), - python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk, +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 10~), + python3-all-dev, dh-python, quilt, gawk, default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc], - tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5), + tdelibs14-trinity-dev, ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev, graphviz [solaris-any], libgtk2.0-dev [solaris-any], oracle-java8-jdk [solaris-any] Section: devel @@ -17,7 +17,7 @@ Architecture: all Section: tde Replaces: kdebindings-trinity (<< 4:14.0.0~) Breaks: kdebindings-trinity (<< 4:14.0.0~) -Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version}) +Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version}) Description: TDE bindings metapackage TDE (the Trinity Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, @@ -66,7 +66,7 @@ Description: DCOP bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libdcop3-jni-trinity (<< 4:14.0.0~) Breaks: libdcop3-jni-trinity (<< 4:14.0.0~) @@ -80,7 +80,7 @@ Description: DCOP bindings for Java ( Native libraries ) [Trinity] This package is part of the official TDE bindings module. Package: libdcop3-java-trinity-dev -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libdevel Replaces: libdcop3-java-trinity-dev (<< 4:14.0.0~) Breaks: libdcop3-java-trinity-dev (<< 4:14.0.0~) @@ -111,7 +111,7 @@ Description: Java bindings for Qt [Trinity] This package is part of the official TDE bindings module. Package: libqt3-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libqt3-jni-trinity (<< 4:14.0.0~) Breaks: libqt3-jni-trinity (<< 4:14.0.0~) @@ -140,7 +140,7 @@ Description: tdelibs bindings for Java [Trinity] This package is part of the official TDE bindings module. Package: libtrinity-jni-trinity -Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc riscv64 s390 sparc solaris-any +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc solaris-any Section: libs Replaces: libtrinity-jni-trinity (<< 4:14.0.0~) Breaks: libtrinity-jni-trinity (<< 4:14.0.0~) @@ -212,13 +212,11 @@ Description: SMOKE Binding Library to TDE - Development Files . This package is part of the official TDE bindings module. -Package: python-dcop-trinity +Package: python3-dcop-trinity Architecture: any Section: python -Replaces: python-dcop-trinity (<< 4:14.0.0~) -Breaks: python-dcop-trinity (<< 4:14.0.0~) -Depends: ${python:Depends}, ${shlibs:Depends} -Provides: ${python:Provides} +Depends: ${python3:Depends}, ${shlibs:Depends} +Provides: ${python3:Provides} Description: DCOP bindings for Python This package contains the shared libraries necessary to run and develop Python programs using the Python DCOP bindings diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.install b/dilos/core/tdebindings/debian/python-dcop-trinity.install deleted file mode 100644 index 86d1a899e..000000000 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/python2.*/site-packages diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.docs b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs index 957d3af3e..957d3af3e 100644 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.docs +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.examples b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples index 4100d465b..4100d465b 100644 --- a/dilos/core/tdebindings/debian/python-dcop-trinity.examples +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples diff --git a/dilos/core/tdebindings/debian/python3-dcop-trinity.install b/dilos/core/tdebindings/debian/python3-dcop-trinity.install new file mode 100644 index 000000000..0cb9ab6cb --- /dev/null +++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python3/dist-packages diff --git a/dilos/core/tdebindings/debian/rules b/dilos/core/tdebindings/debian/rules index 97aacdcc5..e7107a470 100755 --- a/dilos/core/tdebindings/debian/rules +++ b/dilos/core/tdebindings/debian/rules @@ -3,10 +3,6 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) - - include /usr/share/cdbs/1/rules/debhelper.mk override DEB_BUILDDIR := $(DEB_SRCDIR) include debian/cdbs/debian-tde.mk @@ -39,7 +35,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/usr \ --with-extra-includes=/usr/include/tqt \ DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts python' -DEB_COMPRESS_EXCLUDE += .java .ui .js .rb .map .wav .bmp .cpp .sk +DEB_COMPRESS_EXCLUDE_ALL += .java .ui .js .rb .map .wav .bmp .cpp .sk # These are not all the packages with libraries, but only those that # need to be in DEB_SHLIBDEPS_INCLUDE... @@ -117,8 +113,8 @@ common-install-arch:: stamp-install-dcopjava ### -binary-install/python-dcop-trinity:: - ${DH_PYTHON2} -p$(cdbs_curpkg) +binary-install/python3-dcop-trinity:: + dh_python3 -p$(cdbs_curpkg) ### diff --git a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk b/dilos/core/tdeedu/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeedu/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeedu/debian/compat b/dilos/core/tdeedu/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeedu/debian/compat +++ b/dilos/core/tdeedu/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeedu/debian/control b/dilos/core/tdeedu/debian/control index c5e32fe45..1ad6d1deb 100644 --- a/dilos/core/tdeedu/debian/control +++ b/dilos/core/tdeedu/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnum-ocaml-dev | ocaml-nox (<< 4.08), libfacile-ocaml-dev, libboost-python-dev (>= 1.33.1), libusb-dev, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, ghostscript Standards-Version: 3.8.4 Package: tdeedu-trinity diff --git a/dilos/core/tdegames/debian/cdbs/debian-tde.mk b/dilos/core/tdegames/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdegames/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegames/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdegames/debian/compat b/dilos/core/tdegames/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdegames/debian/compat +++ b/dilos/core/tdegames/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdegames/debian/control b/dilos/core/tdegames/debian/control index b7990761a..3b64f2f1f 100644 --- a/dilos/core/tdegames/debian/control +++ b/dilos/core/tdegames/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdegraphics/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdegraphics/debian/compat b/dilos/core/tdegraphics/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdegraphics/debian/compat +++ b/dilos/core/tdegraphics/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdegraphics/debian/control b/dilos/core/tdegraphics/debian/control index fa7773eef..35fe264e9 100644 --- a/dilos/core/tdegraphics/debian/control +++ b/dilos/core/tdegraphics/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev Standards-Version: 3.8.4 Package: tdegraphics-trinity diff --git a/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian index 5bcc6c252..37dda0ca2 100644 --- a/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,2 @@ kfaxview-trinity: no-shlibs-control-file usr/lib/libkfaximage.so -kfaxview-trinity: postinst-must-call-ldconfig usr/lib/libkfaximage.so -kfaxview-trinity: postrm-should-call-ldconfig usr/lib/libkfaximage.so kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian index 1d80f308d..a1f267411 100644 --- a/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian +++ b/dilos/core/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,2 @@ kuickshow-trinity: no-shlibs-control-file usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kuickshow.so kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdelibs/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdelibs/debian/compat b/dilos/core/tdelibs/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdelibs/debian/compat +++ b/dilos/core/tdelibs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdelibs/debian/control b/dilos/core/tdelibs/debian/control index 2b07b8517..4fbb784aa 100644 --- a/dilos/core/tdelibs/debian/control +++ b/dilos/core/tdelibs/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Daniel Schepler <schepler@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, sharutils, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutils, binutils (>= 2.14.90.0.7), binutils-dev [!solaris-any], docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev [!solaris-any], libattr1-dev [!solaris-any], libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], @@ -29,7 +29,7 @@ Architecture: all Replaces: kdelibs-trinity (<< 4:14.0.0~) Breaks: kdelibs-trinity (<< 4:14.0.0~) Provides: tdelibs -Depends: tdelibs14-trinity (>= ${source:Version}), +Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}), tdelibs-data-trinity (>= ${source:Version}) Description: core libraries from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules index a463caa48..b693607f1 100755 --- a/dilos/core/tdelibs/debian/rules +++ b/dilos/core/tdelibs/debian/rules @@ -11,9 +11,16 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = +endif + + DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) @@ -179,3 +186,40 @@ binary-install/tdelibs14-trinity:: mv debian/tmp/usr/bin/tdecmshell debian/tmp/usr/bin/tdecmshell.real install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14-trinity/usr/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/usr/bin/tdecmshell + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/tdelibs14-trinity\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \ + -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +endif + +clean:: + dh_testdir + dh_clean + +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/tdelibs14$(DEB_TIME64_SUFFIX)-trinity\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install index 1144a1dbe..0a24cfe6f 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.install +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.install @@ -1748,6 +1748,7 @@ debian/tmp/usr/share/apps/LICENSES/GPL_V3 debian/tmp/usr/share/apps/LICENSES/LGPL_V2 debian/tmp/usr/share/apps/LICENSES/LGPL_V3 debian/tmp/usr/share/apps/LICENSES/QPL_V1.0 +debian/tmp/usr/share/apps/LICENSES/MIT debian/tmp/usr/share/apps/proxyscout/eventsrc debian/tmp/usr/share/apps/tdemarkdown debian/tmp/usr/share/autostart/tdeab2tdeabc.desktop diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst index 6a6af3c3f..8c563a3d2 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postinst @@ -11,7 +11,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in upgrade|install) -# ldconfig ;; abort-upgrade) diff --git a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm index 5b639eb3e..40c135b0c 100644 --- a/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm +++ b/dilos/core/tdelibs/debian/tdelibs-data-trinity.postrm @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in remove) -# ldconfig ;; abort-upgrade) diff --git a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk b/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdemultimedia/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdemultimedia/debian/compat b/dilos/core/tdemultimedia/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdemultimedia/debian/compat +++ b/dilos/core/tdemultimedia/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdemultimedia/debian/control b/dilos/core/tdemultimedia/debian/control index f865895b1..052e13e67 100644 --- a/dilos/core/tdemultimedia/debian/control +++ b/dilos/core/tdemultimedia/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, cdparanoia, libcdparanoia0-dev, libflac-dev (>= 1.1.4-1), libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libsamplerate0-dev, libspeex-dev (>> 1.1.5), libtag1-dev (>> 1.3.1), libtheora-dev, libxine2-dev | libxine-dev, libxxf86dga-dev, libxv-dev, libxxf86vm-dev, libakode-dev, libogg-dev Standards-Version: 3.8.4 Package: tdemultimedia-trinity diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.install b/dilos/core/tdemultimedia/debian/kmix-trinity.install index a35228747..1c0a60e84 100644 --- a/dilos/core/tdemultimedia/debian/kmix-trinity.install +++ b/dilos/core/tdemultimedia/debian/kmix-trinity.install @@ -12,29 +12,10 @@ debian/tmp/usr/share/applications/tde/kmix.desktop debian/tmp/usr/share/apps/kicker/applets/kmixapplet.desktop debian/tmp/usr/share/apps/kmix/kmixui.rc debian/tmp/usr/share/apps/kmix/pics/Listener.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontLeft.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerFrontRight.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerRearLeft.png -debian/tmp/usr/share/apps/kmix/pics/SpeakerRearRight.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked_error.png -debian/tmp/usr/share/apps/kmix/pics/kmixdocked_mute.png -debian/tmp/usr/share/apps/kmix/pics/mix_ac97.png -debian/tmp/usr/share/apps/kmix/pics/mix_audio.png -debian/tmp/usr/share/apps/kmix/pics/mix_bass.png -debian/tmp/usr/share/apps/kmix/pics/mix_cd.png -debian/tmp/usr/share/apps/kmix/pics/mix_digital.png -debian/tmp/usr/share/apps/kmix/pics/mix_ext.png -debian/tmp/usr/share/apps/kmix/pics/mix_headphone.png -debian/tmp/usr/share/apps/kmix/pics/mix_microphone.png -debian/tmp/usr/share/apps/kmix/pics/mix_midi.png -debian/tmp/usr/share/apps/kmix/pics/mix_recmon.png -debian/tmp/usr/share/apps/kmix/pics/mix_record.png -debian/tmp/usr/share/apps/kmix/pics/mix_surround.png -debian/tmp/usr/share/apps/kmix/pics/mix_treble.png -debian/tmp/usr/share/apps/kmix/pics/mix_unknown.png -debian/tmp/usr/share/apps/kmix/pics/mix_video.png -debian/tmp/usr/share/apps/kmix/pics/mix_volume.png +debian/tmp/usr/share/apps/kmix/pics/Speaker*.png +debian/tmp/usr/share/apps/kmix/pics/mix*.png +debian/tmp/usr/share/apps/kmix/pics/crystal/*.png +debian/tmp/usr/share/apps/kmix/pics/oldcrystal/*.png debian/tmp/usr/share/autostart/restore_kmix_volumes.desktop debian/tmp/usr/share/autostart/kmix.desktop debian/tmp/usr/share/doc/tde/HTML/en/kmix/common diff --git a/dilos/core/tdemultimedia/debian/kmix-trinity.lintian b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian index fa69f2d18..42b01cd6a 100644 --- a/dilos/core/tdemultimedia/debian/kmix-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,2 @@ kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmixctrl.so kmix-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_kmix.so -kmix-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so -kmix-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_kmixctrl.so diff --git a/dilos/core/tdemultimedia/debian/krec-trinity.lintian b/dilos/core/tdemultimedia/debian/krec-trinity.lintian index fdb934927..81041e36d 100644 --- a/dilos/core/tdemultimedia/debian/krec-trinity.lintian +++ b/dilos/core/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1 @@ krec-trinity: no-shlibs-control-file usr/lib/*/libtdeinit_krec.so -krec-trinity: postinst-must-call-ldconfig usr/lib/*/libtdeinit_krec.so -krec-trinity: postrm-should-call-ldconfig usr/lib/*/libtdeinit_krec.so diff --git a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdenetwork/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdenetwork/debian/compat b/dilos/core/tdenetwork/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdenetwork/debian/compat +++ b/dilos/core/tdenetwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdenetwork/debian/control b/dilos/core/tdenetwork/debian/control index 5d3183ee3..cf58e92a1 100644 --- a/dilos/core/tdenetwork/debian/control +++ b/dilos/core/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8) [!solaris-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64 !solaris-any], libxxf86vm-dev, libv4l-dev [!solaris-any], libssl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.postinst b/dilos/core/tdenetwork/debian/kdict-trinity.postinst deleted file mode 100644 index 055be2e09..000000000 --- a/dilos/core/tdenetwork/debian/kdict-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kdict-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian index 58fe394fa..3014f3461 100644 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.lintian +++ b/dilos/core/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1 @@ ksirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ksirc.so -ksirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ksirc.so diff --git a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst b/dilos/core/tdenetwork/debian/ksirc-trinity.postinst deleted file mode 100644 index 2c76ed8a9..000000000 --- a/dilos/core/tdenetwork/debian/ksirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ksirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian index 7f5348940..0e6408ff4 100644 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1 @@ kwifimanager-trinity: no-shlibs-control-file usr/lib/libkwireless.so -kwifimanager-trinity: postinst-must-call-ldconfig usr/lib/libkwireless.so -kwifimanager-trinity: postrm-should-call-ldconfig usr/lib/libkwireless.so diff --git a/dilos/core/tdenetwork/debian/tdednssd-trinity.install b/dilos/core/tdenetwork/debian/tdednssd-trinity.install index 6811c2701..e25b0c1d9 100644 --- a/dilos/core/tdenetwork/debian/tdednssd-trinity.install +++ b/dilos/core/tdenetwork/debian/tdednssd-trinity.install @@ -2,13 +2,14 @@ debian/tmp/usr/share/services/zeroconf.protocol debian/tmp/usr/share/services/invitation.protocol debian/tmp/usr/share/services/kded/dnssdwatcher.desktop debian/tmp/usr/share/apps/remoteview/zeroconf.desktop -debian/tmp/usr/share/apps/zeroconf/_http._tcp debian/tmp/usr/share/apps/zeroconf/_ftp._tcp +debian/tmp/usr/share/apps/zeroconf/_http._tcp debian/tmp/usr/share/apps/zeroconf/_ldap._tcp -debian/tmp/usr/share/apps/zeroconf/_webdav._tcp debian/tmp/usr/share/apps/zeroconf/_nfs._tcp -debian/tmp/usr/share/apps/zeroconf/_ssh._tcp debian/tmp/usr/share/apps/zeroconf/_rfb._tcp +debian/tmp/usr/share/apps/zeroconf/_ssh._tcp +debian/tmp/usr/share/apps/zeroconf/_sftp-ssh._tcp +debian/tmp/usr/share/apps/zeroconf/_webdav._tcp debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.so debian/tmp/usr/lib/*/trinity/tdeio_zeroconf.la debian/tmp/usr/lib/*/trinity/kded_dnssdwatcher.so diff --git a/dilos/core/tdepim/debian/cdbs/debian-tde.mk b/dilos/core/tdepim/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdepim/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdepim/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdepim/debian/compat b/dilos/core/tdepim/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdepim/debian/compat +++ b/dilos/core/tdepim/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdepim/debian/control b/dilos/core/tdepim/debian/control index 5e2457136..1e08619f1 100644 --- a/dilos/core/tdepim/debian/control +++ b/dilos/core/tdepim/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, bison, byacc, bzip2, flex, groff-base, libogg-dev, libboost-dev (>= 1.33.1), libgpgme11-dev | libgpgme-dev (>= 1.0~), @@ -21,7 +21,7 @@ Section: tde Architecture: all Replaces: kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-trinity (<< 4:14.0.0~) -Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) +Depends: akregator-trinity (>= ${source:Version}), kaddressbook-trinity (>= ${source:Version}), kalarm-trinity (>= ${source:Version}), kandy-trinity (>= ${source:Version}), karm-trinity (>= ${source:Version}), tdepim-tdefile-plugins-trinity (>= ${source:Version}), tdepim-tdeio-plugins-trinity (>= ${source:Version}), tdepim-tderesources-trinity (>= ${source:Version}), tdepim-wizards-trinity (>= ${source:Version}), kleopatra-trinity (>= ${source:Version}), kmail-trinity (>= ${source:Version}), kmailcvt-trinity (>= ${source:Version}), knode-trinity (>= ${source:Version}), knotes-trinity (>= ${source:Version}), konsolekalendar-trinity (>= ${source:Version}), kontact-trinity (>= ${source:Version}), korganizer-trinity (>= ${source:Version}), korn-trinity (>= ${source:Version}), ktnef-trinity (>= ${source:Version}), libindex0-trinity (>= ${source:Version}), libtdepim1a-trinity (>= ${source:Version}), libkgantt0-trinity (>= ${source:Version}), libkleopatra1-trinity (>= ${source:Version}) | libkleopatra1t64-trinity (>= ${source:Version}), libkpimexchange1-trinity (>= ${source:Version}), libkpimidentities1-trinity (>= ${source:Version}), libksieve0-trinity (>= ${source:Version}), libktnef1-trinity (>= ${source:Version}), libmimelib1c2a-trinity (>= ${source:Version}) | libmimelib1t64-trinity (>= ${source:Version}) Suggests: tdepim-trinity-doc-html Description: Personal Information Management apps from the official Trinity release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical diff --git a/dilos/core/tdepim/debian/rules b/dilos/core/tdepim/debian/rules index 06c6e701d..afc29ebff 100755 --- a/dilos/core/tdepim/debian/rules +++ b/dilos/core/tdepim/debian/rules @@ -13,6 +13,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = +endif + DEB_KDE_APIDOX := yes CPPFLAGS+= -D__dilos__ @@ -92,3 +99,54 @@ NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) DEB_DH_STRIP_ARGS := -Xlibindex.so.0.0.0 -Xlibgpgme++.so.0.4.0 \ -Xlibmimelib.so.1.0.1 + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libmimelib1c2a" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libmimelib1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \ + done + ls -d debian/* | \ + grep -E "/libkleopatra1-" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libkleopatra1$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + \ + -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libkleopatra1\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +endif + +clean:: + dh_testdir + dh_clean + +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libmimelib1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + ls -d debian/* | \ + grep -E "/libkleopatra1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdesdk/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdesdk/debian/cervisia-trinity.lintian b/dilos/core/tdesdk/debian/cervisia-trinity.lintian index ff16fcf9e..76268d1ab 100644 --- a/dilos/core/tdesdk/debian/cervisia-trinity.lintian +++ b/dilos/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./usr/share/apps/tdeconf_update/move_rep # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/dilos/core/tdesdk/debian/cervisia-trinity.postinst b/dilos/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 4728b399c..000000000 --- a/dilos/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then -# # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdesdk/debian/compat b/dilos/core/tdesdk/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdesdk/debian/compat +++ b/dilos/core/tdesdk/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdesdk/debian/control b/dilos/core/tdesdk/debian/control index fe1f5ae72..58d5361b6 100644 --- a/dilos/core/tdesdk/debian/control +++ b/dilos/core/tdesdk/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, tdelibs14-trinity-dev, binutils-dev [!solaris-any], bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, - libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), + libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), dh-python, libiconv-dev [solaris-any] Standards-Version: 3.8.4 @@ -166,7 +166,7 @@ Architecture: all Section: devel Replaces: kcachegrind-converters-trinity (<< 4:14.0.0~) Breaks: kcachegrind-converters-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, php-cli | php5-cli, python-all +Depends: ${perl:Depends}, ${python3:Depends}, php-cli | php5-cli Recommends: tdecachegrind-trinity Description: format converters for TDECachegrind profiling visualisation tool This is a collection of scripts for converting the output from @@ -220,7 +220,7 @@ Architecture: all Section: devel Replaces: kdesdk-scripts-trinity (<< 4:14.0.0~) Breaks: kdesdk-scripts-trinity (<< 4:14.0.0~) -Depends: ${perl:Depends}, python-all +Depends: ${perl:Depends}, ${python3:Depends} Recommends: automake1.9 | automaken, cvs, gawk Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html, dmalloc, gdb, tdelibs14-trinity-doc, tqt3-doc, valgrind, devscripts Enhances: kate-trinity @@ -361,7 +361,7 @@ Architecture: any Section: devel Replaces: umbrello-trinity (<< 4:14.0.0~) Breaks: umbrello-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends} Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html Description: UML modelling tool and code generator Umbrello UML Modeller is a Unified Modelling Language editor for TDE. diff --git a/dilos/core/tdesdk/debian/rules b/dilos/core/tdesdk/debian/rules index 2321e5f11..24f4043d8 100755 --- a/dilos/core/tdesdk/debian/rules +++ b/dilos/core/tdesdk/debian/rules @@ -43,28 +43,35 @@ DEB_INSTALL_CHANGELOGS_kompare-trinity := kompare/ChangeLog DEB_INSTALL_CHANGELOGS_umbrello-trinity := umbrello/ChangeLog binary-install/tdesdk-scripts-trinity:: -# mv -f debian/tdesdk-scripts-trinity/usr/bin/svn-clean \ -# debian/tdesdk-scripts-trinity/usr/bin/svn-clean-kde -# mv -f debian/tdesdk-scripts-trinity/usr/bin/svnversions \ -# debian/tdesdk-scripts-trinity/usr/bin/svnversion-kde +# mv -f debian/$(cdbs_curpkg)/usr/bin/svn-clean \ +# debian/$(cdbs_curpkg)/usr/bin/svn-clean-kde +# mv -f debian/$(cdbs_curpkg)/usr/bin/svnversions \ +# debian/$(cdbs_curpkg)/usr/bin/svnversion-kde install -p -D -m644 scripts/kde-buildrc \ - debian/tdesdk-scripts-trinity/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin binary-install/tdesdk-misc-trinity:: install -p -D -m644 kdeaccounts-plugin/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kdeaccounts-plugin install -p -D -m644 tdeioslave/svn/AUTHORS \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn install -p -D -m644 tdeioslave/svn/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.tdeioslave-svn + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.tdeioslave-svn install -p -D -m644 kprofilemethod/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.kprofilemethod + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.kprofilemethod install -p -D -m644 scheck/README \ - debian/tdesdk-misc-trinity/usr/share/doc/tdesdk-misc/README.scheck + debian/$(cdbs_curpkg)/usr/share/doc/tdesdk-misc/README.scheck binary-install/kapptemplate-trinity:: - rm -f debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/*.cdbs-orig + rm -f debian/$(cdbs_curpkg)/usr/share/apps/kapptemplate/admin/*.cdbs-orig for admindirfile in compile config.guess config.sub debianrules depcomp detect-autoconf.pl \ Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \ - chmod 755 debian/kapptemplate-trinity/usr/share/apps/kapptemplate/admin/$$admindirfile; \ + chmod 755 debian/$(cdbs_curpkg)/usr/share/apps/kapptemplate/admin/$$admindirfile; \ done + +binary-install/tdecachegrind-converters-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/bin + +binary-install/umbrello-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /usr/share/apps/umbrello/headings diff --git a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk b/dilos/core/tdetoys/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdetoys/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdetoys/debian/compat b/dilos/core/tdetoys/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdetoys/debian/compat +++ b/dilos/core/tdetoys/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdetoys/debian/control b/dilos/core/tdetoys/debian/control index 296f05ede..bad6487d5 100644 --- a/dilos/core/tdetoys/debian/control +++ b/dilos/core/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: tdetoys-trinity diff --git a/dilos/core/tdetoys/debian/kweather-trinity.postinst b/dilos/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index bf30c75a9..000000000 --- a/dilos/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian index b104d2e5d..914337ec6 100644 --- a/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file usr/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_ark.so diff --git a/dilos/core/tdeutils/debian/ark-trinity.postinst b/dilos/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index d314f31e7..000000000 --- a/dilos/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for ark-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdeutils/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdeutils/debian/compat b/dilos/core/tdeutils/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdeutils/debian/compat +++ b/dilos/core/tdeutils/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdeutils/debian/control b/dilos/core/tdeutils/debian/control index 27974d12e..0848fc55e 100644 --- a/dilos/core/tdeutils/debian/control +++ b/dilos/core/tdeutils/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev | python-all-dev, libxtst-dev, xutils +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc Standards-Version: 3.8.4 diff --git a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian index b08559540..c84b29ee9 100644 --- a/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/dilos/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kcalc.so diff --git a/dilos/core/tdeutils/debian/kcalc-trinity.postinst b/dilos/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index e1935e9a5..000000000 --- a/dilos/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/kedit-trinity.lintian b/dilos/core/tdeutils/debian/kedit-trinity.lintian index da3ee87da..32491dbbb 100644 --- a/dilos/core/tdeutils/debian/kedit-trinity.lintian +++ b/dilos/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file usr/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_kedit.so diff --git a/dilos/core/tdeutils/debian/kedit-trinity.postinst b/dilos/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index b939c5451..000000000 --- a/dilos/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for kedit-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdeutils/debian/rules b/dilos/core/tdeutils/debian/rules index 1743d5d67..8c62e265d 100755 --- a/dilos/core/tdeutils/debian/rules +++ b/dilos/core/tdeutils/debian/rules @@ -45,9 +45,3 @@ DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trini DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity - -#shlibs_ver = 4:3.5.0-1 -#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) - -binary-install/superkaramba-trinity:: - rm -f debian/superkaramba/usr/share/doc/superkaramba/examples/globalMouse/xcursor.so diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.examples b/dilos/core/tdeutils/debian/superkaramba-trinity.examples deleted file mode 100644 index c02a032d2..000000000 --- a/dilos/core/tdeutils/debian/superkaramba-trinity.examples +++ /dev/null @@ -1,12 +0,0 @@ -superkaramba/examples/API -superkaramba/examples/autoHide -superkaramba/examples/globalMouse -superkaramba/examples/input_api -superkaramba/examples/input_example -superkaramba/examples/mouseDrag -superkaramba/examples/popupMenu -superkaramba/examples/README -superkaramba/examples/richtext -superkaramba/examples/taskBar -superkaramba/examples/template.py -superkaramba/examples/unicode diff --git a/dilos/core/tdeutils/debian/superkaramba-trinity.install b/dilos/core/tdeutils/debian/superkaramba-trinity.install index 3dd8dbdad..ae0ab4802 100644 --- a/dilos/core/tdeutils/debian/superkaramba-trinity.install +++ b/dilos/core/tdeutils/debian/superkaramba-trinity.install @@ -1,6 +1,7 @@ debian/tmp/usr/bin/superkaramba debian/tmp/usr/share/applications/tde/superkaramba.desktop debian/tmp/usr/share/apps/superkaramba/superkarambaui.rc +debian/tmp/usr/share/apps/superkaramba/examples debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/common debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/superkaramba/index.docbook diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian index 00770eec1..3458103f8 100644 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/dilos/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig usr/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig usr/lib/libtdeinit_irkick.so diff --git a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst b/dilos/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 423d9e98c..000000000 --- a/dilos/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e -if [ "${BASEDIR:=/}" = "/" ]; then - BASEDIR="" -fi - -#if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library -# ldconfig -#fi - -#DEBHELPER# - -exit 0 diff --git a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/dilos/core/tdevelop/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/core/tdevelop/debian/compat b/dilos/core/tdevelop/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/core/tdevelop/debian/compat +++ b/dilos/core/tdevelop/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/core/tdevelop/debian/control b/dilos/core/tdevelop/debian/control index 257910234..682225c31 100644 --- a/dilos/core/tdevelop/debian/control +++ b/dilos/core/tdevelop/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev Standards-Version: 3.8.4 Package: tdevelop-trinity @@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas Replaces: kdevelop-trinity (<< 4:14.0.0~) Breaks: kdevelop-trinity (<< 4:14.0.0~) Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4) -Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake-trinity, ruby, python-all, g++, kdevdesigner-trinity +Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity Description: An IDE for Unix/X11 TDevelop is an easy to use Integrated Development Environment for developing C/C++ applications under X11. It features diff --git a/dilos/core/tdevelop/debian/watch b/dilos/core/tdevelop/debian/watch deleted file mode 100644 index 18344a41a..000000000 --- a/dilos/core/tdevelop/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2 diff --git a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/arts/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/arts/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/arts/debian/compat b/dilos/dependencies/arts/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/arts/debian/compat +++ b/dilos/dependencies/arts/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/arts/debian/control b/dilos/dependencies/arts/debian/control index 980e2a77e..e850901d6 100644 --- a/dilos/dependencies/arts/debian/control +++ b/dilos/dependencies/arts/debian/control @@ -4,7 +4,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Sim <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !solaris-any], libaudio-dev, libaudiofile-dev, libglib2.0-dev, libmad0-dev, @@ -18,7 +18,7 @@ Architecture: all Section: sound Replaces: arts-trinity (<< 4:14.0.0~) Breaks: arts-trinity (<< 4:14.0.0~) -Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) +Depends: libartsc0-trinity (>= ${source:Version}), libarts1c2a-trinity (>= ${source:Version}) | libarts1t64-trinity (>= ${source:Version}) Description: sound system from the official TDE release TDE (the Trinity Desktop Environment) is a powerful Open Source graphical desktop environment for Unix workstations. It combines ease of use, diff --git a/dilos/dependencies/arts/debian/rules b/dilos/dependencies/arts/debian/rules index a81635c90..b97d4a1af 100755 --- a/dilos/dependencies/arts/debian/rules +++ b/dilos/dependencies/arts/debian/rules @@ -12,6 +12,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = c2a +endif + + DEB_CMAKE_EXTRA_FLAGS := \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -37,13 +45,13 @@ DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg \ -Xlibmcop.so.1.0.0 -Xlibqtmcop.so.1.0.0 -Xartsplay -Xartsd -Xartscat \ -Xartsshell -Xartsrec -Xmcopidl -PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity +PACKAGES_WITH_LIBS := libarts1$(DEB_TIME64_SUFFIX)-trinity libartsc0-trinity DEB_DH_MAKESHLIBS_ARGS_ALL := -V DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH)) -DEB_DH_MAKESHLIBS_ARGS_libarts1c2a-trinity := -V'libarts1c2a-trinity (>= 1.5.9)' -DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libarts1$(DEB_TIME64_SUFFIX)-trinity := -V'libarts1$(DEB_TIME64_SUFFIX)-trinity (>= 1.5.9)' +DEB_DH_MAKESHLIBS_ARGS_libartsc0-trinity := -V'libartsc0-trinity (>= 1.5.9)' #shlibs_ver = 1.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) @@ -54,3 +62,40 @@ binary-predeb/libarts1-trinity-dev:: ifeq (linux,$(DEB_HOST_ARCH_OS)) echo "libasound2-dev=libasound2-dev" >> debian/libarts1-trinity-dev.substvars endif + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libarts1c2a" | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libarts1$(DEB_TIME64_SUFFIX)$${a##*c2a} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libarts1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +endif + +clean:: + dh_testdir + dh_clean + +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libarts1$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/avahi-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/avahi-tqt/debian/compat b/dilos/dependencies/avahi-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/avahi-tqt/debian/compat +++ b/dilos/dependencies/avahi-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/avahi-tqt/debian/control b/dilos/dependencies/avahi-tqt/debian/control index 171d4678e..a21507b87 100644 --- a/dilos/dependencies/avahi-tqt/debian/control +++ b/dilos/dependencies/avahi-tqt/debian/control @@ -3,8 +3,8 @@ Section: net Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, - cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, + tde-cmake, ninja-build, gcc, pkg-config, libtqtinterface-dev, diff --git a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/dbus-1-tqt/debian/compat b/dilos/dependencies/dbus-1-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/compat +++ b/dilos/dependencies/dbus-1-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/dbus-1-tqt/debian/control b/dilos/dependencies/dbus-1-tqt/debian/control index 451be956d..20064441f 100644 --- a/dilos/dependencies/dbus-1-tqt/debian/control +++ b/dilos/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.8.3 diff --git a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/dbus-tqt/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/dbus-tqt/debian/compat b/dilos/dependencies/dbus-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/dbus-tqt/debian/compat +++ b/dilos/dependencies/dbus-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/dbus-tqt/debian/control b/dilos/dependencies/dbus-tqt/debian/control index 68eab2d63..d16fa5d28 100644 --- a/dilos/dependencies/dbus-tqt/debian/control +++ b/dilos/dependencies/dbus-tqt/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Drge <slomo@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libdbus-1-dev (>= 0.90) Standards-Version: 3.8.3 Package: libdbus-tqt-1-1c2 diff --git a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/libart-lgpl/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/libart-lgpl/debian/compat b/dilos/dependencies/libart-lgpl/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/libart-lgpl/debian/compat +++ b/dilos/dependencies/libart-lgpl/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/libart-lgpl/debian/control b/dilos/dependencies/libart-lgpl/debian/control index 85484ca75..7dde9f931 100644 --- a/dilos/dependencies/libart-lgpl/debian/control +++ b/dilos/dependencies/libart-lgpl/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.4 Package: libart-2.0-2 diff --git a/dilos/dependencies/python-tqt/debian/README.Debian b/dilos/dependencies/python-tqt/debian/README.Debian deleted file mode 100644 index 33603ec40..000000000 --- a/dilos/dependencies/python-tqt/debian/README.Debian +++ /dev/null @@ -1,4 +0,0 @@ -DOCUMENTATION -------------- -You can find doc and examples about PyTQt in the package python-tqt-doc - diff --git a/dilos/dependencies/python-tqt/debian/compat b/dilos/dependencies/python-tqt/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/dependencies/python-tqt/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/dependencies/python-tqt/debian/control b/dilos/dependencies/python-tqt/debian/control deleted file mode 100644 index 7af5607d6..000000000 --- a/dilos/dependencies/python-tqt/debian/control +++ /dev/null @@ -1,200 +0,0 @@ -Source: python-tqt -Section: python -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, python-support (>= 0.7.1) | dh-python -Standards-Version: 3.8.4 -XS-Python-Version: >= 2.3 -X-Python3-Version: >= 3.0 - -Package: python-tqt -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 -Provides: ${python:Provides} -Description: TQt bindings for Python - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python-tqt-dbg -Architecture: linux-any -Priority: extra -Replaces: python-tqt-dbg (<< 4:14.0.0~) -Breaks: python-tqt-dbg (<< 4:14.0.0~) -Section: debug -Depends: ${shlibs:Depends}, python-dbg, python-tqt (= ${binary:Version}), python-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python3-tqt -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 -Provides: ${python3:Provides} -Description: TQt bindings for Python 3 - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - At this moment PyTQt offers a vast subset of TQt API. There are - some minor issues related to the differences between C++ and Python - (types, etc), but usually you'll be able to write code pretty much the - same way in both languages (with syntax differences, of course) - -Package: python3-tqt-dbg -Architecture: any -Priority: extra -Section: debug -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt (= ${binary:Version}), python3-sip-tqt-dbg, ${misc:Depends} -Description: TQt bindings for Python 3 (debug extension) - Python binding module that allows use of TQt X Window toolkit v3. - You can use it to create portable graphics-capable scripts (there - are PyTQt versions for Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python-tqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends} -Replaces: python-tqt-gl (<< 4:14.0.0~) -Breaks: python-tqt-gl (<< 4:14.0.0~) -Suggests: python-tqt-doc -Provides: ${python:Provides} -Description: TQt OpenGL bindings for Python - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python-tqt-gl-dbg -Priority: extra -Section: debug -Replaces: python-tqt-gl-dbg (<< 4:14.0.0~) -Breaks: python-tqt-gl-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqt-gl (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python3-tqt-gl -Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), python3-opengl, ${misc:Depends} -Suggests: python-tqt-doc -Provides: ${python3:Provides} -Description: TQt OpenGL bindings for Python 3 - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - -Package: python3-tqt-gl-dbg -Priority: extra -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqt-gl (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt OpenGL bindings for Python 3 (debug extension) - Python binding module that allows use of the OpenGL facilities - offered by the TQt X Window toolkit v3. You can use it to create - portable graphics-capable scripts (there are PyTQt versions for - Linux, Windows and MacOS X). - . - This package contains the extension built for the Python debug interpreter. - -Package: python-tqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt (= ${binary:Version}), ${misc:Depends} -Replaces: python-tqtext (<< 4:14.0.0~) -Breaks: python-tqtext (<< 4:14.0.0~) -Provides: ${python:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python-tqtext-dbg -Priority: extra -Section: debug -Replaces: python-tqtext-dbg (<< 4:14.0.0~) -Breaks: python-tqtext-dbg (<< 4:14.0.0~) -Architecture: linux-any -Depends: ${shlibs:Depends}, python-dbg, python-tqtext (= ${binary:Version}), python-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python3-tqtext -Architecture: any -Depends: ${shlibs:Depends}, ${python3:Depends}, python3-tqt (= ${binary:Version}), ${misc:Depends} -Provides: ${python3:Provides} -Description: TQt extensions for PyTQt - PyTQt Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: python3-tqtext-dbg -Priority: extra -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, python3-all-dbg, python3-tqtext (= ${binary:Version}), python3-tqt-dbg (= ${binary:Version}), ${misc:Depends} -Description: TQt debug extensions for PyTQt - PyTQt debug Extensions. Contains: - . - * QScintilla: a featureful TQt source code editing component based - on Scintilla. - -Package: pytqt-tools -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: pytqt-tools (<< 4:14.0.0~) -Breaks: pytqt-tools (<< 4:14.0.0~) -Description: pyuic and pylupdate for TQt - pyuic is the PyTQt counterpart for TQt's uic. It takes an XML - user interface file and generates Python code. - . - 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} -Suggests: python3-sip-tqt-dev | python-sip-tqt-dev -Replaces: python-tqt-dev (<< 4:14.0.0~) -Breaks: python-tqt-dev (<< 4:14.0.0~) -Architecture: all -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 -Section: doc -Architecture: all -Replaces: python-tqt-doc (<< 4:14.0.0~) -Breaks: python-tqt-doc (<< 4:14.0.0~) -Depends: ${misc:Depends} -Suggests: python-tqt -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-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/python-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python-tqt-gl.install deleted file mode 100644 index d58e26ab5..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtgl.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqt.install b/dilos/dependencies/python-tqt/debian/python-tqt.install deleted file mode 100644 index 4ec8f4d19..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtcanvas.so -usr/lib/python2.*/*-packages/python_tqt/qtnetwork.so -usr/lib/python2.*/*-packages/python_tqt/qtsql.so -usr/lib/python2.*/*-packages/python_tqt/qttable.so -usr/lib/python2.*/*-packages/python_tqt/qtui.so -usr/lib/python2.*/*-packages/python_tqt/qtxml.so -usr/lib/python2.*/*-packages/python_tqt/qt.so diff --git a/dilos/dependencies/python-tqt/debian/python-tqtext.install b/dilos/dependencies/python-tqt/debian/python-tqtext.install deleted file mode 100644 index 00345e2e7..000000000 --- a/dilos/dependencies/python-tqt/debian/python-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/python_tqt/qtext.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install b/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install deleted file mode 100644 index ead3920cf..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqt-gl.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtgl.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqt.install b/dilos/dependencies/python-tqt/debian/python3-tqt.install deleted file mode 100644 index 4ceda8c75..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqt.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtcanvas.so -usr/lib/python3*/*-packages/python_tqt/qtnetwork.so -usr/lib/python3*/*-packages/python_tqt/qtsql.so -usr/lib/python3*/*-packages/python_tqt/qttable.so -usr/lib/python3*/*-packages/python_tqt/qtui.so -usr/lib/python3*/*-packages/python_tqt/qtxml.so -usr/lib/python3*/*-packages/python_tqt/qt.so diff --git a/dilos/dependencies/python-tqt/debian/python3-tqtext.install b/dilos/dependencies/python-tqt/debian/python3-tqtext.install deleted file mode 100644 index 4d58d8a28..000000000 --- a/dilos/dependencies/python-tqt/debian/python3-tqtext.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python3*/*-packages/python_tqt/qtext.so diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages b/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages deleted file mode 100644 index 7d27d0034..000000000 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/pylupdate.1 -debian/manpages/pyuic.1 diff --git a/dilos/dependencies/python-tqt/debian/watch b/dilos/dependencies/python-tqt/debian/watch deleted file mode 100644 index 506321d38..000000000 --- a/dilos/dependencies/python-tqt/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.riverbankcomputing.com/software/pyqt/download3 \ - /static/Downloads/PyQt3/PyQt-x11-gpl-([.\d]*)\.tar\.gz diff --git a/dilos/dependencies/pytqt/debian/README.Debian b/dilos/dependencies/pytqt/debian/README.Debian new file mode 100644 index 000000000..201336f3a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/README.Debian @@ -0,0 +1,3 @@ +DOCUMENTATION +------------- +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/pytqt/debian/changelog index 95e2f0cce..e834a6ca8 100644 --- a/dilos/dependencies/python-tqt/debian/changelog +++ b/dilos/dependencies/pytqt/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/pytqt/debian/compat b/dilos/dependencies/pytqt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/dependencies/pytqt/debian/control b/dilos/dependencies/pytqt/debian/control new file mode 100644 index 000000000..d363c373f --- /dev/null +++ b/dilos/dependencies/pytqt/debian/control @@ -0,0 +1,128 @@ +Source: pytqt +Section: python +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg [!solaris-any], libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], libtqscintilla-dev, dh-python +Standards-Version: 3.8.4 +XS-Python-Version: >= 2.3 +X-Python3-Version: >= 3.0 + +Package: python3-pytqt +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, ${py3sip-tqt:Depends}, ${misc:Depends} +Suggests: python3-pytqt-gl, pytqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql +Provides: ${python3:Provides} +Replaces: python3-tqt +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 + are PyTQt versions for Linux, Windows and MacOS X). + . + At this moment PyTQt offers a vast subset of TQt API. There are + some minor issues related to the differences between C++ and Python + (types, etc), but usually you'll be able to write code pretty much the + same way in both languages (with syntax differences, of course) + +Package: python3-pytqt-dbg +Architecture: any +Priority: extra +Section: debug +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 + are PyTQt versions for Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python3-pytqt-gl +Architecture: any +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt (= ${binary:Version}), python3-opengl, ${misc:Depends} +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-pytqt-gl-dbg +Priority: extra +Section: debug +Architecture: any +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 + portable graphics-capable scripts (there are PyTQt versions for + Linux, Windows and MacOS X). + . + This package contains the extension built for the Python debug interpreter. + +Package: python3-pytqtext +Architecture: any +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: + . + * TQScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: python3-pytqtext-dbg +Priority: extra +Section: debug +Architecture: any +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: + . + * TQScintilla: a featureful TQt source code editing component based + on Scintilla. + +Package: pytqt-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: pytqt-tools (<< 4:14.0.0~) +Breaks: pytqt-tools (<< 4:14.0.0~) +Description: pyuic and pylupdate for TQt + pyuic is the PyTQt counterpart for TQt's uic. It takes an XML + user interface file and generates Python code. + . + pylupdate is the counterpart for TQt's lupdate. It updates TQt + Linguist translation files from Python code. + +Package: pytqt-dev +Depends: python3-pytqt (= ${binary:Version}), ${misc:Depends} +Suggests: python3-sip-tqt-dev, sip-tqt-dev +Replaces: python-tqt-dev +Breaks: python-tqt-dev +Architecture: all +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: pytqt-doc +Section: doc +Architecture: all +Replaces: python-tqt-doc +Breaks: python-tqt-doc +Depends: ${misc:Depends} +Suggests: python3-pytqt +Description: TQt bindings for Python - Documentation and examples + Documentation and examples for the PyTQt (bindings that allow + the use of TQt library from within a Python script). diff --git a/dilos/dependencies/python-tqt/debian/copyright b/dilos/dependencies/pytqt/debian/copyright index 715a83f24..715a83f24 100644 --- a/dilos/dependencies/python-tqt/debian/copyright +++ b/dilos/dependencies/pytqt/debian/copyright diff --git a/dilos/dependencies/python-tqt/debian/docs b/dilos/dependencies/pytqt/debian/docs index 50bd824bb..50bd824bb 100644 --- a/dilos/dependencies/python-tqt/debian/docs +++ b/dilos/dependencies/pytqt/debian/docs diff --git a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 index 4d2c8919a..9e68e9605 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pylupdate.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytqlupdate.1 @@ -1,4 +1,4 @@ -.TH pylupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.TH pytqlupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- .\" .\" Copyright 2001 Trolltech AS. All rights reserved. .\" Copyright 2004 Ricardo Cardenes. All rights reserved. @@ -14,20 +14,20 @@ .\" See http://www.trolltech.com/gpl/ for GPL licensing information. .\" .SH NAME -pylupdate \- update Qt Linguist translation files from Python sources +pytqlupdate \- update TQt Linguist translation files from Python sources .SH SYNOPSIS -.B pylupdate +.B pytqlupdate .RI "[ " options " ] " project-file... .SH DESCRIPTION This page documents the -.B Qt Linguist Update -tool for the Qt GUI toolkit, for Python source files. -.B PyLupdate -reads a qmake project file (.pro file), finds the translatable +.B TQt Linguist Update +tool for the TQt GUI toolkit, for Python source files. +.B PyTQLupdate +reads a tqmake project file (.pro file), finds the translatable strings in the specified source, header and interface files, and updates the translation files (.ts files) specified in it. The translation files are given to the translator who uses -.B Qt Linguist +.B TQt Linguist to read the files and insert the translations. .PP The .ts file format is a simple human-readable XML format that can be @@ -66,15 +66,15 @@ TRANSLATIONS = gnomovision_dk.ts \\ .in -4 .PP When running -.B pylupdate +.B pytqlupdate on this project file, the translatable strings in all the files listed in the SOURCES and FORMS entries will be put in the translation files listed in the TRANSLATIONS entry. Previous translations will be reused as far as possible, and translated strings that have vanished from the source files are marked obsolete. .SH "SEE ALSO" -.BR lupdate (1), -.BR lrelease (1) +.BR tqlupdate (1), +.BR tqlrelease (1) and .BR http://doc.trolltech.com/i18n.html .SH AUTHOR diff --git a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 index f1ffa41ff..e456074a2 100644 --- a/dilos/dependencies/python-tqt/debian/manpages/pyuic.1 +++ b/dilos/dependencies/pytqt/debian/manpages/pytquic.1 @@ -1,26 +1,26 @@ -.TH pyuic 1 "25 June 2001" \" -*- nroff -*- +.TH pytquic 1 "25 June 2001" \" -*- nroff -*- .SH NAME -pyuic \- Qt user interface compiler for Python +pytquic \- TQt user interface compiler for Python .SH SYNOPSIS -.B pyuic +.B pytquic [options] <uifile> .SH DESCRIPTION This page documents the .B Python User Interface Compiler -for the Qt GUI application framework. The -.B pyuic -reads a user interface definition file (.ui) in XML as generated by Qt +for the TQt GUI application framework. The +.B pytquic +reads a user interface definition file (.ui) in XML as generated by TQt Designer and creates corresponding Python module. .PP .PP Generate implementation: .br -.I "\fB pyuic [options] \fI<uifile>" +.I "\fB pytquic [options] \fI<uifile>" .br .PP Generate image collection: .br -.I "\fB pyuic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." +.I "\fB pytquic [options] -embed \fI<project> <image1> <image2> <image3>\fP ..." .br \fI<project>\fP: project name \fI<image[1..n]>\fP: image files @@ -28,7 +28,7 @@ Generate image collection: .PP Generate subclass implementation: .br -.I "\fB pyuic [options] -subimpl <classname> \fI<uifile>" +.I "\fB pytquic [options] -subimpl <classname> \fI<uifile>" .br \fI<classname>\fP: name of the subclass to generate .PP @@ -57,13 +57,13 @@ Generate extra code to test the class Generate extra code to test but not display the class .TP .I -version -Display version of pyuic +Display version of pytquic .TP .I -help Display this information .SH "SEE ALSO" -.BR uic (1) +.BR tquic (1) .BR http://www.trolltech.com/ diff --git a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff index 131e9dbdc..131e9dbdc 100644 --- a/dilos/dependencies/python-tqt/debian/patches/debian_configure_changes.diff +++ b/dilos/dependencies/pytqt/debian/patches/debian_configure_changes.diff diff --git a/dilos/dependencies/python-tqt/debian/patches/series b/dilos/dependencies/pytqt/debian/patches/series index 573069d8d..573069d8d 100644 --- a/dilos/dependencies/python-tqt/debian/patches/series +++ b/dilos/dependencies/pytqt/debian/patches/series diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install new file mode 100644 index 000000000..dd7cab0c0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt-gl.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtgl.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqt.install b/dilos/dependencies/pytqt/debian/python3-pytqt.install new file mode 100644 index 000000000..f18aeefd0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqt.install @@ -0,0 +1,7 @@ +usr/lib/python3*/*-packages/PyTQt/tqtcanvas.so +usr/lib/python3*/*-packages/PyTQt/tqtnetwork.so +usr/lib/python3*/*-packages/PyTQt/tqtsql.so +usr/lib/python3*/*-packages/PyTQt/tqttable.so +usr/lib/python3*/*-packages/PyTQt/tqtui.so +usr/lib/python3*/*-packages/PyTQt/tqtxml.so +usr/lib/python3*/*-packages/PyTQt/tqt.so diff --git a/dilos/dependencies/pytqt/debian/python3-pytqtext.install b/dilos/dependencies/pytqt/debian/python3-pytqtext.install new file mode 100644 index 000000000..511c1c0c4 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/python3-pytqtext.install @@ -0,0 +1 @@ +usr/lib/python3*/*-packages/PyTQt/tqtext.so diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.dirs b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs new file mode 100644 index 000000000..735874a93 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/tqt diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.install b/dilos/dependencies/pytqt/debian/pytqt-dev.install new file mode 100644 index 000000000..de146d1b0 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/tqt + diff --git a/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides b/dilos/dependencies/pytqt/debian/pytqt-dev.lintian-overrides new file mode 100644 index 000000000..1a3799d59 --- /dev/null +++ b/dilos/dependencies/pytqt/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/tqt/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtaxcontainer/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtcanvas/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtext/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtgl/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtnetwork/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtpe/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtsql/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqttable/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtui/copying.sip +pytqt-dev binary: extra-license-file usr/share/sip-tqt/tqt/tqtxml/copying.sip diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.dirs b/dilos/dependencies/pytqt/debian/pytqt-doc.dirs new file mode 100644 index 000000000..8067955f9 --- /dev/null +++ b/dilos/dependencies/pytqt/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/pytqt/debian/pytqt-doc.examples index c48447a3e..c48447a3e 100644 --- a/dilos/dependencies/python-tqt/debian/python-tqt-doc.examples +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.examples diff --git a/dilos/dependencies/pytqt/debian/pytqt-doc.install b/dilos/dependencies/pytqt/debian/pytqt-doc.install new file mode 100644 index 000000000..273120f41 --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-doc.install @@ -0,0 +1 @@ +doc/PyTQt.html usr/share/doc/pytqt-doc/html diff --git a/dilos/dependencies/python-tqt/debian/pytqt-tools.install b/dilos/dependencies/pytqt/debian/pytqt-tools.install index 1df36c612..1df36c612 100644 --- a/dilos/dependencies/python-tqt/debian/pytqt-tools.install +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.install diff --git a/dilos/dependencies/pytqt/debian/pytqt-tools.manpages b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages new file mode 100644 index 000000000..a8224067a --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqt-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/pytqlupdate.1 +debian/manpages/pytquic.1 diff --git a/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py new file mode 100644 index 000000000..c25f1f56e --- /dev/null +++ b/dilos/dependencies/pytqt/debian/pytqtconfig_py3.py @@ -0,0 +1,17 @@ +# import the pytqtconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages', 'PyTQt')) + +if 'd' in sys.abiflags: + try: + from pytqtconfig_d import * + from pytqtconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytqtconfig; package python3-pytqt-dbg not installed') +else: + from pytqtconfig_nd import * + from pytqtconfig_nd import _pkg_config, _default_macros diff --git a/dilos/dependencies/python-tqt/debian/rules b/dilos/dependencies/pytqt/debian/rules index 85cc0b06d..d7427e40a 100755 --- a/dilos/dependencies/python-tqt/debian/rules +++ b/dilos/dependencies/pytqt/debian/rules @@ -3,8 +3,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -15,9 +13,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -26,7 +28,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 @@ -39,10 +41,7 @@ else endif CXXFLAGS += "-I/usr/include/tqt" -PYTHONS := $(shell pyversions -vr debian/control) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vr) DEB_PARALLEL_JOBS ?= 40 @@ -59,9 +58,9 @@ build-%/configure-stamp: -c -n /usr/include/tqt3 \ -e python$* \ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -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="" @@ -74,9 +73,9 @@ dbg-build-%/configure-stamp: | python$*-dbg ../configure.py \ -c -n /usr/include/tqt3 \ -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(DEB_PARALLEL_JOBS) \ - -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ + -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="" @@ -101,12 +100,15 @@ install-indep: configure dh_testroot dh_clean -k -i dh_installdirs -i - for version in ${PYTHONS}; do\ - pylib=$$(python$$version -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')/python_tqt;\ - mkdir -p debian/python-tqt-dev/$$pylib;\ - install -m 644 -o root -g root build-$$version/pyqtconfig.py debian/python-tqt-dev/$$pylib;\ + for version in ${PYTHONS}; do \ + pylibdev=debian/pytqt-dev/$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))")/dist-packages/PyTQt;\ + mkdir -p $$pylibdev;\ + install -m 644 -o root -g root build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_nd.py; \ + install -m 644 -o root -g root dbg-build-$$version/pytqtconfig.py $$pylibdev/pytqtconfig_d.py; \ done dh_install -i + mkdir -p debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt + install -m 644 -o root -g root debian/pytqtconfig_py3.py debian/pytqt-dev/usr/lib/python3/dist-packages/PyTQt/pytqtconfig.py install-arch: build dh_testdir @@ -114,7 +116,7 @@ install-arch: build dh_clean -k -a dh_installdirs -a - for p in $(PYTHONS) ; do \ + for p in ${PYTHONS} ; do \ $(MAKE) -f debian/rules install-arch-$$p;\ done @@ -130,29 +132,16 @@ 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)/python_tqt - cp -a debian/tmp/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py \ - debian/python3-tqt/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/__init__.py -# mkdir -p debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \ -# debian/python3-tqt-gl-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/ -# mkdir -p debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python3-tqt-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/qtext.so \ -# debian/python3-tqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/python_tqt/ - -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-tqt-dbg - mkdir -p debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt - cp -a debian/tmp/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py \ - debian/python-tqt/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/__init__.py -# mkdir -p debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtgl.so \ -# debian/python-tqt-gl-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/ -# mkdir -p debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt -# mv debian/python-tqt-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/qtext.so \ -# debian/python-tqtext-dbg/usr/lib/python$*/$(call py_sitename,$$version)/python_tqt/ +# $(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-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/tqtgl.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/tqtext.so \ +# debian/python3-pytqtext-dbg/usr/lib/python3.$*/$(call py_sitename,$$version)/PyTQt/ clean: dh_testdir @@ -175,14 +164,8 @@ binary-common: # dh_strip dh_compress -X.py -X.bmp -X.ui -X.sql dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning - dh_sip_tqt - dh_sip3_tqt + dh_py3sip_tqt dh_lintian dh_installdeb dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/dilos/common/cmake/debian/source/format b/dilos/dependencies/pytqt/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/common/cmake/debian/source/format +++ b/dilos/dependencies/pytqt/debian/source/format diff --git a/dilos/common/cmake/debian/source/options b/dilos/dependencies/pytqt/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/common/cmake/debian/source/options +++ b/dilos/dependencies/pytqt/debian/source/options diff --git a/dilos/dependencies/sip4-tqt/debian/compat b/dilos/dependencies/sip4-tqt/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/sip4-tqt/debian/compat +++ b/dilos/dependencies/sip4-tqt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/sip4-tqt/debian/control b/dilos/dependencies/sip4-tqt/debian/control index 08cddf311..2c7df285c 100644 --- a/dilos/dependencies/sip4-tqt/debian/control +++ b/dilos/dependencies/sip4-tqt/debian/control @@ -4,49 +4,27 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg [!solaris-any], python3-all-dev, python3-all-dbg [!solaris-any], python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex +Build-Depends: debhelper (>= 10~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex Standards-Version: 3.8.4 XS-Python-Version: all X-Python3-Version: >= 3.0 -Package: python-sip-tqt +Package: python3-sip-tqt Architecture: any Section: python -Replaces: python-sip-tqt (<< 4:14.0.0~) -Breaks: python-sip-tqt (<< 4:14.0.0~) -Provides: ${python:Provides} -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4 (<< 4.10) -Description: Python/C++ bindings generator runtime library - SIP-TQt is a tool for generating bindings for C++ classes with some ideas - borrowed from SWIG, but capable of tighter bindings because of its - specificity towards C++ and Python. - -Package: python-sip-tqt-dbg -Priority: extra -Architecture: linux-any -Replaces: python-sip-tqt-dbg (<< 4:14.0.0~) -Breaks: python-sip-tqt-dbg (<< 4:14.0.0~) -Section: debug -Provides: ${python:Provides} -Depends: python-sip-tqt (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends} -Conflicts: python-sip4-dbg (<< 4.10) -Description: Python/C++ bindings generator runtime library (debug extension) +Provides: ${python3:Provides} +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: Python 3/C++ bindings generator runtime library SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - This package contains the extension built for the Python debug interpreter. + This package provides the SIP-TQt module for Python 3 -Package: python-sip-tqt-dev +Package: python3-sip-tqt-dev Architecture: any Section: python -Replaces: python-sip-tqt-dev (<< 4:14.0.0~) -Breaks: python-sip-tqt-dev (<< 4:14.0.0~) -Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} -Recommends: python-sip-tqt (>= ${source:Version}) -Provides: python-sip-dev, python-sip4-dev, sip4 -Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10) +Depends: ${python3:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} Description: Python/C++ bindings generator development files SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its @@ -67,25 +45,26 @@ Description: Python/C++ bindings generator development files - static member functions. . This package contains the code generator tool and the development headers - needed to develop Python bindings with sip-tqt. + needed to develop Python 3 bindings with sip-tqt. -Package: python3-sip-tqt +Package: python3-sip-tqt-dbg Architecture: any -Section: python -Provides: ${python3:Provides} -Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Section: debug +Priority: extra +Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends} Description: Python 3/C++ bindings generator runtime library SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its specificity towards C++ and Python. . - This package provides SIP-TQt with support for Python 3 + This package provides the SIP-TQt module for the debug build of the Python 3. -Package: python3-sip-tqt-dev +Package: sip-tqt-dev Architecture: any Section: python -Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends} -Recommends: python3-sip-tqt (>= ${source:Version}) +Depends: ${python3:Depends}, ${shlibs:Depends} +Breaks: python-sip-tqt-dev (<< 4:14.1.0~) +Recommends: python3-sip-tqt-dev Description: Python/C++ bindings generator development files SIP-TQt is a tool for generating bindings for C++ classes with some ideas borrowed from SWIG, but capable of tighter bindings because of its @@ -105,17 +84,4 @@ Description: Python/C++ bindings generator development files - global class instances - static member functions. . - This package contains the code generator tool and the development headers - needed to develop Python 3 bindings with sip-tqt. - -Package: python3-sip-tqt-dbg -Architecture: any -Section: debug -Priority: extra -Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends} -Description: Python 3/C++ bindings generator runtime library - SIP-TQt is a tool for generating bindings for C++ classes with some ideas - borrowed from SWIG, but capable of tighter bindings because of its - specificity towards C++ and Python. - . - This package contains debugging symbols for python3-sip-tqt + This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt. diff --git a/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt new file mode 100644 index 000000000..a59025f15 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/dh_py3sip_tqt @@ -0,0 +1,49 @@ +#!/usr/bin/perl -w + +=head1 NAME + +dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_py3sip_tqt> + +=head1 DESCRIPTION + +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be +used by Python 3 extensions built with sip-tqt in order to depend on a version of +python3-sip-tqt that exports the correct public API. + +=cut + +init(); + +my $sip_tqt_provides = `dpkg -s python3-sip-tqt`; +$sip_tqt_provides =~ /^Provides:\s*(.+)$/m; + +my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1))); + +my $sip_tqt_api_version=$sip_tqt_apis[-1]; + +foreach my $package (@{$dh{DOPACKAGES}}) { + addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is a part of python3-sip-tqt-dev but is made to work with debhelper. + +=head1 AUTHORS + +Torsten Marek <shlomme@debian.org> +Adapted for Python3 by +Slávek Banko <slavek.banko@axis.cz> + +=cut diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt deleted file mode 100644 index 9b6387689..000000000 --- a/dilos/dependencies/sip4-tqt/debian/dh_sip3_tqt +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip - -=cut - -use strict; -use Debian::Debhelper::Dh_Lib; - -=head1 SYNOPSIS - -B<dh_sip3_tqt> - -=head1 DESCRIPTION - -dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be -used by Python 3 extensions built with sip3-tqt in order to depend on a version of -python3-sip-tqt that exports the correct public API. - -=cut - -init(); - -my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`; -$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m; - -my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1))); - -my $sip3_tqt_api_version=$sip3_tqt_apis[-1]; - -foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version); -} - -=head1 SEE ALSO - -L<debhelper(7)> - -This program is a part of python3-sip-tqt-dev but is made to work with debhelper. - -=head1 AUTHORS - -Torsten Marek <shlomme@debian.org> -Adapted for Python3 by -Slávek Banko <slavek.banko@axis.cz> - -=cut diff --git a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt b/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt deleted file mode 100644 index c92f23529..000000000 --- a/dilos/dependencies/sip4-tqt/debian/dh_sip_tqt +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt - -=cut - -use strict; -use Debian::Debhelper::Dh_Lib; - -=head1 SYNOPSIS - -B<dh_sip_tqt> - -=head1 DESCRIPTION - -dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be -used by Python extensions built with sip-tqt in order to depend on a version of -python-sip-tqt that exports the correct public API. - -=cut - -init(); - -my $sip_tqt_provides = `dpkg -s python-sip-tqt`; -$sip_tqt_provides =~ /^Provides:\s*(.+)$/m; - -my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1))); - -my $sip_tqt_api_version=$sip_tqt_apis[-1]; - -foreach my $package (@{$dh{DOPACKAGES}}) { - addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version); -} - -=head1 SEE ALSO - -L<debhelper(7)> - -This program is a part of python-sip-tqt-dev but is made to work with debhelper. - -=head1 AUTHORS - -Torsten Marek <shlomme@debian.org> - -=cut diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 index a4284326a..8539600cf 100644 --- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 +++ b/dilos/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1 @@ -123,20 +123,20 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "DH_SIP3_TQT 1" -.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" +.IX Title "DH_PY3SIP_TQT 1" +.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l .nh .SH "NAME" -dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt +dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBdh_sip3_tqt\fR +\&\fBdh_py3sip_tqt\fR .SH "DESCRIPTION" .IX Header "DESCRIPTION" -dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by +dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt that exports the correct public \s-1API\s0. .SH "SEE ALSO" diff --git a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 deleted file mode 100644 index 6f0edd8f1..000000000 --- a/dilos/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 +++ /dev/null @@ -1,149 +0,0 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "DH_SIP_TQT 1" -.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "NAME" -dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -\&\fBdh_sip_tqt\fR -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be used by -Python extensions built with sip-tqt in order to depend on a version of python-sip-tqt -that exports the correct public \s-1API\s0. -.SH "SEE ALSO" -.IX Header "SEE ALSO" -\&\fIdebhelper\fR\|(7) -.PP -This program is a part of python-sip-tqt-dev but is made to work with debhelper. -.SH "AUTHORS" -.IX Header "AUTHORS" -Torsten Marek <shlomme@debian.org> diff --git a/dilos/dependencies/sip4-tqt/debian/patches/series b/dilos/dependencies/sip4-tqt/debian/patches/series index 0b31a69ff..e69de29bb 100644 --- a/dilos/dependencies/sip4-tqt/debian/patches/series +++ b/dilos/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +0,0 @@ -# siputils_debian_changes.diff -# siputils_objdir_module_fix.diff diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff deleted file mode 100644 index 2640f57c2..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_debian_changes.diff +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_siputils.dpatch by Torsten Marek <shlomme@debian.org> -Index: sip4-qt3-4.10/siputils.py -=================================================================== ---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100 -+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100 -@@ -718,7 +718,8 @@ - - libs.extend(self.optional_list("LIBS_WINDOWS")) - -- lflags.extend(self._platform_rpaths(rpaths.as_list())) -+ # Don't append any rpaths -+ #lflags.extend(self._platform_rpaths(rpaths.as_list())) - - # Save the transformed values. - self.CFLAGS.set(cflags) -@@ -843,6 +844,15 @@ - clib is the library name in cannonical form. - framework is set of the library is implemented as a MacOS framework. - """ -+ ################################################################## -+ # Generally, the linker is intelligent enough not to need this # -+ # additional information! # -+ # And Qt4's pkg-config and prl files are broken # -+ # Changed for Debian packaging, Torsten Marek <shlomme@gmx.net> # -+ ################################################################## -+ -+ return [] -+ - prl_libs = [] - - if self.generator in ("MSVC", "MSVC.NET", "BMAKE"): diff --git a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff deleted file mode 100644 index 3c4570b21..000000000 --- a/dilos/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: b/siputils.py -=================================================================== ---- a/siputils.py -+++ b/siputils.py -@@ -1547,9 +1547,12 @@ - mfile.write("\n$(OFILES): $(HFILES)\n") - - for mf in self._build["tqmoc_headers"].split(): -- root, discard = os.path.splitext(mf) -+ root, _ = os.path.splitext(mf) - cpp = "tqmoc_" + root + ".cpp" - -+ if self._src_dir != self.dir: -+ mf = os.path.join(self._src_dir, mf) -+ - mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) - diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install deleted file mode 100644 index 8b1c81fa9..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/* -../../debian/dh_sip_tqt /usr/bin/ diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links deleted file mode 100644 index fdd5af4cc..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages deleted file mode 100644 index b3b0eafea..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/manpages/sip-tqt.1 -debian/manpages/dh_sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install b/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install deleted file mode 100644 index e9db89432..000000000 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python2.*/*-packages/sip_tqt.so diff --git a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs index 416a453aa..416a453aa 100644 --- a/dilos/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install index 43fbfa385..8c6fee21f 100644 --- a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install @@ -1 +1 @@ -../../debian/dh_sip3_tqt /usr/bin/ +../dh_py3sip_tqt /usr/bin/ diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links new file mode 100644 index 000000000..47086f7df --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js diff --git a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages index db0d5945a..42f51bda1 100644 --- a/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages +++ b/dilos/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages @@ -1 +1 @@ -debian/manpages/dh_sip3_tqt.1 +debian/manpages/dh_py3sip_tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/pyversions b/dilos/dependencies/sip4-tqt/debian/pyversions deleted file mode 100644 index 57a7586e4..000000000 --- a/dilos/dependencies/sip4-tqt/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.3- diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index 2786cf6f6..9f54ca009 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -12,9 +12,12 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS -PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1 PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1 PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]") @@ -28,12 +31,9 @@ else CFLAGS += -O2 -g endif -PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd) - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +PYTHONS := $(shell py3versions -vr) --include /usr/share/python/python.mk +-include /usr/share/python3/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages @@ -92,7 +92,6 @@ install-arch: build dh_testdir dh_testroot dh_prep -a - echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars dh_installdirs -a # This is needed to enforce that the install-arch-% rules are @@ -104,16 +103,10 @@ install-arch: build $(MAKE) -f debian/rules install-arch-$$p;\ done -# for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \ -# b=$$(basename $$i .so); \ -# mv $$i $$(dirname $$i)/$${b}_d.so; \ -# done # for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f -# find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \; # find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f # find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \; @@ -126,29 +119,14 @@ install-arch-3.%: install -m 644 -o root -g root debian/sip_tqt_config_py3.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config.py install -m 644 -o root -g root build-3.$*/sip_tqt_config.py debian/python3-sip-tqt/usr/lib/python3.$*/dist-packages/sip_tqt_config_nd.py # install -m 644 -o root -g root dbg-build-3.$*/sip_tqt_config.py debian/python3-sip-tqt-dbg/usr/lib/python3.$*/dist-packages/sip_tqt_config_d.py - mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') - install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/ -# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') -# ln -s ../$$(python3.$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \ -# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h + mkdir -p debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))') + install -m 644 -o root -g root siplib/sip-tqt.h debian/python3-sip-tqt-dev$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))')/ +# mkdir -p debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))') +# ln -s ../$$(python3.$* -c 'import sysconfig; print (sysconfig.get_path("include"))' | xargs basename)/sip-tqt.h \ +# debian/python3-sip-tqt-dev/$$(python3.$*-dbg -c 'import sysconfig; print (sysconfig.get_path("include"))')/sip-tqt.h mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages -install-arch-%: - $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp -# $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg - mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/ - install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py - install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py -# install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py - mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') - install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/ -# mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())') -# ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \ -# debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h - mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*) - install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*) - # Must not depend on anything. This is to be called by # binary-arch/binary-indep @@ -163,24 +141,14 @@ binary-common: dh_link # don't call strip twice, it's in binary-common ifneq (,$(findstring -a, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-sip-tqt-dev - DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg - rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg -# mkdir -p debian/python-sip-tqt-dbg/usr/share/doc -# ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg # mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc # ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg endif dh_compress -X.inv dh_fixperms -ifneq (dh_pysupport,${DH_PYTHON2}) - ${DH_PYTHON2} --no-dbg-cleaning -else - ${DH_PYTHON2} -endif dh_python3 --no-dbg-cleaning dh_installdeb dh_shlibdeps diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install new file mode 100644 index 000000000..07438bc04 --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.install @@ -0,0 +1 @@ +usr/bin/sip-tqt diff --git a/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages new file mode 100644 index 000000000..1570b539a --- /dev/null +++ b/dilos/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages @@ -0,0 +1 @@ +debian/manpages/sip-tqt.1 diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py deleted file mode 100644 index 33ebcb65b..000000000 --- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config.py +++ /dev/null @@ -1,13 +0,0 @@ -# import the sip_tqt_config.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from sip_tqt_config_d import * - from sip_tqt_config_d import _pkg_config, _default_macros - except ImportError, msg: - raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed' -else: - from sip_tqt_config_nd import * - from sip_tqt_config_nd import _pkg_config, _default_macros diff --git a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py index fb27b6475..a937df69a 100644 --- a/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py +++ b/dilos/dependencies/sip4-tqt/debian/sip_tqt_config_py3.py @@ -1,8 +1,12 @@ # import the sip_tqt_config.py for the normal or the debug build +import os import sys +import sysconfig -if getattr(sys, "pydebug", False): +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: try: from sip_tqt_config_d import * from sip_tqt_config_d import _pkg_config, _default_macros diff --git a/dilos/common/cmake/debian/cdbs/cmake-versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl index 6bbbec325..6bbbec325 100644 --- a/dilos/common/cmake/debian/cdbs/cmake-versions.pl +++ b/dilos/dependencies/tde-cmake/debian/cdbs/cmake-versions.pl diff --git a/dilos/common/cmake/debian/cdbs/debian-tde.mk b/dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/common/cmake/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tde-cmake/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/common/cmake/debian/cdbs/versions.pl b/dilos/dependencies/tde-cmake/debian/cdbs/versions.pl index 1b110f7af..1b110f7af 100644 --- a/dilos/common/cmake/debian/cdbs/versions.pl +++ b/dilos/dependencies/tde-cmake/debian/cdbs/versions.pl diff --git a/dilos/common/cmake/debian/changelog b/dilos/dependencies/tde-cmake/debian/changelog index a5303f852..368e8ed98 100644 --- a/dilos/common/cmake/debian/changelog +++ b/dilos/dependencies/tde-cmake/debian/changelog @@ -1,3 +1,9 @@ +tde-cmake (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low + + * Move from common submodule to dependencies. + + -- Slávek Banko <slavek.banko@axis.cz> Fri, 13 Jan 2023 15:36:28 +0100 + cmake-trinity (4:14.1.0~pre-0debian10.0.0+0) buster; urgency=low * Initial release as a standalone package. diff --git a/dilos/dependencies/tde-cmake/debian/compat b/dilos/dependencies/tde-cmake/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/dependencies/tde-cmake/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/common/cmake/debian/control b/dilos/dependencies/tde-cmake/debian/control index 50ea830ef..54248affb 100644 --- a/dilos/common/cmake/debian/control +++ b/dilos/dependencies/tde-cmake/debian/control @@ -1,13 +1,16 @@ -Source: cmake-trinity +Source: tde-cmake Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake (>= 3.1~) +Build-Depends: cdbs, debhelper (>= 10~), quilt, cmake (>= 3.5~) Standards-Version: 3.8.4 -Package: cmake-trinity +Package: tde-cmake Architecture: all Depends: cmake (>= ${CMake-Version2}~), cmake (<< ${CMake-Next-Version2}~), perl-base, libxml-parser-perl +Replaces: cmake-trinity (<< 4:14.1.0~) +Breaks: cmake-trinity (<< 4:14.1.0~) +Provides: cmake-trinity Description: TDE CMake modules TDE uses its own set of modules and macros to simplify CMake rules. . diff --git a/dilos/common/cmake/debian/copyright b/dilos/dependencies/tde-cmake/debian/copyright index 82d825030..82d825030 100644 --- a/dilos/common/cmake/debian/copyright +++ b/dilos/dependencies/tde-cmake/debian/copyright diff --git a/dilos/common/cmake/debian/patches/series b/dilos/dependencies/tde-cmake/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/dilos/common/cmake/debian/patches/series +++ b/dilos/dependencies/tde-cmake/debian/patches/series diff --git a/dilos/common/cmake/debian/rules b/dilos/dependencies/tde-cmake/debian/rules index 95a42b3f7..95a42b3f7 100755 --- a/dilos/common/cmake/debian/rules +++ b/dilos/dependencies/tde-cmake/debian/rules diff --git a/dilos/dependencies/python-tqt/debian/source/format b/dilos/dependencies/tde-cmake/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/dependencies/python-tqt/debian/source/format +++ b/dilos/dependencies/tde-cmake/debian/source/format diff --git a/dilos/dependencies/python-tqt/debian/source/options b/dilos/dependencies/tde-cmake/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/dependencies/python-tqt/debian/source/options +++ b/dilos/dependencies/tde-cmake/debian/source/options diff --git a/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tqca/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/tqca/debian/compat b/dilos/dependencies/tqca/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqca/debian/compat +++ b/dilos/dependencies/tqca/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control index 7da73e73c..91abded59 100644 --- a/dilos/dependencies/tqca/debian/control +++ b/dilos/dependencies/tqca/debian/control @@ -2,7 +2,7 @@ Source: tqca Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqtinterface-dev, libssl-dev Standards-Version: 3.8.3 Package: libtqca diff --git a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tqscintilla/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/tqscintilla/debian/compat b/dilos/dependencies/tqscintilla/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqscintilla/debian/compat +++ b/dilos/dependencies/tqscintilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqscintilla/debian/control b/dilos/dependencies/tqscintilla/debian/control index 9d4458b48..0ce7442c2 100644 --- a/dilos/dependencies/tqscintilla/debian/control +++ b/dilos/dependencies/tqscintilla/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Torsten Marek <shlomme@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-dev-tools, libtqtinterface-dev Standards-Version: 3.8.4 Package: libtqscintilla7 diff --git a/dilos/dependencies/tqt3/debian/README.Debian b/dilos/dependencies/tqt3/debian/README.Debian index e48fe37ea..6d5c135e2 100644 --- a/dilos/dependencies/tqt3/debian/README.Debian +++ b/dilos/dependencies/tqt3/debian/README.Debian @@ -246,26 +246,6 @@ A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called KDE programs. Install your application's system wide configuration file to /etc/tqt3. -Q: I'm compiling a program and I have a compile error due to a missing -include. Why isn't that include not present in the Debian packages anymore -? It compiled with older versions of Debian packages of Qt ! - -A: This may be due to two reasons: either the package still uses the old -includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to -the naming convention. The filenames are now all following the scheme - -ClassName -> classname.h. - -Therefore, if you are the developer of the affected program, change your -sources according to this scheme. Qt ships with tqtrename140, a tool to -help developers migrate their API to the Qt 3 version, -which can help you in the transition upgrade to Qt 3. - -If you are affected by this as a packager, notify upstream to fix those -problems and in the meanwhile use libtqt3-compat-headers as a build -dependency which includes the compatibility headers that just include the -right files from the new API again. - Q: I have a question not covered by this FAQ and README file. Who should I turn to ? diff --git a/dilos/dependencies/tqt3/debian/compat b/dilos/dependencies/tqt3/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqt3/debian/compat +++ b/dilos/dependencies/tqt3/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index cbf9bae09..021e167a6 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 10~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, @@ -125,7 +125,7 @@ Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libxft-dev, libaudio-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libc6-dev [!solaris-any], libtqt3-mt (= ${binary:Version}), libtqt3-headers (= ${binary:Version}), tqt3-dev-tools (= ${binary:Version}) -Recommends: libtqt3-compat-headers, libcups2-dev +Recommends: libcups2-dev Suggests: libtqt3-i18n, tqt3-doc Description: TQt development files (Threaded) TQt is a C++ class library optimized for graphical user interface @@ -133,13 +133,6 @@ Description: TQt development files (Threaded) for building threaded TQt applications as well as the libtqui.so symlink and the necessary header files for libtqui.so. (See README.Debian and the TQt Documentation for instructions on libtqui.so) - . - WARNING: If you plan to build some older TQt3 applications, you will - most probably have to install the libtqt3-compat-headers package. It - contains all the headers which are not part of the official TQt3 API - anymore but which are still used by some programs. So if you encounter - problems with missing header files, please install this package first - before you send a bugreport. Package: libtqt3-headers Architecture: all @@ -153,23 +146,6 @@ Description: TQt3 header files with TQt3. If you want to compile or develop programs which use TQt3, you have to install this package. -Package: libtqt3-compat-headers -Architecture: all -Multi-Arch: foreign -Section: devel -Replaces: libtqt3-compat-headers (<< 4:14.0.0~) -Breaks: libtqt3-compat-headers (<< 4:14.0.0~) -Depends: libtqt3-headers (= ${binary:Version}) -Recommends: libtqt3-mt-dev -Description: TQt 1.x and 2.x compatibility includes - This package contains header files that are intended for build - compatibility for applications that build with TQt3 but still use - deprecated includes. It is meant as an intermediate solution and - these header files are not part of the official TQt3 API. - All sourcecode that is still using the headers of this package is - subject to be changed to use the new header files which are in - libtqt3-headers. - Package: tqt3-dev-tools Architecture: any Multi-Arch: foreign @@ -211,17 +187,27 @@ Depends: ${shlibs:Depends} Description: TQt3 Designer plugins This package contains plugins for TQt3 Designer +Package: libtqt3-apps-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Conflicts: tqt3-apps-dev (<< 4:14.1.0~) +Depends: ${shlibs:Depends}, libtqt3-mt (= ${binary:Version}) +Description: TQt3 Developer applications development libraries + This package contains additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. + Package: tqt3-apps-dev Architecture: any Multi-Arch: no Section: devel Replaces: tqt3-apps-dev (<< 4:14.0.0~) Breaks: tqt3-apps-dev (<< 4:14.0.0~) -Depends: libtqt3-mt-dev +Depends: libtqt3-mt-dev, libtqt3-apps-dev Description: TQt3 Developer applications development files This package is intended for developers who want to develop applications - using the additional static libraries that ship with the applications - included with TQt; the TQt Designer and the TQt Assistant. + using the additional libraries that ship with the applications + included with TQt - the TQt Designer and the TQt Assistant. It allows integrating additional enhancements into the TQt Designer respectively faciliate the TQt Assistant from within your TQt application to interactively call the Assistant for displaying online help that the @@ -300,7 +286,7 @@ Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~) Recommends: libtqt3-mt-dev Depends: ${shlibs:Depends} Description: Conversion utilities for TQt3 development - This package contains some older TQt tools (namely tqtrename140, + This package contains some older TQt tools (namely tqm2ts, tqtmergetr, tqtfindtr and msg2tqm). These tools are needed only by application developers who need to migrate any TQt application written for TQt 1.x or 2.x over to TQt 3.x. The purpose of the tools are to @@ -314,7 +300,7 @@ Multi-Arch: foreign Section: libs Replaces: libtqt3-i18n (<< 4:14.0.0~) Breaks: libtqt3-i18n (<< 4:14.0.0~) -Recommends: libtqt3-mt +Recommends: libtqt3-mt | libtqt3-mt-t64 Description: i18n files for TQt3 library This package contains the internationalization files for the TQt library. TQt applications that are internationalized will need to depend on this package diff --git a/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install new file mode 100644 index 000000000..eea094136 --- /dev/null +++ b/dilos/dependencies/tqt3/debian/libtqt3-apps-dev.install @@ -0,0 +1,3 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so.* diff --git a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install deleted file mode 100644 index d2bcbd7d6..000000000 --- a/dilos/dependencies/tqt3/debian/libtqt3-compat-headers.install +++ /dev/null @@ -1,48 +0,0 @@ -usr/include/tqt3/ntqapp.h -usr/include/tqt3/ntqarray.h -usr/include/tqt3/ntqbitarry.h -usr/include/tqt3/ntqbttngrp.h -usr/include/tqt3/ntqchkbox.h -usr/include/tqt3/ntqclipbrd.h -usr/include/tqt3/ntqcollect.h -usr/include/tqt3/ntqcollection.h -usr/include/tqt3/ntqcombo.h -usr/include/tqt3/ntqconnect.h -usr/include/tqt3/ntqdatetm.h -usr/include/tqt3/ntqdrawutl.h -usr/include/tqt3/ntqdstream.h -usr/include/tqt3/ntqfiledef.h -usr/include/tqt3/ntqfiledlg.h -usr/include/tqt3/ntqfileinf.h -usr/include/tqt3/ntqfontinf.h -usr/include/tqt3/ntqfontmet.h -usr/include/tqt3/ntqgrpbox.h -usr/include/tqt3/ntqintcach.h -usr/include/tqt3/ntqiodev.h -usr/include/tqt3/ntqlcdnum.h -usr/include/tqt3/ntqlined.h -usr/include/tqt3/ntqmenudta.h -usr/include/tqt3/ntqmetaobj.h -usr/include/tqt3/ntqmlined.h -usr/include/tqt3/ntqmsgbox.h -usr/include/tqt3/ntqmultilinedit.h -usr/include/tqt3/ntqobjcoll.h -usr/include/tqt3/ntqobjdefs.h -usr/include/tqt3/ntqpdevmet.h -usr/include/tqt3/ntqpmcache.h -usr/include/tqt3/ntqpntarry.h -usr/include/tqt3/ntqpopmenu.h -usr/include/tqt3/ntqprndlg.h -usr/include/tqt3/ntqprogbar.h -usr/include/tqt3/ntqprogdlg.h -usr/include/tqt3/ntqpsprn.h -usr/include/tqt3/ntqpushbt.h -usr/include/tqt3/ntqqueue.h -usr/include/tqt3/ntqradiobt.h -usr/include/tqt3/ntqrangect.h -usr/include/tqt3/ntqscrbar.h -usr/include/tqt3/ntqsocknot.h -usr/include/tqt3/ntqtabdlg.h -usr/include/tqt3/ntqtstream.h -usr/include/tqt3/ntqwidcoll.h -usr/include/tqt3/ntqwindefs.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-headers.install b/dilos/dependencies/tqt3/debian/libtqt3-headers.install index be1e2d79c..a91948f60 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-headers.install +++ b/dilos/dependencies/tqt3/debian/libtqt3-headers.install @@ -169,7 +169,6 @@ usr/include/tqt3/ntqrtlcodec.h usr/include/tqt3/ntqscrollbar.h usr/include/tqt3/ntqscrollview.h usr/include/tqt3/ntqsemaphore.h -usr/include/tqt3/ntqsemimodal.h usr/include/tqt3/ntqserversocket.h usr/include/tqt3/ntqsession.h usr/include/tqt3/ntqsessionmanager.h @@ -188,7 +187,6 @@ usr/include/tqt3/ntqslider.h usr/include/tqt3/ntqsocket.h usr/include/tqt3/ntqsocketdevice.h usr/include/tqt3/ntqsocketnotifier.h -usr/include/tqt3/ntqsortedlist.h usr/include/tqt3/ntqsound.h usr/include/tqt3/ntqspinbox.h usr/include/tqt3/ntqsplashscreen.h diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs +++ b/dilos/dependencies/tqt3/debian/libtqt3-mt-dev.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs b/dilos/dependencies/tqt3/debian/libtqt3-mt.docs index dbd9a5d19..59a51ee13 100644 --- a/dilos/dependencies/tqt3/debian/libtqt3-mt.docs +++ b/dilos/dependencies/tqt3/debian/libtqt3-mt.docs @@ -1,4 +1,5 @@ -README +README.md README.immodule +README.Qt3 README-QT.TXT PLATFORMS diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index 9b6c34f78..910bfb64a 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -25,6 +25,13 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = -t64 +else +DEB_TIME64_SUFFIX = +endif + # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. DEB_BUILD_PARALLEL ?= true @@ -36,7 +43,7 @@ PLATFORM_ARG = dilos-g++ # build variables (directorys) DEBIAN = $(shell pwd)/debian -P_LIBS = $(DEBIAN)/libtqt3-mt +P_LIBS = $(DEBIAN)/libtqt3-mt$(DEB_TIME64_SUFFIX) P_DOC = $(DEBIAN)/tqt3-doc P_APPSDEV = $(DEBIAN)/tqt3-apps-dev P_HEADERS = $(DEBIAN)/libtqt3-headers @@ -131,6 +138,22 @@ endif post-patches:: dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libtqt3-mt\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libtqt3-mt$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +endif build build-arch: libqt-thread-stamp build-indep: @@ -159,7 +182,6 @@ libqt-thread-stamp: post-patches # archives get accidentally stripped by make install. Copy over unstripped ones for now. -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/ - cp bin/tqtrename140 $(TMP_INSTALL)/usr/bin/ cp bin/tqtfindtr $(TMP_INSTALL)/usr/bin/ # build tqtconv2ui @@ -231,6 +253,20 @@ clean:: dh_clean +ifeq ($(DEB_TIME64_API),true) + # revert library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "\.t64$$" | \ + while read a; do \ + mv $$a $${a%.t64}; \ + done + ls -d debian/* | \ + grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif + install: build dh_testdir @@ -430,7 +466,7 @@ binary-arch: build install dh_link -ptqt3-dev-tools usr/share/tqt3/doc/html usr/share/doc/tqt3-dev-tools/html # copy README.Debian - for a in libtqt3-mt-dev libtqt3-mt tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done + for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done # install the qmake binary rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake @@ -467,7 +503,7 @@ binary-arch: build install dh_makeshlibs -a $(IBASE) -V dh_installdeb -a $(IBASE) dh_perl -a $(IBASE) - dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt/usr/lib\ + dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libtqt3-mt$(DEB_TIME64_SUFFIX)/usr/lib\ --dpkg-shlibdeps-params=--ignore-missing-info # fix shlibdeps madness diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install index d60b07fc7..43dc0a94a 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* -usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so usr/include/tqt3/ntqassistantclient.h diff --git a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links index 72bd7093a..60fe91b77 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/dilos/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ /usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.so /usr/share/tqt3/lib/libtqteditor.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.so /usr/share/tqt3/lib/libtqtdesignercore.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.so /usr/share/tqt3/lib/libtqassistantclient.so /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install index 56e0156b5..5975d4bb9 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install +++ b/dilos/dependencies/tqt3/debian/tqt3-dev-tools-compat.install @@ -1,4 +1,3 @@ -usr/bin/tqtrename140 usr/bin/tqm2ts usr/bin/tqtmergetr usr/bin/tqtfindtr diff --git a/dilos/dependencies/tqt3/debian/tqt3-doc.docs b/dilos/dependencies/tqt3/debian/tqt3-doc.docs index f08fd0f02..2630a416c 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-doc.docs +++ b/dilos/dependencies/tqt3/debian/tqt3-doc.docs @@ -1,2 +1,3 @@ FAQ +README.md README-QT.TXT diff --git a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk index f36e3527c..5b87bf463 100644 --- a/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk +++ b/dilos/dependencies/tqtinterface/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/dependencies/tqtinterface/debian/compat b/dilos/dependencies/tqtinterface/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/dependencies/tqtinterface/debian/compat +++ b/dilos/dependencies/tqtinterface/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/dependencies/tqtinterface/debian/control b/dilos/dependencies/tqtinterface/debian/control index 0c20229d6..0d440e29d 100644 --- a/dilos/dependencies/tqtinterface/debian/control +++ b/dilos/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqt3-mt-dev, tqt3-apps-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libtqt3-mt-dev, tqt3-apps-dev Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/libraries/libtdeldap/debian/compat b/dilos/libraries/libtdeldap/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/libtdeldap/debian/compat +++ b/dilos/libraries/libtdeldap/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/libtdeldap/debian/control b/dilos/libraries/libtdeldap/debian/control index 0bedee5d7..6c8ce3269 100644 --- a/dilos/libraries/libtdeldap/debian/control +++ b/dilos/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/dilos/libraries/python-trinity/debian/NEWS.Debian b/dilos/libraries/pytde/debian/NEWS.Debian index 367c6950d..367c6950d 100644 --- a/dilos/libraries/python-trinity/debian/NEWS.Debian +++ b/dilos/libraries/pytde/debian/NEWS.Debian diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/pytde/debian/changelog index 12485eccd..43df2609a 100644 --- a/dilos/libraries/python-trinity/debian/changelog +++ b/dilos/libraries/pytde/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/pytde/debian/compat b/dilos/libraries/pytde/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/libraries/pytde/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/pytde/debian/control index 85cb1de20..b8859e4a1 100644 --- a/dilos/libraries/python-trinity/debian/control +++ b/dilos/libraries/pytde/debian/control @@ -1,44 +1,40 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-all, python-all-dev, python-all-dbg [!solaris-any], python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], python-tqt-dev, python-tqt-dbg [!solaris-any], tdelibs14-trinity-dev, dh-python +Build-Depends: debhelper (>= 10~), libtqtinterface-dev, dh-python, python3-all-dev, python3-all-dbg [!solaris-any], python3-sip-tqt, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], pytqt-dev, python3-pytqt-dbg [!solaris-any], tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python3-pytde Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt -Replaces: python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-trinity-trinity (<< 4:14.0.0~) -Provides: ${python:Provides} -Conflicts: python-trinity-trinity -Description: Trinity bindings for Python [Trinity] +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt +Breaks: python-trinity-trinity (<< 4:14.1.0~) +Provides: ${python3:Provides} +Description: Trinity bindings for Python 3 [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: python3-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-tqt-dbg, ${shlibs:Depends} -Description: Trinity bindings for Python (debug extensions) [Trinity] +Depends: python3-pytde (= ${binary:Version}), python3-all-dbg, python3-pytqt-dbg, ${shlibs:Depends} +Description: Trinity bindings for Python 3 (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 from kio, kjs, tdehtml and kprint. . 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~) -Depends: pytqt-tools, ${python:Depends} +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) +Depends: pytqt-tools, ${python3:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They are needed to build PyTDE, but also as building blocks of other @@ -46,11 +42,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/copyright b/dilos/libraries/pytde/debian/copyright index eec6b36a5..eec6b36a5 100644 --- a/dilos/libraries/python-trinity/debian/copyright +++ b/dilos/libraries/pytde/debian/copyright diff --git a/dilos/libraries/python-trinity/debian/patches/.gitignore b/dilos/libraries/pytde/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/dilos/libraries/python-trinity/debian/patches/.gitignore +++ b/dilos/libraries/pytde/debian/patches/.gitignore diff --git a/dilos/libraries/pytde/debian/pytde-dev.dirs b/dilos/libraries/pytde/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/dilos/libraries/pytde/debian/pytde-dev.install b/dilos/libraries/pytde/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/pytde/debian/pytde-doc.dirs b/dilos/libraries/pytde/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/dilos/libraries/pytde/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/dilos/libraries/pytde/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/dilos/libraries/pytde/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/pytde/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/dilos/libraries/pytde/debian/pytde-doc.examples diff --git a/dilos/libraries/pytde/debian/pytde-doc.install b/dilos/libraries/pytde/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/pytde/debian/pytdeconfig.py b/dilos/libraries/pytde/debian/pytdeconfig.py new file mode 100644 index 000000000..c12c20788 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytdeconfig.py @@ -0,0 +1,17 @@ +# import the sipconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: + try: + from pytdeconfig_d import * + from pytdeconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed') +else: + from pytdeconfig_nd import * + from pytdeconfig_nd import _pkg_config, _default_macros diff --git a/dilos/libraries/pytde/debian/python3-pytde.install b/dilos/libraries/pytde/debian/python3-pytde.install new file mode 100644 index 000000000..a3546ced0 --- /dev/null +++ b/dilos/libraries/pytde/debian/python3-pytde.install @@ -0,0 +1,2 @@ +usr/lib/python3*/*-packages/*.so +usr/lib/python3*/*-packages/dcop*.py diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/pytde/debian/rules index 3bae8384b..40e46f0ad 100755 --- a/dilos/libraries/python-trinity/debian/rules +++ b/dilos/libraries/pytde/debian/rules @@ -1,11 +1,8 @@ #!/usr/bin/make -f -# -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man DEB_CONFIGURE_PREFIX := /usr @@ -23,10 +20,22 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -# This has to be exported to make some magic below work. +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + export DH_OPTIONS -export QTDIR=/usr/share/qt3 -export QMAKESPEC=$(QTDIR)/mkspecs/dilos-g++ + +-include /usr/share/python3/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + +export TQTDIR=/usr/share/tqt3 +export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++ CXXFLAGS = -Wall -g @@ -36,10 +45,7 @@ else CXXFLAGS += -O2 endif -PYTHONS := $(shell pyversions -vr debian/control) -#DBG_PYTHONS := $(shell pyversions -vd) - -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) +PYTHONS := $(shell py3versions -vr) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -52,15 +58,15 @@ endif # dbg-build-%/configure-stamp configure: $(PYTHONS:%=build-%/configure-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) +# $(PYTHONS:%=dbg-build-%/configure-stamp) build-%/configure-stamp: dh_testdir mkdir -p build-$* 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) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -68,12 +74,12 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* 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) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/build-stamp) +# $(PYTHONS:%=dbg-build-%/build-stamp) build-indep: build-%/build-stamp: build-%/configure-stamp @@ -90,7 +96,7 @@ clean: dh_testdir dh_testroot rm -f *-stamp - rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%) + rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) # remove autogenerated *mod.sip files and clean up sources for moddir in sip/*;\ @@ -111,14 +117,12 @@ install-indep: dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' for version in ${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 "import sysconfig; print(sysconfig.get_path('platstdlib'))");\ + 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;\ -# done +# install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ install-arch: dh_testdir @@ -130,23 +134,19 @@ install-arch: do\ $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\ done - -# set -e; \ -# for version in ${DBG_PYTHONS}; do \ -# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ -# done +# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python3-pytde-dbg;\ 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) -# for i in $$(find debian/python-*-dbg -name '*.so'); do \ + mkdir -p $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) +# for i in $$(find debian/python3-*-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-*-dbg ! -type d \ +# find debian/python3-*-dbg ! -type d \ # ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f -# find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; +# find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \; # Must not depend on anything. This is to be called by @@ -160,11 +160,11 @@ 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 -ppython3-pytde #--dbg-package=python3-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms - ${DH_PYTHON2} + dh_python3 --no-dbg-cleaning --shebang=/usr/bin/python3 dh_installdeb dh_shlibdeps -l /usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol diff --git a/dilos/libraries/python-trinity/debian/source/format b/dilos/libraries/pytde/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/libraries/python-trinity/debian/source/format +++ b/dilos/libraries/pytde/debian/source/format diff --git a/dilos/libraries/python-trinity/debian/source/options b/dilos/libraries/pytde/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/libraries/python-trinity/debian/source/options +++ b/dilos/libraries/pytde/debian/source/options diff --git a/dilos/libraries/pytdeextensions/debian/compat b/dilos/libraries/pytdeextensions/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/pytdeextensions/debian/compat +++ b/dilos/libraries/pytdeextensions/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/pytdeextensions/debian/control b/dilos/libraries/pytdeextensions/debian/control index 48386f4de..bd6fc8f4d 100644 --- a/dilos/libraries/pytdeextensions/debian/control +++ b/dilos/libraries/pytdeextensions/debian/control @@ -3,18 +3,18 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), chrpath [!solaris-any], quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool, - libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev +Build-Depends: cdbs, debhelper (>= 10~), chrpath [!solaris-any], quilt, tdelibs-trinity, libtool-bin, libtool, + libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python3-pytde, + pytqt-dev, python3-sip-tqt-dev, dh-python, python3-all, python3-all-dev Standards-Version: 3.8.4 Package: pytdeextensions-trinity Architecture: all -Depends: ${python:Depends} +Depends: ${python3:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0~) Breaks: pykdeextensions-trinity (<< 4:14.0.0~) Conflicts: pykdeextensions -Provides: ${python:Provides} +Provides: ${python3:Provides} Description: Python packages to support TDE applications (scripts) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0~) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0~) -Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python3-all-dev Description: Python packages to support TDE applications (development) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. diff --git a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk deleted file mode 100644 index 8b238c772..000000000 --- a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk +++ /dev/null @@ -1,297 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Colin Walters <walters@debian.org> -# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org> -# -# Description: manage Python public modules build -# This class is designed to work with Python packages using the -# 'distutils' build system and comply to the new policy established -# during summer 2006. Use of the debhelper class to make use of the -# new dh_python is strongly advised. (This is still left as optional -# in line with CDBS' flexible behavior.) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02111-1307 USA. -# - -# This class provides rules for old and new Python policy. Leaving -# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and -# pycentral methods are available to comply with new policy. Don't forget -# to update your 'debian/control'. (Build-Depends are correctly generated -# if you are using the auto control generation feature.) - -# Once all old-style packages are removed before etch, some of the old -# can be refactored or removed. - - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_python_distutils -_cdbs_class_python_distutils = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - - -# check python system -cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) -cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) -cdbs_pycompat = $(cdbs_selected_pycompat) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - # warning pysupport compatibility mode - ifneq (, $(cdbs_use_xs_field)) - $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.) - endif # use XS field (compat) -else - ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - else - ifneq (, $(DEB_PYTHON_SYSTEM)) - $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) - else - ifneq (, $(cdbs_use_xs_field)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - ifneq (, $(cdbs_selected_pycompat)) - ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - endif # use pycompat - endif # unknown method - endif # pycentral -endif # pysupport - - -ifndef DEB_PYTHON_SYSTEM -DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7 -else -# default package is the first one declared in 'debian/control' -# (override if necessary) -DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))) -DEB_PYTHON_PRIVATE_MODULES_DIRS = -endif - -# common variables -DEB_PYTHON_SETUP_CMD = setup.py -DEB_PYTHON_CLEAN_ARGS = -a -DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build" -DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr - - -ifndef DEB_PYTHON_SYSTEM -########################### old policy method ########################### - -$(warning =======================================================) -$(warning Your package does not conform to the new Python policy.) -$(warning Please consider updating. Here is some documentation:) -$(warning http://wiki.debian.org/DebianPython/NewPolicy) -$(warning http://wiki.debian.org/DebianPythonFAQ) -$(warning =======================================================) - -# make: *** No rule to make target `voodoo'. Stop. -DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -# If no versioned python library packages found, grab all simpler ones -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -endif - -cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg)))) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) - - -# See if this package doesn't appear to need to be compiled by multiple -# Python versions. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -else -$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -# This class can optionally utilize debhelper's "dh_python" command. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# Ignore errors from this rule. In a tarball build, the file may not -# exist. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -clean:: - -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else -clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) - -$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : - -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif - -else -########################## new policy methods ########################### - -# Calculate cdbs_python_build_versions -cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control)) -cdbs_python_current_version := $(shell pyversions -vd) -ifeq (all, $(cdbs_python_module_arch)) - # check if current is in build versions - ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) - cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) - cdbs_python_build_versions := $(cdbs_python_compile_version) - else - cdbs_python_build_versions := $(cdbs_python_current_version) - endif -else -cdbs_python_build_versions := $(shell pyversions -vr) -endif # archall - -# check if build is possible -ifeq (, $(cdbs_python_build_versions)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -$(error invalid setting in debian/pyversions) -else -$(error invalid setting for XS-Python-Version) -endif # system selected -endif # build versions empty - - -# Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43) -ifeq (all, $(cdbs_python_module_arch)) - ifneq (, $(cdbs_python_compile_version)) - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) - else - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) - endif -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) -endif -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) -endif - - -cdbs_python_current_binary := $(shell pyversions -d) -cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1)) - -# build stage -common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions)) -python-build-stamp-%: -ifeq (all, $(cdbs_python_module_arch)) - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -else - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -endif # archall detection - touch $@ - - -# install stage -ifeq (all, $(cdbs_python_module_arch)) -common-install-arch common-install-indep:: python-install-py -python-install-py: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -else -common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions)) -python-install-%: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -endif # archall detection - - -# This class can optionally use debhelper's commands. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -else - dh_pycentral -p$(cdbs_curpkg) -endif - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# clean stage -clean:: $(addprefix python-clean-, $(cdbs_python_build_versions)) -python-clean-%: -ifeq (all, $(cdbs_python_module_arch)) - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif # archall detection - -clean:: -ifeq (, $(cdbs_selected_pycompat)) - echo "$(cdbs_pycompat)" >debian/pycompat -endif # use pycompat - rm -f python-build-stamp-* - -endif - - -########################## all policy methods ########################### - -# Calling setup.py clean may create .pyc files, so we need a final cleanup -# pass here. -clean:: - find . -name '*.pyc' -exec rm '{}' ';' - -endif diff --git a/dilos/libraries/pytdeextensions/debian/pyversions b/dilos/libraries/pytdeextensions/debian/pyversions deleted file mode 100644 index 0c043f18c..000000000 --- a/dilos/libraries/pytdeextensions/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.6- diff --git a/dilos/libraries/pytdeextensions/debian/rules b/dilos/libraries/pytdeextensions/debian/rules index 009b362ca..9f24adcf1 100755 --- a/dilos/libraries/pytdeextensions/debian/rules +++ b/dilos/libraries/pytdeextensions/debian/rules @@ -1,17 +1,11 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity +DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) include /usr/share/cdbs/1/rules/debhelper.mk -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - include debian/python-distutils-jaunty.mk -else - include /usr/share/cdbs/1/class/python-distutils.mk -endif -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include @@ -40,12 +34,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/dilos/libraries/python-trinity/debian/compat b/dilos/libraries/python-trinity/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/libraries/python-trinity/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/libraries/python-trinity/debian/pytdeconfig.py b/dilos/libraries/python-trinity/debian/pytdeconfig.py deleted file mode 100644 index eac264752..000000000 --- a/dilos/libraries/python-trinity/debian/pytdeconfig.py +++ /dev/null @@ -1,11 +0,0 @@ -# import the sipconfig.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from pytdeconfig_d import * - except ImportError, msg: - raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' -else: - from pytdeconfig_nd import * 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/python-trinity-trinity.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity.install deleted file mode 100644 index facee2907..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python*/*-packages/*.so -usr/lib/python*/*-packages/dcop*.py - diff --git a/dilos/libraries/python-trinity/debian/watch b/dilos/libraries/python-trinity/debian/watch deleted file mode 100644 index 8b3afcac0..000000000 --- a/dilos/libraries/python-trinity/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2 |