diff options
Diffstat (limited to 'ubuntu/_base/core')
146 files changed, 384 insertions, 1356 deletions
diff --git a/ubuntu/_base/core/tde-i18n/debian/compat b/ubuntu/_base/core/tde-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tde-i18n/debian/compat +++ b/ubuntu/_base/core/tde-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tde-i18n/debian/control b/ubuntu/_base/core/tde-i18n/debian/control index f5b6bb982..33461f159 100644 --- a/ubuntu/_base/core/tde-i18n/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tde-i18n/debian/control-lang b/ubuntu/_base/core/tde-i18n/debian/control-lang index 5d409c28d..2fce8baf8 100644 --- a/ubuntu/_base/core/tde-i18n/debian/control-lang +++ b/ubuntu/_base/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/ubuntu/_base/core/tde-i18n/debian/control-source b/ubuntu/_base/core/tde-i18n/debian/control-source index 984fed2a5..b959dad00 100644 --- a/ubuntu/_base/core/tde-i18n/debian/control-source +++ b/ubuntu/_base/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/ubuntu/_base/core/tde-i18n/debian/rules b/ubuntu/_base/core/tde-i18n/debian/rules index 0daf98a6d..900b2d86e 100755 --- a/ubuntu/_base/core/tde-i18n/debian/rules +++ b/ubuntu/_base/core/tde-i18n/debian/rules @@ -150,6 +150,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/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeaccessibility/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeaccessibility/debian/compat b/ubuntu/_base/core/tdeaccessibility/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeaccessibility/debian/compat +++ b/ubuntu/_base/core/tdeaccessibility/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeaccessibility/debian/control b/ubuntu/_base/core/tdeaccessibility/debian/control index ca1a83529..ecc06a9a0 100644 --- a/ubuntu/_base/core/tdeaccessibility/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeaddons/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeaddons/debian/compat b/ubuntu/_base/core/tdeaddons/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeaddons/debian/compat +++ b/ubuntu/_base/core/tdeaddons/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeaddons/debian/control b/ubuntu/_base/core/tdeaddons/debian/control index b73c4c501..3cc04d044 100644 --- a/ubuntu/_base/core/tdeaddons/debian/control +++ b/ubuntu/_base/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 +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 Standards-Version: 3.8.4 Package: tdeaddons-trinity @@ -152,7 +152,7 @@ Architecture: all Section: tde Replaces: knewsticker-scripts-kde3 (<< 4:14.0.0~), knewsticker-scripts-trinity (<< 4:14.0.0~) Breaks: knewsticker-scripts-kde3 (<< 4:14.0.0~), 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-kde3 (<< 4:14.0.0~), konq-plugins-trinity (<< 4:14.0.0~) Breaks: konq-plugins-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/_base/core/tdeaddons/debian/kicker-applets-trinity.lintian deleted file mode 100644 index 705d74139..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdeaddons/debian/rules b/ubuntu/_base/core/tdeaddons/debian/rules index 76d43dd46..dceaa1982 100755 --- a/ubuntu/_base/core/tdeaddons/debian/rules +++ b/ubuntu/_base/core/tdeaddons/debian/rules @@ -22,11 +22,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/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdeaddons-tdefile-plugins/README.renamedlgplugins binary-install/knewsticker-scripts-trinity:: - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.pl - chmod 755 debian/knewsticker-scripts-trinity/opt/trinity/share/apps/knewsticker/scripts/*.py + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.pl + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/knewsticker/scripts/*.py + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/knewsticker/scripts binary-install/kate-plugins-trinity:: - chmod 755 debian/kate-plugins-trinity/opt/trinity/share/apps/kate/scripts/html-tidy.sh + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kate/scripts/html-tidy.sh + +binary-install/konq-plugins-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/imagerotation diff --git a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeadmin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeadmin/debian/compat b/ubuntu/_base/core/tdeadmin/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeadmin/debian/compat +++ b/ubuntu/_base/core/tdeadmin/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeadmin/debian/control b/ubuntu/_base/core/tdeadmin/debian/control index 016c24273..917184580 100644 --- a/ubuntu/_base/core/tdeadmin/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeartwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeartwork/debian/compat b/ubuntu/_base/core/tdeartwork/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeartwork/debian/compat +++ b/ubuntu/_base/core/tdeartwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeartwork/debian/control b/ubuntu/_base/core/tdeartwork/debian/control index 00f306f34..15b472ff5 100644 --- a/ubuntu/_base/core/tdeartwork/debian/control +++ b/ubuntu/_base/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 +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 Build-Conflicts: nvidia-glx Standards-Version: 3.8.4 diff --git a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdebase/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdebase/debian/compat b/ubuntu/_base/core/tdebase/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdebase/debian/compat +++ b/ubuntu/_base/core/tdebase/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control index df3705481..0d88bcb73 100644 --- a/ubuntu/_base/core/tdebase/debian/control +++ b/ubuntu/_base/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], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev +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], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev 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-kde3 (<< 4:14.0.0~), kicker-trinity (<< 4:14.0.0~) Breaks: kicker-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst deleted file mode 100644 index 0b3eb0b52..000000000 --- a/ubuntu/_base/core/tdebase/debian/kdesktop-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kdesktop-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install index 96fce70e1..4e883cb6b 100644 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.install @@ -36,6 +36,7 @@ debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/man9.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/Manpages/mann.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/support.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/quickstart.desktop +debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/releasenotes.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/visualdict.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/userguide.desktop debian/tmp/opt/trinity/share/apps/khelpcenter/plugins/welcome.desktop @@ -99,6 +100,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/quickstart/index.docboo debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.0.x/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.1.x/*.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/releasenotes/r14.2.x/*.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/shadow1.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/support.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/khelpcenter/userguide/a-window.png diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian index 3a278bff7..c57f28095 100644 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.lintian @@ -1,3 +1 @@ khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so -khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so diff --git a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst b/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst deleted file mode 100644 index b6b0656b7..000000000 --- a/ubuntu/_base/core/tdebase/debian/khelpcenter-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for khelpcenter-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian index bee8b8020..c46e478c8 100644 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.lintian @@ -1,3 +1 @@ klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so -klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so -klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst b/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst deleted file mode 100644 index b2c57de01..000000000 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for klipper-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian index c36dd0445..f9d56b353 100644 --- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.lintian @@ -1,4 +1,2 @@ kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so -kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so -kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so diff --git a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst b/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst deleted file mode 100644 index b3a79cc14..000000000 --- a/ubuntu/_base/core/tdebase/debian/kmenuedit-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kmenuedit-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs index c023d564b..e00f630aa 100644 --- a/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs +++ b/ubuntu/_base/core/tdebase/debian/konqueror-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian index 7006dfe10..f0a12e1aa 100644 --- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.lintian @@ -1,3 +1 @@ konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so -konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so -konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst index 532e028bd..3b7be1e92 100644 --- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst +++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.postinst @@ -21,9 +21,6 @@ case "$1" in configure) update-alternatives --install /usr/bin/x-terminal-emulator x-terminal-emulator /opt/trinity/bin/konsole 35 \ --slave /usr/share/man/man1/x-terminal-emulator.1 x-terminal-emulator.1 /opt/trinity/share/man/man1/konsole.1 - - # force ldconfig due to tdeinit library - ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian index 2c7c61596..74b77ecf6 100644 --- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.lintian @@ -1,2 +1 @@ ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so -ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so diff --git a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst index 14e203a41..3b85196bb 100644 --- a/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst +++ b/ubuntu/_base/core/tdebase/debian/ksmserver-trinity.postinst @@ -23,9 +23,6 @@ case "$1" in x-session-manager /opt/trinity/bin/starttde 40 \ --slave /usr/share/man/man1/x-session-manager.1 \ x-session-manager.1 "/opt/trinity/share/man/man1/starttde.1" - - # force ldconfig due to tdeinit library - ldconfig ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs index c023d564b..e00f630aa 100644 --- a/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs +++ b/ubuntu/_base/core/tdebase/debian/libkonq4-trinity.docs @@ -1 +1 @@ -libkonq/SERVICEMENUS +libkonq/SERVICEMENUS.md diff --git a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff index 598cd7092..99db98c6f 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,6 +1,6 @@ --- a/starttde +++ b/starttde -@@ -288,17 +288,17 @@ +@@ -396,17 +396,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff index 79aebbd1d..bb1dccd7b 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff @@ -2,7 +2,7 @@ diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop index dd64b58..0af3e44 100644 --- a/kate/data/kwrite.desktop +++ b/kate/data/kwrite.desktop -@@ -109,3 +109,4 @@ Terminal=false +@@ -12,3 +12,4 @@ Terminal=false X-TDE-InitialPreference=8 X-DCOP-ServiceType=Multi Categories=Qt;TDE;TextEditor; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff index 608802a75..64adee330 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_07_hide_knetattach_menu_entry.diff @@ -2,7 +2,7 @@ diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop index 6003b68..f33e1f4 100644 --- a/knetattach/knetattach.desktop +++ b/knetattach/knetattach.desktop -@@ -80,3 +80,4 @@ Terminal=false +@@ -11,3 +11,4 @@ Terminal=false X-TDE-StartupNotify=true Categories=Qt;TDE;Network; X-DocPath=knetattach/index.html diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff index 0bbb613a9..e5b89e2ba 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_09_hide_kpersonaliser_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/kpersonalizer/kpersonalizer.desktop-orig 2005-03-17 01:05:16.091600616 +0000 +++ tdebase/kpersonalizer/kpersonalizer.desktop 2005-03-17 01:05:23.678447240 +0000 -@@ -77,3 +77,4 @@ +@@ -13,3 +13,4 @@ X-DCOP-ServiceType=Multi Categories=Qt;TDE;Settings; OnlyShowIn=TDE; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff index e12245486..ef79cc8eb 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_14_hide_konquerorsu_menu_entry.diff @@ -2,7 +2,7 @@ Index: b/konqueror/konquerorsu.desktop =================================================================== --- a/konqueror/konquerorsu.desktop +++ b/konqueror/konquerorsu.desktop -@@ -88,3 +88,4 @@ +@@ -11,3 +11,4 @@ Categories=Qt;TDE;X-TDE-System-su; OnlyShowIn=TDE; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff index 009d6f9db..e8f88b7f4 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_15_hide_tdefontview_menu_entry.diff @@ -2,7 +2,7 @@ diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefon index 5d5e2b8..c989adf 100644 --- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop +++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop -@@ -99,3 +99,4 @@ Terminal=false +@@ -10,3 +10,4 @@ Terminal=false X-TDE-InitialPreference=1 Categories=Qt;TDE;Graphics; X-DocPath=tdefontview/index.html diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff index 3eab104cb..e1d2567bd 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_16_hide_kpager_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/kpager/kpager.desktop +++ tdebase/kpager/kpager.desktop -@@ -96,3 +96,4 @@ +@@ -11,3 +11,4 @@ X-TDE-StartupNotify=false X-DCOP-ServiceType=Unique Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff index a46ab143c..bfac9d8ea 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff @@ -1,6 +1,6 @@ --- tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop +++ tdebase/tdeprint/tdeprintfax/tdeprintfax.desktop -@@ -90,3 +90,4 @@ +@@ -9,3 +9,4 @@ Terminal=false X-DCOP-ServiceType=Multi Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index baeb8bfd5..fa2b265e5 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -11,7 +11,7 @@ TQHBoxLayout* hbuttonbox; --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp -@@ -697,7 +697,7 @@ +@@ -725,7 +725,7 @@ 2 * KDialog::spacingHint() ); // default factor @@ -20,3 +20,14 @@ // slighty more space for the new logout int factor = 2; +--- a/kcontrol/smserver/kcmsmserver.cpp ++++ b/kcontrol/smserver/kcmsmserver.cpp +@@ -94,7 +94,7 @@ + + c->setGroup("Logout"); + dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true)); +- dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", false)); ++ dialog->showUbuntuStyleDialog->setChecked(c->readBoolEntry("doUbuntuLogout", true)); + dialog->showFadeAway->setChecked(c->readBoolEntry("doFadeaway", true)); + dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true)); + dialog->showFancyFadeAway->setEnabled(dialog->confirmLogoutCheck->isChecked() && dialog->showFadeAway->isChecked()), diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff index 8db1221a5..98fae0e38 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9904_hide_kfind.diff @@ -1,6 +1,6 @@ --- tdebase-3.5.7/kfind/Kfind.desktop +++ tdebase-3.5.7/kfind/Kfind.desktop -@@ -73,3 +73,4 @@ +@@ -9,3 +9,4 @@ X-TDE-StartupNotify=true OnlyShowIn=TDE; Categories=Qt;TDE;Core; diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff index c312b6fb7..49a653275 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_9921_tdm_bulletproof_x.diff @@ -1,6 +1,6 @@ --- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 +++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 -@@ -996,9 +996,14 @@ ReapChildren( void ) +@@ -1023,9 +1023,14 @@ ReapChildren( void ) /* don't kill again */ break; case running: diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index df3327542..8cdb710e0 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -45,6 +45,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ -DWITH_LDAP="ON" \ -DWITH_SAMBA="ON" \ + -DWITH_SFTP="ON" \ -DWITH_LIBUSB="ON" \ -DWITH_LIBRAW1394="ON" \ -DWITH_OPENEXR="ON" \ @@ -74,6 +75,9 @@ DEB_FIXPERMS_EXCLUDE := \ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg +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/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install index ffd4cc04a..0ab9bc8a8 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install @@ -88,20 +88,26 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DarkBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DesertRed.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/DigitalCDE.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/EveX.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Human.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDEOne.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KDETwo.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikEmerald.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Keramik.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/KeramikWhite.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Last.fm.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Lizard.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/MediaPeach.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Next.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PaleGray.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Plastik.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Platinum.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/PointReyesGreen.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Pumpkin.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Sienna.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/SolarisCDE.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Storm.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/System.kcsrc +debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WedgieWeb.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WhiteOnBlack.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows2000.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/Windows95.kcsrc diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install index c8666a793..9ddb66bc2 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install @@ -1,6 +1,8 @@ debian/tmp/opt/trinity/bin/migratekde3 debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/tde_release_notes +debian/tmp/opt/trinity/bin/tde_license_info +debian/tmp/opt/trinity/bin/tde_show_license_info debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdeinit_displayconfig @@ -75,7 +77,9 @@ debian/tmp/opt/trinity/share/apps/kdcop/kdcopui.rc debian/tmp/opt/trinity/share/apps/khotkeys/trinity2b1.khotkeys debian/tmp/opt/trinity/share/apps/khotkeys/konqueror_gestures_trinity21.khotkeys debian/tmp/opt/trinity/share/apps/khotkeys/printscreen.khotkeys +debian/tmp/opt/trinity/share/apps/kxkb/eventsrc debian/tmp/opt/trinity/share/autostart/tde_release_notes.desktop +debian/tmp/opt/trinity/share/autostart/tde_license_info.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdcop/index.docbook diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian index 6501cf36b..ddaa5b274 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian +++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.lintian @@ -5,5 +5,3 @@ tdebase-bin-trinity: setuid-binary opt/trinity/bin/tdmtsak 4711 root/root tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so -tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so -tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian index 52cd10d88..8410a13ae 100644 --- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian +++ b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.lintian @@ -1,4 +1,2 @@ tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so -tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so -tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so diff --git a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst b/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst deleted file mode 100644 index c812a9390..000000000 --- a/ubuntu/_base/core/tdebase/debian/tdeprint-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for tdeprint-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm index 23de3a247..d51bcd8dc 100644 --- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm +++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.prerm @@ -172,4 +172,6 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi fi +#DEBHELPER# + exit 0 diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install index 381a173be..52c59c4a7 100644 --- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install @@ -11,24 +11,24 @@ debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.la debian/tmp/opt/trinity/lib/trinity/kcm_twinoptions.so debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.la debian/tmp/opt/trinity/lib/trinity/kcm_twinrules.so -debian/tmp/opt/trinity/lib/trinity/twin3_b2.la -debian/tmp/opt/trinity/lib/trinity/twin3_b2.so -debian/tmp/opt/trinity/lib/trinity/twin3_default.la -debian/tmp/opt/trinity/lib/trinity/twin3_default.so -debian/tmp/opt/trinity/lib/trinity/twin3_keramik.la -debian/tmp/opt/trinity/lib/trinity/twin3_keramik.so -debian/tmp/opt/trinity/lib/trinity/twin3_laptop.la -debian/tmp/opt/trinity/lib/trinity/twin3_laptop.so -debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.la -debian/tmp/opt/trinity/lib/trinity/twin3_modernsys.so -debian/tmp/opt/trinity/lib/trinity/twin3_plastik.la -debian/tmp/opt/trinity/lib/trinity/twin3_plastik.so -debian/tmp/opt/trinity/lib/trinity/twin3_quartz.la -debian/tmp/opt/trinity/lib/trinity/twin3_quartz.so -debian/tmp/opt/trinity/lib/trinity/twin3_redmond.la -debian/tmp/opt/trinity/lib/trinity/twin3_redmond.so -debian/tmp/opt/trinity/lib/trinity/twin3_web.la -debian/tmp/opt/trinity/lib/trinity/twin3_web.so +debian/tmp/opt/trinity/lib/trinity/twin_b2.la +debian/tmp/opt/trinity/lib/trinity/twin_b2.so +debian/tmp/opt/trinity/lib/trinity/twin_default.la +debian/tmp/opt/trinity/lib/trinity/twin_default.so +debian/tmp/opt/trinity/lib/trinity/twin_keramik.la +debian/tmp/opt/trinity/lib/trinity/twin_keramik.so +debian/tmp/opt/trinity/lib/trinity/twin_laptop.la +debian/tmp/opt/trinity/lib/trinity/twin_laptop.so +debian/tmp/opt/trinity/lib/trinity/twin_modernsys.la +debian/tmp/opt/trinity/lib/trinity/twin_modernsys.so +debian/tmp/opt/trinity/lib/trinity/twin_plastik.la +debian/tmp/opt/trinity/lib/trinity/twin_plastik.so +debian/tmp/opt/trinity/lib/trinity/twin_quartz.la +debian/tmp/opt/trinity/lib/trinity/twin_quartz.so +debian/tmp/opt/trinity/lib/trinity/twin_redmond.la +debian/tmp/opt/trinity/lib/trinity/twin_redmond.so +debian/tmp/opt/trinity/lib/trinity/twin_web.la +debian/tmp/opt/trinity/lib/trinity/twin_web.so debian/tmp/opt/trinity/lib/trinity/twin_b2_config.la debian/tmp/opt/trinity/lib/trinity/twin_b2_config.so debian/tmp/opt/trinity/lib/trinity/twin_default_config.la @@ -54,12 +54,11 @@ debian/tmp/opt/trinity/share/applications/tde/twindecoration.desktop debian/tmp/opt/trinity/share/applications/tde/twinoptions.desktop debian/tmp/opt/trinity/share/applications/tde/twinrules.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinactions.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/twinactiveborders.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinadvanced.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinfocus.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twinmoving.desktop debian/tmp/opt/trinity/share/applnk/.hidden/twintranslucency.desktop -debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.pl -debian/tmp/opt/trinity/share/apps/tdeconf_update/twin3_plugin.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.sh debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus1.upd debian/tmp/opt/trinity/share/apps/tdeconf_update/twin_focus2.sh diff --git a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdebindings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdebindings/debian/compat b/ubuntu/_base/core/tdebindings/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdebindings/debian/compat +++ b/ubuntu/_base/core/tdebindings/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control index 651da2701..1bda66f65 100644 --- a/ubuntu/_base/core/tdebindings/debian/control +++ b/ubuntu/_base/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 Section: devel Priority: optional @@ -16,7 +16,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, @@ -65,7 +65,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 +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc Section: libs Replaces: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~) Breaks: libdcop3-jni-kde3 (<< 4:14.0.0~), libdcop3-jni-trinity (<< 4:14.0.0~) @@ -79,7 +79,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 +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc Section: libdevel Replaces: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~) Breaks: libdcop3-java-kde3-dev (<< 4:14.0.0~), libdcop3-java-trinity-dev (<< 4:14.0.0~) @@ -110,7 +110,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 +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc Section: libs Replaces: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~) Breaks: libqt3-jni-kde3 (<< 4:14.0.0~), libqt3-jni-trinity (<< 4:14.0.0~) @@ -139,7 +139,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 +Architecture: amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc Section: libs Replaces: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~) Breaks: libtrinity-jni-kde3 (<< 4:14.0.0~), libtrinity-jni-trinity (<< 4:14.0.0~) @@ -211,13 +211,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-kde3 (<< 4:14.0.0~), python-dcop-trinity (<< 4:14.0.0~) -Breaks: python-dcop-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install deleted file mode 100644 index 364b52d9d..000000000 --- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/opt/trinity/lib/python2.*/site-packages diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs index 957d3af3e..957d3af3e 100644 --- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs +++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples index 4100d465b..4100d465b 100644 --- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples +++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples diff --git a/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install new file mode 100644 index 000000000..8123736e6 --- /dev/null +++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install @@ -0,0 +1 @@ +debian/tmp/opt/trinity/lib/python3/dist-packages diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules index 63b19e54f..f7d6f4790 100755 --- a/ubuntu/_base/core/tdebindings/debian/rules +++ b/ubuntu/_base/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 @@ -33,7 +29,7 @@ endif DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) --prefix=/opt/trinity \ 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... @@ -111,8 +107,9 @@ common-install-arch:: stamp-install-dcopjava binary-install/juic-trinity:: sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic -binary-install/python-dcop-trinity:: - ${DH_PYTHON2} -p$(cdbs_curpkg) + +binary-install/python3-dcop-trinity:: + dh_python3 -p$(cdbs_curpkg) ### diff --git a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeedu/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeedu/debian/compat b/ubuntu/_base/core/tdeedu/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeedu/debian/compat +++ b/ubuntu/_base/core/tdeedu/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeedu/debian/control b/ubuntu/_base/core/tdeedu/debian/control index d853f11f8..121b7140c 100644 --- a/ubuntu/_base/core/tdeedu/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdegames/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdegames/debian/compat b/ubuntu/_base/core/tdegames/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdegames/debian/compat +++ b/ubuntu/_base/core/tdegames/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdegames/debian/control b/ubuntu/_base/core/tdegames/debian/control index 895beb8cf..c7c4a74b5 100644 --- a/ubuntu/_base/core/tdegames/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdegraphics/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdegraphics/debian/compat b/ubuntu/_base/core/tdegraphics/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdegraphics/debian/compat +++ b/ubuntu/_base/core/tdegraphics/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control index 42f48f50b..7105a7f6e 100644 --- a/ubuntu/_base/core/tdegraphics/debian/control +++ b/ubuntu/_base/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, libglut-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/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian index 77a1b0e8e..dbcda26a3 100644 --- a/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian +++ b/ubuntu/_base/core/tdegraphics/debian/kfaxview-trinity.lintian @@ -1,4 +1,2 @@ kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so -kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so -kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage diff --git a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian index 89f453cea..121ed9a1b 100644 --- a/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian +++ b/ubuntu/_base/core/tdegraphics/debian/kuickshow-trinity.lintian @@ -1,4 +1,2 @@ kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so -kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow diff --git a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdelibs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdelibs/debian/compat b/ubuntu/_base/core/tdelibs/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdelibs/debian/compat +++ b/ubuntu/_base/core/tdelibs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index 6cf2eb867..2af3ea23e 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/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, docbook-to-man, libart-2.0-dev (>= 4:14.0.0~), libarts1-trinity-dev (>= 1.5.0), libacl1-dev, libattr1-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], @@ -29,7 +29,7 @@ Replaces: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~) Breaks: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~) Provides: tdelibs Conflicts: 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/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index eafe84957..533c0ed51 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -13,6 +13,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) +ifeq ($(DEB_TIME64_API),true) +DEB_TIME64_SUFFIX = t64 +else +DEB_TIME64_SUFFIX = +endif + + DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) @@ -105,3 +113,40 @@ binary-install/tdelibs14-trinity:: mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/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/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install index d06f09083..615399188 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install @@ -1748,6 +1748,7 @@ debian/tmp/opt/trinity/share/apps/LICENSES/GPL_V3 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2 debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V3 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0 +debian/tmp/opt/trinity/share/apps/LICENSES/MIT debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc debian/tmp/opt/trinity/share/apps/tdemarkdown debian/tmp/opt/trinity/share/autostart/tdeab2tdeabc.desktop diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst index f2a8d925b..99078621c 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postinst @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in upgrade|install) - ldconfig ;; abort-upgrade) diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm index aae9f3600..40c135b0c 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.postrm @@ -7,7 +7,6 @@ MD5SUM340="ea26be9e934fb23c04b0b1409706bace" case "$1" in remove) - ldconfig ;; abort-upgrade) diff --git a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdemultimedia/debian/compat b/ubuntu/_base/core/tdemultimedia/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/compat +++ b/ubuntu/_base/core/tdemultimedia/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdemultimedia/debian/control b/ubuntu/_base/core/tdemultimedia/debian/control index 7ae0e8b3b..3ac50dd74 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install index 3e0d2daf7..4ee39eb84 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install +++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.install @@ -12,29 +12,10 @@ debian/tmp/opt/trinity/share/applications/tde/kmix.desktop debian/tmp/opt/trinity/share/apps/kicker/applets/kmixapplet.desktop debian/tmp/opt/trinity/share/apps/kmix/kmixui.rc debian/tmp/opt/trinity/share/apps/kmix/pics/Listener.png -debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontLeft.png -debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerFrontRight.png -debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearLeft.png -debian/tmp/opt/trinity/share/apps/kmix/pics/SpeakerRearRight.png -debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked.png -debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_error.png -debian/tmp/opt/trinity/share/apps/kmix/pics/kmixdocked_mute.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ac97.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_audio.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_bass.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_cd.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_digital.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_ext.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_headphone.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_microphone.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_midi.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_recmon.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_record.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_surround.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_treble.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_unknown.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_video.png -debian/tmp/opt/trinity/share/apps/kmix/pics/mix_volume.png +debian/tmp/opt/trinity/share/apps/kmix/pics/Speaker*.png +debian/tmp/opt/trinity/share/apps/kmix/pics/mix*.png +debian/tmp/opt/trinity/share/apps/kmix/pics/crystal/*.png +debian/tmp/opt/trinity/share/apps/kmix/pics/oldcrystal/*.png debian/tmp/opt/trinity/share/autostart/restore_kmix_volumes.desktop debian/tmp/opt/trinity/share/autostart/kmix.desktop debian/tmp/opt/trinity/share/doc/tde/HTML/en/kmix/common diff --git a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian index c802a5b07..914623090 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian +++ b/ubuntu/_base/core/tdemultimedia/debian/kmix-trinity.lintian @@ -1,4 +1,2 @@ kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so -kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so -kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so diff --git a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian index 9cba1f36a..e5e13fb57 100644 --- a/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian +++ b/ubuntu/_base/core/tdemultimedia/debian/krec-trinity.lintian @@ -1,3 +1 @@ krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so -krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so -krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so diff --git a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdenetwork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdenetwork/debian/compat b/ubuntu/_base/core/tdenetwork/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdenetwork/debian/compat +++ b/ubuntu/_base/core/tdenetwork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdenetwork/debian/control b/ubuntu/_base/core/tdenetwork/debian/control index a5ff721d6..b89afb1bb 100644 --- a/ubuntu/_base/core/tdenetwork/debian/control +++ b/ubuntu/_base/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), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-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), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install index 7d57f12cf..8712a1ebd 100644 --- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.install @@ -24,6 +24,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kdict.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kdict.png debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kdict.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kdict.svgz +debian/tmp/opt/trinity/share/man/man1/kdict.1 debian/icons/kdict-16.xpm /opt/trinity/share/pixmaps debian/icons/kdict.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages deleted file mode 100644 index 3128a0e9a..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kdict-trinity.1 diff --git a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst deleted file mode 100644 index 5076ff321..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/kdict-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kdict-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install index d2a0707c9..623f76912 100644 --- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.install @@ -73,6 +73,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kget_list.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kget.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kget_list.png +debian/tmp/opt/trinity/share/man/man1/kget.1 debian/tmp/opt/trinity/share/mimelnk/application/x-kgetlist.desktop debian/tmp/opt/trinity/share/sounds/KGet_Added.ogg debian/tmp/opt/trinity/share/sounds/KGet_Finished.ogg diff --git a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages deleted file mode 100644 index 585b03129..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/kget-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kget-trinity.1 diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install index 48f843209..8ac850cbf 100644 --- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.install @@ -474,6 +474,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/jabber_protocol.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kopete.png debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kopete.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kopete2.svgz +debian/tmp/opt/trinity/share/man/man1/kopete.1 debian/tmp/opt/trinity/share/mimelnk/application/x-icq.desktop debian/tmp/opt/trinity/share/mimelnk/application/x-kopete-emoticons.desktop debian/tmp/opt/trinity/share/services/aim.protocol diff --git a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages deleted file mode 100644 index 214a24d2e..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/kopete-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/out/kopete-trinity.1 diff --git a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian index f219b1176..6cd864e57 100644 --- a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian +++ b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.lintian @@ -1,3 +1 @@ ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so -ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so -ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so diff --git a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst b/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst deleted file mode 100644 index 1ee118baa..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/ksirc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for ksirc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install index 328c9ae44..f4eb51a58 100644 --- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.install @@ -29,6 +29,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kwifimanager.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kwifimanager.png debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/kwifimanager.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/kwifimanager.svgz +debian/tmp/opt/trinity/share/man/man1/kwifimanager.1 debian/icons/kwifimanager-16.xpm /opt/trinity/share/pixmaps debian/icons/kwifimanager.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian index 1586f0f0a..f85b1021c 100644 --- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian +++ b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.lintian @@ -1,3 +1 @@ kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so -kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so -kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so diff --git a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages deleted file mode 100644 index 4f390510b..000000000 --- a/ubuntu/_base/core/tdenetwork/debian/kwifimanager-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/kwifimanager-trinity.1 diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install index 728eed390..47ab05c03 100644 --- a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.install @@ -15,6 +15,8 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/lanbrowser/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/lisa/index.docbook +debian/tmp/opt/trinity/share/man/man8/lisa.8 +debian/tmp/opt/trinity/share/man/man8/reslisa.8 debian/tmp/opt/trinity/share/services/lan.protocol debian/tmp/opt/trinity/share/services/rlan.protocol diff --git a/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages b/ubuntu/_base/core/tdenetwork/debian/lisa-trinity.manpages deleted file mode 100644 index 306f0c52e..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kdict-trinity.1 deleted file mode 100644 index aff5138c4..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kget-trinity.1 deleted file mode 100644 index 72b2d3305..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml b/ubuntu/_base/core/tdenetwork/debian/man/kopete-trinity.sgml deleted file mode 100644 index 87922999d..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1 b/ubuntu/_base/core/tdenetwork/debian/man/kwifimanager-trinity.1 deleted file mode 100644 index 5f12be561..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/lisa-trinity.8 deleted file mode 100644 index 9b3192e14..000000000 --- a/ubuntu/_base/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 /opt/trinity/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/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8 b/ubuntu/_base/core/tdenetwork/debian/man/reslisa-trinity.8 deleted file mode 100644 index eb2ca8f48..000000000 --- a/ubuntu/_base/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 /opt/trinity/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/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install index 46b3c424c..54cb2ca36 100644 --- a/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install +++ b/ubuntu/_base/core/tdenetwork/debian/tdednssd-trinity.install @@ -2,13 +2,14 @@ debian/tmp/opt/trinity/share/services/zeroconf.protocol debian/tmp/opt/trinity/share/services/invitation.protocol debian/tmp/opt/trinity/share/services/kded/dnssdwatcher.desktop debian/tmp/opt/trinity/share/apps/remoteview/zeroconf.desktop -debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp debian/tmp/opt/trinity/share/apps/zeroconf/_ftp._tcp +debian/tmp/opt/trinity/share/apps/zeroconf/_http._tcp debian/tmp/opt/trinity/share/apps/zeroconf/_ldap._tcp -debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp debian/tmp/opt/trinity/share/apps/zeroconf/_nfs._tcp -debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp debian/tmp/opt/trinity/share/apps/zeroconf/_rfb._tcp +debian/tmp/opt/trinity/share/apps/zeroconf/_ssh._tcp +debian/tmp/opt/trinity/share/apps/zeroconf/_sftp-ssh._tcp +debian/tmp/opt/trinity/share/apps/zeroconf/_webdav._tcp debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.so debian/tmp/opt/trinity/lib/trinity/tdeio_zeroconf.la debian/tmp/opt/trinity/lib/trinity/kded_dnssdwatcher.so diff --git a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdepim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdepim/debian/compat b/ubuntu/_base/core/tdepim/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdepim/debian/compat +++ b/ubuntu/_base/core/tdepim/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control index c85222c1d..756e22d00 100644 --- a/ubuntu/_base/core/tdepim/debian/control +++ b/ubuntu/_base/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-kde3 (<< 4:14.0.0~), kdepim-trinity (<< 4:14.0.0~) Breaks: kdepim-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdepim/debian/rules b/ubuntu/_base/core/tdepim/debian/rules index f2de846ca..874cc57ac 100755 --- a/ubuntu/_base/core/tdepim/debian/rules +++ b/ubuntu/_base/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 DEB_CMAKE_EXTRA_FLAGS := \ @@ -86,3 +93,54 @@ KDE_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/\.dfsg. KDE_TARBALL := ../$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION).tar.bz2 KDE_SOURCEDIR := dfsg-tmp/$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION) NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) + +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/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdesdk/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian index 6759ea297..189c5f2f2 100644 --- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian +++ b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.lintian @@ -4,6 +4,4 @@ cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/ # This is from tdeinit black magic. cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so -cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia diff --git a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst b/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst deleted file mode 100644 index 800a596bf..000000000 --- a/ubuntu/_base/core/tdesdk/debian/cervisia-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for cervisia-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdesdk/debian/compat b/ubuntu/_base/core/tdesdk/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdesdk/debian/compat +++ b/ubuntu/_base/core/tdesdk/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdesdk/debian/control b/ubuntu/_base/core/tdesdk/debian/control index b4e0c1eae..0001d479c 100644 --- a/ubuntu/_base/core/tdesdk/debian/control +++ b/ubuntu/_base/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, 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 Standards-Version: 3.8.4 Package: tdesdk-trinity @@ -165,7 +165,7 @@ Architecture: all Section: devel Replaces: kcachegrind-converters-kde3 (<< 4:14.0.0~), kcachegrind-converters-trinity (<< 4:14.0.0~) Breaks: kcachegrind-converters-kde3 (<< 4:14.0.0~), 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 @@ -219,7 +219,7 @@ Architecture: all Section: devel Replaces: kdesdk-scripts-kde3 (<< 4:14.0.0~), kdesdk-scripts-trinity (<< 4:14.0.0~) Breaks: kdesdk-scripts-kde3 (<< 4:14.0.0~), 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 @@ -360,7 +360,7 @@ Architecture: any Section: devel Replaces: umbrello-kde3 (<< 4:14.0.0~), umbrello-trinity (<< 4:14.0.0~) Breaks: umbrello-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdesdk/debian/rules b/ubuntu/_base/core/tdesdk/debian/rules index 2a1a0c921..a550a3c23 100755 --- a/ubuntu/_base/core/tdesdk/debian/rules +++ b/ubuntu/_base/core/tdesdk/debian/rules @@ -32,28 +32,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/opt/trinity/bin/svn-clean \ - debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde - mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \ - debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde + mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean \ + debian/$(cdbs_curpkg)/opt/trinity/bin/svn-clean-kde + mv -f debian/$(cdbs_curpkg)/opt/trinity/bin/svnversions \ + debian/$(cdbs_curpkg)/opt/trinity/bin/svnversion-kde install -p -D -m644 scripts/kde-buildrc \ - debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin binary-install/tdesdk-misc-trinity:: install -p -D -m644 kdeaccounts-plugin/README \ - debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kdeaccounts-plugin install -p -D -m644 tdeioslave/svn/AUTHORS \ - debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/AUTHORS.tdeioslave-svn install -p -D -m644 tdeioslave/svn/README \ - debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.tdeioslave-svn install -p -D -m644 kprofilemethod/README \ - debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.kprofilemethod install -p -D -m644 scheck/README \ - debian/tdesdk-misc-trinity/opt/trinity/share/doc/tdesdk-misc/README.scheck + debian/$(cdbs_curpkg)/opt/trinity/share/doc/tdesdk-misc/README.scheck binary-install/kapptemplate-trinity:: - rm -f debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/*.cdbs-orig + rm -f debian/$(cdbs_curpkg)/opt/trinity/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/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \ + chmod 755 debian/$(cdbs_curpkg)/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \ done + +binary-install/tdecachegrind-converters-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin + +binary-install/umbrello-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/umbrello/headings diff --git a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdetoys/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdetoys/debian/compat b/ubuntu/_base/core/tdetoys/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdetoys/debian/compat +++ b/ubuntu/_base/core/tdetoys/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdetoys/debian/control b/ubuntu/_base/core/tdetoys/debian/control index e56160909..a0a19c2eb 100644 --- a/ubuntu/_base/core/tdetoys/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst b/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst deleted file mode 100644 index 99a084399..000000000 --- a/ubuntu/_base/core/tdetoys/debian/kweather-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kweather-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian index 47861fafc..66bb7fec8 100644 --- a/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian +++ b/ubuntu/_base/core/tdeutils/debian/ark-trinity-trinity.lintian @@ -1,3 +1 @@ ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so -ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so -ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so diff --git a/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst deleted file mode 100644 index b919d035f..000000000 --- a/ubuntu/_base/core/tdeutils/debian/ark-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for ark-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdeutils/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdeutils/debian/compat b/ubuntu/_base/core/tdeutils/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdeutils/debian/compat +++ b/ubuntu/_base/core/tdeutils/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control index bd25d44d8..0edc263b7 100644 --- a/ubuntu/_base/core/tdeutils/debian/control +++ b/ubuntu/_base/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/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian index 0b36154e5..3c468628f 100644 --- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian +++ b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity-trinity.lintian @@ -1,3 +1 @@ kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so -kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so -kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so diff --git a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst deleted file mode 100644 index 6cf1c841c..000000000 --- a/ubuntu/_base/core/tdeutils/debian/kcalc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kcalc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian index fdde7bd3b..fbe5924d2 100644 --- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian +++ b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.lintian @@ -1,3 +1 @@ kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so -kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so -kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so diff --git a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst deleted file mode 100644 index 1fa143a43..000000000 --- a/ubuntu/_base/core/tdeutils/debian/kedit-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kedit-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdeutils/debian/rules b/ubuntu/_base/core/tdeutils/debian/rules index 6014293b3..1eb1c2497 100755 --- a/ubuntu/_base/core/tdeutils/debian/rules +++ b/ubuntu/_base/core/tdeutils/debian/rules @@ -33,9 +33,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/opt/trinity/share/doc/superkaramba/examples/globalMouse/xcursor.so diff --git a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.examples b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.examples deleted file mode 100644 index c02a032d2..000000000 --- a/ubuntu/_base/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/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install index b56555797..6304c3c0e 100644 --- a/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install +++ b/ubuntu/_base/core/tdeutils/debian/superkaramba-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/superkaramba debian/tmp/opt/trinity/share/applications/tde/superkaramba.desktop debian/tmp/opt/trinity/share/apps/superkaramba/superkarambaui.rc +debian/tmp/opt/trinity/share/apps/superkaramba/examples debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/superkaramba/index.docbook diff --git a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian index 0c89583f3..666092455 100644 --- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian +++ b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.lintian @@ -1,3 +1 @@ tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so -tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so -tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so diff --git a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst b/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst deleted file mode 100644 index 9119d5017..000000000 --- a/ubuntu/_base/core/tdeutils/debian/tdelirc-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for tdelirc-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdevelop/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdevelop/debian/compat b/ubuntu/_base/core/tdevelop/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdevelop/debian/compat +++ b/ubuntu/_base/core/tdevelop/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdevelop/debian/control b/ubuntu/_base/core/tdevelop/debian/control index cf3284fc7..dd8099bc1 100644 --- a/ubuntu/_base/core/tdevelop/debian/control +++ b/ubuntu/_base/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-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~) Breaks: kdevelop-kde3 (<< 4:14.0.0~), 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/ubuntu/_base/core/tdevelop/debian/watch b/ubuntu/_base/core/tdevelop/debian/watch deleted file mode 100644 index 18344a41a..000000000 --- a/ubuntu/_base/core/tdevelop/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.kde.org/pub/kde/stable/latest/src/tdevelop-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk b/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/core/tdewebdev/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/core/tdewebdev/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)/opt/trinity/lib && \ + test $$(find debian/$(cdbs_curpkg)/opt/trinity/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/ubuntu/_base/core/tdewebdev/debian/compat b/ubuntu/_base/core/tdewebdev/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/core/tdewebdev/debian/compat +++ b/ubuntu/_base/core/tdewebdev/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/core/tdewebdev/debian/control b/ubuntu/_base/core/tdewebdev/debian/control index 81718eef4..f3d95dbb4 100644 --- a/ubuntu/_base/core/tdewebdev/debian/control +++ b/ubuntu/_base/core/tdewebdev/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>, Armin Berres <trigger+debian@space-based.de>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tqt3-doc, libreadline-dev | libreadline6-dev | libreadline5-dev, libxml2-dev, libxslt1-dev, libicu-dev, libcvsservice-trinity-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net |