diff options
Diffstat (limited to 'dilos/core')
133 files changed, 353 insertions, 1385 deletions
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.install b/dilos/core/tdenetwork/debian/kdict-trinity.install index c3ac57162..982ec3754 100644 --- a/dilos/core/tdenetwork/debian/kdict-trinity.install +++ b/dilos/core/tdenetwork/debian/kdict-trinity.install @@ -24,6 +24,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kdict.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kdict.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kdict.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kdict.svgz +debian/tmp/usr/share/man/man1/kdict.1 debian/icons/kdict-16.xpm /usr/share/pixmaps debian/icons/kdict.xpm /usr/share/pixmaps diff --git a/dilos/core/tdenetwork/debian/kdict-trinity.manpages b/dilos/core/tdenetwork/debian/kdict-trinity.manpages deleted file mode 100644 index 3128a0e9a..000000000 --- a/dilos/core/tdenetwork/debian/kdict-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kdict-trinity.1 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/kget-trinity.install b/dilos/core/tdenetwork/debian/kget-trinity.install index 618f2163f..dc488268e 100644 --- a/dilos/core/tdenetwork/debian/kget-trinity.install +++ b/dilos/core/tdenetwork/debian/kget-trinity.install @@ -73,6 +73,7 @@ debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kget.png debian/tmp/usr/share/icons/crystalsvg/32x32/mimetypes/kget_list.png debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kget.png debian/tmp/usr/share/icons/crystalsvg/48x48/mimetypes/kget_list.png +debian/tmp/usr/share/man/man1/kget.1 debian/tmp/usr/share/mimelnk/application/x-kgetlist.desktop debian/tmp/usr/share/sounds/KGet_Added.ogg debian/tmp/usr/share/sounds/KGet_Finished.ogg diff --git a/dilos/core/tdenetwork/debian/kget-trinity.manpages b/dilos/core/tdenetwork/debian/kget-trinity.manpages deleted file mode 100644 index 585b03129..000000000 --- a/dilos/core/tdenetwork/debian/kget-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kget-trinity.1 diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.install b/dilos/core/tdenetwork/debian/kopete-trinity.install index 2245d6527..28ab451bb 100644 --- a/dilos/core/tdenetwork/debian/kopete-trinity.install +++ b/dilos/core/tdenetwork/debian/kopete-trinity.install @@ -474,6 +474,7 @@ debian/tmp/usr/share/icons/hicolor/48x48/apps/jabber_protocol.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kopete.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kopete.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kopete2.svgz +debian/tmp/usr/share/man/man1/kopete.1 debian/tmp/usr/share/mimelnk/application/x-icq.desktop debian/tmp/usr/share/mimelnk/application/x-kopete-emoticons.desktop debian/tmp/usr/share/services/aim.protocol diff --git a/dilos/core/tdenetwork/debian/kopete-trinity.manpages b/dilos/core/tdenetwork/debian/kopete-trinity.manpages deleted file mode 100644 index 214a24d2e..000000000 --- a/dilos/core/tdenetwork/debian/kopete-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/out/kopete-trinity.1 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.install b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install index 2b13c9206..47ddce17e 100644 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.install +++ b/dilos/core/tdenetwork/debian/kwifimanager-trinity.install @@ -29,6 +29,7 @@ debian/tmp/usr/share/icons/hicolor/32x32/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/48x48/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/64x64/apps/kwifimanager.png debian/tmp/usr/share/icons/hicolor/scalable/apps/kwifimanager.svgz +debian/tmp/usr/share/man/man1/kwifimanager.1 debian/icons/kwifimanager-16.xpm /usr/share/pixmaps debian/icons/kwifimanager.xpm /usr/share/pixmaps 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/kwifimanager-trinity.manpages b/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages deleted file mode 100644 index 4f390510b..000000000 --- a/dilos/core/tdenetwork/debian/kwifimanager-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kwifimanager-trinity.1 diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.install b/dilos/core/tdenetwork/debian/lisa-trinity.install index 1e64a3ed2..cab76e2c2 100644 --- a/dilos/core/tdenetwork/debian/lisa-trinity.install +++ b/dilos/core/tdenetwork/debian/lisa-trinity.install @@ -15,6 +15,8 @@ debian/tmp/usr/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook debian/tmp/usr/share/doc/tde/HTML/en/lisa/common debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.cache.bz2 debian/tmp/usr/share/doc/tde/HTML/en/lisa/index.docbook +debian/tmp/usr/share/man/man8/lisa.8 +debian/tmp/usr/share/man/man8/reslisa.8 debian/tmp/usr/share/services/lan.protocol debian/tmp/usr/share/services/rlan.protocol diff --git a/dilos/core/tdenetwork/debian/lisa-trinity.manpages b/dilos/core/tdenetwork/debian/lisa-trinity.manpages deleted file mode 100644 index 306f0c52e..000000000 --- a/dilos/core/tdenetwork/debian/lisa-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/lisa-trinity.8 -debian/man/reslisa-trinity.8 diff --git a/dilos/core/tdenetwork/debian/man/kdict-trinity.1 b/dilos/core/tdenetwork/debian/man/kdict-trinity.1 deleted file mode 100644 index aff5138c4..000000000 --- a/dilos/core/tdenetwork/debian/man/kdict-trinity.1 +++ /dev/null @@ -1,180 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDICT 1 "June 2006" "Trinity Desktop Environment" "TDE Dictionary Client" -.SH NAME -kdict -\- The TDE Dictionary Client -.SH SYNOPSIS -\fBkdict\fP [Qt\-options] [TDE\-options] [options] [word/phrase] -.SH DESCRIPTION -\fBKDict\fP is a graphical client for the \fBDICT Protocol\fP. It enables you to search through dictionary databases for a word or phrase, then displays suitable definitions. \fBKDict\fP tries to ease basic as well as advanced queries. A separate list offers a convenient way to deal with the enormous number of matching words that a advanced query can return. -.sp 1 -The remainder of \fBKDict\fP's user interface resembles a web browser. For instance, you can jump to the definition of a synonym by simply clicking on the highlighted word. The back/forward functionality is also implemented, enabling you to quickly go back to the result of previous queries. -.sp 1 -\fBKDict\fP is able to process the content of the clipboard, so it's easy to combine \fBKDict\fP with your web browser or text editor. -.sp 1 -If your machine is behind a firewall, has no permanent internet connection or the server of dict.org is too slow for you, you can set up your own local server, all you need is available at \fBwww.dict.org\fP. The advantages of a local server are optimal performance and the ability to install additional databases of your choice. -.SH OPTIONS -.SS -.SS Arguments: -word/phrase Lookup the given word/phrase -.SS Options: -.TP -.B \-c, \-\-clipboard -Define X11-clipboard content (selected text) -.SS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget - see man X for the argument format -.TP -.B \-\-nofork -Don't run in the background. -.SS -.SH FILES -.I ~/.trinity/share/config/kdictrc -.br -.I ~/.trinity/share/config/kdict_panelappletrc -.RS -\fBkdict\fP configuration files -.SH SEE ALSO -.TP -\fBwww.dict.org\fP -DICT Development Group home page -.RE -.sp 1 -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kdict/ -directly into konqueror or you can run -.BR "khelpcenter help:/kdict/" -from the command\-line. -.br -.SH AUTHORS -.nf -Christian Gebauer <gebauer@kde.org> -.br -Matthias Hoelzer <hoelzer@kde.org> -.br - -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/dilos/core/tdenetwork/debian/man/kget-trinity.1 b/dilos/core/tdenetwork/debian/man/kget-trinity.1 deleted file mode 100644 index 72b2d3305..000000000 --- a/dilos/core/tdenetwork/debian/man/kget-trinity.1 +++ /dev/null @@ -1,168 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KGET 1 "June 2006" "Trinity Desktop Environment" "download manager" -.SH NAME -kget -\- An advanced download manager for TDE -.SH SYNOPSIS -\fBkget\fP [Qt\-options] [TDE\-options] [options] [URL(s)] -.SH DESCRIPTION -\fBKGet\fP is an advanced download manager for TDE. It allows you to group downloads. In some cases, \fBKGet\fP can resume these downloads even if you shutdown your computer before the downloads have completed. -.sp 1 -To download a document or package, drag and drop the URL on to \fBKGet\fP. -.SH OPTIONS -.SS -.SS Arguments: -URL(s) URL(s) to download -.SS Options: -.TP -.B \-\-showDropTarget -Start KGet with drop target -.SS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-tde -Show TDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display <displayname> -Use the X\-server display 'displayname' -.TP -.B \-\-session <sessionId> -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols <count> -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font <fontname> -defines the application font -.TP -.B \-\-bg, \-\-background <color> -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground <color> -sets the default foreground color -.TP -.B \-\-btn, \-\-button <color> -sets the default button color -.TP -.B \-\-name <name> -sets the application name -.TP -.B \-\-title <title> -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS TDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget - see man X for the argument format -.TP -.B \-\-nofork -Don't run in the background. -.SS - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/kget/ -directly into konqueror or you can run -.BR "khelpcenter help:/kget/" -from the command\-line. -.br -.SH AUTHORS -.nf -Matej Moss -.br -Patrick Charbonnier <pch@freeshell.org> -.br -Carsten Pfeiffer <pfeiffer@kde.org> -.br - -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml b/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml deleted file mode 100644 index 87922999d..000000000 --- a/dilos/core/tdenetwork/debian/man/kopete-trinity.sgml +++ /dev/null @@ -1,334 +0,0 @@ -<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ - -<!-- Process this file with docbook-to-man to generate an nroff manual - page: `docbook-to-man manpage.sgml > manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - --> - - <!ENTITY dhfirstname "<firstname>Daniel</firstname>"> - <!ENTITY dhsurname "<surname>Stone</surname>"> - <!ENTITY dhdate "<date>April 20, 2002</date>"> - <!ENTITY dhsection "<manvolnum>1</manvolnum>"> - <!ENTITY dhemail "<email>dstone@kde.org</email>"> - <!ENTITY dhusername "Daniel Stone"> - <!ENTITY dhucpackage "<refentrytitle>KOPETE</refentrytitle>"> - <!ENTITY dhpackage "kopete"> - - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY gnu "<acronym>GNU</acronym>"> -]> - -<refentry> - <refentryinfo> - <address> - &dhemail; - </address> - <author> - &dhfirstname; - &dhsurname; - </author> - <copyright> - <year>2001</year> - <holder>&dhusername;</holder> - </copyright> - &dhdate; - </refentryinfo> - <refmeta> - &dhucpackage; - - &dhsection; - </refmeta> - <refnamediv> - <refname>&dhpackage;</refname> - - <refpurpose>A TDE-based Instant Messaging client.</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>&dhpackage;</command> - - <arg><option>--help<replaceable></replaceable></option></arg> - <arg><option>--help-tde<replaceable></replaceable></option></arg> - <arg><option>--help-qt<replaceable></replaceable></option></arg> - <arg><option>--version<replaceable> -v</replaceable></option></arg> - <arg><option>--license<replaceable></replaceable</option></arg> - <arg><option>--author<replaceable></replaceable></option></arg> - <arg><option>--caption <caption><replaceable></replaceable></option></arg> - <arg><option>--icon <icon><replaceable></replaceable></option></arg> - <arg><option>--miniicon <icon><replaceable></replaceable></option></arg> - <arg><option>--dcopserver <server><replaceable></replaceable></option></arg> - <arg><option>--nocrashhandler<replaceable></replaceable></option></arg> - <arg><option>--waitforwm<replaceable></replaceable></option></arg> - <arg><option>--style <style><replaceable></replaceable></option></arg> - <arg><option>--geometry <geometry><replaceable></replaceable></option></arg> - <arg><option>--display <display><replaceable></replaceable></option></arg> - <arg><option>--session <sessionid><replaceable></replaceable></option></arg> - <arg><option>--cmap<replaceable></replaceable></option></arg> - <arg><option>--ncols <columns><replaceable></replaceable></option></arg> - <arg><option>--nograb<replaceable></replaceable></option></arg> - <arg><option>--dograb<replaceable></replaceable></option></arg> - <arg><option>--sync<replaceable></replaceable></option></arg> - <arg><option>--font<replaceable> --fn <fontname></replaceable></option></arg> - <arg><option>--background<replaceable> --bg <colour></replaceable></option></arg> - <arg><option>--button<replaceable> --btn <colour></replaceable></option></arg> - <arg><option>--name<replaceable> <name></replaceable></option></arg> - <arg><option>--title<replaceable> <title></replaceable></option></arg> - <arg><option>--visual<replaceable> TrueColor</replaceable></option></arg> - <arg><option>--inputstyle<replaceable> <style></replaceable></option></arg> - <arg><option>--im<replaceable> <server></replaceable></option></arg> - <arg><option>--noxim<replaceable></replaceable></option></arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - - <para>This manual page documents briefly the - <command>&dhpackage;</command> command.</para> - - <para><command>&dhpackage;</command> is a TDE-based multi-protocol Instant - Messaging client. Currently, it supports AIM, ICQ, MSN, IRC and Jabber. - </para> - - </refsect1> - <refsect1> - <title>OPTIONS</title> - - <para>These programs follow the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. However, the ordering is very strict - - --help/-h must come before hostname.</para> - <variablelist> - <varlistentry> - <term><option>-v</option> - <option>--version</option> - </term> - <listitem> - <para>Show version information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--author</option> - </term> - <listitem> - <para>Show information about the author.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--license</option> - </term> - <listitem> - <para>Show license information.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--caption <caption></option> - </term> - <listitem> - <para>Specify the caption of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--icon <icon></option> - </term> - <listitem> - <para>Specify the icon of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--miniicon <icon></option> - </term> - <listitem> - <para>Specify the mini-icon of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--dcopserver <server></option> - </term> - <listitem> - <para>Specify the DCOP server to use.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--nocrashhandler</option> - </term> - <listitem> - <para>Disable TDE crash handler (enables core dumps).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--waitforwm</option> - </term> - <listitem> - <para>Waits for a compatible window manager to start.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--style <style></option> - </term> - <listitem> - <para>Sets the application's GUI style (overrides TDE).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--geometry <geometry></option> - </term> - <listitem> - <para>Sets the geometry of the window.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--display <display></option> - </term> - <listitem> - <para>Specifies the X display to use.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--session <sessionid></option> - </term> - <listitem> - <para>Restores the application for the given session ID.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--cmap</option> - </term> - <listitem> - <para>Forces use of an internal colour map on an 8-bit display.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--ncols <count></option> - </term> - <listitem> - <para>Limits the number of colours allowed in an 8-bit display.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--nograb</option> - </term> - <listitem> - <para>Forces Qt to never grab the mouse or keyboard.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--dograb</option> - </term> - <listitem> - <para>Overrides --nograb, which may be implicitly set.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--sync</option> - </term> - <listitem> - <para>Forces synchronous mode (for debugging).</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--font <font></option> - <option>--fn <font></option></term> - <listitem> - <para>Sets the default application font.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--background <colour></option> - <option>--bg <colour></option></term> - <listitem> - <para>Sets the default background colour and application - pallette.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--foreground <colour></option> - <option>--fg <colour></option></term> - <listitem> - <para>Sets the default foreground colour.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--button <colour></option> - <option>--btn <colour></option></term> - <listitem> - <para>Sets the default button colour.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--name <name></option> - </term> - <listitem> - <para>Sets the application name.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--title <name></option> - </term> - <listitem> - <para>Sets the application title.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--visual TrueColor</option> - </term> - <listitem> - <para>Forces the application to use a True Colour visual on 8-bit - displays.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--inputstyle <style></option> - </term> - <listitem> - <para>Sets X Input Method (XIM) input style. Possible values are: - onthespot, overthespot, offthespot, and root.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--im <server></option> - </term> - <listitem> - <para>Sets X Input Method (XIM) server.</para> - </listitem> - </varlistentry> - <varlistentry> - <term><option>--noxim</option> - </term> - <listitem> - <para>Disables X Input Method (XIM) support.</para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - <refsect1> - <title>AUTHOR</title> - - <para>This manual page was written by &dhusername; <&dhemail;> for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the <acronym>GNU</acronym> General Public License - version 2 or any later version published by the Free Software Foundation.</para> - - </refsect1> -</refentry> - -<!-- Keep this comment at the end of the file -Local variables: -mode: sgml -sgml-omittag:t -sgml-shorttag:t -sgml-minimize-attributes:nil -sgml-always-quote-attributes:t -sgml-indent-step:2 -sgml-indent-data:t -sgml-parent-document:nil -sgml-default-dtd-file:nil -sgml-exposed-tags:nil -sgml-local-catalogs:nil -sgml-local-ecat-files:nil -End: ---> diff --git a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 deleted file mode 100644 index 5f12be561..000000000 --- a/dilos/core/tdenetwork/debian/man/kwifimanager-trinity.1 +++ /dev/null @@ -1,121 +0,0 @@ -.TH KWIFIMANAGER "1" "October 2006" "kwifimanager" "User Commands" -.SH NAME -kwifimanager \- manual page for kwifimanager -.SH SYNOPSIS -.B kwifimanager -[\fIOPTIONS\fR] -.SH DESCRIPTION -\fBkwifimanager\fR is a TDE wireless management program. -.SH GENERIC OPTIONS: -.TP -\fB\-\-help\fR -Show help about options -.TP -\fB\-\-help\-qt\fR -Show QT specific options -.TP -\fB\-\-help\-tde\fR -Show TDE specific options -.TP -\fB\-\-help\-all\fR -Show all options -.TP -\fB\-\-author\fR -Show author information -.TP -\fB\-v\fR, \fB\-\-version\fR -Show version information -.TP -\fB\-\-license\fR -Show license information -.SH QT OPTIONS: -.TP -\fB\-\-display <displayname>\fR -Use the X-server display 'displayname' -.TP -\fB\-\-session <sessionId>\fR -Restore the application for the given 'sessionId' -.TP -\fB\-\-cmap\fR -Causes the application to install a private color map on an 8-bit display -.TP -\fB\-\-ncols <count>\fR -Limits the number of colors allocated in the color cube on an 8-bit display, if the application is using the QApplication::ManyColor color specification -.TP -\fB\-\-nograb\fR -Tells Qt to never grab the mouse or the keyboard -.TP -\fB\-\-dograb\fR -Running under a debugger can cause an implicit -nograb, use -dograb to override -.TP -\fB\-\-sync\fR -Switches to synchronous mode for debugging -.TP -\fB\-\-fn, \-\-font <fontname>\fR -Defines the application font -.TP -\fB\-\-bg, \-\-background <color>\fR -Sets the default background color and an application palette (light and dark shades are calculated) -.TP -\fB\-\-fg, \-\-foreground <color>\fR -Sets the default foreground color -.TP -\fB\-\-btn, \-\-button <color>\fR -Sets the default button color -.TP -\fB\-\-name <name>\fR -Sets the application name -.TP -\fB\-\-title <title>\fR -Sets the application title (caption) -.TP -\fB\-\-visual TrueColor\fR -Forces the application to use a TrueColor visual on an 8-bit display -.TP -\fB\-\-inputstyle <inputstyle>\fR -Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root -.TP -\fB\-\-im <XIM server>\fR -Set XIM server -.TP -\fB\-\-noxim\fR -Disable XIM -.TP -\fB\-\-reverse\fR -Mirrors the whole layout of widgets -.SH TDE OPTIONS: -.TP -\fB\-\-caption <caption>\fR -Use 'caption' as name in the titlebar -.TP -\fB\-\-icon <icon>\fR -Use 'icon' as the application icon -.TP -\fB\-\-miniicon <icon>\fR -Use 'icon' as the icon in the titlebar -.TP -\fB\-\-config <filename>\fR -Use alternative configuration file -.TP -\fB\-\-dcopserver <server>\fR -Use the DCOP Server specified by 'server' -.TP -\fB\-\-nocrashhandler\fR -Disable crash handler, to get core dumps -.TP -\fB\-\-waitforwm\fR -Waits for a WM_NET compatible windowmanager -.TP -\fB\-\-style <style>\fR -Sets the application GUI style -.TP -\fB\-\-geometry <geometry>\fR -Sets the client geometry of the main widget - see man X for the argument format -.SH AUTHOR -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -This manual page was written by Chris Bier <chris.bier@cymor.com>. -Based on the xchat man page written by Davide Puricelli <evo@debian.org>, -and the kwifimanager help options. It was written for the Debian GNU/Linux -system (but may be used by others). diff --git a/dilos/core/tdenetwork/debian/man/lisa-trinity.8 b/dilos/core/tdenetwork/debian/man/lisa-trinity.8 deleted file mode 100644 index 7015757c5..000000000 --- a/dilos/core/tdenetwork/debian/man/lisa-trinity.8 +++ /dev/null @@ -1,77 +0,0 @@ -.TH "lisa" "8" "December 2005" - -.SH "NAME" -lisa \- LAN Information Server - -.SH "SYNOPSIS" -.PP -.B lisa -[options] - -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -.B lisa -command. -.PP -.B lisa -is intended to provide a kind of "network neighbourhood" but only relaying on -the TCP/IP protocol stack, no smb or whatever. The list of running hosts is -provided via TCP port 7741. - -.SH "OPTIONS" -.TP -.B \-c, \-\-config=\fIFILE\fR -Read -.I FILE -instead of $(HOME)/.lisarc and /etc/lisarc. -.TP -.BI "\-p, \-\-port" " PORTNR" -Start the server on the portnumber -.IR PORTNR . -If you use this, LISa won't be able to -cooperate with other LISa's in the network. -.TP -.B \-q, \-\-quiet -Start quiet without the greeting message. -.TP -.B \-u, \-\-unix -Deprecated. -.TP -.B \-k, \-\-kde1 -Deprecated. -.TP -.B \-K, \-\-kde2 -Deprecated. -.TP -.B \-h, \-\-help -Show usage. -.TP -.B \-v, \-\-version -Print out a short version info. - -.SH SIGNALS -.PP -If you send the Hangup-Signal to \fBlisa\fR, it will reread its -configuration file (killall -HUP lisa). -.PP -If you send the User1-Signal to \fBlisa\fR, it will print some status -information to the standard output (killall -USR1 lisa). You won't see -anything if the console from which \fBlisa\fR was started has terminated. - -.SH "SEE ALSO" -.TP -.BR reslisa (8) -.TP -.I /usr/share/doc/lisa/README.gz - -.SH "AUTHOR" -.PP -.B LISa -is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>. -.PP -This manual page was written by Francois Wendling <frwendling@free.fr>. 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 of the -License, or (at your option) any later version. - diff --git a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 b/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 deleted file mode 100644 index 159b5b7b8..000000000 --- a/dilos/core/tdenetwork/debian/man/reslisa-trinity.8 +++ /dev/null @@ -1,72 +0,0 @@ -.TH "reslisa" "8" "December 2005" - -.SH "NAME" -reslisa \- Restricted LAN Information Server - -.SH "SYNOPSIS" -.PP -.B reslisa -[options] - -.SH "DESCRIPTION" -.PP -This manual page documents briefly the -.B reslisa -command. -.PP -If you have very strict security rules in your network or you don't want to -have another port open or whatever, you can use -.B resLISa -instead of -.BR lisa (1). - -.SH "OPTIONS" -.TP -.B \-c, \-\-config=\fIFILE\fR -Read -.I FILE -instead of $(HOME)/.reslisarc and /etc/reslisarc. -.TP -.B \-q, \-\-quiet -Start quiet without the greeting message. -.TP -.B \-u, \-\-unix -Deprecated. -.TP -.B \-k, \-\-kde1 -Deprecated. -.TP -.B \-K, \-\-kde2 -Deprecated. -.TP -.B \-h, \-\-help -Show usage. -.TP -.B \-v, \-\-version -Print out a short version info. - -.SH SIGNALS -.PP -If you send the Hangup-Signal to \fBreslisa\fR, it will reread its -configuration file (killall -HUP reslisa). -.PP -If you send the User1-Signal to \fBreslisa\fR, it will print some status -information to the standard output (killall -USR1 reslisa). You won't see -anything if the console from which \fBreslisa\fR was started has terminated. - -.SH "SEE ALSO" -.TP -.BR lisa (8) -.TP -.I /usr/share/doc/lisa/README.gz - -.SH "AUTHOR" -.PP -.B LISa -is Copyright (c) 2000-2003 by Alexander Neundorf <neundorf@kde.org>. -.PP -This manual page was written by Francois Wendling <frwendling@free.fr>. 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 of the -License, or (at your option) any later version. - 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 ae733a3e9..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, 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 |