diff options
Diffstat (limited to 'ubuntu/_base/applications')
701 files changed, 4777 insertions, 9538 deletions
diff --git a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/kdbg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/kdbg/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/applications/development/kdbg/debian/compat b/ubuntu/_base/applications/development/kdbg/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/kdbg/debian/compat +++ b/ubuntu/_base/applications/development/kdbg/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/kdbg/debian/control b/ubuntu/_base/applications/development/kdbg/debian/control index 2df63bacd..e32f49776 100644 --- a/ubuntu/_base/applications/development/kdbg/debian/control +++ b/ubuntu/_base/applications/development/kdbg/debian/control @@ -2,7 +2,7 @@ Source: kdbg-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.kdbg.org/ diff --git a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/kdiff3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/kdiff3/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/applications/development/kdiff3/debian/compat b/ubuntu/_base/applications/development/kdiff3/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/kdiff3/debian/compat +++ b/ubuntu/_base/applications/development/kdiff3/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/kdiff3/debian/control b/ubuntu/_base/applications/development/kdiff3/debian/control index 78d8e0592..aa979644f 100644 --- a/ubuntu/_base/applications/development/kdiff3/debian/control +++ b/ubuntu/_base/applications/development/kdiff3/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Eike Sauer <eike@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev Standards-Version: 3.8.4 Package: kdiff3-trinity diff --git a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/kpicosim/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/kpicosim/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/applications/development/kpicosim/debian/compat b/ubuntu/_base/applications/development/kpicosim/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/kpicosim/debian/compat +++ b/ubuntu/_base/applications/development/kpicosim/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/kpicosim/debian/control b/ubuntu/_base/applications/development/kpicosim/debian/control index 4397384d7..51b5d898b 100644 --- a/ubuntu/_base/applications/development/kpicosim/debian/control +++ b/ubuntu/_base/applications/development/kpicosim/debian/control @@ -2,7 +2,7 @@ Source: kpicosim-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kpicosim-trinity diff --git a/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/kscope/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/kscope/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/applications/development/kscope/debian/compat b/ubuntu/_base/applications/development/kscope/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/kscope/debian/compat +++ b/ubuntu/_base/applications/development/kscope/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/kscope/debian/control b/ubuntu/_base/applications/development/kscope/debian/control index 24cae5f83..73542706b 100644 --- a/ubuntu/_base/applications/development/kscope/debian/control +++ b/ubuntu/_base/applications/development/kscope/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bison, flex, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bison, flex, tdebase-trinity-dev Standards-Version: 3.8.0 Homepage: http://kscope.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log diff --git a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/ktechlab/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/ktechlab/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/applications/development/ktechlab/debian/compat b/ubuntu/_base/applications/development/ktechlab/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/ktechlab/debian/compat +++ b/ubuntu/_base/applications/development/ktechlab/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/ktechlab/debian/control b/ubuntu/_base/applications/development/ktechlab/debian/control index a45c7e13b..a36f98051 100644 --- a/ubuntu/_base/applications/development/ktechlab/debian/control +++ b/ubuntu/_base/applications/development/ktechlab/debian/control @@ -2,7 +2,7 @@ Source: ktechlab-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, imagemagick, tdelibs14-trinity-dev, gpsim-dev (>= 0.21.11-2) Standards-Version: 3.8.4 Package: ktechlab-trinity diff --git a/ubuntu/_base/applications/development/ktechlab/debian/docs b/ubuntu/_base/applications/development/ktechlab/debian/docs index 724e08449..76c3076c9 100644 --- a/ubuntu/_base/applications/development/ktechlab/debian/docs +++ b/ubuntu/_base/applications/development/ktechlab/debian/docs @@ -1,2 +1,3 @@ -README +AUTHORS +README.md TODO diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/kxmleditor/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/kxmleditor/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/applications/development/kxmleditor/debian/compat b/ubuntu/_base/applications/development/kxmleditor/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/kxmleditor/debian/compat +++ b/ubuntu/_base/applications/development/kxmleditor/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/control b/ubuntu/_base/applications/development/kxmleditor/debian/control index 1486106b3..0047dbbc0 100644 --- a/ubuntu/_base/applications/development/kxmleditor/debian/control +++ b/ubuntu/_base/applications/development/kxmleditor/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Package: kxmleditor-trinity diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/docs b/ubuntu/_base/applications/development/kxmleditor/debian/docs index ca0272abf..76c3076c9 100644 --- a/ubuntu/_base/applications/development/kxmleditor/debian/docs +++ b/ubuntu/_base/applications/development/kxmleditor/debian/docs @@ -1,3 +1,3 @@ AUTHORS -README +README.md TODO diff --git a/ubuntu/_base/applications/development/kxmleditor/debian/patches/series b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/development/kxmleditor/debian/patches/series +++ b/ubuntu/_base/applications/development/kxmleditor/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/piklab/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/piklab/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/applications/development/piklab/debian/compat b/ubuntu/_base/applications/development/piklab/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/piklab/debian/compat +++ b/ubuntu/_base/applications/development/piklab/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control index af567d8cf..502bc13bd 100644 --- a/ubuntu/_base/applications/development/piklab/debian/control +++ b/ubuntu/_base/applications/development/piklab/debian/control @@ -2,7 +2,7 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, quilt, chrpath, +Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath, libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/development/tdesvn/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/development/tdesvn/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/applications/development/tdesvn/debian/compat b/ubuntu/_base/applications/development/tdesvn/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/development/tdesvn/debian/compat +++ b/ubuntu/_base/applications/development/tdesvn/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/development/tdesvn/debian/control b/ubuntu/_base/applications/development/tdesvn/debian/control index 74e482108..def2cb962 100644 --- a/ubuntu/_base/applications/development/tdesvn/debian/control +++ b/ubuntu/_base/applications/development/tdesvn/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, libaprutil1-dev Standards-Version: 3.8.4 Package: libsvnqt4-trinity diff --git a/ubuntu/_base/applications/development/tdesvn/debian/docs b/ubuntu/_base/applications/development/tdesvn/debian/docs index ca0272abf..0b6e0f321 100644 --- a/ubuntu/_base/applications/development/tdesvn/debian/docs +++ b/ubuntu/_base/applications/development/tdesvn/debian/docs @@ -1,3 +1,2 @@ AUTHORS -README -TODO +README.md diff --git a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1 deleted file mode 100644 index 7a4db503b..000000000 --- a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvn.1 +++ /dev/null @@ -1,171 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH TDESVN 1 "Dez 2005" "Trinity Desktop Environment" "A Subversion Client for TDE (standalone application)" -.SH NAME -tdesvn -\- A Subversion client for TDE (standalone application) -.SH SYNOPSIS -tdesvn [Qt\-options] [TDE\-options] [options] exec <command> [URL] -.SH DESCRIPTION -A Subversion client for TDE (standalone application) -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B exec -<command> Execute subversion command ("exec help" for more information, opens TDE Help Center) -.TP -.B URL -Path to local working copy or a repository. -.SS Options: -.TP -.B \-r startrev -[:endrev] Execute single subversion command on specific revision(-range) -.TP -.B \-R -Ask for revision when executing single command -.TP -.B \-o <file> -Save output of subversion command (eg "cat") into file <file> -.TP -.B \-l <number> -Limit log output to <number> -.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 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 -.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 - -.SH EXAMPLE -tdesvn file:///path/to/local/working/copy -.br -tdesvn http://remote/svn/project/trunk - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/tdesvn/ -directly into konqueror or you can run -.BR "`khelpcenter help:/tdesvn/'" -from the command-line. -.br -.SH AUTHORS -.nf -Rajko Albrecht <ral@alwins-world.de> -.br - diff --git a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1 b/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1 deleted file mode 100644 index e19bcaf04..000000000 --- a/ubuntu/_base/applications/development/tdesvn/debian/man/tdesvnaskpass.1 +++ /dev/null @@ -1,145 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH TDESVNASKPASS 1 "Aug 2005" "Trinity Desktop Environment" "ssh-askpass for tdesvn" -.SH NAME -tdesvnaskpass -\- ssh-askpass for tdesvn -.SH SYNOPSIS -tdesvnaskpass [Qt\-options] [TDE\-options] [prompt] -.SH DESCRIPTION -ssh-askpass for tdesvn. -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B prompt -Prompt that is displayed to the user. -.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 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 -.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 - -.SH SEE ALSO -.BR tdesvn(1) -.br -.SH AUTHORS -.nf -Rajko Albrecht <ral@alwins-world.de> -.br - diff --git a/ubuntu/_base/applications/development/tdesvn/debian/rules b/ubuntu/_base/applications/development/tdesvn/debian/rules index e56464216..219eeb56e 100755 --- a/ubuntu/_base/applications/development/tdesvn/debian/rules +++ b/ubuntu/_base/applications/development/tdesvn/debian/rules @@ -35,4 +35,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ binary-install/tdesvn-trinity:: # remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so* - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ diff --git a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install index 8903355a2..7dc6dca33 100644 --- a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install +++ b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.install @@ -11,4 +11,4 @@ debian/tmp/opt/trinity/share/locale/*/LC_MESSAGES/*.mo debian/tmp/opt/trinity/share/config.kcfg/ debian/tmp/opt/trinity/share/applications/tde/*.desktop debian/tmp/opt/trinity/share/doc/tde/ - +debian/tmp/opt/trinity/share/man/ diff --git a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages b/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages deleted file mode 100644 index 8cb778203..000000000 --- a/ubuntu/_base/applications/development/tdesvn/debian/tdesvn-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/tdesvn.1 -debian/man/tdesvnaskpass.1 diff --git a/ubuntu/_base/applications/development/tdesvn/debian/watch b/ubuntu/_base/applications/development/tdesvn/debian/watch deleted file mode 100644 index 80c0f090c..000000000 --- a/ubuntu/_base/applications/development/tdesvn/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://tdesvn.alwins-world.de/trac.fcgi/wiki/DownLoads .*tdesvn-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/games/knights/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/games/knights/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/applications/games/knights/debian/compat b/ubuntu/_base/applications/games/knights/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/games/knights/debian/compat +++ b/ubuntu/_base/applications/games/knights/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/games/knights/debian/control b/ubuntu/_base/applications/games/knights/debian/control index 6b64a15ad..fb1fe9894 100644 --- a/ubuntu/_base/applications/games/knights/debian/control +++ b/ubuntu/_base/applications/games/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> Uploaders: Ola Lundqvist <opal@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/games/tdepacman/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/games/tdepacman/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/applications/games/tdepacman/debian/compat b/ubuntu/_base/applications/games/tdepacman/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/games/tdepacman/debian/compat +++ b/ubuntu/_base/applications/games/tdepacman/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/games/tdepacman/debian/control b/ubuntu/_base/applications/games/tdepacman/debian/control index 95a24c9ca..2039eefb8 100644 --- a/ubuntu/_base/applications/games/tdepacman/debian/control +++ b/ubuntu/_base/applications/games/tdepacman/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: J.rg Th.nnissen <joe@dsite.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdegames-trinity-dev Standards-Version: 0.3.2 Package: tdepacman-trinity diff --git a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/graphics/digikam/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/applications/graphics/digikam/debian/compat b/ubuntu/_base/applications/graphics/digikam/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/compat +++ b/ubuntu/_base/applications/graphics/digikam/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/graphics/digikam/debian/control b/ubuntu/_base/applications/graphics/digikam/debian/control index cf999e44c..f0da4b350 100644 --- a/ubuntu/_base/applications/graphics/digikam/debian/control +++ b/ubuntu/_base/applications/graphics/digikam/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tdelibs14-trinity-dev, libtiff-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng-dev, libexiv2-dev, diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/graphics/gwenview-i18n/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/applications/graphics/gwenview-i18n/debian/compat b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat +++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control index 32ea8025c..b292db694 100644 --- a/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control +++ b/ubuntu/_base/applications/graphics/gwenview-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Standards-Version: 3.8.0 Homepage: http://gwenview.sourceforge.net @@ -13,5 +13,5 @@ Depends: gwenview-trinity (>= 1.4.2) Replaces: gwenview-trinity (<< 1.4.0-1) Description: Internationalization (i18n) for Gwenview, an image viewer for TDE This package provides internationalization (i18n) files (translations) for - Gwenview, an image viewer for the Trinity Desktop Environment. See the 'gwenview' - package description for more information. + Gwenview, an image viewer for the Trinity Desktop Environment. See the + 'gwenview-trinity' package description for more information. diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/graphics/gwenview/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/graphics/gwenview/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/applications/graphics/gwenview/debian/compat b/ubuntu/_base/applications/graphics/gwenview/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/graphics/gwenview/debian/compat +++ b/ubuntu/_base/applications/graphics/gwenview/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/control b/ubuntu/_base/applications/graphics/gwenview/debian/control index f5734ed43..632b8aa24 100644 --- a/ubuntu/_base/applications/graphics/gwenview/debian/control +++ b/ubuntu/_base/applications/graphics/gwenview/debian/control @@ -2,9 +2,9 @@ Source: gwenview-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.4.3), libkipi0-trinity-dev (>= 0.1.2-2), libexiv2-dev, libmng-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libkipi0-trinity-dev, libexiv2-dev, libmng-dev, libxcursor-dev Standards-Version: 3.8.4 -Homepage: http://gwenview.sourceforge.net Package: gwenview-trinity Architecture: any @@ -12,7 +12,7 @@ Depends: ${shlibs:Depends} Replaces: gwenview-kde3 (<< 4:14.0.0~), gwenview-trinity (<< 4:14.0.0~) Breaks: gwenview-kde3 (<< 4:14.0.0~), gwenview-trinity (<< 4:14.0.0~) Recommends: tdegraphics-tdefile-plugins-trinity, kipi-plugins-trinity -Suggests: gwenview-i18n +Suggests: gwenview-i18n-trinity Description: image viewer for TDE Gwenview is an image viewer for the Trinity Desktop Environment. It features a folder tree window and a file list window to provide easy navigation of your @@ -29,5 +29,5 @@ Description: image viewer for TDE package. The ability to perform lossless JPEG transforms is built in. . Gwenview's internationalization files (i18n) (translations) are available - in the gwenview-i18n package. Users with non-US English desktops should - install this package. + in the gwenview-i18n-trinity package. Users with non-US English desktops + should install this package. diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base deleted file mode 100644 index 931c8d219..000000000 --- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview-trinity.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: gwenview-trinity -Title: Gwenview Handbook -Author: Aurélien Gâteau, Christopher Martin, The TDE Team -Abstract: Gwenview is an image viewer for TDE. -Section: Viewers - -Format: HTML -Index: /opt/trinity/share/doc/tde/HTML/en/gwenview/index.html -Files: /opt/trinity/share/doc/tde/HTML/en/gwenview/*.html diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian deleted file mode 100644 index 0e247a6ab..000000000 --- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.lintian +++ /dev/null @@ -1,3 +0,0 @@ -gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so -gwenview-trinity binary: shlib-missing-in-control-file libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so -gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm b/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm deleted file mode 100644 index 076efa834..000000000 --- a/ubuntu/_base/applications/graphics/gwenview/debian/gwenview.xpm +++ /dev/null @@ -1,554 +0,0 @@ -/* XPM */ -static char * gwenview_xpm[] = { -"32 32 519 2", -" c None", -". c #2D2F32", -"+ c #3A3C3F", -"@ c #3C3F42", -"# c #333538", -"$ c #5F6164", -"% c #A0A2A4", -"& c #CCCDCF", -"* c #E3E4E5", -"= c #ECEDEE", -"- c #EEEFEF", -"; c #E8E9EA", -"> c #D7D8DA", -", c #B4B6B8", -"' c #7B7D80", -") c #383A3D", -"! c #6D7073", -"~ c #CBCDCF", -"{ c #F6F7F8", -"] c #FEFFFF", -"^ c #FEFEFE", -"/ c #FCFDFE", -"( c #FCFDFD", -"_ c #FDFEFE", -": c #E5E6E7", -"< c #9DA0A2", -"[ c #36383B", -"} c #323539", -"| c #ADB0B3", -"1 c #F3F5F7", -"2 c #FAFCFD", -"3 c #F7F9FA", -"4 c #F8FAFB", -"5 c #D7DADC", -"6 c #616468", -"7 c #3E4145", -"8 c #C6CACE", -"9 c #F6F9FB", -"0 c #F3F7F8", -"a c #F3F6F8", -"b c #F5F9FA", -"c c #E6EAEC", -"d c #74787C", -"e c #32363A", -"f c #C0C7CB", -"g c #F1F6F8", -"h c #EFF3F6", -"i c #F0F5F7", -"j c #E3E9EC", -"k c #676C71", -"l c #A2AAAF", -"m c #EBF2F6", -"n c #EDF3F6", -"o c #EEF4F7", -"p c #EFF5F7", -"q c #EFF4F7", -"r c #EEF4F6", -"s c #EDF2F5", -"t c #ECF1F4", -"u c #EBF0F3", -"v c #EBF0F4", -"w c #ECF0F4", -"x c #ECF1F5", -"y c #EDF2F6", -"z c #EEF3F7", -"A c #EFF4F8", -"B c #D1D9DD", -"C c #42474B", -"D c #686F73", -"E c #D5DFE3", -"F c #D1D8DB", -"G c #C2C7CB", -"H c #B1B5BA", -"I c #A1A6AC", -"J c #949AA0", -"K c #899298", -"L c #828D92", -"M c #7D8C8E", -"N c #798A8A", -"O c #778985", -"P c #778982", -"Q c #788A7F", -"R c #7A8B7E", -"S c #7F8E82", -"T c #869288", -"U c #8F9991", -"V c #9AA29D", -"W c #A7AEAC", -"X c #B6BCBD", -"Y c #C7CCCF", -"Z c #D4DCE1", -"` c #A0A8AE", -" . c #110D12", -".. c #665A69", -"+. c #7E6B83", -"@. c #7F6C87", -"#. c #877993", -"$. c #928AA3", -"%. c #9E9DB2", -"&. c #AAAFBF", -"*. c #B5C0CA", -"=. c #BECCD2", -"-. c #C4D6D8", -";. c #C8DCDA", -">. c #CADED7", -",. c #CBDFD3", -"'. c #C9DECD", -"). c #C5DBC5", -"!. c #C1D6BE", -"~. c #BBCFB5", -"{. c #B4C7A9", -"]. c #AABB9A", -"^. c #9FAD8A", -"/. c #939E79", -"(. c #888F6B", -"_. c #808465", -":. c #787965", -"<. c #2F2D26", -"[. c #724051", -"}. c #AF889E", -"|. c #D8B3D1", -"1. c #ECCEED", -"2. c #F4E1FA", -"3. c #F7ECFE", -"4. c #F6F0FF", -"5. c #F3F2FF", -"6. c #F1F5FF", -"7. c #EEF7FF", -"8. c #ECFAFF", -"9. c #E9FDFF", -"0. c #E7FFFC", -"a. c #E6FFF6", -"b. c #E4FFF0", -"c. c #E3FFE9", -"d. c #E3FFE3", -"e. c #E6FFE2", -"f. c #E9FFE1", -"g. c #ECFFE0", -"h. c #EFFFDF", -"i. c #F3FFDD", -"j. c #F5FFDA", -"k. c #F6FED3", -"l. c #F4F7C7", -"m. c #EAE4B6", -"n. c #CFBE9B", -"o. c #A68269", -"p. c #3F1E13", -"q. c #6C2632", -"r. c #FCC0D2", -"s. c #FDD7EE", -"t. c #FFD4F8", -"u. c #FCCEFD", -"v. c #F3CEFE", -"w. c #EAD0FE", -"x. c #E1D2FE", -"y. c #D7D5FE", -"z. c #D2DCFE", -"A. c #CDE5FE", -"B. c #C9EFFE", -"C. c #C5F8FD", -"D. c #C2FDF6", -"E. c #C1FEE8", -"F. c #C0FEDA", -"G. c #BFFECB", -"H. c #BFFEBF", -"I. c #C5FEBD", -"J. c #CCFEBC", -"K. c #D2FEBB", -"L. c #DAFEBA", -"M. c #E1FEB8", -"N. c #E9FEB7", -"O. c #F1FEB7", -"P. c #F9FEB6", -"Q. c #FEF7BA", -"R. c #FDE8BF", -"S. c #FDD8BE", -"T. c #B96B57", -"U. c #A44855", -"V. c #FBB9CF", -"W. c #F8B6DD", -"X. c #FDB2EF", -"Y. c #FAACFC", -"Z. c #EDAFFE", -"`. c #DEB4FE", -" + c #CFB8FE", -".+ c #C0BDFE", -"++ c #B8C9FE", -"@+ c #B2D7FE", -"#+ c #ABE6FE", -"$+ c #A5F6FD", -"%+ c #A1FDF2", -"&+ c #A0FEDD", -"*+ c #9FFEC6", -"=+ c #9DFEB0", -"-+ c #9FFE9E", -";+ c #A8FE9B", -">+ c #B3FE9A", -",+ c #BDFE99", -"'+ c #C8FE98", -")+ c #D3FE97", -"!+ c #DFFE96", -"~+ c #EBFE95", -"{+ c #F7FD94", -"]+ c #FDF297", -"^+ c #FBDC9F", -"/+ c #F4C39F", -"(+ c #DC816C", -"_+ c #220502", -":+ c #B24A58", -"<+ c #F69ABA", -"[+ c #F899D1", -"}+ c #FD92E9", -"|+ c #F88BFB", -"1+ c #E68FFE", -"2+ c #D196FE", -"3+ c #BC9DFE", -"4+ c #A9A4FD", -"5+ c #9DB5FE", -"6+ c #95C9FE", -"7+ c #8CDEFE", -"8+ c #83F2FD", -"9+ c #7EFDEE", -"0+ c #7DFED1", -"a+ c #7CFEB3", -"b+ c #7BFE94", -"c+ c #7DFD7D", -"d+ c #8AFE79", -"e+ c #99FE78", -"f+ c #A8FE77", -"g+ c #B7FE75", -"h+ c #C5FE74", -"i+ c #D5FE73", -"j+ c #E4FE72", -"k+ c #F5FD71", -"l+ c #FDEE77", -"m+ c #FBD282", -"n+ c #EFAF7F", -"o+ c #E1765D", -"p+ c #2A0704", -"q+ c #AB3849", -"r+ c #F278A2", -"s+ c #F67CC5", -"t+ c #FD72E3", -"u+ c #F669FB", -"v+ c #DF6FFE", -"w+ c #C578FE", -"x+ c #AA81FD", -"y+ c #918BFE", -"z+ c #819FFC", -"A+ c #74B5F5", -"B+ c #6CD3FC", -"C+ c #62F0FD", -"D+ c #5CFDEA", -"E+ c #5BFEC5", -"F+ c #5AFE9F", -"G+ c #58FE78", -"H+ c #5CFE5B", -"I+ c #6CFD56", -"J+ c #7CF653", -"K+ c #8FF853", -"L+ c #A5FE53", -"M+ c #B8FD52", -"N+ c #CBFE51", -"O+ c #DEFE50", -"P+ c #F2FD4F", -"Q+ c #FCEA56", -"R+ c #FAC864", -"S+ c #EB9A5E", -"T+ c #D75E3F", -"U+ c #210502", -"V+ c #8F1F32", -"W+ c #EF5488", -"X+ c #F45FB8", -"Y+ c #FC53DD", -"Z+ c #F548FA", -"`+ c #D850FE", -" @ c #B95BFE", -".@ c #9866FE", -"+@ c #7770F8", -"@@ c #506AC1", -"#@ c #3B6FA2", -"$@ c #3C9DC1", -"%@ c #40E8F8", -"&@ c #3BFEE6", -"*@ c #3AFEBA", -"=@ c #39FE8C", -"-@ c #37FE5D", -";@ c #3CFE3B", -">@ c #44DA2F", -",@ c #43A623", -"'@ c #56AE24", -")@ c #88E92F", -"!@ c #ABFE31", -"~@ c #C2FE30", -"{@ c #D9FE2F", -"]@ c #F1FD2E", -"^@ c #FCE636", -"/@ c #F8BC45", -"(@ c #E7833C", -"_@ c #BB401D", -":@ c #5C091A", -"<@ c #E92B6C", -"[@ c #F13FA8", -"}@ c #FC34D7", -"|@ c #F427F9", -"1@ c #D131FE", -"2@ c #AC3EFE", -"3@ c #864BFF", -"4@ c #5A50E8", -"5@ c #2D4696", -"6@ c #22588E", -"7@ c #1B7495", -"8@ c #1DD7E7", -"9@ c #19FEE3", -"0@ c #18FEAE", -"a@ c #17FE78", -"b@ c #15FE42", -"c@ c #1BFB19", -"d@ c #21AF0D", -"e@ c #2A8D0A", -"f@ c #388D09", -"g@ c #67C60D", -"h@ c #9EFF10", -"i@ c #B8FE0F", -"j@ c #D3FE0E", -"k@ c #EEFD0E", -"l@ c #FCE318", -"m@ c #F5B027", -"n@ c #E56D19", -"o@ c #7C2304", -"p@ c #1C0006", -"q@ c #BD084A", -"r@ c #F02099", -"s@ c #FD1AD4", -"t@ c #F20CF9", -"u@ c #CC18FE", -"v@ c #A327FE", -"w@ c #7836FE", -"x@ c #4D44F5", -"y@ c #2949B4", -"z@ c #195998", -"A@ c #1288B4", -"B@ c #0BE0F4", -"C@ c #04FEE1", -"D@ c #03FFA9", -"E@ c #03FF6E", -"F@ c #03FE34", -"G@ c #0AFE08", -"H@ c #1BCF01", -"I@ c #279B01", -"J@ c #3BA101", -"K@ c #6DE102", -"L@ c #98FF02", -"M@ c #B4FD02", -"N@ c #D1FE02", -"O@ c #EFFE02", -"P@ c #FEE50E", -"Q@ c #EAA419", -"R@ c #944609", -"S@ c #1B0700", -"T@ c #2D0012", -"U@ c #9B0E63", -"V@ c #E810C1", -"W@ c #F206F8", -"X@ c #CE14FF", -"Y@ c #A324FF", -"Z@ c #7734FF", -"`@ c #4E45FF", -" # c #3765F8", -".# c #2689EC", -"+# c #19BBF9", -"@# c #09E9FD", -"## c #00E5CA", -"$# c #02C381", -"%# c #02BF52", -"&# c #00DD29", -"*# c #08FB06", -"=# c #24FD02", -"-# c #3CF002", -";# c #59F302", -"># c #7BFE02", -",# c #9AFF02", -"'# c #B7FF02", -")# c #CDFA00", -"!# c #D4E200", -"~# c #B0A00C", -"{# c #614C1A", -"]# c #0F0A06", -"^# c #161117", -"/# c #6A3C67", -"(# c #88208E", -"_# c #8C13AF", -":# c #801CCB", -"<# c #652ADE", -"[# c #443CE7", -"}# c #315EEA", -"|# c #2284E6", -"1# c #139CD2", -"2# c #128E9D", -"3# c #4A7E7C", -"4# c #869796", -"5# c #8B9A98", -"6# c #52785B", -"7# c #1B891A", -"8# c #1CBD03", -"9# c #34D300", -"0# c #4CD400", -"a# c #60CA00", -"b# c #6EB804", -"c# c #749E10", -"d# c #73862A", -"e# c #797F57", -"f# c #7D807B", -"g# c #494D52", -"h# c #7B8487", -"i# c #BFCACB", -"j# c #9FA4AA", -"k# c #858294", -"l# c #706C89", -"m# c #606285", -"n# c #586584", -"o# c #5C7185", -"p# c #73858E", -"q# c #A7AEB2", -"r# c #DAE0E5", -"s# c #E5EDF2", -"t# c #DBE3E8", -"u# c #BABDC2", -"v# c #B1B5BB", -"w# c #8D9B95", -"x# c #798E7B", -"y# c #7A8D79", -"z# c #859385", -"A# c #97A09D", -"B# c #B0B6BC", -"C# c #CAD1DA", -"D# c #C7CED4", -"E# c #9A9EA1", -"F# c #242629", -"G# c #2A2D31", -"H# c #BFC7CC", -"I# c #E6F0F5", -"J# c #E3EDF1", -"K# c #E1EBEE", -"L# c #DFE8EB", -"M# c #DEE6E9", -"N# c #E0E8EC", -"O# c #E3EBF0", -"P# c #E3ECF2", -"Q# c #E1EAEF", -"R# c #E0E9EE", -"S# c #D6DEE3", -"T# c #D8E0E4", -"U# c #E2EBF0", -"V# c #E4EDF2", -"W# c #E3EBF2", -"X# c #E4ECF2", -"Y# c #E4EDF3", -"Z# c #E3ECF1", -"`# c #CED5D9", -" $ c #ADB1B3", -".$ c #53565A", -"+$ c #505559", -"@$ c #D1DADF", -"#$ c #E1E9EE", -"$$ c #DEE7EC", -"%$ c #C6CDD0", -"&$ c #AFB3B5", -"*$ c #73777A", -"=$ c #62666B", -"-$ c #D3DBE0", -";$ c #E4ECF1", -">$ c #E2EAEF", -",$ c #D8DFE3", -"'$ c #C5CBCE", -")$ c #BDC2C5", -"!$ c #BCC1C4", -"~$ c #C1C6C9", -"{$ c #D1D8DC", -"]$ c #E0E8ED", -"^$ c #C5CACD", -"/$ c #AEB1B3", -"($ c #7D8083", -"_$ c #565B5F", -":$ c #C4CBD1", -"<$ c #E2EBEF", -"[$ c #CFD5D9", -"}$ c #CDD3D6", -"|$ c #D5DCE0", -"1$ c #DFE6EB", -"2$ c #DEE6EB", -"3$ c #C6CBCF", -"4$ c #AAADAF", -"5$ c #727578", -"6$ c #33363A", -"7$ c #D5DDE2", -"8$ c #E1E8ED", -"9$ c #D6DDE1", -"0$ c #BBC0C3", -"a$ c #939698", -"b$ c #4F5255", -"c$ c #42464A", -"d$ c #898F94", -"e$ c #BFC6CB", -"f$ c #DCE4E8", -"g$ c #DDE4E9", -"h$ c #DAE2E6", -"i$ c #D4DBDF", -"j$ c #C7CDD0", -"k$ c #AEB3B6", -"l$ c #888C8E", -"m$ c #55575A", -"n$ c #414447", -"o$ c #575A5E", -"p$ c #626569", -"q$ c #626568", -"r$ c #575A5D", -"s$ c #434548", -"t$ c #292B2D", -" ", -" ", -" ", -" . + @ # ", -" $ % & * = - ; > , ' ) ", -" ! ~ { ] ^ / ( ( / _ ] ( : < [ ", -" } | 1 2 3 3 3 3 3 3 3 3 3 3 4 2 5 6 ", -" 7 8 9 0 a a a a a a a a a a a a a b c d ", -" e f g h h h h h h h h h h h h h h h h i j k ", -" l m n o p q r n s t u v w x y z o A o o o B C ", -" D E F G H I J K L M N O P Q R S T U V W X Y Z ` ", -" ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<. ", -" [.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p. ", -" q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T. ", -" U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+", -" :+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+", -" q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+", -" V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@ ", -" :@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@ ", -" p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@ ", -" T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]# ", -" ^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g# ", -" h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F# ", -" G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#W#X#Y#Z#`# $.$ ", -" +$@$O##$Q#Q#Q#Q##$R##$Q#Q#R##$Q##$Q#$$%$&$*$ ", -" =$-$;$Q##$Q#>$,$'$)$!$~${$#$>$>$]$^$/$($ ", -" _$:$;$<$#$>$]$T#[$}$|$1$>$>$2$3$4$5$ ", -" 6$J 7$;$;$>$U#O#O#O#O#8$9$0$a$b$ ", -" c$d$e$S#f$g$h$i$j$k$l$m$ ", -" n$o$p$q$r$s$t$ ", -" ", -" "}; diff --git a/ubuntu/_base/applications/graphics/gwenview/debian/rules b/ubuntu/_base/applications/graphics/gwenview/debian/rules index 4f8a32879..f8596e545 100755 --- a/ubuntu/_base/applications/graphics/gwenview/debian/rules +++ b/ubuntu/_base/applications/graphics/gwenview/debian/rules @@ -1,44 +1,19 @@ -#! /usr/bin/make -f - -DEB_PATCHDIRS := debian/patches/common debian/patches +#!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --enable-kipi --enable-final --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_INSTALL_DOCS_ALL := -DEB_INSTALL_CHANGELOGS_ALL := NEWS - -DEB_DH_MAKESHLIBS_ARGS_ALL := -V -DEB_SHLIBDEPS_INCLUDE = debian/gwenview-trinity/opt/trinity/lib - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -install/gwenview-trinity:: - install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm - install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) - - cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \ - /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" + +DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/compat b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/compat +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/control b/ubuntu/_base/applications/graphics/ksquirrel/debian/control index a4c43964e..08c8cdff8 100644 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/control +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/control @@ -3,7 +3,7 @@ Section: graphics Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl> -Build-Depends: debhelper (>= 9~), +Build-Depends: debhelper (>= 10~), cdbs, quilt, libksquirrel-trinity-dev, libkonq4-trinity-dev, diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/docs b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs index 724e08449..6f12db508 100644 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/docs +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/docs @@ -1,2 +1,2 @@ +AUTHORS README -TODO diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 b/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 deleted file mode 100644 index a6da62b4c..000000000 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/ksquirrel-libs-configurator.1 +++ /dev/null @@ -1,22 +0,0 @@ -.\" -.TH "KSQUIRREL-LIBS-CONFIGURATOR" "1" "september 13, 2008" "Paul Gevers" "Graphics" -.SH "NAME" -ksquirrel\-libs\-configurator \- library configurator for ksquirel -.SH "SYNOPSIS" -.B ksquirrel\-libs\-configurator -.SH "DESCRIPTION" -This manual page documents briefly the -.B ksquirrel\-libs\-configurator -and -.B ksquirrel\-libs\-configurator\-real -commands. -\fBksquirrel\-libs\-configurator\fP is a graphical user interface that lets you select which libraries should be enabled/disabled in ksquirrel. -.SH "OPTIONS" -These programs does not have any options. -.SH "SEE ALSO" -ksquirrel(1) -.SH "AUTHORS" -ksquirrel\-libs\-configurator was written by <Baryshev Dmitry>. -.PP -This manual page was written by Paul Gevers <paul@climbing.nl>, -for the Debian project (but may be used by others). diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules index 813fff66f..8f95f25f5 100755 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/rules +++ b/ubuntu/_base/applications/graphics/ksquirrel/debian/rules @@ -108,12 +108,6 @@ binary-arch: build install dh_installchangelogs ChangeLog dh_installdocs dh_installexamples - dh_installman debian/ksquirrel-libs-configurator.1 - cp -a debian/ksquirrel-trinity/usr/share/man debian/ksquirrel-trinity/opt/trinity/share/ - rm -fr debian/ksquirrel-trinity/usr/share/man - dh_link \ - opt/trinity/share/man/man1/ksquirrel-libs-configurator.1 \ - opt/trinity/share/man/man1/ksquirrel-libs-configurator-real.1 dh_strip dh_compress dh_fixperms diff --git a/ubuntu/_base/applications/graphics/ksquirrel/debian/watch b/ubuntu/_base/applications/graphics/ksquirrel/debian/watch deleted file mode 100644 index a276799ff..000000000 --- a/ubuntu/_base/applications/graphics/ksquirrel/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -http://sf.net/ksquirrel/ksquirrel-([\d.]*)\.tar\.bz2 diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/graphics/potracegui/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/graphics/potracegui/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/applications/graphics/potracegui/debian/compat b/ubuntu/_base/applications/graphics/potracegui/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/graphics/potracegui/debian/compat +++ b/ubuntu/_base/applications/graphics/potracegui/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/graphics/potracegui/debian/control b/ubuntu/_base/applications/graphics/potracegui/debian/control index abf8f7a57..b74639fe5 100644 --- a/ubuntu/_base/applications/graphics/potracegui/debian/control +++ b/ubuntu/_base/applications/graphics/potracegui/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Christoph Wegscheider <christoph.wegscheider@wegi.net> Uploaders: Bartosz Fenski <fenio@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: potracegui-trinity diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kasablanca/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kasablanca/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/applications/internet/kasablanca/debian/compat b/ubuntu/_base/applications/internet/kasablanca/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kasablanca/debian/compat +++ b/ubuntu/_base/applications/internet/kasablanca/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kasablanca/debian/control b/ubuntu/_base/applications/internet/kasablanca/debian/control index 5e701cb6c..75b562ffe 100644 --- a/ubuntu/_base/applications/internet/kasablanca/debian/control +++ b/ubuntu/_base/applications/internet/kasablanca/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libssl-dev Standards-Version: 3.8.3 Package: kasablanca-trinity diff --git a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kbiff/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kbiff/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/applications/internet/kbiff/debian/compat b/ubuntu/_base/applications/internet/kbiff/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kbiff/debian/compat +++ b/ubuntu/_base/applications/internet/kbiff/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kbiff/debian/control b/ubuntu/_base/applications/internet/kbiff/debian/control index 273bec840..6615dd019 100644 --- a/ubuntu/_base/applications/internet/kbiff/debian/control +++ b/ubuntu/_base/applications/internet/kbiff/debian/control @@ -2,7 +2,7 @@ Source: kbiff-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 (>= 4:3.4.2) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.9.1 Package: kbiff-trinity diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kftpgrabber/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kftpgrabber/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/applications/internet/kftpgrabber/debian/compat b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kftpgrabber/debian/compat +++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/control b/ubuntu/_base/applications/internet/kftpgrabber/debian/control index 832139e15..fec3c520e 100644 --- a/ubuntu/_base/applications/internet/kftpgrabber/debian/control +++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libssl-dev Standards-Version: 3.8.3 Homepage: http://www.kftp.org diff --git a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs index ca0272abf..76c3076c9 100644 --- a/ubuntu/_base/applications/internet/kftpgrabber/debian/docs +++ b/ubuntu/_base/applications/internet/kftpgrabber/debian/docs @@ -1,3 +1,3 @@ AUTHORS -README +README.md TODO diff --git a/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/knmap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/knmap/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/applications/internet/knmap/debian/compat b/ubuntu/_base/applications/internet/knmap/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/knmap/debian/compat +++ b/ubuntu/_base/applications/internet/knmap/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/knmap/debian/control b/ubuntu/_base/applications/internet/knmap/debian/control index 7d46e8cd9..92ca50aa0 100644 --- a/ubuntu/_base/applications/internet/knmap/debian/control +++ b/ubuntu/_base/applications/internet/knmap/debian/control @@ -2,7 +2,7 @@ Source: knmap-trinity Section: tde Priority: extra 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, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: knmap-trinity diff --git a/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/konversation/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/konversation/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/applications/internet/konversation/debian/compat b/ubuntu/_base/applications/internet/konversation/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/konversation/debian/compat +++ b/ubuntu/_base/applications/internet/konversation/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/konversation/debian/control b/ubuntu/_base/applications/internet/konversation/debian/control index 4795202fb..76b4861db 100644 --- a/ubuntu/_base/applications/internet/konversation/debian/control +++ b/ubuntu/_base/applications/internet/konversation/debian/control @@ -4,17 +4,17 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev, dh-python Standards-Version: 3.8.4 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ Package: konversation-trinity Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${python3:Depends} Replaces: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~) Breaks: konversation-kde3 (<< 4:14.0.0~), konversation-trinity (<< 4:14.0.0~) -Recommends: python-all, ruby +Recommends: python3-all, ruby Suggests: libsoap-lite-perl Description: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] Konversation is a client for the Internet Relay Chat (IRC) protocol. diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs index e7f450c0c..0b6e0f321 100644 --- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs +++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.docs @@ -1,2 +1,2 @@ -TODO AUTHORS +README.md diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install index c62ad7db5..15ccbbe5e 100644 --- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install +++ b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.install @@ -6,16 +6,10 @@ debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc debian/tmp/opt/trinity/share/apps/konversation/scripts/* debian/tmp/opt/trinity/share/apps/konversation/themes/* debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg -debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/* -#debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/ru/konversation/* -debian/tmp/opt/trinity/share/doc/tde/HTML/sv/konversation/* +debian/tmp/opt/trinity/share/doc/tde/HTML/* debian/tmp/opt/trinity/share/icons/* debian/tmp/opt/trinity/share/locale/* +debian/tmp/opt/trinity/share/man/man1/* debian/tmp/opt/trinity/share/services/konvirc.protocol debian/tmp/opt/trinity/share/services/konvirc6.protocol diff --git a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages b/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages deleted file mode 100644 index 8b3496a3d..000000000 --- a/ubuntu/_base/applications/internet/konversation/debian/konversation-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -#debian/man/*.1 diff --git a/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook deleted file mode 100644 index 719d6e158..000000000 --- a/ubuntu/_base/applications/internet/konversation/debian/man/konversation.1.docbook +++ /dev/null @@ -1,214 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Nathaniel</firstname> - <othername role="mi">W</othername> - <surname>Turner</surname> - <email>nate@houseofnate.net</email> - </author> - <copyright> - <year>2004</year> - <holder>Nathaniel W. Turner</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-05-31</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>KONVERSATION</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>konversation</refname> - <refpurpose>user friendly IRC client for TDE</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>konversation</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - Konversation is client for the Internet Relay Chat (IRC) protocol. - </para> - <para> - IRC is a great way to meet friends on the net, make new acquaintances and - lose yourself in talk about your favorite subject. - </para> - <para> - Konversation is under active development and is currently in beta. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - </para> - <para> - <variablelist> - <title>Options</title> - <varlistentry> - <term><option>--server</option> - <arg choice="req"><replaceable>server</replaceable></arg></term> - <listitem><para>Server to connect</para></listitem> - </varlistentry> - <varlistentry> - <term><option>--port</option> - <arg choice="req"><replaceable>port</replaceable></arg></term> - <listitem><para>Port to use (default: 6667)</para></listitem> - </varlistentry> - <varlistentry> - <term><option>--channel</option> - <arg choice="req"><replaceable>channel</replaceable></arg></term> - <listitem><para>Channel to join after connection</para></listitem> - </varlistentry> - <varlistentry> - <term><option>--nick</option> - <arg choice="req"><replaceable>nickname</replaceable></arg></term> - <listitem><para>Nickname to use</para></listitem> - </varlistentry> - <varlistentry> - <term><option>--password</option> - <arg choice="req"><replaceable>password</replaceable></arg></term> - <listitem><para>Password for connection</para></listitem> - </varlistentry> - <varlistentry> - <term><option>--ssl</option></term> - <listitem><para>Use SSL for connection (default: - false)</para></listitem> - </varlistentry> - </variablelist> - </para> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to keep it up to date --> - </refsect1> - <refsect1> - <title>SCRIPTING</title> - <para>Konversation looks for scripts in <filename - class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and - in <filename - class="directory">~/.trinity/share/apps/konversation/scripts</filename>. - To execute a script, use the <command>exec</command> command:</para> - <cmdsynopsis> - <command>/exec</command> - <arg choice="req"><replaceable>scriptname</replaceable></arg> - <arg choice="opt"><replaceable>arguments</replaceable></arg> - </cmdsynopsis> - <para> - For example: - </para> - <para><userinput>/exec gauge 75</userinput></para> - </refsect1> - <refsect1> - <title>FILES</title> - <para> - <variablelist> - <varlistentry> - <term><filename>~/.trinity/share/config/konversationrc</filename></term> - <listitem><para>Main configuration</para></listitem> - </varlistentry> - <varlistentry> - <term> - <filename>~/.trinity/share/config/konversation.eventsrc</filename> - </term> - <listitem><para>Notification settings</para></listitem> - </varlistentry> - <varlistentry> - <term> - <filename - class="directory">~/.trinity/share/apps/konversation/logs</filename> - </term> - <listitem><para>Directory containing channel log - files</para></listitem> - </varlistentry> - </variablelist> - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para> - The Konversation Handbook is an excellent resource for further reading. - It can be found under the <guimenu>Help</guimenu> menu in Konversation. - </para> - <para> - The following manual pages may also be of interest: - <citerefentry> - <refentrytitle>konversationircprotocolhandler</refentrytitle> - <manvolnum>1</manvolnum> - </citerefentry>, - <citerefentry> - <refentrytitle>dcop</refentrytitle> - <manvolnum>1</manvolnum> - </citerefentry> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Nathaniel W. Turner - <email>nate@houseofnate.net</email> for the - <productname>Debian</productname> 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> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> diff --git a/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook deleted file mode 100644 index 3a82060c1..000000000 --- a/ubuntu/_base/applications/internet/konversation/debian/man/konversationircprotocolhandler.1.docbook +++ /dev/null @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Nathaniel</firstname> - <othername role="mi">W</othername> - <surname>Turner</surname> - <email>nate@houseofnate.net</email> - </author> - <copyright> - <year>2004</year> - <holder>Nathaniel W. Turner</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2004-07-06</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>KONVERSATIONIRCPROTOCOLHANDLER</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>konversationircprotocolhandler</refname> - <refpurpose>handler for irc:// URI scheme</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>konversationircprotocolhandler</command> - <arg choice="req"> - <option>URI</option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - This program takes a URI of the form - irc://<replaceable>server</replaceable>:<replaceable>port</replaceable>/ - (or simply irc://<replaceable>server</replaceable>/) and opens a - connection to the specified IRC server in a running Konversation client. - </para> - <para> - This program is registered with TDE as a handler for the irc URI scheme, - and TDE applications will use this program to handle such URI. - (For example, it will be called if a user clicks on an irc:// link on a - web page in Konqueror.) - </para> - <para> - This program can also be used directly, but since it is somewhat internal - to Konversation, it's interface might change in an incompatible way, and - relying on it is not advised. It is better to use Konversation's dcop - interface directly. - </para> - </refsect1> - <refsect1> - <title>BUGS</title> - <para> - This program will only work if there is a currently running konversation - process. - </para> - </refsect1> - <refsect1> - <title>SEE ALSO</title> - <para> - <citerefentry> - <refentrytitle>konversation</refentrytitle> - <manvolnum>1</manvolnum> - </citerefentry>, - <citerefentry> - <refentrytitle>dcop</refentrytitle> - <manvolnum>1</manvolnum> - </citerefentry> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Nathaniel W. Turner - <email>nate@houseofnate.net</email> for the - <productname>Debian</productname> 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> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> diff --git a/ubuntu/_base/applications/internet/konversation/debian/rules b/ubuntu/_base/applications/internet/konversation/debian/rules index 61fe9b5c9..1fc2edbda 100755 --- a/ubuntu/_base/applications/internet/konversation/debian/rules +++ b/ubuntu/_base/applications/internet/konversation/debian/rules @@ -18,22 +18,10 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" -### Manpages -XP = xsltproc --nonet --output debian/man/ -DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl - -%.1 : %.1.docbook - $(XP) $(DB2MAN) $< - -GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook)) -build/konversation-trinity:: $(GENERATED_MANPAGES) -clean:: - -rm -f $(GENERATED_MANPAGES) - -rm -f po/*/konversation.gmo +binary-install/konversation-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/konversation/scripts ### Extra file installation install/konversation-trinity:: install -D -m 644 konversation/scripts/README \ debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts - dh_installman debian/man/*.1 - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kopete-otr/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kopete-otr/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/applications/internet/kopete-otr/debian/compat b/ubuntu/_base/applications/internet/kopete-otr/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kopete-otr/debian/compat +++ b/ubuntu/_base/applications/internet/kopete-otr/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/control b/ubuntu/_base/applications/internet/kopete-otr/debian/control index acc314c08..69d31c248 100644 --- a/ubuntu/_base/applications/internet/kopete-otr/debian/control +++ b/ubuntu/_base/applications/internet/kopete-otr/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0) Standards-Version: 3.8.4 Package: kopete-otr-trinity diff --git a/ubuntu/_base/applications/internet/kopete-otr/debian/docs b/ubuntu/_base/applications/internet/kopete-otr/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/internet/kopete-otr/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kshowmail/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kshowmail/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/applications/internet/kshowmail/debian/compat b/ubuntu/_base/applications/internet/kshowmail/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kshowmail/debian/compat +++ b/ubuntu/_base/applications/internet/kshowmail/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kshowmail/debian/control b/ubuntu/_base/applications/internet/kshowmail/debian/control index 16085c4cb..95597c177 100644 --- a/ubuntu/_base/applications/internet/kshowmail/debian/control +++ b/ubuntu/_base/applications/internet/kshowmail/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lionel Le Folgoc <mrpouit@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libmimelib1-trinity-dev Standards-Version: 3.7.2 Package: kshowmail-trinity diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kstreamripper/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/applications/internet/kstreamripper/debian/compat b/ubuntu/_base/applications/internet/kstreamripper/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/compat +++ b/ubuntu/_base/applications/internet/kstreamripper/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/control b/ubuntu/_base/applications/internet/kstreamripper/debian/control index cd91c065f..213d9b940 100644 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/control +++ b/ubuntu/_base/applications/internet/kstreamripper/debian/control @@ -2,7 +2,7 @@ Source: kstreamripper-trinity Section: sound 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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kstreamripper-trinity diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/dirs b/ubuntu/_base/applications/internet/kstreamripper/debian/dirs deleted file mode 100644 index a59ccc8af..000000000 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/applications -usr/share/pixmaps diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst deleted file mode 100644 index f5542ab64..000000000 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postinst +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -set -e - -if [ "$1" = "configure" ]; then - if [ -x /usr/bin/update-desktop-database ] ; then - /usr/bin/update-desktop-database -q - fi -fi - - -#DEBHELPER# - -exit 0 - diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm deleted file mode 100644 index 5209bcb38..000000000 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper-trinity.postrm +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -set -e - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if [ -x "`which update-desktop-database 2>/dev/null`" ]; then - update-desktop-database -q - fi - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1 b/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1 deleted file mode 100644 index 3129be689..000000000 --- a/ubuntu/_base/applications/internet/kstreamripper/debian/kstreamripper.1 +++ /dev/null @@ -1,32 +0,0 @@ -.TH "KSTREAMRIPPER" "1" "Apr 26, 2004" "Michael Ablassmeier" "sound" -.SH "NAME" -kstreamripper \- TDE frontend for streamripper -.SH "SYNOPSIS" -.B kstreamripper [Qt\-options] [TDE\-options] -.SH "DESCRIPTION" -KStreamRipper is a small frontend for the streamripper command -line utility. Streamripper captures internet shoutcast radio streams -on your harddisk and splits them up in mp3 files. KStreamRipper helps -you with managing/ripping your preferred streams. - -.SH "OPTIONS" -.IP "\fB\-\-help\fR" -Show help about options -.IP "\fB\-\-help\-qt\fR" -Show Qt specific options -.IP "\fB\-\-help\-tde\fR" -Show TDE specific options -.IP "\fB\-\-help\-all\fR" -Show all options -.IP "\fB\-\-author\fR" -Show author information -.IP "\fB\-v, \-\-version\fR" -Show version information -.IP "\fB\-\-license\fR" -Show license information -.IP "\fB\-\-\fR" -End of options -.SH "SEE ALSO" -streamripper(1) -.SH "AUTHOR" -2004 \- Created by Michael Ablassmeier (abi@grinser.de) for the Debian Project. diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/ktorrent/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/ktorrent/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/applications/internet/ktorrent/debian/compat b/ubuntu/_base/applications/internet/ktorrent/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/ktorrent/debian/compat +++ b/ubuntu/_base/applications/internet/ktorrent/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/control b/ubuntu/_base/applications/internet/ktorrent/debian/control index 65092ce74..b19611be8 100644 --- a/ubuntu/_base/applications/internet/ktorrent/debian/control +++ b/ubuntu/_base/applications/internet/ktorrent/debian/control @@ -2,7 +2,7 @@ Source: ktorrent-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: ktorrent-trinity diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook b/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook deleted file mode 100644 index 63a5fa185..000000000 --- a/ubuntu/_base/applications/internet/ktorrent/debian/ktorrent.1.docbook +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Mercatante</firstname> - <surname>Anthony</surname> - <email>tonio@ubuntu.com</email> - </author> - <copyright> - <year>2006</year> - <holder>Anthony Mercatante</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2006-12-205</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>ktorrent</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>ktorrent</refname> - <refpurpose>BitTorrent client for TDE</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>ktorrent</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - BitTorrent client for TDE. - </para> - <para> - KTorrent is a BitTorrent program for TDE. Its features include speed capping (both down and up), integrated searching, UDP tracker support, preview of certain file types (video and audio) and integration into the TDE Panel enabling background downloading. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. ktorrent has no - application-specific options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to ktorrent it up to date --> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Anthony Mercatante - <email>tonio@ubuntu.com</email> for the - <productname>Debian</productname> 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> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> - diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/rules b/ubuntu/_base/applications/internet/ktorrent/debian/rules index a90794996..4ad6f5c28 100755 --- a/ubuntu/_base/applications/internet/ktorrent/debian/rules +++ b/ubuntu/_base/applications/internet/ktorrent/debian/rules @@ -13,9 +13,3 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -build/ktorrent-trinity:: - docbook2x-man debian/ktorrent.1.docbook - -clean:: - rm -f ktorrent.1 diff --git a/ubuntu/_base/applications/internet/ktorrent/debian/watch b/ubuntu/_base/applications/internet/ktorrent/debian/watch deleted file mode 100644 index 0262eb3c5..000000000 --- a/ubuntu/_base/applications/internet/ktorrent/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://ktorrent.org/downloads/(^2\.[\d\.]+)/ktorrent-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/applications/internet/kvirc/debian/compat b/ubuntu/_base/applications/internet/kvirc/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/compat +++ b/ubuntu/_base/applications/internet/kvirc/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kvirc/debian/control b/ubuntu/_base/applications/internet/kvirc/debian/control index 528f85fdc..f1c0488bd 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/control +++ b/ubuntu/_base/applications/internet/kvirc/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Raúl Sánchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 9~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 10~), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libperl-dev, libssl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kvirc.net/ diff --git a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install index 6ba0b5d33..010c6f400 100644 --- a/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install +++ b/ubuntu/_base/applications/internet/kvirc/debian/kvirc-data-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/bin/kvi_run_netscape debian/tmp/opt/trinity/bin/kvi_search_help debian/tmp/opt/trinity/share/applnk/Internet/kvirc.desktop +debian/tmp/opt/trinity/share/apps/tdeconf_update/ debian/tmp/opt/trinity/share/icons/hicolor/ debian/tmp/opt/trinity/share/kvirc/*/config/ debian/tmp/opt/trinity/share/kvirc/*/defscript/ diff --git a/ubuntu/_base/applications/internet/kvirc/debian/rules b/ubuntu/_base/applications/internet/kvirc/debian/rules index 6fc9dffe2..6ca089653 100755 --- a/ubuntu/_base/applications/internet/kvirc/debian/rules +++ b/ubuntu/_base/applications/internet/kvirc/debian/rules @@ -47,7 +47,7 @@ endif # # Don't compress these files # -DEB_COMPRESS_EXCLUDE := .kvs +DEB_COMPRESS_EXCLUDE_ALL += .kvs # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/kvpnc/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/kvpnc/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/applications/internet/kvpnc/debian/compat b/ubuntu/_base/applications/internet/kvpnc/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/kvpnc/debian/compat +++ b/ubuntu/_base/applications/internet/kvpnc/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/kvpnc/debian/control b/ubuntu/_base/applications/internet/kvpnc/debian/control index 18ca8c728..d628ae4bb 100644 --- a/ubuntu/_base/applications/internet/kvpnc/debian/control +++ b/ubuntu/_base/applications/internet/kvpnc/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgcrypt-dev | libgcrypt20-dev | libgcrypt11-dev Standards-Version: 3.8.4 Package: kvpnc-trinity diff --git a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/smb4k/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/smb4k/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/applications/internet/smb4k/debian/compat b/ubuntu/_base/applications/internet/smb4k/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/smb4k/debian/compat +++ b/ubuntu/_base/applications/internet/smb4k/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/smb4k/debian/control b/ubuntu/_base/applications/internet/smb4k/debian/control index 4f01f0481..38234f9e5 100644 --- a/ubuntu/_base/applications/internet/smb4k/debian/control +++ b/ubuntu/_base/applications/internet/smb4k/debian/control @@ -2,7 +2,7 @@ Source: smb4k-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: tdebase-trinity-dev, tdelibs14-trinity-dev, libart-2.0-dev, libpng-dev, zlib1g-dev, debhelper (>= 9~), cdbs, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://smb4k.berlios.de/ diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series b/ubuntu/_base/applications/internet/smb4k/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/patches/series +++ b/ubuntu/_base/applications/internet/smb4k/debian/patches/series diff --git a/ubuntu/_base/applications/internet/smb4k/debian/rules b/ubuntu/_base/applications/internet/smb4k/debian/rules index 95e8cd9f1..a6797f19a 100755 --- a/ubuntu/_base/applications/internet/smb4k/debian/rules +++ b/ubuntu/_base/applications/internet/smb4k/debian/rules @@ -1,33 +1,17 @@ #!/usr/bin/make -f -# -# Uhm, too much complicated eh? -# include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/internet/smb4k/debian/watch b/ubuntu/_base/applications/internet/smb4k/debian/watch deleted file mode 100644 index 70154d877..000000000 --- a/ubuntu/_base/applications/internet/smb4k/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -version=3 -opts=downloadurlmangle=s/prdownload/download/ \ - http://developer.berlios.de/project/showfiles.php?group_id=769 \ - http://prdownload.berlios.de/smb4k/smb4k-([\d\.]+)\.tar\.bz2 - - diff --git a/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/internet/tork/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/internet/tork/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/applications/internet/tork/debian/compat b/ubuntu/_base/applications/internet/tork/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/internet/tork/debian/compat +++ b/ubuntu/_base/applications/internet/tork/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/internet/tork/debian/control b/ubuntu/_base/applications/internet/tork/debian/control index 8acf55f64..a3b2d8a99 100644 --- a/ubuntu/_base/applications/internet/tork/debian/control +++ b/ubuntu/_base/applications/internet/tork/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Homepage: http://tork.sourceforge.net/ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, torsocks, libgeoip-dev, libssl-dev Standards-Version: 3.9.1 Package: tork-trinity diff --git a/ubuntu/_base/applications/internet/tork/debian/docs b/ubuntu/_base/applications/internet/tork/debian/docs index ca0272abf..76c3076c9 100644 --- a/ubuntu/_base/applications/internet/tork/debian/docs +++ b/ubuntu/_base/applications/internet/tork/debian/docs @@ -1,3 +1,3 @@ AUTHORS -README +README.md TODO diff --git a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/bibletime/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/applications/misc/bibletime/debian/compat b/ubuntu/_base/applications/misc/bibletime/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/compat +++ b/ubuntu/_base/applications/misc/bibletime/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/bibletime/debian/control b/ubuntu/_base/applications/misc/bibletime/debian/control index e68bb12de..2b0adecc7 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/control +++ b/ubuntu/_base/applications/misc/bibletime/debian/control @@ -1,6 +1,6 @@ Source: bibletime-trinity Section: tde -Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1 deleted file mode 100644 index a7b223af3..000000000 --- a/ubuntu/_base/applications/misc/bibletime/debian/de/bibletime.1 +++ /dev/null @@ -1,109 +0,0 @@ -.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "TDE Application" -.SH "NAME" -bibletime \- Software für das Bibelstudium für TDE -.SH "ÃœBERSICHT" -.B bibletime -[ -\fIQt\-Optionen\fR -] -[ -\fITDE\-Optionen\fR -] -[ -\fIOptionen\fR -] -.SH "BESCHREIBUNG" -Diese Manpage beschreibt die -TDE\-Applikation -.B bibletime -und wurde für Debian GNU/Linux geschrieben, weil -das Programm selbst keine Manpage mitbrachte. -.P -.B BibleTime -ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium -für UNIX\-Systeme. -Es erfordert eine laufende TDE\-Umgebung und die Bibliothek SWORD. -BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln, -Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen -Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern, -drucken usw.). -.SS "Einfache Optionen:" -.TP -\fB\-\-help\fR -Optionen von "Hilfe zu" anzeigen -.TP -\fB\-\-help\-qt\fR -Spezielle Optionen zu Qt anzeigen -.TP -\fB\-\-help\-tde\fR -Spezielle Optionen zu TDE anzeigen -.TP -\fB\-\-help\-all\fR -Alle Optionen anzeigen -.TP -\fB\-\-author\fR -Autoren\-Information anzeigen -.TP -\fB\-v\fR, \fB\-\-version\fR -Versionsinformation anzeigen -.TP -\fB\-\-license\fR -Lizenz\-Info anzeigen -.TP -\fB\-\-\fR -Ende der Optionen -.SH "OPTIONEN" -.TP -\fB\-\-debug\fR -Fehlermeldungen aktivieren -.TP -\fB\-\-ignore\-session\fR -Die Startsitzung ignorieren, die beim letzten Beenden von BibleTime -gespeichert wurde. -.TP -\fB\-\-open\-default\-bible\fR \fIkey\fR -Die Standardbibel an der angegebenen Stelle \fIkey\fR öffnen. -Verwenden Sie \fIrandom\fR, um eine zufällige Stelle aufzuschlagen. -.SH "SIEHE AUCH" -Die vollständige Dokumentation für -.B bibletime -und das -.B Bibelstudium -werden als DocBook\-Handbuch bereitgestellt. Wenn das Progamm -.B khelpcenter -richtig eingerichtet ist, sollte das Kommando -.IP -.B khelpcenter help:/bibletime -.PP -das komplette Handbuch zugänglich machen. -.SH "FEHLER" -Bitte melden Sie Fehler an -.br -http://bugs.trinitydesktop.org oder info@bibletime.info , -.br -nicht direkt an die Autoren. -.br -.SH "AUTOREN" -BibleTime wurde geschrieben von: -.br -.nh -Joachim Ansorg <junkmail@joachim.ansorgs.de> -.br -Martin Gruner <mg.pub@gmx.net> -.br -Nikolay Igotti <olonho@hotmail.com> -.br -Gary Sims <gary@garysims.co.uk> -.br -Timothy R. Butler <tbutler@uninetsolutions.com> -.br -James Ots <me@jamesots.com> -.br -Fred Saalbach <saalbach@sybercom.net> -.hy -.P -Diese Manpage wurde erstellt von -.nh -Erik Schanze <schanzi_@gmx.de> -.hy -für Debian GNU/Linux (kann aber auch von anderen genutzt werden). diff --git a/ubuntu/_base/applications/misc/bibletime/debian/docs b/ubuntu/_base/applications/misc/bibletime/debian/docs new file mode 100644 index 000000000..b43bf86b5 --- /dev/null +++ b/ubuntu/_base/applications/misc/bibletime/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1 b/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1 deleted file mode 100644 index 46332c7d9..000000000 --- a/ubuntu/_base/applications/misc/bibletime/debian/en/bibletime.1 +++ /dev/null @@ -1,109 +0,0 @@ -.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "TDE Application" -.SH "NAME" -bibletime \- Bible study tool for TDE -.SH "SYNOPSIS" -.B bibletime -[ -\fIQt\-options\fR -] -[ -\fITDE\-options\fR -] -[ -\fIoptions\fR -] -.SH "DESCRIPTION" -This manual page documents briefly the -.B bibletime -TDE Application. -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.P -.B BibleTime -is a free and easy to use bible study tool for UNIX systems. -It requires a working TDE environment and the SWORD library. -BibleTime provides easy handling of digitized texts (Bibles, commentaries -and lexicons) and powerful features to work with these texts (search in -texts, write own notes, save, print etc.). -.SS "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 -.TP -\fB\-\-\fR -End of options. -.SH "OPTIONS" -.TP -\fB\-\-debug\fR -Enable debug messages. -.TP -\fB\-\-ignore\-session\fR -Ignore the startup session that was saved when BibleTime was closed -the last time. -.TP -\fB\-\-open\-default\-bible\fR \fIkey\fR -Open the default bible with the given \fIkey\fR. -Use -.I random -to open at a random position. -.SH "SEE ALSO" -The full documentations for -.B bibletime -and -.B bible study -are maintained as docbook manuals. If the -.B khelpcenter -program is properly installed at your site, the command -.IP -.B khelpcenter help:/bibletime -.PP -should give you access to the complete manual. -.SH "BUGS" -Please use -.br -http://bugs.trinitydesktop.org or info@bibletime.info -.br -to report bugs, do not mail the authors directly. -.br -.SH "AUTHOR" -BibleTime was written by -.br -.nh -Joachim Ansorg <junkmail@joachim.ansorgs.de> -.br -Martin Gruner <mg.pub@gmx.net> -.br -Nikolay Igotti <olonho@hotmail.com> -.br -Gary Sims <gary@garysims.co.uk> -.br -Timothy R. Butler <tbutler@uninetsolutions.com> -.br -James Ots <me@jamesots.com> -.br -Fred Saalbach <saalbach@sybercom.net> -.hy -.P -This manual page was prepared by -.nh -Erik Schanze <schanzi_@gmx.de> -.hy -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/misc/bibletime/debian/install b/ubuntu/_base/applications/misc/bibletime/debian/install index dc727ccec..dcf290ae2 100644 --- a/ubuntu/_base/applications/misc/bibletime/debian/install +++ b/ubuntu/_base/applications/misc/bibletime/debian/install @@ -1,3 +1 @@ -bibletime.xpm /opt/trinity/share/pixmaps/ -en/bibletime.1 /opt/trinity/share/man/man1 -de/bibletime.1 /opt/trinity/share/man/de/man1 +debian/bibletime.xpm /opt/trinity/share/pixmaps/ diff --git a/ubuntu/_base/applications/misc/bibletime/debian/rules b/ubuntu/_base/applications/misc/bibletime/debian/rules index 430b47715..a6797f19a 100755 --- a/ubuntu/_base/applications/misc/bibletime/debian/rules +++ b/ubuntu/_base/applications/misc/bibletime/debian/rules @@ -1,23 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_DH_INSTALL_SOURCEDIR := debian - -DEB_BUILDDIR = $(DEB_SRCDIR) - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - -binary-install/bibletime-trinity:: - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc - chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/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/applications/misc/compizconfig-backend-tdeconfig/debian/compat b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat +++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control index 2fb9394d3..5536499f7 100644 --- a/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control +++ b/ubuntu/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control @@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity Section: libs Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev Standards-Version: 3.8.4 Package: compizconfig-backend-tdeconfig-trinity diff --git a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/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/applications/settings/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl index 1b110f7af..1b110f7af 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control index 4c731ebe2..14ddd5ccc 100644 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/control @@ -2,16 +2,16 @@ Source: desktop-effects-tde-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev +Build-Depends-Indep: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, + dh-python, python3-all-dev, pytde-dev Standards-Version: 3.8.4 -XS-Python-Version: all +X-Python3-Version: all Package: desktop-effects-tde-trinity Architecture: all -Depends: ${python:Depends}, python-tqt, python-trinity-trinity +Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde Replaces: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~) Breaks: desktop-effects-kde-kde3 (<< 4:14.0.0~), desktop-effects-kde-trinity (<< 4:14.0.0~) -XB-Python-Version: ${python:Versions} Description: compiz setup tool for Trinity A simple Compiz configuration tool for Trinity. Installs and sets Compiz as the window manager. diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install deleted file mode 100644 index 2b6b93781..000000000 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install +++ /dev/null @@ -1,8 +0,0 @@ -desktop-effects-tde /opt/trinity/bin/ -25enable-compiz /etc/X11/Xsession.d/ -DesktopEffects/DesktopEffectsCommon.py /opt/trinity/share/pyshared/DesktopEffects/ -DesktopEffects/DesktopEffectsDialog.py /opt/trinity/share/pyshared/DesktopEffects/ -DesktopEffects/DesktopEffectsTDE.py /opt/trinity/share/pyshared/DesktopEffects/ -DesktopEffects/__init__.py /opt/trinity/share/pyshared/DesktopEffects/ -data/* /opt/trinity/share/apps/desktop-effects-tde/ -desktop-effects-tde.desktop /opt/trinity/share/applications/ diff --git a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules index eef8add16..bcea12716 100755 --- a/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules +++ b/ubuntu/_base/applications/misc/desktop-effects-tde/debian/rules @@ -1,26 +1,20 @@ #!/usr/bin/make -f -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 +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" binary-install/desktop-effects-tde-trinity:: - ${DH_PYTHON2} -pdesktop-effects-tde-trinity + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/changelog b/ubuntu/_base/applications/misc/fusion-icon/debian/changelog deleted file mode 100644 index 87f2b117a..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/changelog +++ /dev/null @@ -1,76 +0,0 @@ -fusion-icon-trinity (0.0.0+git20071028-0ubuntu1) jaunty; urgency=low - - * Added -trinity suffix - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 16 Apr 2009 19:57:00 -0600 - -fusion-icon (0.0.0+git20071028-2ubuntu2) hardy; urgency=low - - * Rebuild package so that it uses the python-central's new directories, - to avoid an installation error (LP: #207831). - - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 28 Mar 2008 00:22:47 +0100 - -fusion-icon (0.0.0+git20071028-2ubuntu1) hardy; urgency=low - - * Manual sync to workaround .orig.tar.gz mismatch (LP: #204799). - - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 20:55:03 +0100 - -fusion-icon (0.0.0+git20071028-2) unstable; urgency=medium - - * debian/control: - - Bump python-central build dependency's minimum version to 0.6.0. - - Remove "${shlibs:Depends}" from Depends. - * debian/rules: - - Do not try to remove usr/lib, as python-central doesn't create it - anymore now (Closes: #472010). - - Remove unnecessary explicit dh_pycentral call. - - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 19:57:39 +0100 - -fusion-icon (0.0.0+git20071028-1) unstable; urgency=low - - * Initial upload to Debian (Closes: #461769). - * debian/rules: - - Change priority from "extra" to "optional". - - Change the Maintainer to myself and add the python-apps team - as Uploader. - - Add SVN information. - * debian/copyright: - - Some formatting changes. - - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 20 Jan 2008 21:34:55 +0100 - -fusion-icon (0.0.0+git20071028-0ubuntu2) hardy; urgency=low - - * patches/remove_shabangs.patch: - - Remove Python shabangs - * patches/update-desktop-file.patch: - - Update .desktop file to match the current FD.o standards - - Add Catalan and Spanish translations - - Launch with the "--no-start" option, so that it doesn't reload - Compiz when it's run from the menu - * patches/glx_vendor_crash.patch: - - Always define the self.glx_vendor variable, to avoid and - AttributeError (LP: #175504) - * Add a .xpm version of the icon (debian/fusion-icon.xpm) and a - menu file (debian/menu, debian/install) - * Symlink the .png icon to /usr/share/pixmaps, so that it's - displayed in the menu and the tray (debian/links) - * Add a manpage (debian/fusion-icon.1, debian/manpages) - * debian/control: - - Bump standards version to 3.7.3 - - Bump cdbs' and debhelper's minium versions. - - Move python-central and intltool to Build-Depends-Indep - - Add python-compizconfig dependency (LP: #174507) - - Add python-qt4 as alternative dependency to python-gtk2 - - Change short description - - -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Tue, 11 Dec 2007 20:49:24 +0100 - -fusion-icon (0.0.0+git20071028-0ubuntu1) hardy; urgency=low - - * Initial upload. - - -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 28 Oct 2007 11:28:19 -0400 diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/compat b/ubuntu/_base/applications/misc/fusion-icon/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/control b/ubuntu/_base/applications/misc/fusion-icon/debian/control deleted file mode 100644 index ee5531317..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/control +++ /dev/null @@ -1,23 +0,0 @@ -Source: fusion-icon-trinity -Section: x11 -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> -XS-Python-Version: all -Build-Depends: cdbs (>= 0.4.49), debhelper (>= 9~), quilt, pkg-config, python-all-dev -Build-Depends-Indep: python-support (>= 0.6) | dh-python -Standards-Version: 3.8.4 - -Package: fusion-icon-trinity -Architecture: all -XB-Python-Version: ${python:Versions} -Replaces: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~) -Breaks: fusion-icon-kde3 (<< 4:14.0.0~), fusion-icon-trinity (<< 4:14.0.0~) -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity -Description: tray icon to launch and manage Compiz Fusion [Trinity] - The OpenCompositing Project brings 3D desktop visual effects that - improve the usability and eye candy of the X Window System and provide - increased productivity. - . - This package contains a tray icon that can launch Compiz and its - decorators. diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/copyright b/ubuntu/_base/applications/misc/fusion-icon/debian/copyright deleted file mode 100644 index ae1ce34fa..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/copyright +++ /dev/null @@ -1,31 +0,0 @@ -This package was debianized by Michael Vogt <mvo@ubuntu.com> -Wed, 28 Oct 2007 15:59:31 +0200. - -It was downloaded from git://anongit.compiz-fusion.org/users/crdlb/fusion-icon - -Upstream Author: - - Christopher Williams - -Copyright: - - Copyright (C) 2007 Christopher Williams - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is (C) 2007 Michael Vogt <mvo@ubuntu.com>, -(C) 2008 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>, and it -is licensed under the GPL (see above). diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1 b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1 deleted file mode 100644 index 1b15860e1..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.1 +++ /dev/null @@ -1,38 +0,0 @@ -.TH FUSION\-ICON "1" "11 December 2007" -.SH NAME -fusion\-icon \- tray icon to launch and manage Compiz Fusion -.SH SYNOPSIS -.B fusion\-icon\fR [\fBOPTIONS\fR] -.SH DESCRIPTION -.PP -This man page documents briefly the \fBfusion\-icon\fR command. -\fBfusion\-icon\fR is a tray icon for easy window manager and window -decorator switching, and it is being developed as part of the Open -Compositing project. -.SH OPTIONS -.TP -.B \-\-version -Show \fBfusion\-icon\fR's version number and exit. -.TP -\fB\-s\fR <seconds>, \fB\-\-sleep\fR=<seconds> -Sleep for \fIseconds\fR seconds before launching \fBfusion\-icon\fR. -.TP -\fB\-i\fR <interface>, \fB\-\-interface\fR=<interface> -Try a certain interface first. -.TP -\fB\-u\fR, \fB\-\-no\-interface\fR -Do not use any interface. -.TP -\fB\-f\fR, \fB\-\-force\-compiz\fR -Start compiz regardless of environment or configuration. -.TP -\fB\-n\fR, \fB\-\-no\-start\fR -Run, but do not start a window manager. - -.SH SEE ALSO -.BR compiz (1) -.PP - -.SH COPYRIGHT -This manual page was written by Siegfried\-Angel Gevatter Pujals <rainct@ubuntu.com>. -It is released under the GNU General Public License, version 2 or later. diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm b/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm deleted file mode 100644 index fe0843739..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm +++ /dev/null @@ -1,359 +0,0 @@ -/* XPM */ -static char * fusion_icon_xpm[] = { -"32 32 324 2", -" c None", -". c #C8E3FA", -"+ c #D4E9FB", -"@ c #FDFEFF", -"# c #F0F5FB", -"$ c #C6E2FA", -"% c #CDE5FB", -"& c #CBE6FB", -"* c #C5E6FC", -"= c #BEE7FB", -"- c #B6E6FB", -"; c #AAE3FB", -"> c #9DDFFA", -", c #93DCF9", -"' c #E3F3FA", -") c #E0EFF7", -"! c #90BFE4", -"~ c #77A8DF", -"{ c #C3E0FA", -"] c #C9E4FB", -"^ c #C5E4FB", -"/ c #C1E6FC", -"( c #BAE6FB", -"_ c #B3E5FB", -": c #A7E2FB", -"< c #9ADEFA", -"[ c #8DDBF9", -"} c #8CDBFB", -"| c #A9D4E8", -"1 c #0681C1", -"2 c #017FBE", -"3 c #429ECF", -"4 c #82B7E0", -"5 c #6EA3DC", -"6 c #B9DCF9", -"7 c #ACE1FA", -"8 c #A1DEF9", -"9 c #93DAF7", -"0 c #87D6F7", -"a c #87D7F8", -"b c #9FCEE3", -"c c #007DBD", -"d c #007CBC", -"e c #3C99CC", -"f c #639FD9", -"g c #B8DFF9", -"h c #82D4F6", -"i c #80D2F3", -"j c #98CAE1", -"k c #007CBB", -"l c #007BBB", -"m c #007BBA", -"n c #5B9ED6", -"o c #B7DDF9", -"p c #7ECFF3", -"q c #7EBBD6", -"r c #89B8CC", -"s c #7CCCEF", -"t c #7DCFF3", -"u c #91C5DE", -"v c #007BB9", -"w c #007AB9", -"x c #5B9ED5", -"y c #B6DEF7", -"z c #77CBF0", -"A c #79B9D4", -"B c #ECF4FB", -"C c #AEC6D2", -"D c #77C1E0", -"E c #8AC1DB", -"F c #007AB8", -"G c #0079B7", -"H c #5B9DD5", -"I c #B5DDF7", -"J c #71C8EE", -"K c #74B6D3", -"L c #EEF6FD", -"M c #EFF7FE", -"N c #D7E3EB", -"O c #7CB6D2", -"P c #71C7ED", -"Q c #70C7EE", -"R c #83BDD8", -"S c #0079B6", -"T c #0078B6", -"U c #5B9DD4", -"V c #B4DCF8", -"W c #6BC3EC", -"X c #6FB2D1", -"Y c #99BDCE", -"Z c #6DBEE5", -"` c #6BC2EC", -" . c #7BB8D6", -".. c #0078B5", -"+. c #0077B4", -"@. c #B4DBF7", -"#. c #65BFE9", -"$. c #6CAFD0", -"%. c #C7D8E2", -"&. c #6EB3D4", -"*. c #64BEE9", -"=. c #75B4D4", -"-. c #0076B3", -";. c #0076B2", -">. c #B3DAF6", -",. c #5FBAE6", -"'. c #67ACCE", -"). c #E7EFF6", -"!. c #84B1C9", -"~. c #60B9E4", -"{. c #5EB9E6", -"]. c #6EAFD0", -"^. c #0075B2", -"/. c #0075B1", -"(. c #5B9CD3", -"_. c #B3DAF5", -":. c #59B6E3", -"<. c #62A8CB", -"[. c #B2C8D5", -"}. c #60AFD5", -"|. c #58B5E3", -"1. c #68ABCE", -"2. c #0074B0", -"3. c #0074AF", -"4. c #B1DAF5", -"5. c #52B1E0", -"6. c #5CA6C9", -"7. c #CDE6F5", -"8. c #8CC5E1", -"9. c #85C1E1", -"0. c #81BFDF", -"a. c #7DBEDE", -"b. c #71B7D9", -"c. c #51B1E0", -"d. c #50B1E0", -"e. c #4FB0E0", -"f. c #4DAFDF", -"g. c #4AAEDF", -"h. c #5EA5CA", -"i. c #0073AF", -"j. c #0073AE", -"k. c #5B9CD2", -"l. c #B0D9F4", -"m. c #4CACDE", -"n. c #59A2C8", -"o. c #B5DCF1", -"p. c #BCD7E6", -"q. c #EAF4FB", -"r. c #5CABD5", -"s. c #45A9DD", -"t. c #43A8DD", -"u. c #41A7DC", -"v. c #3FA6DC", -"w. c #3DA5DC", -"x. c #3CA5DB", -"y. c #3AA4DB", -"z. c #529EC5", -"A. c #0072AD", -"B. c #0072AC", -"C. c #5B9BD2", -"D. c #B0D7F4", -"E. c #3DA4DA", -"F. c #4D99C3", -"G. c #DEF0FB", -"H. c #43A3D7", -"I. c #67A6C7", -"J. c #BAD7E7", -"K. c #35A0D7", -"L. c #34A0D8", -"M. c #4C99C2", -"N. c #0071AC", -"O. c #0071AB", -"P. c #589AD1", -"Q. c #AFD6F4", -"R. c #2F9CD5", -"S. c #4595C0", -"T. c #ECF4FC", -"U. c #64B0D9", -"V. c #3A9ED4", -"W. c #CFDEE7", -"X. c #EBF4FC", -"Y. c #68AACE", -"Z. c #4495BF", -"`. c #0071AA", -" + c #0070AA", -".+ c #0070A9", -"++ c #5497CF", -"@+ c #ACD6F3", -"#+ c #2997D2", -"$+ c #4091BE", -"%+ c #9BC9E7", -"&+ c #73A5C3", -"*+ c #E1EFFC", -"=+ c #D6E9F8", -"-+ c #3497CD", -";+ c #3E8FBB", -">+ c #006FA9", -",+ c #006FA8", -"'+ c #4F95CE", -")+ c #A6D2F2", -"!+ c #2393CF", -"~+ c #318FC2", -"{+ c #2994CE", -"]+ c #3491C4", -"^+ c #CFE1F2", -"/+ c #D6EAFC", -"(+ c #92C3E1", -"_+ c #378BB8", -":+ c #006EA7", -"<+ c #006EA6", -"[+ c #4B91CD", -"}+ c #A2CFF1", -"|+ c #1F8ECD", -"1+ c #1E8ECD", -"2+ c #7DA8C4", -"3+ c #CBE4FB", -"4+ c #4699C9", -"5+ c #3087B5", -"6+ c #006DA6", -"7+ c #006DA5", -"8+ c #468ECB", -"9+ c #9ECDF1", -"0+ c #2691CD", -"a+ c #2590CD", -"b+ c #2490CD", -"c+ c #2390CC", -"d+ c #218FCC", -"e+ c #1F8ECC", -"f+ c #3A88B6", -"g+ c #BEDCF7", -"h+ c #C0DEFA", -"i+ c #ACD3F3", -"j+ c #1D8AC8", -"k+ c #198ACA", -"l+ c #188ACA", -"m+ c #2A82B3", -"n+ c #016EA5", -"o+ c #0570A7", -"p+ c #0972A8", -"q+ c #4990CC", -"r+ c #99C8EF", -"s+ c #3798CF", -"t+ c #3598CF", -"u+ c #3497CF", -"v+ c #3397CF", -"w+ c #3296CE", -"x+ c #3093CC", -"y+ c #8DB1CF", -"z+ c #B5D9F9", -"A+ c #B4D8F9", -"B+ c #6BAFDA", -"C+ c #2891CC", -"D+ c #2690CC", -"E+ c #248FCB", -"F+ c #218DCA", -"G+ c #1E8CCA", -"H+ c #1B8AC9", -"I+ c #2880B2", -"J+ c #0C74A9", -"K+ c #1076AB", -"L+ c #1378AC", -"M+ c #177AAD", -"N+ c #4E92CE", -"O+ c #8DB5D9", -"P+ c #9ECBF3", -"Q+ c #94C7F1", -"R+ c #85C0EA", -"S+ c #72B3DF", -"T+ c #61A7D4", -"U+ c #539FCD", -"V+ c #479BCD", -"W+ c #3F9ACF", -"X+ c #5394BD", -"Y+ c #AAD3F8", -"Z+ c #A9D3F8", -"`+ c #A8D1F8", -" @ c #4197CB", -".@ c #3B99CF", -"+@ c #3A98CF", -"@@ c #3897CE", -"#@ c #3696CE", -"$@ c #398AB9", -"%@ c #187BAD", -"&@ c #1B7CAF", -"*@ c #1E7EB0", -"=@ c #2C85B7", -"-@ c #4E93CB", -";@ c #6096D1", -">@ c #45596A", -",@ c #5A7389", -"'@ c #6D8CA6", -")@ c #7EA0C0", -"!@ c #8FB7DB", -"~@ c #9ECAF2", -"{@ c #97C9F3", -"]@ c #A0CEF7", -"^@ c #87C1EC", -"/@ c #469DCF", -"(@ c #49A0D2", -"_@ c #489FD1", -":@ c #469ED1", -"<@ c #4590BC", -"[@ c #2884B3", -"}@ c #378ABD", -"|@ c #5999CF", -"1@ c #689AD1", -"2@ c #486B90", -"3@ c #45596B", -"4@ c #59738B", -"5@ c #6C8AA5", -"6@ c #7DA1C1", -"7@ c #8FB9DC", -"8@ c #98C9F2", -"9@ c #8CC3EE", -"0@ c #7DB9E6", -"a@ c #6DAFDA", -"b@ c #65A6CE", -"c@ c #639FD4", -"d@ c #6B9CD0", -"e@ c #47688C", -"f@ c #475C6E", -"g@ c #5B758C", -"h@ c #7391AC", -"i@ c #446385", -" ", -" ", -" ", -" ", -" . + @ # ", -" $ % & * = - ; > , ' ) ! ~ ", -" { ] ^ / ( _ : < [ } } } } } } } | 1 2 3 4 5 ", -" 6 7 8 9 0 a a a a a a a a a a a a a a b c c c d e f ", -" g h i h h h h h h h h h h h h h h h h j d k k l m n ", -" o p q r s p p p p p p t t t t t t t t u m m v w w x ", -" y z A B C D z z z z z z z z z z z z z E w F F G G H ", -" I J K L M N O P J J J J J J Q Q Q Q Q R G G S T T U ", -" V W X L M M B Y Z W W W W W W ` ` ` ` .T ....+.+.U ", -" @.#.$.L M M M M %.&.#.#.#.#.#.#.#.#.*.=.+.+.-.-.;.U ", -" >.,.'.L M M M M M ).!.~.,.,.,.,.,.,.{.].-.;.^././.(. ", -" _.:.<.L M M M M M M L [.}.|.|.|.|.|.|.1././.2.2.3.(. ", -" 4.5.6.L M M M 7.8.9.0.a.b.c.c.d.e.f.g.h.3.3.i.j.j.k. ", -" l.m.n.L M o.p.q.r.s.t.u.v.w.x.y.y.y.y.z.j.j.A.A.B.C. ", -" D.E.F.L G.H.I.L J.K.L.L.L.L.L.L.L.L.L.M.B.B.N.O.O.P. ", -" Q.R.S.T.U.R.V.W.X.Y.R.R.R.R.R.R.R.R.R.Z.O.`. + +.+++ ", -" @+#+$+%+#+#+#+&+*+=+-+#+#+#+#+#+#+#+#+;+.+>+,+,+,+'+ ", -" )+!+~+{+!+!+!+]+^+/+(+!+!+!+!+!+!+!+!+_+,+:+:+:+<+[+ ", -" }+|+|+|+1+1+1+|+2+3+3+4+1+1+1+1+1+1+1+5+<+6+7+7+7+8+ ", -" 9+0+0+a+b+c+d+e+f+g+h+i+j+k+k+k+k+l+l+m+7+7+n+o+p+q+ ", -" r+s+t+u+v+v+w+w+x+y+z+A+B+C+D+E+F+G+H+I+p+J+K+L+M+N+ ", -" O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@.@+@@@#@$@%@&@*@=@-@;@ ", -" >@,@'@)@!@~@{@]@]@]@^@/@(@_@_@:@<@[@}@|@1@2@ ", -" 3@4@5@6@7@8@9@0@a@b@c@d@e@ ", -" f@g@h@i@ ", -" ", -" ", -" "}; diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/install b/ubuntu/_base/applications/misc/fusion-icon/debian/install deleted file mode 100644 index 7d4e26567..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/install +++ /dev/null @@ -1 +0,0 @@ -debian/fusion-icon.xpm usr/share/pixmaps diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/links b/ubuntu/_base/applications/misc/fusion-icon/debian/links deleted file mode 100644 index 51627e83a..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/links +++ /dev/null @@ -1 +0,0 @@ -opt/trinity/share/icons/hicolor/48x48/apps/fusion-icon.png opt/trinity/share/pixmaps/fusion-icon.png diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/manpages b/ubuntu/_base/applications/misc/fusion-icon/debian/manpages deleted file mode 100644 index 3ba122a39..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/fusion-icon.1 diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/menu b/ubuntu/_base/applications/misc/fusion-icon/debian/menu deleted file mode 100644 index e85a21dbf..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(fusion-icon-trinity): needs="X11" section="Applications/System/Administration" title="Compiz Fusion Icon [Trinity]" \ - command="/opt/trinity/bin/fusion-icon" icon="/opt/trinity/share/pixmaps/fusion-icon.xpm" diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat b/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk b/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk deleted file mode 100644 index fbc70a624..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk +++ /dev/null @@ -1,260 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Colin Walters <walters@debian.org> -# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org> -# -# Description: manage Python public modules build -# This class is designed to work with Python packages using the -# 'distutils' build system and comply to the new policy established -# during summer 2006. Use of the debhelper class to make use of the -# new dh_python is strongly advised. (This is still left as optional -# in line with CDBS' flexible behavior.) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02111-1307 USA. -# - -# This class provides rules for old and new Python policy. Leaving -# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and -# pycentral methods are available to comply with new policy. Don't forget -# to update your 'debian/control'. (Build-Depends are correctly generated -# if you are using the auto control generation feature.) - -# Once all old-style packages are removed before etch, some of the old -# can be refactored or removed. - - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_python_distutils -_cdbs_class_python_distutils = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - - -# check python system -cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) -cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) -cdbs_pycompat = $(cdbs_selected_pycompat) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - # warning pysupport compatibility mode - ifneq (, $(cdbs_use_xs_field)) - $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.) - endif # use XS field (compat) -else - ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - else - ifneq (, $(DEB_PYTHON_SYSTEM)) - $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) - else - ifneq (, $(cdbs_use_xs_field)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - ifneq (, $(cdbs_selected_pycompat)) - ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - endif # use pycompat - endif # unknown method - endif # pycentral -endif # pysupport - - -ifndef DEB_PYTHON_SYSTEM -DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 -else -# default package is the first one declared in 'debian/control' -# (override if necessary) -DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))) -DEB_PYTHON_PRIVATE_MODULES_DIRS = -endif - -# common variables -DEB_PYTHON_SETUP_CMD = setup.py -DEB_PYTHON_CLEAN_ARGS = -a -DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build" -DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 - - -ifndef DEB_PYTHON_SYSTEM -########################### old policy method ########################### - -$(warning =======================================================) -$(warning Your package does not conform to the new Python policy.) -$(warning Please consider updating. Here is some documentation:) -$(warning http://wiki.debian.org/DebianPython/NewPolicy) -$(warning http://wiki.debian.org/DebianPythonFAQ) -$(warning =======================================================) - -# make: *** No rule to make target `voodoo'. Stop. -DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -# If no versioned python library packages found, grab all simpler ones -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -endif - -cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg)))) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) - - -# See if this package doesn't appear to need to be compiled by multiple -# Python versions. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -else -$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -endif - -$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - -# This class can optionally utilize debhelper's "dh_python" command. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# Ignore errors from this rule. In a tarball build, the file may not -# exist. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -clean:: - -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else -clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) - -$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : - -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif - -else -########################## new policy methods ########################### - -# Calculate cdbs_python_build_versions -cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control)) -cdbs_python_current_version := $(shell pyversions -vd) -ifeq (all, $(cdbs_python_module_arch)) - # check if current is in build versions - ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) - cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) - cdbs_python_build_versions := $(cdbs_python_compile_version) - else - cdbs_python_build_versions := $(cdbs_python_current_version) - endif -else -cdbs_python_build_versions := $(shell pyversions -vr) -endif # archall - -# check if build is possible -ifeq (, $(cdbs_python_build_versions)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -$(error invalid setting in debian/pyversions) -else -$(error invalid setting for XS-Python-Version) -endif # system selected -endif # build versions empty - - -# Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43) -ifeq (all, $(cdbs_python_module_arch)) - ifneq (, $(cdbs_python_compile_version)) - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) - else - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) - endif -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) -endif -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) -endif - - -cdbs_python_current_binary := $(shell pyversions -d) -cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1)) - -# build stage -common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions)) -python-build-stamp-%: -ifeq (all, $(cdbs_python_module_arch)) - cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -else - cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -endif # archall detection - touch $@ - - -# install stage -ifeq (all, $(cdbs_python_module_arch)) -common-install-arch common-install-indep:: python-install-py -python-install-py: - cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -else -common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions)) -python-install-%: - cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -endif # archall detection - - -# clean stage -clean:: $(addprefix python-clean-, $(cdbs_python_build_versions)) -python-clean-%: -ifeq (all, $(cdbs_python_module_arch)) - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif # archall detection - -clean:: -ifeq (, $(cdbs_selected_pycompat)) - echo "$(cdbs_pycompat)" >debian/pycompat -endif # use pycompat - rm -f python-build-stamp-* - -endif - - -########################## all policy methods ########################### - -# Calling setup.py clean may create .pyc files, so we need a final cleanup -# pass here. -clean:: - find . -name '*.pyc' -exec rm '{}' ';' - -endif diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/rules b/ubuntu/_base/applications/misc/fusion-icon/debian/rules deleted file mode 100755 index a0c6906dd..000000000 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/rules +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/make -f - -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) -DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity - -include /usr/share/cdbs/1/rules/debhelper.mk -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - include debian/python-distutils-custom.mk -else - include /usr/share/cdbs/1/class/python-distutils.mk -endif -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - -binary-install/fusion-icon-trinity:: - mkdir -p debian/fusion-icon-trinity/usr/local/lib - cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/ - rm -rf debian/fusion-icon-trinity/usr/local - mkdir -p debian/fusion-icon-trinity/temp - mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp - mkdir -p debian/fusion-icon-trinity/opt/trinity - cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ - rm -rf debian/fusion-icon-trinity/usr - ${DH_PYTHON2} -pfusion-icon-trinity - ### - # Must be done after invoking dh_pysupport, otherwise python scripts will - # end up in /usr/share/pyshare instead of dist-packages - mkdir -p debian/fusion-icon-trinity/usr - mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr - rm -rf debian/fusion-icon-trinity/temp - ### - mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity - mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/ - rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity - dh_icons diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/kcmldap/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/applications/misc/kcmldap/debian/compat b/ubuntu/_base/applications/misc/kcmldap/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/kcmldap/debian/compat +++ b/ubuntu/_base/applications/misc/kcmldap/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/kcmldap/debian/control b/ubuntu/_base/applications/misc/kcmldap/debian/control index f67cb5723..b8a62a2d1 100644 --- a/ubuntu/_base/applications/misc/kcmldap/debian/control +++ b/ubuntu/_base/applications/misc/kcmldap/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-bonding-trinity diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/kcmldapcontroller/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/applications/misc/kcmldapcontroller/debian/compat b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat +++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control index 9b6de5bbe..ff1388334 100644 --- a/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control +++ b/ubuntu/_base/applications/misc/kcmldapcontroller/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-controller-trinity diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/kcmldapmanager/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/applications/misc/kcmldapmanager/debian/compat b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat +++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control index 072371003..189fbb3ce 100644 --- a/ubuntu/_base/applications/misc/kcmldapmanager/debian/control +++ b/ubuntu/_base/applications/misc/kcmldapmanager/debian/control @@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-ldap-manager-trinity diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/kerberostray/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/applications/misc/kerberostray/debian/compat b/ubuntu/_base/applications/misc/kerberostray/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/kerberostray/debian/compat +++ b/ubuntu/_base/applications/misc/kerberostray/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/kerberostray/debian/control b/ubuntu/_base/applications/misc/kerberostray/debian/control index 0af0907f4..b4b65fb21 100644 --- a/ubuntu/_base/applications/misc/kerberostray/debian/control +++ b/ubuntu/_base/applications/misc/kerberostray/debian/control @@ -2,7 +2,7 @@ Source: kerberostray-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, libtdeldap-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev Standards-Version: 3.8.4 Package: kerberostray-trinity diff --git a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/misc/krecipes/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/applications/misc/krecipes/debian/compat b/ubuntu/_base/applications/misc/krecipes/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/compat +++ b/ubuntu/_base/applications/misc/krecipes/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/misc/krecipes/debian/control b/ubuntu/_base/applications/misc/krecipes/debian/control index 4c32c8ee2..cafce1080 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/control +++ b/ubuntu/_base/applications/misc/krecipes/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Matthias Julius <mdeb@julius-net.net> -Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev +Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev Standards-Version: 3.8.1 Homepage: http://krecipes.sourceforge.net/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/ diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install index 8c3677c1a..28bc4ff13 100644 --- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install +++ b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install @@ -1,6 +1,7 @@ debian/tmp/opt/trinity/share/apps debian/tmp/opt/trinity/share/icons debian/tmp/opt/trinity/share/locale +debian/tmp/opt/trinity/share/man/man1/krecipes.1 debian/tmp/opt/trinity/share/mimelnk debian/krecipes.xpm opt/trinity/share/pixmaps/ diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages b/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages deleted file mode 100644 index 196cdc430..000000000 --- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/krecipes.1 diff --git a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1 b/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1 deleted file mode 100644 index aaf56f777..000000000 --- a/ubuntu/_base/applications/misc/krecipes/debian/krecipes.1 +++ /dev/null @@ -1,187 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KRECIPES 1 "May 2009" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -Krecipes \- The TDE Cookbook -.SH SYNOPSIS -.B krecipes -[Qt\-options] [TDE\-options] [options] -.SH DESCRIPTION -.B Krecipes -is a program that lets you to manage your recipes, create shopping -lists, choose a recipe based on available ingredients and plan your -menu/diet in advance. -.PP -This manual page briefly describes its command line options. -.SH OPTIONS -This program follows the usual GNU command line syntax, with long -options starting with two dashes (`-'). -.TP -.B \-\-convert-sqlite3 -Convert the current SQLite 2.x database to SQLite 3 and exit -.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 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 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. - -.SH FILES -.TP -.I ~/.trinity/share/config/krecipesrc -.B Krecipes -configuration file -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You -can also enter the URL -.BR help:/krecipes/ -directly into konqueror or you can run -.BR "khelpcenter help:/krecipes/" -from the command\-line. - -.SH AUTHORS -.nf -Jason Kivlighn <jkivlighn@gmail.com> -.br -Unai Garro <ugarro@users.sourceforge.net> -.br -Cyril Bosselut <bosselut@b1project.com> -.br -.fi -Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors -directly. -.PP -This manual page was written by Matthias Julius <mdeb@julius-net.net>, -for the Debian project (and 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 -version 2 can be found in /usr/share/common\-licenses/GPL\-2. diff --git a/ubuntu/_base/applications/misc/krecipes/debian/rules b/ubuntu/_base/applications/misc/krecipes/debian/rules index e3708987f..523611ff9 100755 --- a/ubuntu/_base/applications/misc/krecipes/debian/rules +++ b/ubuntu/_base/applications/misc/krecipes/debian/rules @@ -33,10 +33,6 @@ binary-install/krecipes-trinity:: install -p -D -m644 debian/$(cdbs_curpkg).lintian \ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg) -binary-install/krecipes-data-trinity:: - dh_testdir - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - clean:: dh_testdir rm -f debian/stamp-bootstrap diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install index ed34bb3c2..0dbd9f84e 100644 --- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install +++ b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.install @@ -1,28 +1,32 @@ -debian/tmp/opt/trinity/share/applications/tde/amarok.desktop -debian/tmp/opt/trinity/share/services/amarokitpc.protocol -debian/tmp/opt/trinity/share/services/amaroklastfm.protocol -debian/tmp/opt/trinity/share/services/amarokpcast.protocol -debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop -debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop -debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop -debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la -debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so +debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la +debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.la debian/tmp/opt/trinity/lib/trinity/libamarok_generic-mediadevice.so debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.la debian/tmp/opt/trinity/lib/trinity/libamarok_ipod-mediadevice.so -debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la -debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so -debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la -debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.la debian/tmp/opt/trinity/lib/trinity/libamarok_massstorage-device.so debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.la debian/tmp/opt/trinity/lib/trinity/libamarok_nfs-device.so -debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.la -debian/tmp/opt/trinity/lib/trinity/libamarok_daap-mediadevice.so +debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.la +debian/tmp/opt/trinity/lib/trinity/libamarok_njb-mediadevice.so +debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.la +debian/tmp/opt/trinity/lib/trinity/libamarok_smb-device.so +debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.la +debian/tmp/opt/trinity/lib/trinity/libamarok_void-engine_plugin.so +debian/tmp/opt/trinity/share/applications/tde/amarok.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_append.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop +debian/tmp/opt/trinity/share/man/man1/amarokapp.1 +debian/tmp/opt/trinity/share/man/man1/amarokcollectionscanner.1 +debian/tmp/opt/trinity/share/man/man1/amarok_libvisual.1 +debian/tmp/opt/trinity/share/man/man1/amarok.1 +debian/tmp/opt/trinity/share/services/amarokitpc.protocol +debian/tmp/opt/trinity/share/services/amaroklastfm.protocol +debian/tmp/opt/trinity/share/services/amarokpcast.protocol +debian/tmp/opt/trinity/share/servicetypes/amarok_codecinstall.desktop +debian/tmp/opt/trinity/share/servicetypes/amarok_plugin.desktop #libkarma is not in MAIN yet #debian/tmp/opt/trinity/lib/trinity/libamarok_riokarma-mediadevice.la diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages b/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages deleted file mode 100644 index 8094eebb9..000000000 --- a/ubuntu/_base/applications/multimedia/amarok/debian/amarok-trinity.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/man/amarokapp-trinity.1 -debian/man/amarok-trinity.1 -debian/man/amarokcollectionscanner-trinity.1 -debian/man/amarok_libvisual-trinity.1 diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/amarok/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/amarok/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/applications/multimedia/amarok/debian/compat b/ubuntu/_base/applications/multimedia/amarok/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/amarok/debian/compat +++ b/ubuntu/_base/applications/multimedia/amarok/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/control b/ubuntu/_base/applications/multimedia/amarok/debian/control index 9e0aebf98..6e16f1f12 100644 --- a/ubuntu/_base/applications/multimedia/amarok/debian/control +++ b/ubuntu/_base/applications/multimedia/amarok/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Modestas Vainius <modestas@vainius.eu> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, bzip2, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, bzip2, tdelibs14-trinity-dev, tdebase-trinity-dev, - libakode-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, + libakode-dev, libxine2-dev | libxine-dev, libtag1-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, - ruby, ruby-dev + ruby, ruby-dev, dh-python Standards-Version: 3.8.4 Homepage: http://amarok.kde.org @@ -21,7 +21,7 @@ Depends: libamarok-trinity (= ${binary:Version}), amarok-common-trinity (>= ${so Replaces: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~) Breaks: amarok-kde3 (<< 4:14.0.0~), amarok-trinity (<< 4:14.0.0~) Suggests: amarok-konqsidebar-trinity, moodbar, konqueror-trinity | www-browser, - python-all, python-tqt, libqt0-ruby-trinity, libvisual-0.4-plugins + python3-all, python3-pytqt, libqt0-ruby-trinity, libvisual-0.4-plugins Description: versatile and easy to use audio player for Trinity Amarok tries to be a little different, providing a simple drag and drop interface that really makes playlist handling easy. @@ -57,18 +57,18 @@ Description: base library for Amarok [Trinity] Package: amarok-common-trinity Architecture: all -Depends: ruby +Depends: ruby, ${python3:Depends} Replaces: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~) Breaks: amarok-common-kde3 (<< 4:14.0.0~), amarok-common-trinity (<< 4:14.0.0~) Recommends: amarok-trinity (>= ${source:Version}) -Suggests: libqt0-ruby-trinity, python-all, python-tqt +Suggests: libqt0-ruby-trinity, python3-all, python3-pytqt Description: architecture independent files for Amarok [Trinity] This package contains architecture independent files needed for Amarok to run properly. It also provides Amarok documentation. Therefore, unless you have 'amarok' package installed, you will hardly find this package useful. . You need to install Python if you intend to use Zeroconf support, WebControl - and/or playlist2html scripts. You will also need python-qt3 for the + and/or playlist2html scripts. You will also need python3-pytqt for the WebControl script. Package: amarok-konqsidebar-trinity diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 deleted file mode 100644 index 821ec48c7..000000000 --- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok-trinity.1 +++ /dev/null @@ -1,181 +0,0 @@ -.\" Generated by kdemangen.pl and edited by hand -.TH AMAROK 1 "Mar 2004" "Trinity Desktop Environment" "An audio player for TDE" -.SH NAME -amarok -\- An audio player for TDE -.SH SYNOPSIS -amarok [Qt-options] [TDE-options] [URL(s)] -.SH DESCRIPTION -amaroK is a multimedia player based on the soundserver-independent framework. -There are many media players around these days, true. What's missing from most -players is a user interface, that doesn't get in the way of the user. -.SH OPTIONS -.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. -.SS -.SS Arguments: -URL(s) Files/URLs to Open -.SS -.SS Options: -.TP -.B \-r, \-\-previous -Skip backwards in playlist -.TP -.B \-p, \-\-play -Start playing current playlist -.TP -.B \-s, \-\-stop -Stop playback -.TP -.B \-\-pause -Pause playback -.TP -.B \-f, \-\-next -Skip forwards in playlist -.SS -.SS Additional options: -.TP -.B \-e, \-\-enqueue -Enqueue Files/URLs - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/amarok/ -directly into konqueror or you can run -.BR "`khelpcenter help:/amarok/'" -from the command-line. -.BR -.SH AUTHORS -.nf -Christian Muehlhaeuser <chris@chris.de> -.BR -Mark Kretschmann <markey@web.de> -.BR -Max Howell <max.howell@methylblue.com> -.BR -Stanislav Karchebny <berk@upnet.ru> -.BR -Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. -.BR -.SH OTHER -This manual page was written by Alejandro Exojo <suy@badopi.org> for the Debian -system (but may be used by others). -.BR diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 deleted file mode 100644 index c932b9b0c..000000000 --- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarok_libvisual-trinity.1 +++ /dev/null @@ -1,14 +0,0 @@ -.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius -.TH AMAROK_LIBVISUAL 1 "Feb 2008" "Amarok" "LibVisual support utility for Amarok" -.SH NAME -amarok_libvisual \- LibVisual support utility for Amarok -.SH SYNOPSIS -amarok_libvisual -.SH DESCRIPTION -This is LibVisual support helper utility for Amarok. It's used internally by Amarok -itself when needed and is not supposed to be invoked manually by user. -.SS -.SH AUTHORS -Amarok Developers -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 deleted file mode 100644 index 91ff8b6aa..000000000 --- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokapp-trinity.1 +++ /dev/null @@ -1,23 +0,0 @@ -.\" Generated by kdemangen.pl and edited by hand -.TH AMAROK 1 "Feb 2008" "Amarok" "An audio player for TDE" -.SH NAME -amarokapp -\- A direct executable for Amarok. -.SH SYNOPSIS -amarokapp [Qt-options] [TDE-options] [URL(s)] -.SH DESCRIPTION -Amarok is a multimedia player based on the soundserver-independent framework. -There are many media players around these days, true. What's missing from most -players is a user interface, that doesn't get in the way of the user. -.P -This is direct Amarok executable. The recommend way to run Amarok is using -\fBamarok(1)\fP, which is a wrapper script around \fBamarokapp\fP. However, if you're -debugging Amarok with gdb, valgrind or similar program, you will probably want to -run it against this binary directly. -.P -\fBamarokapp(1)\fP takes the same command line options and arguments as -\fBamarok(1)\fP. See its manual page for more information how to run \fBamarokapp\fP. -.SH SEE ALSO -amarok(1) -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 b/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 deleted file mode 100644 index c67cd917f..000000000 --- a/ubuntu/_base/applications/multimedia/amarok/debian/man/amarokcollectionscanner-trinity.1 +++ /dev/null @@ -1,63 +0,0 @@ -.\" This file was generated by kdemangen.pl and edited manually by Modestas Vainius -.TH AMAROKCOLLECTIONSCANNER 1 "Feb 2008" "Amarok" "Collection Scanner for Amarok" -.SH NAME -amarokcollectionscanner \- Collection Scanner for Amarok -.SH SYNOPSIS -amarokcollectionscanner [Qt\-options] [TDE\-options] Folder(s) -.SH DESCRIPTION -This Amarok helper utility scans folder(s) given on the command line or -restarts previous scan if \fB\-\-restart\fP option was given and writes a -specially structured XML file to standard output with extensive information -(including tags) about audio files it was able to find. XML file schema used -by this utility is Amarok specific. -.P -You may find his utility useful if you need to retreive and/or display extended -information about collection of audio files. -.SH OPTIONS -.SS -.SS Arguments: -Folder(s) Folders to scan -.SS -.SS Options: -.TP -.B \-r, \-\-recursive -Scan folders recursively -.TP -.B \-i, \-\-incremental -Incremental Scan (modified folders only) -.TP -.B \-p, \-\-importplaylists -Import playlist -.TP -.B \-s, \-\-restart -Restart the scanner at last position, after a crash [] -.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 -.SH AUTHORS -Amarok Developers -.SH OTHER -This manual page was written by Modestas Vainius <modestas@vainius.eu> for Debian. diff --git a/ubuntu/_base/applications/multimedia/amarok/debian/rules b/ubuntu/_base/applications/multimedia/amarok/debian/rules index 55c147b76..09544563a 100755 --- a/ubuntu/_base/applications/multimedia/amarok/debian/rules +++ b/ubuntu/_base/applications/multimedia/amarok/debian/rules @@ -17,3 +17,9 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_YAUAP="OFF" \ -DWITH_IFP="OFF" + +binary-install/amarok-common-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/playlist2html + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 \ + /opt/trinity/share/apps/amarok/scripts/webcontrol diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/codeine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/codeine/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/applications/multimedia/codeine/debian/compat b/ubuntu/_base/applications/multimedia/codeine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/codeine/debian/compat +++ b/ubuntu/_base/applications/multimedia/codeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/control b/ubuntu/_base/applications/multimedia/codeine/debian/control index 03cba509a..e1ca4d568 100644 --- a/ubuntu/_base/applications/multimedia/codeine/debian/control +++ b/ubuntu/_base/applications/multimedia/codeine/debian/control @@ -2,7 +2,7 @@ Source: codeine-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxine2-dev | libxine-dev, libxtst-dev Standards-Version: 3.7.3 Homepage: http://codeine.sourceforge.net/ diff --git a/ubuntu/_base/applications/multimedia/codeine/debian/patches/series b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/multimedia/codeine/debian/patches/series +++ b/ubuntu/_base/applications/multimedia/codeine/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/k3b-i18n/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/applications/multimedia/k3b-i18n/debian/compat b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat +++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control index a33db1b1e..426d3811a 100644 --- a/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control +++ b/ubuntu/_base/applications/multimedia/k3b-i18n/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build Build-Depends-Indep: tdelibs14-trinity-dev Standards-Version: 3.8.3 diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES index 7b99dabec..7b65b9a3f 100644 --- a/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/ubuntu/_base/applications/multimedia/k3b/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -1,8 +1,5 @@ remove build-dep on libdvdread-dev -libk3b3-extracodecs conflicts libk3b2-extracodecs -transitional libk3b2-extracodecs package - Do not recommend on tdebase-tdeio-plugins, kcontrol, Change recommend to suggest for vcdimager diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/k3b/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/k3b/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/applications/multimedia/k3b/debian/compat b/ubuntu/_base/applications/multimedia/k3b/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/k3b/debian/compat +++ b/ubuntu/_base/applications/multimedia/k3b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/control b/ubuntu/_base/applications/multimedia/k3b/debian/control index d5bd13a60..b4a28b818 100644 --- a/ubuntu/_base/applications/multimedia/k3b/debian/control +++ b/ubuntu/_base/applications/multimedia/k3b/debian/control @@ -5,8 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Francois Marier <francois@debian.org>, Fathi Boudra <fabo@debian.org> Build-Depends: - cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, - tdelibs14-trinity-dev, libdbus-tqt-1-dev, + cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdvdread-dev, libasound2-dev, lame, libmp3lame-dev, libflac++-dev (>= 1.1.2), flac, libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmad0-dev, libavformat-dev, libavcodec-dev, libvorbis-dev, libsamplerate0-dev, libsndfile1-dev @@ -64,7 +63,7 @@ Section: libs Architecture: any Replaces: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~) Breaks: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~) -Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity +Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity Depends: ${shlibs:Depends} Description: The TDE cd burning application library - runtime files [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. @@ -79,7 +78,6 @@ Architecture: any Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~) Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends} -Conflicts: libk3b2-mp3-trinity Description: The TDE cd burning application library - extra decoders [Trinity] K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord. Its aim is to provide a very user friendly interface to all the tasks @@ -87,17 +85,6 @@ Description: The TDE cd burning application library - extra decoders [Trinity] . This package contains runtime libraries for the MP3 and FFMPEG decoder plugin. -Package: libk3b2-extracodecs-trinity -Architecture: all -Priority: extra -Replaces: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Breaks: libk3b2-extracodecs-kde3 (<< 4:14.0.0~), libk3b2-extracodecs-trinity (<< 4:14.0.0~) -Depends: libk3b3-extracodecs-trinity -Description: transitional package for K3b's extra decoders [Trinity] - This is a dummy transitional package to enable a smooth transition from - libk3b2-extracodecs to libk3b3-extracodecs. - It may safely be removed after installation. - Package: k3b-trinity-dbg Priority: extra Architecture: any diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files deleted file mode 100644 index 3b3a0add7..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/share/apps/* -usr/share/icons/* -usr/share/kde/* -usr/share/sounds/* -usr/share/doc/tde/* diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install deleted file mode 100644 index b7175c514..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-data.install +++ /dev/null @@ -1,11 +0,0 @@ -debian/tmp/usr/share/applnk/.hidden/* -debian/tmp/usr/share/apps/* -debian/tmp/usr/share/icons/* -debian/tmp/usr/share/doc/tde/* -debian/tmp/usr/share/sounds/* -debian/tmp/usr/share/mimelnk/* -debian/tmp/usr/share/services/* -debian/k3b-rip-audiocd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-rip-videodvd.desktop usr/share/kde4/apps/solid/actions -debian/k3b-write-iso-image.desktop usr/share/kde4/services/ServiceMenus -debian/k3b-write-bin-image.desktop usr/share/kde4/services/ServiceMenus diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1 b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1 deleted file mode 100644 index 08ca27b5f..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.1 +++ /dev/null @@ -1,207 +0,0 @@ -.TH K3B "1" "December 2002" TDE "TDE Application" -.SH NAME -k3b \- TDE CD burning program -.SH SYNOPSIS -.B k3b -[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR] -.SH DESCRIPTION -This manual page documents briefly the -.B k3b -TDE Application. -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -K3b is a CD burning program that has two aims: -usability and as many features as possible. -.P -This program is part of the official TDE extra gear #1 module. -.SH OPTIONS -.SS "Arguments:" -.TP -File(s) -file(s) to open -.SS "General Options" -.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\fR, \fB\-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS "Options:" -.B \-\-datacd -Create a new data CD project and add all given files -.TP -.B \-\-audiocd -Create a new audio CD project and add all given files -.TP -.B \-\-videocd -Create a new video CD project and add all given files -.TP -.B \-\-mixedcd -Create a new mixed mode CD project and add all given files -.TP -.B \-\-emovixcd -Create a new eMovix CD project and add all given files -.TP -.B \-\-datadvd -Create a new data DVD project and add all given files -.TP -.B \-\-emovixdvd -Create a new eMovix DVD project and add all given files -.TP -.B \-\-copycd -Open the CD copy dialog -.TP -.B \-\-clonecd -Open the CD cloning dialog -.TP -.B \-\-cdimage -Write an ISO image or Bin/Cue image to cd -.TP -.B \-\-erasecd -Erase a CDRW -.TP -.B \-\-formatdvd -Format a DVD-RW or DVD+RW -.TP -.BI \-\-lang \ language -Set the GUI language -.SS "Qt options:" -.TP -.BI \-\-display \ displayname -Use the X-server display \fIdisplayname\fP. -.TP -.BI \-\-session \ sessionId -Restore the application for the given \fIsessionId\fP. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8-bit display. -.TP -.BI \-\-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 -.B \-nograb, use \fB\-dograb\fR to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.BI "\-\-fn\fR, \fP\-\-font" \ fontname -defines the application font. -.TP -.BI "-\-bg\fR, \fB\-\-background" \ color -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.BI "\-\-fg\fR, \fB\-\-foreground" \ color -sets the default foreground color. -.TP -.BI \-\-btn\fR, \fB\-\-button \ color -sets the default button color. -.TP -.BI \-\-name \ name -sets the application name. -.TP -.BI \-\-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 -.BI \-\-inputstyle \ inputstyle -sets XIM (X Input Method) input style. Possible -values are -.BR onthespot ", " overthespot ", " offthespot and root . -.TP -.BI \-\-im " XIM-server" -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS "TDE options:" -.TP -.BI \-\-caption \ caption -Use \fIcaption\fP as name in the titlebar. -.TP -.BI \-\-icon \ icon -Use \fIicon\fP as the application icon. -.TP -.BI \-\-miniicon \ icon -Use \fIicon\fP as the icon in the titlebar. -.TP -.BI \-\-config \ filename -Use alternative configuration file. -.TP -.BI \-\-dcopserver \ server -Use the DCOP Server specified by \fIserver\fP. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.BI \-\-style \ style -sets the application GUI style. -.TP -.BI \-\-geometry \ geometry -sets the client geometry of the main widget. -.SH AUTHOR -K3b was written by -.nh -.ad l -Sebastian Trueg <trueg@informatik.uni-freiburg.de> -and Thomas Froescher <tfroescher@gmx.de>. -.hy -.br -Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly. -.br -This manual page was prepared by -.nh -.ad l -Karolina Lindqvist <pgd\-karolinali@algonet.se> -.hy -for the Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -If the -.B khelpcenter -program is properly installed at your site, the command -.IP -.B khelpcenter help:/k3b -.PP -should give you access to the complete manual. -.P -Alternatively the manual can be browsed in -.B konqueror -giving it the URL help:/k3b - diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install index a72c0b374..8c6643cf2 100644 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install +++ b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.install @@ -1,5 +1,7 @@ debian/tmp/opt/trinity/bin/* -debian/tmp/opt/trinity/share/applications/* -debian/k3b.xpm /opt/trinity/share/pixmaps/ debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.so debian/tmp/opt/trinity/lib/trinity/tdefile_k3b.la +debian/tmp/opt/trinity/share/applications/* +debian/tmp/opt/trinity/share/man/man1/k3b.1 + +debian/k3b.xpm /opt/trinity/share/pixmaps/ diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages deleted file mode 100644 index 328f16efe..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/k3b-trinity.1 diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files deleted file mode 100644 index d6388a5b6..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.files +++ /dev/null @@ -1,6 +0,0 @@ -usr/share/applications/* -usr/share/mimelnk/* -usr/share/pixmaps/* -usr/share/services/* -usr/bin/* -etc/* diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install deleted file mode 100644 index 134bb0bf2..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/bin/* -debian/tmp/usr/share/applications/* -debian/k3b.xpm usr/share/pixmaps/ -debian/tmp/usr/lib/trinity/tdefile_k3b.so -debian/tmp/usr/lib/trinity/tdefile_k3b.la diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages deleted file mode 100644 index 60dde70bc..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/k3b.1 diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu deleted file mode 100644 index e3ec0ef1f..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(k3b-trinity):\ - needs="X11"\ - section="Applications/File Management"\ - title="K3b"\ - command="/opt/trinity/bin/k3b"\ - icon="/opt/trinity/share/pixmaps/k3b.xpm" diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst b/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst deleted file mode 100644 index 3807d55e6..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/k3b.postinst +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -e - -case "$1" in - configure) - - # Remove bad files - if dpkg --compare-versions "$2" eq "0.10.3-1"; then - rm -rf /usr/share/applnk/.hidden - rm -rf /usr/share/applnk/System/k3b.desktop - fi - - if dpkg --compare-versions "$2" lt "0.10.3-1"; then - rm -rf /usr/share/applnk/System/k3b.desktop - rm -rf /usr/share/applnk/System/k3bsetup.desktop - fi - - ;; -abort-upgrade|abort-remove|abort-deconfigure) - ;; - -*) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files deleted file mode 100644 index d45003d06..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/*.la -usr/lib/*.so diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install deleted file mode 100644 index 6257a06d1..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/libk3b.so -debian/tmp/usr/lib/libk3bdevice.so -debian/tmp/usr/include/* diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install deleted file mode 100644 index 0e57a97dc..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3-extracodecs.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/trinity/libk3bmaddecoder.* -#debian/tmp/usr/lib/trinity/libk3bffmpegdecoder.* diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files deleted file mode 100644 index d77e53e7c..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*.so.* -usr/lib/libk3baudio*.{so,la} -usr/lib/trinity/* diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install b/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install deleted file mode 100644 index 69b7f7909..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/libk3b3.install +++ /dev/null @@ -1,25 +0,0 @@ -debian/tmp/usr/lib/libk3b.so.* -debian/tmp/usr/lib/libk3bdevice.so.* -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.la -debian/tmp/usr/lib/trinity/libk3balsaoutputplugin.so -debian/tmp/usr/lib/trinity/libk3bexternalencoder.la -debian/tmp/usr/lib/trinity/libk3bexternalencoder.so -debian/tmp/usr/lib/trinity/libk3bflacdecoder.la -debian/tmp/usr/lib/trinity/libk3bflacdecoder.so -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.la -debian/tmp/usr/lib/trinity/libk3bmpcdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisdecoder.so -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.la -debian/tmp/usr/lib/trinity/libk3boggvorbisencoder.so -debian/tmp/usr/lib/trinity/libk3bsoxencoder.la -debian/tmp/usr/lib/trinity/libk3bsoxencoder.so -debian/tmp/usr/lib/trinity/libk3bwavedecoder.la -debian/tmp/usr/lib/trinity/libk3bwavedecoder.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.so -debian/tmp/usr/lib/trinity/libk3baudioprojectcddbplugin.la -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.so -debian/tmp/usr/lib/trinity/libk3baudiometainforenamerplugin.la -debian/tmp/usr/lib/trinity/tdeio_videodvd.so -debian/tmp/usr/lib/trinity/tdeio_videodvd.la diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/rules b/ubuntu/_base/applications/multimedia/k3b/debian/rules index 72db8e489..0cd87b24d 100755 --- a/ubuntu/_base/applications/multimedia/k3b/debian/rules +++ b/ubuntu/_base/applications/multimedia/k3b/debian/rules @@ -4,6 +4,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_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,3 +22,41 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DWITH_ALL_OPTIONS="ON" + + +post-patches:: + dh_testdir +ifeq ($(DEB_TIME64_API),true) + # update library package name for TIME64 ABI + ls -d debian/* | \ + grep -E "/libk3b3-trinity\." | \ + grep -v "\.t64$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.t64 ] || \ + (cp -a $$a debian/libk3b3$(DEB_TIME64_SUFFIX)-$${a##*-} && mv $$a $$a.t64); \ + done + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-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 "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ + xargs -r rm + [ ! -f debian/control.t64 ] || \ + mv debian/control.t64 debian/control +endif diff --git a/ubuntu/_base/applications/multimedia/k3b/debian/watch b/ubuntu/_base/applications/multimedia/k3b/debian/watch deleted file mode 100644 index 7e3c554ae..000000000 --- a/ubuntu/_base/applications/multimedia/k3b/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/k3b/k3b-([\d.]*).tar.bz2 diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/k9copy/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/applications/multimedia/k9copy/debian/compat b/ubuntu/_base/applications/multimedia/k9copy/debian/compat index 48c962ffa..021ea30c0 100644 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/compat +++ b/ubuntu/_base/applications/multimedia/k9copy/debian/compat @@ -1,2 +1,2 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/control b/ubuntu/_base/applications/multimedia/k9copy/debian/control index c0784a2c0..beb816701 100644 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/control +++ b/ubuntu/_base/applications/multimedia/k9copy/debian/control @@ -3,7 +3,8 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libdvdread-dev, libk3b-trinity-dev, libavformat-dev, libswscale-dev Standards-Version: 3.8.4 Package: k9copy-trinity diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook b/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook deleted file mode 100644 index 96001a6ad..000000000 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/k9copy.1.docbook +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -]> -<refentry> - <refentryinfo> - <author> - <firstname>Mercatante</firstname> - <surname>Anthony</surname> - <email>anthony.mercatante@laposte.net</email> - </author> - <copyright> - <year>2005</year> - <holder>Anthony Mercatante</holder> - </copyright> - <!-- XXX IMPORTANT XXX --> - <!-- Keep this date up to date: --> - <date>2005-07-28</date> - <!-- ^^^^^^^^^^ --> - </refentryinfo> - <refmeta> - <refentrytitle>k9copy</refentrytitle> - <manvolnum>1</manvolnum> - </refmeta> - <refnamediv> - <refname>k9copy</refname> - <refpurpose>DVD copy tool for TDE</refpurpose> - </refnamediv> - <refsynopsisdiv> - <cmdsynopsis> - <command>k9copy</command> - <arg choice="opt"> - <option><replaceable>Qt-options</replaceable></option> - </arg> - <arg choice="opt"> - <option><replaceable>TDE-options</replaceable></option> - </arg> - </cmdsynopsis> - </refsynopsisdiv> - <refsect1> - <title>DESCRIPTION</title> - <para> - DVD copy tool for TDE. - </para> - <para> - k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5. - </para> - </refsect1> - <refsect1> - <title>OPTIONS</title> - <para> - All <productname>TDE</productname> and <productname>Qt</productname> - programs accept a some common command-line options. k9copy has no - application-specific options. - </para> - <para> - <variablelist> - <title>Generic options:</title> - <varlistentry> - <term> <option>--help</option> </term> - <listitem> <para>Show help about options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-qt</option> </term> - <listitem> <para>Show Qt specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-tde</option> </term> - <listitem> <para>Show TDE specific options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--help-all</option> </term> - <listitem> <para>Show all options</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--author</option> </term> - <listitem> <para>Show author information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>-v</option>, <option>--version</option> </term> - <listitem> <para>Show version information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--license</option> </term> - <listitem> <para>Show license information</para> </listitem> - </varlistentry> - <varlistentry> - <term> <option>--</option> </term> - <listitem> <para>Indicates end of options</para> </listitem> - </varlistentry> - </variablelist> - <!-- TODO * add all the rest of the options, but maybe find an automated - way to keep it up to date --> - </para> - </refsect1> - <refsect1> - <title>COPYRIGHT</title> - <para> - This manual page was written by Anthony Mercatante - <email>anthony.mercatante@laposte.net</email> for the - <productname>Debian</productname> 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> - <para> - On Debian systems, the complete text of the GNU General Public - License can be found in - <filename>/usr/share/common-licenses/GPL</filename>. - </para> - </refsect1> -</refentry> - diff --git a/ubuntu/_base/applications/multimedia/k9copy/debian/rules b/ubuntu/_base/applications/multimedia/k9copy/debian/rules index aca7b475b..a6797f19a 100755 --- a/ubuntu/_base/applications/multimedia/k9copy/debian/rules +++ b/ubuntu/_base/applications/multimedia/k9copy/debian/rules @@ -1,43 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -install/k9copy-trinity:: - dh_installman k9copy.1 - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ - dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html - -build/k9copy-trinity:: - docbook2x-man debian/k9copy.1.docbook - -clean:: - rm -f k9copy.1 +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/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/applications/multimedia/kaffeine-mozilla/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat +++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control index 514747b65..3567b8f9e 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control +++ b/ubuntu/_base/applications/multimedia/kaffeine-mozilla/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Riku Voipio <riku.voipio@iki.fi> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libxaw7-dev, libnspr4-dev Standards-Version: 3.8.4 Package: kaffeine-mozilla-trinity diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/kaffeine/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/applications/multimedia/kaffeine/debian/compat b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine/debian/compat +++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/kaffeine/debian/control b/ubuntu/_base/applications/multimedia/kaffeine/debian/control index 52db3bce8..1f2c3098a 100644 --- a/ubuntu/_base/applications/multimedia/kaffeine/debian/control +++ b/ubuntu/_base/applications/multimedia/kaffeine/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Riku Voipio <riku.voipio@iki.fi>, Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libogg-dev, libxine2-dev | libxine-dev (>= 1.1.7), libxcb1-dev, libxtst-dev, libgstreamer1.0-dev | libgstreamer0.10-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/kmplayer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/kmplayer/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/applications/multimedia/kmplayer/debian/compat b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/kmplayer/debian/compat +++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/kmplayer/debian/control b/ubuntu/_base/applications/multimedia/kmplayer/debian/control index a285abe80..85a13e26e 100644 --- a/ubuntu/_base/applications/multimedia/kmplayer/debian/control +++ b/ubuntu/_base/applications/multimedia/kmplayer/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libnspr4-dev, libcairo2-dev, libdbus-1-dev, libdbus-glib-1-dev, libdbus-tqt-1-dev, libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, libxine2-dev | libxine-dev, libxv-dev, libxtst-dev, diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/kplayer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/kplayer/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/applications/multimedia/kplayer/debian/compat b/ubuntu/_base/applications/multimedia/kplayer/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/kplayer/debian/compat +++ b/ubuntu/_base/applications/multimedia/kplayer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/control b/ubuntu/_base/applications/multimedia/kplayer/debian/control index b964e58cb..20fdf0f39 100644 --- a/ubuntu/_base/applications/multimedia/kplayer/debian/control +++ b/ubuntu/_base/applications/multimedia/kplayer/debian/control @@ -2,7 +2,7 @@ Source: kplayer-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.4 Homepage: http://kplayer.sourceforge.net/ #Vcs-Git: git://anonscm.debian.org/collab-maint/kplayer-trinity.git diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/docs b/ubuntu/_base/applications/multimedia/kplayer/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/ubuntu/_base/applications/multimedia/kplayer/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO diff --git a/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series +++ b/ubuntu/_base/applications/multimedia/kplayer/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/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/applications/multimedia/mplayerthumbs/debian/compat b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat +++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control index aed8fbc85..675c8fd5f 100644 --- a/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control +++ b/ubuntu/_base/applications/multimedia/mplayerthumbs/debian/control @@ -2,7 +2,7 @@ Source: mplayerthumbs-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, tdelibs14-trinity-dev Standards-Version: 3.8.2 Package: mplayerthumbs-trinity diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/rosegarden/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/applications/multimedia/rosegarden/debian/compat b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/compat +++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/control b/ubuntu/_base/applications/multimedia/rosegarden/debian/control index f2b7ad8d6..b55aec989 100644 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/control +++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Multimedia Team <debian-multimedia@lists.debian.org> Uploaders: Mike O'Connor <stew@debian.org>, Free Ekanayaka <freee@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblirc-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, libfftw3-dev Standards-Version: 3.8.4 Homepage: http://www.rosegardenmusic.com/ diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 deleted file mode 100644 index b420ba197..000000000 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-audiofile-importer.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" This is free documentation; 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. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-AUDIOFILE-IMPORTER 1 "19 March 2006" - -.SH NAME - -rosegarden-audiofile-importer - Helper application to convert and -import audio files for Rosegarden. - -.SH SYNOPSIS - -rosegarden-audiofile-importer -t [<version>] -rosegarden-audiofile-importer --conftest [<version>] -rosegarden-audiofile-importer -l [<version>] -rosegarden-audiofile-importer [-r <rate>] -w <inputfile> -rosegarden-audiofile-importer [-r <rate>] -c <inputfile> <outputfile> - - -.SH OPTIONS - -.BR -t " " [<version>], -.BR --conftest " " [<version>] - -Exit successfully if the importer is available and working [and is -of at least version <version>]. If some of the required helper -applications are missing, also print to stdout a line saying -"Required: application1, application2", listing the missing -programs. - -.BR \-l " " [<version>] - -List known file extensions (e.g. ogg wav flac). Return code is same -as for -t (so can combine two calls into one) - -.BR \-r " " <rate> - -Test whether any work is needed to convert the input, either because -it isn't in a Rosegarden-compatible format or because its samplerate -differs from <rate>. Exit successfully if no work is required; return -error code 2 if conversion required, 3 if resampling required, 4 if -both required, 1 for other error. - -.SH DESCRIPTION - -Helper application to convert and import audio files for Rosegarden. - -Can take audio files of various kinds as input, always produces WAV -files that are compatible with Rosegarden as output. - -Not actually specific to Rosegarden in any way, except that -Rosegarden needs to know it can rely on its presence and calling -interface. - -.SH SEE ALSO - rosegarden(1), rosegarden-lilypondview(1), rosegarden-project-page(1) - - - diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 deleted file mode 100644 index e2aa9f951..000000000 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-lilypondview.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" This is free documentation; 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. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-LILIPONDVIEW 1 "10 February 2006" -i -.SH NAME - -rosegardern-lilypondview - display a lilypond file in a postscript -viewer. - -.SH SYNOPSIS - -rosegarden-lilypondview [-g] [FILE].ly - -.SH DESCRIPTION - -This script takes a Lilypond file as input. It creates a temporary -sandbox, runs Lilypond against the input file, then opens a PostScript -viewer against the results in order to provide a graphical, printable -preview. - -This script is used internally by Rosegarden, as the backend for the File -> -Export -> Preview Lilypond file feature. - -.SH OPTIONS -.BR \-g " " Use graphical mode - -.SH REQUIREMENTS - -Working installation of Lilypond 2.0 or later KGhostView or KPDF or -XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for -graphical mode only] - -.SH AUTHOR -Chris Cannam - -.SH COPYRIGHT -2005-2006 Fervent Software. - - diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 deleted file mode 100644 index 0da30c2a5..000000000 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-project-package.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" This is free documentation; 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. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.TH ROSEGARDEN-PROJECT-PACKAGE 1 "10 February 2006" - -.SH NAME - -rosegarden-project-package - converts between Rosegarden (.rg) files -and Rosegarden Project (.rgp) files. - -.SH SYNOPSIS - -orosegarden-project-package [--quiet] [--pack] [--unpack] [--conftest] [FILE] [.rg|.rgp] - -.SH OPTIONS -.BR \-\-quiet " " Be silent -.BR \-\-unpack " " Unpack .rgp file -.BR \-\-pack " " Pack .rg file plus associated external data files into .rgp file -.BR \-\-conftest " " Test environment for necessary installed components - -.SH DESCRIPTION - -This program converts between Rosegarden (.rg) files and Rosegarden -Project (.rgp) files. It is primarily intended to be used internally and -transparently by the Rosegarden application. - -A Rosegarden file (.rg) is a single file (in gzipped XML format) -that defines a Rosegarden composition in terms of events, segments, -programs, plugin data, references to audio files, and so on. Some -of these types of information depend on the presence of external -files such as the audio files or plugin preset data, without which -the file cannot be used. - -A Rosegarden Project (.rgp) file is a bundle of files, including the -Rosegarden file itself, as well as any audio file or other external -data it requires, in compressed form. A Rosegarden Project file is -intended to be portable and self-contained, but the Rosegarden -program itself does not (at the time of writing) understand these -files directly. - -This program can take a Rosegarden file, examine it to find out -which other data files it uses, and pack it to create the -corresponding Rosegarden Project file. Conversely, it can also take -a Rosegarden Project file and unpack it as a project directory for -use with Rosegarden. - -.SH REQUIREMENTS - -Working installation of Lilypond 2.0 or later KGhostView or KPDF or -XPDF or GhostView or GS XDialog or Konsole or RXVT or Xterm [for -graphical mode only] - -.SH AUTHOR -Chris Cannam - -.SH COPYRIGHT -2005-2006 Fervent Software. - - diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install index 50a0bcdaa..ac05f6185 100644 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install +++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.install @@ -1,4 +1,8 @@ debian/tmp/opt/trinity/bin/rosegarden* debian/tmp/opt/trinity/bin/rosegardensequencer* -debian/tmp/opt/trinity/share/mimelnk debian/tmp/opt/trinity/share/applications +debian/tmp/opt/trinity/share/mimelnk +debian/tmp/opt/trinity/share/man/man1/rosegarden.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-lilypondview.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-project-package.1 +debian/tmp/opt/trinity/share/man/man1/rosegarden-audiofile-importer.1 diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages deleted file mode 100644 index 6e3b96ee0..000000000 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden-trinity.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/rosegarden.1 -debian/rosegarden-lilypondview.1 -debian/rosegarden-project-package.1 -debian/rosegarden-audiofile-importer.1 diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1 b/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1 deleted file mode 100644 index fe750e0b2..000000000 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rosegarden.1 +++ /dev/null @@ -1,155 +0,0 @@ -.TH ROSEGARDEN 1 "23 July 2006" - -.SH NAME - -rosegarden, rosegarden-sequencer - MIDI and audio sequencer and -musical notation editor. - -.SH SYNOPSIS - -rosegarden [Qt-options] [TDE-options] [options] [File] - -rosegardensequencer [Qt-options] [TDE-options] [playback_1 playback_2 capture_1 capture_2] - -.SH DESCRIPTION - -This manual page documents briefly the rosegarden and rosegardensequencer commands. - -rosegarden is a MIDI and audio sequencer, notation editor, and general-purpose music composition and editing application for Unix and Linux. It is a TDE application, which means to build it you need the TDE libraries. However, once installed it can be run within the TDE environment or any other desktop or window manager environment. - -rosegardensequencer is part of the rosegarden application, the part which knows about and audio MIDI devices, and about real time. rosegardensequencer is executed automatically when rosegarden starts, so you will probably never need to execute it directly. You may want to specify command line options, though, to change the JACK ports used for audio capture and playback. In order to do that, you can invoque rosegardensequencer directly before running rosegarden, or you can specify the sequencer command line arguments using the rosegarden configuration dialog, and restarting the application. This program follows the usual GNU command line syntax, with long options starting with two dashes ('-'). A summary of options is included below. - -.SH OPTIONS -.BR \-\-author " " - Show author information. - -.BR \-\-help " " - Show help about options. - -.BR \-\-help-all - Show all options. - -.BR \-\-help-tde - Show TDE specific options. - -.BR \-\-help-qt - Show Qt specific options. - -.BR \-\-license - Show license information. - -.BR \-v, \-\-version - Show version information. - - -.SH OPTIONS for rosegarden - -.BR \-\-nosplash - Don\'t show splash screen. - - -.BR \-\-nosequencer - Don\'t use an external sequencer. - -.BR \-\-nofork - Don\'t automatically run in the background. - -.BR \ \--existingsequencer - Attach to a running sequencer process, if found. - -.BR File - File to load at startup. Typically a rosegarden (.rg) file, but it can also be a rosegarden2.1 file or a MIDI file. - -.SH OPTIONS -.BR \-g " " Use graphical mode> - -.SH QT OPTIONS -.BR \-\-bg, --background color - Sets the default background color and an application palette (light and dark shades are calculated). - -.BR \-\-btn, --button color - Sets the default button color. - -.BR \-\-cmap - Causes the application to install a private color map on an 8-bit display. - -.BR \-\-display displayname - Use the X-server display 'displayname'. - -.BR \-\-dograb - Running under a debugger can cause an implicit --nograb, use --dograb to override. - -.BR \-\-fg, \-\-foreground color - Sets the default foreground color. - -.BR \-\-fn, \-\-font fontname - Defines the application font. - -.BR \-\-im XIMserver - Set XIM server. - -.BR \-\-inputstyle inputstyle - Sets XIM (X Input Method) input style. Possible values are onthespot, overthespot, offthespot and root. - -.BR \-\-name name - Sets the application name. - -.BR \-\-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. - -.BR \-\-nograb - Tells Qt to never grab the mouse or the keyboard. - -.BR \-\-noxim - Disable XIM. - -.BR \-\-reverse - Mirrors the whole layout of widgets. - -.BR \-\-session sessionId - Restore the application for the given 'sessionId'. - -.BR \-\-sync - Switches to synchronous mode for debugging. - -.BR \-\-title title - Sets the application title (caption). - -.BR \-\-visual TrueColor - Forces the application to use a TrueColor visual on an 8-bit display. - - -.SH TDE OPTIONS -.BR \-\-caption caption - Use 'caption' as name in the titlebar. - -.BR \-\-config filename - Use alternative configuration file. - -.BR \-\-dcopserver server - Use the DCOP Server specified by 'server'. - -.BR \-\-geometry geometry - Sets the client geometry of the main widget. - -.BR \-\-icon icon - Use 'icon' as the application icon. - -.BR \-\-miniicon icon - Use 'icon' as the icon in the titlebar. - -.BR \-\-nocrashhandler - Disable crash handler, to get core dumps. - -.BR \-\-style style - Sets the application GUI style. - -.BR \-\-waitforwm - Waits for a WM_NET compatible windowmanager. - -.SH SEE ALSO - jackd(1), rosegarden-lilypondview(1), rosegarden-project-package(1), rosegarden-audiofile-importer(1) - - -.SH AUTHOR -This manual page was written by Enrique Robledo Arnuncio <era@debian.org> and later ammended by Mike O'Connor <stew@vireo.org> 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 GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front Cover Texts and no Back Cover Texts. diff --git a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules index 94fe8c0a8..5839a4d6d 100755 --- a/ubuntu/_base/applications/multimedia/rosegarden/debian/rules +++ b/ubuntu/_base/applications/multimedia/rosegarden/debian/rules @@ -21,13 +21,11 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEB_COMPRESS_EXCLUDE += .rg .wav .docbook +DEB_COMPRESS_EXCLUDE_ALL += .rg .wav .docbook binary-install/rosegarden-trinity:: dh_testdir find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \; - cp -Rp debian/rosegarden-trinity/usr/share/man/* debian/rosegarden-trinity/opt/trinity/share/man/ - rm -rf debian/rosegarden-trinity/usr/share/man clean:: dh_testdir diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/multimedia/soundkonverter/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/applications/multimedia/soundkonverter/debian/compat b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control index c7ae17d47..1e5845fbd 100644 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/control +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org>, Michael Meskes <meskes@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcdparanoia0-dev, libtag1-dev Standards-Version: 3.8.4 Homepage: http://www.kde-apps.org/content/show.php?content=29024 diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/series diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules index fa0a1f580..a6797f19a 100755 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/rules @@ -1,38 +1,17 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_EXTRA_FLAGS = --with-extra-libs=/opt/trinity/lib - -install/soundkonverter-trinity:: - install -D -p -m0644 debian/soundkonverter-trinity.lintian-overrides \ - debian/soundkonverter-trinity/usr/share/lintian/overrides/soundkonverter-trinity - -install/soundkonverter-amarok-trinity:: - chmod 0755 debian/tmp/opt/trinity/share/apps/soundkonverter/amarokscript/soundKonverter.rb - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install index fcfaef212..485f58a96 100644 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install +++ b/ubuntu/_base/applications/multimedia/soundkonverter/debian/soundkonverter-trinity.install @@ -2,10 +2,10 @@ opt/trinity/bin/soundkonverter opt/trinity/share/applications/tde/soundkonverter.desktop opt/trinity/share/apps/soundkonverter/soundkonverterui.rc opt/trinity/share/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -opt/trinity/share/apps/soundkonverter/format_infos/ -opt/trinity/share/apps/soundkonverter/pics/ -opt/trinity/share/apps/soundkonverter/plugins/ -opt/trinity/share/doc/ -opt/trinity/share/icons/ -opt/trinity/share/locale/ -opt/trinity/share/mimelnk/ +opt/trinity/share/apps/soundkonverter/format_infos +opt/trinity/share/apps/soundkonverter/pics +opt/trinity/share/apps/soundkonverter/plugins +opt/trinity/share/doc +opt/trinity/share/icons +opt/trinity/share/locale +opt/trinity/share/mimelnk diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl index 1b110f7af..1b110f7af 100644 --- a/ubuntu/_base/applications/system/kpowersave/debian/cdbs/versions.pl +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/cdbs/versions.pl diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/compat b/ubuntu/_base/applications/multimedia/tderadio/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/compat +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/control b/ubuntu/_base/applications/multimedia/tderadio/debian/control index dc6584c46..594d6c136 100644 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/control +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/control @@ -2,9 +2,9 @@ Source: tderadio-trinity Section: sound Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), tdelibs14-trinity-dev, liblircclient-dev, libsndfile1-dev, imagemagick, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + liblirc-dev, libsndfile1-dev, libmp3lame-dev, libogg-dev, libvorbis-dev Standards-Version: 3.8.4 -Homepage: http://tderadio.sourceforge.net/ Package: tderadio-trinity Architecture: any diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1 deleted file mode 100644 index 0a96aa40e..000000000 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/convert-presets.1 +++ /dev/null @@ -1,150 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH CONVERT\-PRESETS 1 "Dec 2005" "Trinity Desktop Environment" "convert-presets" -.SH NAME -convert\-presets -\- convert-presets -.SH SYNOPSIS -convert\-presets [Qt\-options] [TDE\-options] [options] [preset files] -.SH DESCRIPTION -convert-presets -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B preset -files preset file to convert -.SS Options: --q be quiet -.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 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 -.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 - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/convert\-presets/ -directly into konqueror or you can run -.BR "`khelpcenter help:/convert\-presets/'" -from the command-line. -.br -.SH AUTHORS -Ernst Martin Witte, Klas Kalass -.nf diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/docs b/ubuntu/_base/applications/multimedia/tderadio/debian/docs index 0ecc1e4f1..76c3076c9 100644 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/docs +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/docs @@ -1,2 +1,3 @@ -tderadio3/README -tderadio3/TODO +AUTHORS +README.md +TODO diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages b/ubuntu/_base/applications/multimedia/tderadio/debian/manpages deleted file mode 100644 index 4760e939e..000000000 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/tderadio.1 -debian/convert-presets.1 diff --git a/ubuntu/_base/applications/system/kpowersave/debian/patches/series b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/applications/system/kpowersave/debian/patches/series +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/patches/series diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/rules b/ubuntu/_base/applications/multimedia/tderadio/debian/rules index 4bef8d0a0..a6797f19a 100755 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/rules +++ b/ubuntu/_base/applications/multimedia/tderadio/debian/rules @@ -1,142 +1,17 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -debian/tderadio.xpm: tderadio3/icons/hi32-app-tderadio.png - convert $< $@ - -configure: -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cat /usr/share/aclocal/libtool.m4 > admin/libtool.m4.in - cp -f /usr/share/misc/config.sub admin/config.sub - cp -f /usr/share/misc/config.guess admin/config.guess - - make -f admin/Makefile.common - -config.status: configure - dh_testdir - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/opt/trinity --with-qt-dir=/usr/share/qt3 \ - --with-qt-includes=/usr/include/qt3 \ - --with-qt-libraries=/usr/share/qt3/lib \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --disable-rpath --disable-debug \ - kde_htmldir=\$${prefix}/share/doc/tde/HTML - - - -build: build-stamp debian/tderadio.xpm - -build-stamp: config.status - dh_testdir - # Add here commands to compile the package. - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -f debian/debiandirs - rm -f debian/tderadio.xpm - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean -# [ ! -tderadio3/src && $(MAKE) clean - for i in `find | grep .gmo` ; do rm -f $$i ; done - find -name Makefile.in -delete - rm -f config.sub config.guess configure - rm -f acinclude.m4 - dh_clean - -install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - # Add here commands to install the package into debian/tderadio. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tderadio-trinity - install -D -m 644 debian/tderadio.xpm debian/tderadio-trinity/opt/trinity/share/pixmaps/tderadio.xpm -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libalsa-sound.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimeshifter.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstandard-display.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liblirc.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libstreaming.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libradio.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libquickbar.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/librecording.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libv4lradio.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libtimecontrol.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libdocking-menu.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liboss-sound.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/liberror-log.so -# chrpath -d debian/tderadio/usr/lib/tderadio/plugins/libsoundserver.so -# chrpath -d debian/tderadio/usr/bin/convert-presets -# chrpath -d debian/tderadio/usr/bin/tderadio - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs tderadio3/ChangeLog - dh_installdocs - dh_installmenu - dh_installman - mv debian/tderadio-trinity/usr/share/man debian/tderadio-trinity/opt/trinity/share/ - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb $(DEB_DH_BUILDDEB_ARGS) - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1 b/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1 deleted file mode 100644 index 2648970c2..000000000 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/tderadio.1 +++ /dev/null @@ -1,147 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KRADIO 1 "Dec 2005" "Trinity Desktop Environment" "TDERadio" -.SH NAME -tderadio -\- TDERadio -.SH SYNOPSIS -tderadio [Qt\-options] [TDE\-options] -.SH DESCRIPTION -TDERadio -.SH OPTIONS -.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 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 -.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 - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/tderadio/ -directly into konqueror or you can run -.BR "`khelpcenter help:/tderadio/'" -from the command-line. -.br -.SH AUTHORS -.nf -Martin Witte <witte@kawo1.rwth-aachen.de> -.br -Marcus Camen <mcamen@mcamen.de> -.br -Klas Kalass <klas.kalass@gmx.de> -.br - diff --git a/ubuntu/_base/applications/multimedia/tderadio/debian/watch b/ubuntu/_base/applications/multimedia/tderadio/debian/watch deleted file mode 100644 index 033fb78b0..000000000 --- a/ubuntu/_base/applications/multimedia/tderadio/debian/watch +++ /dev/null @@ -1,6 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -version=2 -tderadio.sourceforge.net /download tderadio-(.*)\.tar\.gz debian uupdate diff --git a/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/basket/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/basket/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/applications/office/basket/debian/compat b/ubuntu/_base/applications/office/basket/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/basket/debian/compat +++ b/ubuntu/_base/applications/office/basket/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/basket/debian/control b/ubuntu/_base/applications/office/basket/debian/control index e7d6a2f72..11dd982bf 100644 --- a/ubuntu/_base/applications/office/basket/debian/control +++ b/ubuntu/_base/applications/office/basket/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libgpgme11-dev | libgpgme-dev (>= 1.0~) Standards-Version: 3.8.4 Package: basket-trinity diff --git a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/kbibtex/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/kbibtex/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/applications/office/kbibtex/debian/compat b/ubuntu/_base/applications/office/kbibtex/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/kbibtex/debian/compat +++ b/ubuntu/_base/applications/office/kbibtex/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/kbibtex/debian/control b/ubuntu/_base/applications/office/kbibtex/debian/control index b061836c4..84e2ce4f8 100644 --- a/ubuntu/_base/applications/office/kbibtex/debian/control +++ b/ubuntu/_base/applications/office/kbibtex/debian/control @@ -2,7 +2,7 @@ Source: kbibtex-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 (>= 3.3.2), libxslt1-dev, libyaz-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 3.3.2), libxslt1-dev, libyaz-dev Standards-Version: 3.9.0 Homepage: http://www.unix-ag.uni-kl.de/~fischer/kbibtex Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/kbibtex.git diff --git a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/kbookreader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/kbookreader/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/applications/office/kbookreader/debian/compat b/ubuntu/_base/applications/office/kbookreader/debian/compat index 48c962ffa..021ea30c0 100644 --- a/ubuntu/_base/applications/office/kbookreader/debian/compat +++ b/ubuntu/_base/applications/office/kbookreader/debian/compat @@ -1,2 +1,2 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/kbookreader/debian/control b/ubuntu/_base/applications/office/kbookreader/debian/control index 85093a432..c362b7f9e 100644 --- a/ubuntu/_base/applications/office/kbookreader/debian/control +++ b/ubuntu/_base/applications/office/kbookreader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://k9copy.sourceforge.net/ diff --git a/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/keximdb/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/keximdb/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/applications/office/keximdb/debian/compat b/ubuntu/_base/applications/office/keximdb/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/keximdb/debian/compat +++ b/ubuntu/_base/applications/office/keximdb/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/keximdb/debian/control b/ubuntu/_base/applications/office/keximdb/debian/control index f55077a26..e3117201b 100644 --- a/ubuntu/_base/applications/office/keximdb/debian/control +++ b/ubuntu/_base/applications/office/keximdb/debian/control @@ -2,7 +2,7 @@ Source: keximdb-trinity Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Martin Ellis <martin.ellis@kdemail.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, koffice-trinity-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, koffice-trinity-dev, libglib2.0-dev Standards-Version: 3.7.2 Section: tde diff --git a/ubuntu/_base/applications/office/kile/debian/README.Debian b/ubuntu/_base/applications/office/kile/debian/README.Debian deleted file mode 100644 index 5339affff..000000000 --- a/ubuntu/_base/applications/office/kile/debian/README.Debian +++ /dev/null @@ -1,10 +0,0 @@ -kile for Debian ---------------- - -Kile no longer comes with a Gnuplot front end. The Gnuplot front end that used -to be part of Kile is now a separate application named Qgfe maintained by -Pascal Brachet at http://www.xm1math.net/qgfe/ . - -Syntax files bibtex.xml and latex.xml are provided by tdelibs-data package. - - -- Ben Burton <bab@debian.org>, Sat, 23 Oct 2004 12:56:57 +1000 diff --git a/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/kile/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/kile/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/applications/office/kile/debian/compat b/ubuntu/_base/applications/office/kile/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/kile/debian/compat +++ b/ubuntu/_base/applications/office/kile/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/kile/debian/control b/ubuntu/_base/applications/office/kile/debian/control index 7b699f3b0..a8cf1cf71 100644 --- a/ubuntu/_base/applications/office/kile/debian/control +++ b/ubuntu/_base/applications/office/kile/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, tdelibs14-trinity-dev, pkg-config, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kile.sourceforge.net diff --git a/ubuntu/_base/applications/office/kile/debian/docs b/ubuntu/_base/applications/office/kile/debian/docs index 724e08449..76c3076c9 100644 --- a/ubuntu/_base/applications/office/kile/debian/docs +++ b/ubuntu/_base/applications/office/kile/debian/docs @@ -1,2 +1,3 @@ -README +AUTHORS +README.md TODO diff --git a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install index eb1b59da1..fdbee1056 100644 --- a/ubuntu/_base/applications/office/kile/debian/kile-trinity.install +++ b/ubuntu/_base/applications/office/kile/debian/kile-trinity.install @@ -6,3 +6,4 @@ opt/trinity/bin/kile /opt/trinity/share/doc/tde/HTML/en/kile /opt/trinity/share/icons /opt/trinity/share/mimelnk/text/x-kilepr.desktop +/opt/trinity/share/man/man1/kile.1 diff --git a/ubuntu/_base/applications/office/kile/debian/kile.1 b/ubuntu/_base/applications/office/kile/debian/kile.1 deleted file mode 100644 index d7609722c..000000000 --- a/ubuntu/_base/applications/office/kile/debian/kile.1 +++ /dev/null @@ -1,64 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KILE 1 "June 22, 2005" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kile \- the TDE Integrated LaTeX Environment -.SH SYNOPSIS -.B kile [ \fIgeneric-options\fP ] -[ \fB\-\-line\fP \fIline\fP ] [ \fB\-\-new\fP ] -[ \fIfile\fP ] -.SH DESCRIPTION -\fBKile\fP (the TDE Integrated LaTeX Environment) is a user-friendly -LaTeX source editor and TeX shell for TDE. -.PP -The source editor is a multi-document editor designed for .tex and .bib -files. Menus, wizards and auto-completion are provided to assist with -tag insertion and code generation. A structural view of the document -assists with navigation within source files. -.PP -The TeX shell integrates the various tools required for TeX processing. -It assists with LaTeX compilation, DVI and postscript document viewing, -generation of bibliographies and indices and other common tasks. -.PP -Kile can support large projects consisting of several smaller files. -.SH OPTIONS -Below are the kile-specific options. -For a full summary of options, run \fIkile \-\-help\fP. -.TP -\fB\-\-line\fP \fIline\fP -Jump to the given line in the file that is opened. -.TP -\fB\-\-new\fP -Start a new Kile main window. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kile/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kile/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can -read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kile/\fP. -.SH AUTHOR -Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and -Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from -many others. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore b/ubuntu/_base/applications/office/kile/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/applications/multimedia/soundkonverter/debian/patches/.gitignore +++ b/ubuntu/_base/applications/office/kile/debian/patches/series diff --git a/ubuntu/_base/applications/office/kile/debian/rules b/ubuntu/_base/applications/office/kile/debian/rules index bd5478578..59bca7cd4 100755 --- a/ubuntu/_base/applications/office/kile/debian/rules +++ b/ubuntu/_base/applications/office/kile/debian/rules @@ -1,60 +1,39 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp -DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -install/kile-trinity-i18n-br:: - -for language in `cd translations; ls -1d */`; do \ - cd $(CURDIR)/$(DEB_BUILDDIR)/translations/$$language; \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-$$language; \ +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" + +common-install-indep:: + # Install translations into individual packages + -for language in `cd debian/tmp/opt/trinity/share/locale; ls -1d */`; do \ + pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \ + install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale; \ + cp -a $(CURDIR)/debian/tmp/opt/trinity/share/locale/$$language \ + $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/locale/$$language; \ + done + -for language in `cd debian/tmp/opt/trinity/share/doc/tde/HTML; ls -1d */ | grep -v '^en/'`; do \ + pkg_lang=$$(echo $$language | tr '[:upper:]' '[:lower:]' | sed -e s/@latn/latin/ -e s/[@_]//g); \ + install -d $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML; \ + cp -a $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/$$language \ + $(CURDIR)/debian/kile-trinity-i18n-$$pkg_lang/opt/trinity/share/doc/tde/HTML/$$language; \ done - - cd $(CURDIR)/$(DEB_BUILDDIR)/translations/en_GB/; \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-engb - - cd $(CURDIR)/$(DEB_BUILDDIR)/translations/pt_BR/; \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-ptbr - - cd $(CURDIR)/$(DEB_BUILDDIR)/translations/sr@Latn/;\ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-srlatin - - cd $(CURDIR)/$(DEB_BUILDDIR)/translations/zh_CN/; \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/kile-trinity-i18n-zhcn install/kile-trinity:: # Install pixmap install -D -p -m0644 debian/kile.xpm debian/kile-trinity/opt/trinity/share/pixmaps/kile.xpm - chmod +x debian/tmp/opt/trinity/share/apps/kile/test/runTests.sh - clean:: rm -rf debian/kile-trinity-i18n-* diff --git a/ubuntu/_base/applications/office/kile/debian/watch b/ubuntu/_base/applications/office/kile/debian/watch deleted file mode 100644 index e372a7062..000000000 --- a/ubuntu/_base/applications/office/kile/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kile/kile-([\d\.].[\d])\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/_base/applications/office/kmymoney/debian/README.source b/ubuntu/_base/applications/office/kmymoney/debian/README.source deleted file mode 100644 index 2a0f24655..000000000 --- a/ubuntu/_base/applications/office/kmymoney/debian/README.source +++ /dev/null @@ -1,6 +0,0 @@ -This package uses quilt for upstream source code patch management. Please read -/usr/share/doc/quilt/README.source for more information how to apply, unapply, -add, modify or remove patches. - -Please note that /usr/share/doc/quilt/README.source is only available in quilt -version 0.46-4.1 or later. diff --git a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/kmymoney/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/kmymoney/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/applications/office/kmymoney/debian/compat b/ubuntu/_base/applications/office/kmymoney/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/kmymoney/debian/compat +++ b/ubuntu/_base/applications/office/kmymoney/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control index 8693580ef..d6011e239 100644 --- a/ubuntu/_base/applications/office/kmymoney/debian/control +++ b/ubuntu/_base/applications/office/kmymoney/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3 Standards-Version: 3.8.4 Package: kmymoney2-trinity diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install index f8c5dc4e3..9c50137ba 100644 --- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/tde/kmymoney/* +opt/trinity/include/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs index cbc02b603..85b95d21e 100644 --- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs +++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity.docs @@ -1 +1,3 @@ +AUTHORS +README.md README.Fileformats diff --git a/ubuntu/_base/applications/office/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules index 0f794b445..ba37f1c35 100755 --- a/ubuntu/_base/applications/office/kmymoney/debian/rules +++ b/ubuntu/_base/applications/office/kmymoney/debian/rules @@ -1,35 +1,18 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include --disable-pdf-docs - -LDFLAGS += -Wl,--as-needed - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - -clean:: - rm -f po/*.gmo +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" \ + -DBUILD_DEVELOPER_DOCS="OFF" diff --git a/ubuntu/_base/applications/office/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch deleted file mode 100644 index b80efc65c..000000000 --- a/ubuntu/_base/applications/office/kmymoney/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/knowit/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/knowit/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/applications/office/knowit/debian/compat b/ubuntu/_base/applications/office/knowit/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/knowit/debian/compat +++ b/ubuntu/_base/applications/office/knowit/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/knowit/debian/control b/ubuntu/_base/applications/office/knowit/debian/control index 27d36e7ff..cc453f515 100644 --- a/ubuntu/_base/applications/office/knowit/debian/control +++ b/ubuntu/_base/applications/office/knowit/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Lorenzo Villani <arbiter@arbiterlab.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knowit.sourceforge.net/ diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/compat b/ubuntu/_base/applications/office/koffice-i18n/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/koffice-i18n/debian/compat +++ b/ubuntu/_base/applications/office/koffice-i18n/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control b/ubuntu/_base/applications/office/koffice-i18n/debian/control index 8f7bb1a23..d4a192d8d 100644 --- a/ubuntu/_base/applications/office/koffice-i18n/debian/control +++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control @@ -2,397 +2,15 @@ Source: koffice-i18n-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Isaac Clerencia <isaac@debian.org>, Ben Burton <bab@debian.org> -Build-Depends-Indep: tdelibs14-trinity-dev -Build-Depends: debhelper (>= 9~), cdbs, quilt, automake, autoconf, libtool, libltdl-dev -Standards-Version: 3.7.2 +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev +Standards-Version: 3.8.4 -Package: koffice-i18n-bg-trinity +Package: koffice-i18n-trinity Architecture: all Section: tde -Recommends: tde-i18n-bg-trinity +Recommends: tde-i18n-trinity Suggests: koffice-trinity Provides: koffice-i18n-trinity -Description: Bulgarian (bg) translations for KOffice - This package contains the Bulgarian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ca-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ca-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Catalan (ca) translations for KOffice - This package contains the Catalan translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-cs-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-cs-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Czech (cs) translations for KOffice - This package contains the Czech translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-cy-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-cy-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Welsh (cy) translations for KOffice - This package contains the Welsh translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-da-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-da-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Danish (da) translations for KOffice - This package contains the Danish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-de-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-de-trinity -Suggests: koffice-trinity, openthesaurus-de-kword -Provides: koffice-i18n-trinity -Description: German (de) translations for KOffice - This package contains the German translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-el-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-el-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Greek (el) translations for KOffice - This package contains the greek translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-engb-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-engb-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: British English (en_GB) translations for KOffice - This package contains the British English (en_GB) translations - for all applications in the Trinity Office Suite. - -Package: koffice-i18n-es-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-es-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Spanish (es) translations for KOffice - This package contains the Spanish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-et-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-et-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Estonian (et) translations for KOffice - This package contains the Estonian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-eu-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-eu-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Basque (eu) translations for KOffice - This package contains the Basque translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-fa-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-fa-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Farsi (fa) translations for KOffice - This package contains the Farsi translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-fi-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-fi-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Finnish (fi) translations for KOffice - This package contains the Finnish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-fr-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-fr-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: French (fr) translations for KOffice - This package contains the French translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ga-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ga-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Irish Gaelic (ga) translations for KOffice - This package contains the Irish Gaelic translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-gl-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-gl-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Galician (gl) translations for KOffice - This package contains the Galician translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-hu-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-hu-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Hungarian (hu) translations for KOffice - This package contains the Hungarian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-it-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-it-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Italian (it) translations for KOffice - This package contains the Italian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ja-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ja-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Japanese (ja) translations for KOffice - This package contains the Japanese translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-km-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-km-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Khmer (km) translations for KOffice - This package contains the Khmer translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-lv-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-lv-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Latvian (lv) translations for KOffice - This package contains the Latvian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ms-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ms-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Malay (ms) translations for KOffice - This package contains the Malay translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-nb-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-nb-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Norwegian Bookmal (nb) translations for KOffice - This package contains the Norwegian Bookmal translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-nds-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-nds-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Low Saxon (nds) translations for KOffice - This package contains the Low Saxon translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ne-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ne-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Nepali (ne) translations for KOffice - This package contains the Nepali translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-nl-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-nl-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Dutch (nl) translations for KOffice - This package contains the Dutch translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-pl-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-pl-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Polish (pl) translations for KOffice - This package contains the Polish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-pt-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-pt-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Portuguese (pt) translations for KOffice - This package contains the Portuguese translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-ptbr-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ptbr-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Brazilian Portuguese (pt_BR) translations for KOffice - This package contains the Brazilian Portuguese translations for all - applications in the Trinity Office Suite. - -Package: koffice-i18n-ru-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-ru-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Russian (ru) translations for KOffice - This package contains the Russian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-sk-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-sk-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Slovak (sk) translations for KOffice - This package contains the Slovak translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-sl-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-sl-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Slovenian (sl) translations for KOffice - This package contains the Slovenian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-sr-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-sr-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Serbian (sr) translations for KOffice - This package contains the Serbian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-srlatin-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-srlatin-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Latin Serbian (sr@Latn) translations for KOffice - This package contains the Latin Serbian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-sv-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-sv-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Swedish (sv) translations for KOffice - This package contains the Swedish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-tr-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-tr-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Turkish (tr) translations for KOffice - This package contains the Turkish translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-uk-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-uk-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Ukrainian (uk) translations for KOffice - This package contains the Ukrainian translations for all applications - in the Trinity Office Suite. - -Package: koffice-i18n-zhcn-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-zhcn-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Chinese Simplified (zh_CN) translations for KOffice - This package contains the Chinese Simplified translations for all - applications in the Trinity Office Suite. - -Package: koffice-i18n-zhtw-trinity -Architecture: all -Section: tde -Recommends: tde-i18n-zhtw-trinity -Suggests: koffice-trinity -Provides: koffice-i18n-trinity -Description: Chinese Traditional (zh_TW) translations for KOffice - This package contains the Chinese Traditional translations for all - applications in the Trinity Office Suite. +Description: All languages (all) internationalized (i18n) files for KOffice + This package contains the All languages (all) internationalized (i18n) + files for all applications in Trinity Office Suite. diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang new file mode 100644 index 000000000..f75b7d747 --- /dev/null +++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-lang @@ -0,0 +1,10 @@ + +Package: koffice-i18n-@pkg_lang@-trinity +Architecture: all +Section: tde +Recommends: tde-i18n-@pkg_lang@-trinity +Suggests: koffice-trinity +Provides: koffice-i18n-trinity +Description: @lang_desc@ (@lang@) internationalized (i18n) files for KOffice + This package contains the @lang_desc@ (@lang@) internationalized (i18n) + files for all applications in Trinity Office Suite. diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/control-source b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source new file mode 100644 index 000000000..c1a3a089b --- /dev/null +++ b/ubuntu/_base/applications/office/koffice-i18n/debian/control-source @@ -0,0 +1,6 @@ +Source: koffice-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 +Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs b/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs deleted file mode 100644 index 90247b9a0..000000000 --- a/ubuntu/_base/applications/office/koffice-i18n/debian/debiandirs +++ /dev/null @@ -1,10 +0,0 @@ -export kde_prefix=/opt/trinity -export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/tde -export infodir=/opt/trinity/share/info -export mandir=/opt/trinity/share/man -export qtdir=/opt/trinity/share/qt3 -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_confdir=/etc/trinity -export kde_htmldir=/opt/trinity/share/doc/tde/HTML -configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/ubuntu/_base/applications/office/koffice-i18n/debian/rules b/ubuntu/_base/applications/office/koffice-i18n/debian/rules index 8fb58ece9..2a292557e 100755 --- a/ubuntu/_base/applications/office/koffice-i18n/debian/rules +++ b/ubuntu/_base/applications/office/koffice-i18n/debian/rules @@ -3,11 +3,36 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +I18N_DIR_PREFIX := koffice-i18n +I18N_DEST_PREFIX := $(I18N_DIR_PREFIX) +I18N_DIR_PAT := $(I18N_DIR_PREFIX)-% +I18N_DIRS := $(wildcard $(I18N_DIR_PREFIX)-*) + +# Stamps and support variables +cur_lang = $(word 2,$(subst __, ,$@)) +cur_lang_target = $(subst @,_,$(cur_lang)) +cur_lang_dir = $(patsubst %,$(I18N_DIR_PREFIX)-%,$(cur_lang)) +cur_pkg_lang = $(subst _,,$(subst @,,$(subst @latn,latin,$(shell echo $(cur_lang) | tr '[:upper:]' '[:lower:]')))) +cur_pkg = $(I18N_DEST_PREFIX)-$(cur_pkg_lang)-trinity + +STAMP_BUILD := $(patsubst $(I18N_DIR_PAT),debian/stamp__%__build,$(I18N_DIRS)) +I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) +I18N_CLEAN := $(patsubst $(I18N_DIR_PAT),clean__%,$(I18N_DIRS)) + +DEB_BUILD_PARALLEL ?= true + ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif + # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ sed -e "s|.*version ||" -e "s| .*||" | \ @@ -18,91 +43,124 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -languages = `ls -1d *i18n*` +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" + -build-stamp: +build:: dh_testdir + dh_prep + +ifneq "$(wildcard /usr/bin/ninja)" "" + +build:: debian/stamp__build + +debian/stamp__build: + [ -d build ] || \ + mkdir build + cd build && \ + cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \ + $(MAKE) $(DEB_MAKE_PARALLEL) + touch $@ + +else + +build:: $(STAMP_BUILD) + +$(STAMP_BUILD): + # Building the '$(cur_lang)' language ... + [ -d $(cur_lang_dir)/build ] || \ + mkdir $(cur_lang_dir)/build + [ -e $(cur_lang_dir)/CMakeLists.txt ] || \ + ln -s ../template/commonCMakeLists.txt $(cur_lang_dir)/CMakeLists.txt + cd $(cur_lang_dir)/build && \ + cmake .. $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) && \ + $(MAKE) $(DEB_MAKE_PARALLEL) + touch $@ - # Regenerate build system -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh + +install:: + dh_testdir + dh_testroot + +install:: $(I18N_INSTALL) + dh_testdir + cat debian/control-source > debian/control + find debian -name "control-lang-*" | LANG=C sort | xargs -r cat >> debian/control + +$(I18N_INSTALL): build +ifneq "$(wildcard /usr/bin/ninja)" "" + [ ! -e $(cur_lang_dir)/CMakeLists.txt ] || \ + DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) -C build install-$(cur_lang_target) +else + cd $(cur_lang_dir)/build && \ + DESTDIR=$(CURDIR)/debian/$(cur_pkg) $(MAKE) install $(DEB_MAKE_PARALLEL) endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - #Configure languages. - -for i in $(languages); do \ - cd $$i && \ - autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \ - ./configure $(configkde); \ - $(MAKE) $(DEB_MAKE_PARALLEL); \ - cd ..; \ - done - - touch build-stamp - -build: build-stamp --include debian/debiandirs - -clean: - dh_clean + sed -e "s|@lang@|$(cur_lang)|g" \ + -e "s|@pkg_lang@|$(cur_pkg_lang)|g" \ + -e "s|@lang_desc@|$$(sed -n '/^\[$(cur_lang)\]/,/^\[/s#^Name=##p' /opt/trinity/share/locale/all_languages)|" \ + < debian/control-lang > debian/control-lang-$(cur_pkg_lang); \ + +ifneq "$(wildcard /usr/bin/ninja)" "" + +clean: debian-clean + +else + +clean: $(I18N_CLEAN) debian-clean + +$(I18N_CLEAN): dh_testdir - - # Remove all language directories. - rm -rf build-stamp - rm -rf debian/*18n* + rm -rf $(cur_lang_dir)/build + +endif -binary-indep: build +debian-clean: dh_testdir + rm -rf build + rm -rf debian/$(I18N_DEST_PREFIX)-* + rm -f debian/stamp__* + rm -f debian/control-lang-* + cat debian/control-source > debian/control + sed -e "s|@lang@|all|g" \ + -e "s|-@pkg_lang@||g" \ + -e "s|@lang_desc@|All languages|" \ + < debian/control-lang >> debian/control + dh_clean + + +binary-arch: build dh_testroot - dh_clean -k - - -for i in $(languages); do \ - ( \ - cd $$i && \ - echo $$(install_dir) && \ - $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \ - cd .. \ - ) \ - done - - - mkdir debian/koffice-i18n-engb-trinity - cp -aR debian/koffice-i18n-en_GB-trinity/* debian/koffice-i18n-engb-trinity/ - - mkdir debian/koffice-i18n-ptbr-trinity - cp -aR debian/koffice-i18n-pt_BR-trinity/* debian/koffice-i18n-ptbr-trinity/ - - mkdir debian/koffice-i18n-srlatin-trinity - cp -aR debian/koffice-i18n-sr@Latn-trinity/* debian/koffice-i18n-srlatin-trinity/ - - mkdir debian/koffice-i18n-zhcn-trinity - cp -aR debian/koffice-i18n-zh_CN-trinity/* debian/koffice-i18n-zhcn-trinity/ - - mkdir debian/koffice-i18n-zhtw-trinity - cp -aR debian/koffice-i18n-zh_TW-trinity/* debian/koffice-i18n-zhtw-trinity/ - - - #Removing duplicate kdgantt.mo files. - -rm -f `find . -name "kdgantt.mo"` + dh_testdir + +binary-indep: build install + dh_testroot + dh_testdir dh_installdocs dh_installmenu dh_installchangelogs - dh_strip dh_link + dh_strip + $(if $(wildcard /usr/bin/dh_strip_nondeterminism),\ + dh_strip_nondeterminism) dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2 dh_fixperms dh_installdeb + dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb $(DEB_DH_BUILDDEB_ARGS) -binary: binary-indep -.PHONY: binary binary-indep clean +# Below here is fairly generic really +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean build install $(I18N_INSTALL) diff --git a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/koffice/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/applications/office/koffice/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/koffice/debian/compat +++ b/ubuntu/_base/applications/office/koffice/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control index d22475ffb..af290bec8 100644 --- a/ubuntu/_base/applications/office/koffice/debian/control +++ b/ubuntu/_base/applications/office/koffice/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>, Ral Snchez Siles <rasasi78@gmail.com> -Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 9~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-all-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 10~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python3-all-dev, dh-python, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.4 Homepage: http://www.koffice.org @@ -303,7 +303,7 @@ Section: libs Replaces: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~) Breaks: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~) Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~) -Recommends: latex-xft-fonts, ruby, python-all +Recommends: latex-xft-fonts, ruby, python3-all Suggests: wordnet, texlive-base Description: common libraries and binaries for the Trinity Office Suite [Trinity] This package provides the libraries and binaries that are shared amongst diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install index a03e53a02..8b0b8b25c 100644 --- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install @@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz +debian/tmp/opt/trinity/share/man/man1/karbon.1 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages deleted file mode 100644 index 8a212a2b2..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/karbon.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1 deleted file mode 100644 index 6a4cbb8ef..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/karbon.1 +++ /dev/null @@ -1,44 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KARBON 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -karbon \- a vector graphics application for the Trinity Office Suite -.SH SYNOPSIS -.B karbon -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKarbon\fP is a vector graphics application. -.PP -Note that the Trinity Office Suite comes with two graphics applications \- -Kontour (which is vector-based) and Chalk (which is raster-based). -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the karbon-specific options. -For a full summary of options, run \fIkarbon \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH AUTHOR -Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling -<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and -Benoit Vautrin <benoit.vautrin@free.fr>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install index c5d3596c2..a6a595a2b 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install @@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png +debian/tmp/opt/trinity/share/man/man1/kchart.1 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages deleted file mode 100644 index 38c864763..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kchart.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1 deleted file mode 100644 index 367f2e7ab..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kchart.1 +++ /dev/null @@ -1,53 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KCHART 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kchart \- a chart drawing program for the Trinity Office Suite -.SH SYNOPSIS -.B kchart -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKChart\fP is a chart drawing application. It can be used to embed charts -into KOffice documents. KChart is easy to use and highly configurable. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kchart-specific options. -For a full summary of options, run \fIkchart \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kchart/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kchart/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kchart/\fP. -.SH AUTHOR -KChart was written by Kalle Dalheimer <kalle@kde.org>, -Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and -Reginald Stadlbauer <reggie@kde.org>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install index c97a73fa5..c73fd674a 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install @@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png +debian/tmp/opt/trinity/share/man/man1/kformula.1 debian/tmp/opt/trinity/share/services/kformulapart.desktop debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian index 25a8c006f..806f0020c 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian +++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian @@ -1,4 +1,2 @@ kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so -kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so -kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages deleted file mode 100644 index 35c78eaa9..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kformula.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1 deleted file mode 100644 index ebbd55afb..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kformula.1 +++ /dev/null @@ -1,75 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KFORMULA 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kformula \- a formula editor for the Trinity Office Suite -.SH SYNOPSIS -.B kformula -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKFormula\fP is an easy to use formula editor. It provides the basic -input facilities and the support functionality you come to expect of a -KOffice application. But there is more. Some of its most exciting -features are: -.PP -.RS -Easy Greek letter insertion -.PP -Intelligent cursor movement -.PP -Advanced syntax highlighting -.PP -Multi-level undo support -.PP -LaTeX export (copy and paste into a text editor) -.RE -.PP -KFormula uses the KOffice formula drawing library. If you have to deal -with many formulae you may wish to use a KFormula object embedded in -KWord or KSpread. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kformula-specific options. -For a full summary of options, run \fIkformula \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -.BR kword (1), -.BR kspread (1). -.PP -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kformula/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kformula/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kformula/\fP. -.SH AUTHOR -KFormula was written by Andrea Rizzi <rizzi@kde.org>, -Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>, -Heinrich Kuettler <heinrich.kuettler@gmx.de> and -Claus O. Wilke <wilke@caltech.edu>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install index 289580d09..b1fa9d81d 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install @@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la debian/tmp/opt/trinity/lib/trinity/straight_connector.so debian/tmp/opt/trinity/lib/libtdeinit_kivio.so debian/tmp/opt/trinity/lib/libkiviocommon.so.* +debian/tmp/opt/trinity/share/man/man1/kivio.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages deleted file mode 100644 index 1f348c0ca..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kivio.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1 deleted file mode 100644 index b6557f54f..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kivio.1 +++ /dev/null @@ -1,47 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KIVIO 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kivio \- a flowcharting program for the Trinity Office Suite -.SH SYNOPSIS -.B kivio -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKivio\fP is a flowcharting program that offers basic flowcharting -abilities, but with a twist. Objects are scriptable, and a backend plugin -system offers the ability to make objects do just about anything. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kivio-specific options. -For a full summary of options, run \fIkivio \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -Some documentation from the program author -is available in \fI/usr/share/doc/kivio/\fP. -.SH AUTHOR -Kivio was written by Dave Marotti <lndshark@speakeasy.net>, -Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>, -Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>, -Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1 deleted file mode 100644 index 07529ada9..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/koconverter.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KOCONVERTER 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -koconverter \- convert between office suite file formats -.SH SYNOPSIS -.B koconverter -[ \fIgeneric-options\fP ] -[ \fB\-\-mimetype\fP \fImime\fP ] -\fIinput\fP \fIoutput\fP -.SH DESCRIPTION -\fBKOConverter\fP is the KOffice file format converter. It uses the -KOffice import and export filters to convert from any file format -that is understood by KOffice to any other. -.PP -This tool is part of the Trinity Office Suite. -.SH OPTIONS -Below are the koconverter-specific options. For a full summary of options, -run \fIkoconverter \-\-help\fP. -.TP -\fB\-\-mimetype\fP \fImime\fP -Use \fImime\fP as the mime type for the output file. This option should be -used when the desired type of output file cannot be determined from its -name alone. -.SH EXAMPLES -The following line will convert an Excel spreadsheet to a native KSpread -file. -.PP -.RS -\fIexample$\fP koconverter file.xls file.ksp -.RE -.PP -The following line will convert an Excel spreadsheet to a plain text -file. Note that this conversion is done internally by first importing -to a KSpread spreadsheet and then exporting as plain text. -.PP -.RS -\fIexample$\fP koconverter file.xls file.txt -.RE -.SH AUTHOR -KOConverter was written by David Faure <faure@kde.org>. -.br -This manual page was written by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install index 4be4f26eb..317098e2f 100644 --- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install @@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.* debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.* debian/tmp/opt/trinity/lib/libkwmf.so.* debian/tmp/opt/trinity/lib/libkwordexportfilters.so.* +debian/tmp/opt/trinity/share/man/man1/koconverter.1 +debian/tmp/opt/trinity/share/man/man1/koscript.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages deleted file mode 100644 index 52c63b5d7..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/koconverter.1 -debian/koscript.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1 deleted file mode 100644 index 419c52df0..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/koscript.1 +++ /dev/null @@ -1,39 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KOSCRIPT 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -koscript \- a script interpreter for the Trinity Office Suite -.SH SYNOPSIS -.B koscript -[ \fIgeneric-options\fP ] -\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ] -.SH DESCRIPTION -\fBKOScript\fP is the KOffice script interpreter. It is used to run the -given KOffice script. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the koscript-specific options. For a full summary of options, -run \fIkoscript \-\-help\fP. -.TP -\fB\-\-\fP \fIscript-options\fP -Pass \fIscript-options\fP as options to the script. -.SH AUTHOR -KOScript was written by Torben Weis <weis@kde.org>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install index 4b63bd352..dd3561570 100644 --- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install @@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz +debian/tmp/opt/trinity/share/man/man1/koshell.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian index c77411ba2..888cebb0a 100644 --- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian +++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian @@ -1,4 +1,2 @@ koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so -koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so -koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages deleted file mode 100644 index fc332a5cc..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/koshell.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1 deleted file mode 100644 index d1dc76870..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/koshell.1 +++ /dev/null @@ -1,36 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KOSHELL 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -koshell \- the Trinity Office Suite workspace -.SH SYNOPSIS -.B koshell -.RI "[ " generic-options " ]" -.SH DESCRIPTION -\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click -launchers for KOffice applications. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -For a full summary of options, run \fIkoshell \-\-help\fP. -.SH AUTHOR -KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann -<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken -<sven@kde.org>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian index 74f77679d..4e0bf33b8 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian +++ b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian @@ -1,4 +1,2 @@ kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so -kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so -kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato diff --git a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 deleted file mode 100644 index 635cc9556..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 +++ /dev/null @@ -1,45 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KPRCONVERTER.PL 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kprconverter.pl \- converts a KPresenter document from old to new format -.SH SYNOPSIS -.B kprconverter.pl -.I old-XML new-XML -.SH DESCRIPTION -This Perl script converts the XML data within a KPresenter document from the -old format (v1) to the new format (v2), which is necessary due to the new -text object. It reads the old XML data from \fIold-XML\fP and writes new -converted XML data to \fInew-XML\fP. -.PP -The XML data stored in a KPresenter document can be accessed by passing -the \fB.kpr\fP document through gunzip. -.PP -This utility is part of the Trinity Office Suite. -.SH NOTES -Be aware that \fIold-XML\fP should not be the -original \fB.kpr\fP document, but should -instead be just the extracted XML data. -.PP -This script is automatically called by KPresenter when an old format -document is opened. Ordinary users should not need to run this script -themselves. -.SH SEE ALSO -.BR kpresenter (1). -.SH AUTHOR -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install index 5aada1cab..44d61cc4c 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install @@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.* debian/tmp/opt/trinity/lib/libkpresenterprivate.so.* +debian/tmp/opt/trinity/share/man/man1/kpresenter.1 +debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages deleted file mode 100644 index 3357e6954..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kpresenter.1 -debian/kprconverter.pl.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 deleted file mode 100644 index 08eddd41e..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 +++ /dev/null @@ -1,56 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KPRESENTER 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kpresenter \- a presentation program for the Trinity Office Suite -.SH SYNOPSIS -.B kpresenter -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKPresenter\fP is a fully-featured presentation program. Presentations can -be edited directly within KPresenter, and many advanced features for -screen presentations are available. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kpresenter-specific options. -For a full summary of options, run \fIkpresenter \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kpresenter/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kpresenter/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP. -.SH AUTHOR -KPresenter was written by Reginald Stadlbauer <reggie@kde.org>, -Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>, -Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>, -Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and -Ariya Hidayat <ariya@kde.org>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install index ee708351b..915f71c19 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install @@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png +debian/tmp/opt/trinity/share/man/man1/kspread.1 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages deleted file mode 100644 index 833228aec..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kspread.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1 deleted file mode 100644 index 0cf7e8861..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kspread.1 +++ /dev/null @@ -1,55 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KSPREAD 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kspread \- a spreadsheet for the Trinity Office Suite -.SH SYNOPSIS -.B kspread -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKSpread\fP is a powerful spreadsheet application. It is scriptable and -provides both table-oriented sheets and support for complex mathematical -formulae and statistics. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kspread-specific options. -For a full summary of options, run \fIkspread \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -.BR kformula (1). -.PP -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kspread/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kspread/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kspread/\fP. -.SH AUTHOR -KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel -<montell@club-internet.fr>, David Faure <faure@kde.org> and many others. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install index 1ce19b21c..4fb9550bd 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install @@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook +debian/tmp/opt/trinity/share/man/man1/kthesaurus.1 debian/tmp/opt/trinity/share/services/thesaurustool.desktop debian/kthesaurus.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian index 252102b05..5f43c4233 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian +++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian @@ -1,5 +1,3 @@ kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so -kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so -kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages deleted file mode 100644 index 4fb6feb79..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kthesaurus.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 deleted file mode 100644 index 32f929bb8..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 +++ /dev/null @@ -1,52 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KTHESAURUS 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kthesaurus \- a thesaurus for the Trinity Office Suite -.SH SYNOPSIS -.B kthesaurus -[ \fIgeneric-options\fP ] [ \fIterm\fP ] -.SH DESCRIPTION -\fBKThesaurus\fP is a thesaurus tool. It lists words related to a search -term and offers a user interface to WordNet, an online lexical reference -system. -.PP -Only the English language is supported. -.PP -A term to search for may be optionally specified on the command-line. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -For a full summary of options, run \fIkthesaurus \-\-help\fP. -.SH SEE ALSO -.BR kword (1). -.PP -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/thesaurus/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/thesaurus/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP. -.SH AUTHOR -KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1 deleted file mode 100644 index bb08bb355..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1 +++ /dev/null @@ -1,61 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KUDESIGNER 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kudesigner \- a report template designer for Kugar -.SH SYNOPSIS -.B kudesigner -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKuDesigner\fP is a tool for creating report templates to use with -Kugar, the business report maker for KOffice. Templates (which describe -the layout of the data within a report) can be created in a visual -drag-and-drop manner and then saved to file. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kudesigner-specific options. -For a full summary of options, run \fIkudesigner \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -.BR kugar (1). -.PP -Full user documentation for Kugar is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kugar/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kugar/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kugar/\fP. -.SH AUTHOR -KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and -Joseph Wenninger <jowenn@jowenn.at>. -.br -Kugar was written by Keith Davis (Mutiny Bay Software) -<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>, -Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at> -and Joris Marcillac <joris@marcillac.com>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install index 0cda2bece..b1b014203 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install @@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png +debian/tmp/opt/trinity/share/man/man1/kugar.1 +debian/tmp/opt/trinity/share/man/man1/kudesigner.1 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop debian/tmp/opt/trinity/share/services/kugarpart.desktop diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages deleted file mode 100644 index 2a72a7d1b..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/kugar.1 -debian/kudesigner.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1 deleted file mode 100644 index 134747aa2..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kugar.1 +++ /dev/null @@ -1,70 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KUGAR 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kugar \- a business report maker for the Trinity Office Suite -.SH SYNOPSIS -.B kugar -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIxml-data-file\fP ... ] -.SH DESCRIPTION -\fBKugar\fP is a tool for generating business quality reports that can -be viewed and printed. It includes a standalone report viewer and a -KPart report viewer. The latter means that any TDE application can -embed the report viewing functionality and that reports can be viewed -using the Konqueror browser. -.PP -Kugar will create a report for the data stored in the data file -\fIxml-data-file\fP. Data files typically end in \fB.kud\fP. -Note that simply clicking on a data file in Konqueror will cause Kugar -to create a report. -.PP -The data will be displayed according to the layout described in a template -file. This template file is generally named in the data file. -Template files typically end in \fB.kut\fP. See -.BR kudesigner (1) -for a tool for creating template files. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kugar-specific options. -For a full summary of options, run \fIkugar \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -.BR kudesigner (1). -.PP -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kugar/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kugar/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kugar/\fP. -.SH AUTHOR -Kugar was written by Keith Davis (Mutiny Bay Software) -<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>, -Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at> -and Joris Marcillac <joris@marcillac.com>. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install index dfeb77b97..29ea06866 100644 --- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install +++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install @@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la debian/tmp/opt/trinity/lib/trinity/libwpimport.so debian/tmp/opt/trinity/lib/libtdeinit_kword.so debian/tmp/opt/trinity/lib/libkwordprivate.so.* +debian/tmp/opt/trinity/share/man/man1/kword.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages deleted file mode 100644 index a9bf36729..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kword.1 diff --git a/ubuntu/_base/applications/office/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1 deleted file mode 100644 index e55e7f5f3..000000000 --- a/ubuntu/_base/applications/office/koffice/debian/kword.1 +++ /dev/null @@ -1,60 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KWORD 1 "May 9, 2003" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kword \- a word processor for the Trinity Office Suite -.SH SYNOPSIS -.B kword -[ \fIgeneric-options\fP ] -[ \fB\-\-print\fP ] -[ \fIfile\fP ... ] -.SH DESCRIPTION -\fBKWord\fP is a FrameMaker-like word processing and desktop publishing -application. KWord is capable of creating demanding and professional -looking documents. It can be used for desktop publishing, but also for -"normal" word processing, like writing letters, reports and so on. -.PP -This application is part of the Trinity Office Suite. -.SH OPTIONS -Below are the kword-specific options. -For a full summary of options, run \fIkword \-\-help\fP. -.TP -\fB\-\-print\fP -Print the given file(s) and exit. -.SH SEE ALSO -.BR kformula (1), -.BR kthesaurus (1). -.PP -Full user documentation is available through the TDE Help Centre. -You can also enter the URL -\fIhelp:/kword/\fP -directly into konqueror or you can run -`\fIkhelpcenter help:/kword/\fP' -from the command-line. -.PP -If the TDE Help Centre is not installed then you can install the package -\fIkoffice-doc-html\fP and read this documentation in HTML format from -\fI/usr/share/doc/tde/HTML/en/kword/\fP. -.SH AUTHOR -KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis -<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander -<zander@kde.org>, Shaheed Haque <srhaque@iee.org>, -Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org> -and many others. -.br -This manual page was prepared by Ben Burton <bab@debian.org> -for the Debian GNU/Linux system (but may be used by others). diff --git a/ubuntu/_base/applications/office/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules index 397783a27..741529df1 100755 --- a/ubuntu/_base/applications/office/koffice/debian/rules +++ b/ubuntu/_base/applications/office/koffice/debian/rules @@ -27,7 +27,7 @@ DEB_INSTALL_CHANGELOGS_kugar-trinity := kugar/CHANGES DEB_INSTALL_CHANGELOGS_kword-trinity := kword/CHANGES DEB_INSTALL_CHANGELOGS_koffice-libs-trinity := lib/CHANGES -DEB_COMPRESS_EXCLUDE := .ksp .kwd .kwt .docbook +DEB_COMPRESS_EXCLUDE_ALL += .ksp .kwd .kwt .docbook install/chalk-data-trinity:: install -m 755 -d debian/chalk-data-trinity/opt/trinity/share/apps/chalk/profiles/ diff --git a/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/kpilot/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/kpilot/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/applications/office/kpilot/debian/compat b/ubuntu/_base/applications/office/kpilot/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/kpilot/debian/compat +++ b/ubuntu/_base/applications/office/kpilot/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/kpilot/debian/control b/ubuntu/_base/applications/office/kpilot/debian/control index e598f518b..4483a0767 100644 --- a/ubuntu/_base/applications/office/kpilot/debian/control +++ b/ubuntu/_base/applications/office/kpilot/debian/control @@ -2,7 +2,7 @@ Source: kpilot-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdepim-trinity-dev, libpisock-dev Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/office/kpilot/debian/docs b/ubuntu/_base/applications/office/kpilot/debian/docs new file mode 100644 index 000000000..960f99591 --- /dev/null +++ b/ubuntu/_base/applications/office/kpilot/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README.md +TODO diff --git a/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/office/tellico/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/office/tellico/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/applications/office/tellico/debian/compat b/ubuntu/_base/applications/office/tellico/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/office/tellico/debian/compat +++ b/ubuntu/_base/applications/office/tellico/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/office/tellico/debian/control b/ubuntu/_base/applications/office/tellico/debian/control index 4866a3f73..35625317b 100644 --- a/ubuntu/_base/applications/office/tellico/debian/control +++ b/ubuntu/_base/applications/office/tellico/debian/control @@ -3,10 +3,10 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Regis Boudin <regis@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, libtdepim1-trinity-dev, libxml2-dev, libxslt1-dev, libtag1-dev, libyaz-dev, - libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev + libpoppler-tqt-dev, libexempi-dev, libbtparse-dev, libv4l-dev, dh-python Standards-Version: 3.8.4 Homepage: http://periapsis.org/tellico/ @@ -31,11 +31,11 @@ Description: collection manager for books, videos, music [Trinity] Package: tellico-data-trinity Architecture: all -Depends: tdelibs-data-trinity +Depends: tdelibs-data-trinity, ${python3:Depends} Replaces: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~) Breaks: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~) Recommends: tellico-trinity -Suggests: python-all +Suggests: python3-all Description: collection manager for books, videos, music [data] [Trinity] Tellico is a collection manager for TDE. It includes default collections for books, bibliographies, comic books, videos, music, coins, stamps, trading @@ -55,10 +55,11 @@ Description: collection manager for books, videos, music [data] [Trinity] Package: tellico-scripts-trinity Architecture: all +Depends: ${python3:Depends} Recommends: tellico-trinity Replaces: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~) Breaks: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~) -Suggests: python-all, ruby +Suggests: python3-all, ruby Description: collection manager for books, videos, music [scripts] [Trinity] Tellico is a collection manager for TDE. It includes default collections for books, bibliographies, comic books, videos, music, coins, stamps, trading diff --git a/ubuntu/_base/applications/office/tellico/debian/rules b/ubuntu/_base/applications/office/tellico/debian/rules index 0c4cf46b6..ed4736e50 100755 --- a/ubuntu/_base/applications/office/tellico/debian/rules +++ b/ubuntu/_base/applications/office/tellico/debian/rules @@ -26,6 +26,7 @@ binary-install/tellico-data-trinity:: [ ! -d debian/tmp/opt/trinity/share/mime ] || \ mv debian/tmp/opt/trinity/share/mime debian/$(cdbs_curpkg)/usr/share/ mv debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico.xml debian/$(cdbs_curpkg)/usr/share/mime/packages/tellico-trinity.xml + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico -binary-install/tellico-trinity:: - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ +binary-install/tellico-scripts-trinity:: + dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/share/apps/tellico/data-sources diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install index a45d88c99..c20347b59 100644 --- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install +++ b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.install @@ -1,3 +1,5 @@ debian/tmp/opt/trinity/bin/* -debian/tellico.xpm /opt/trinity/share/pixmaps/ debian/tmp/opt/trinity/share/applications/* +debian/tmp/opt/trinity/share/man/man1/tellico.1 + +debian/tellico.xpm /opt/trinity/share/pixmaps/ diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages b/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages deleted file mode 100644 index 68831ac30..000000000 --- a/ubuntu/_base/applications/office/tellico/debian/tellico-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tellico.1x diff --git a/ubuntu/_base/applications/office/tellico/debian/tellico.1x b/ubuntu/_base/applications/office/tellico/debian/tellico.1x deleted file mode 100644 index 29a569a0b..000000000 --- a/ubuntu/_base/applications/office/tellico/debian/tellico.1x +++ /dev/null @@ -1,63 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH TELLICO: "1x" "March 2008" -.SH NAME -Tellico \- a collection manager for TDE -.SH SYNOPSIS -.B tellico -[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfilename\fR] -.SH DESCRIPTION -Tellico \- a collection manager for TDE -.SS "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 -.TP -\fB\-\-\fR -End of options -.SH OPTIONS -.TP -\fB\-\-nofile\fR -Do not reopen the last open file -.TP -\fB\-\-bibtex\fR -Import <filename> as a bibtex file -.TP -\fB\-\-mods\fR -Import <filename> as a MODS file -.TP -\fB\-\-ris\fR -Import <filename> as a RIS file -.SS "Arguments:" -.TP -filename -File to open -.SH "SEE ALSO" -The full documentation for -.B Qt: -is maintained as a Texinfo manual. If the -.B info -and -.B Qt: -programs are properly installed at your site, the command -.IP -.B info Qt: -.PP -should give you access to the complete manual. diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/kdpkg/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/applications/settings/kdpkg/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/kdpkg/debian/compat +++ b/ubuntu/_base/applications/settings/kdpkg/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control index ef413b9de..5f096c6d5 100644 --- a/ubuntu/_base/applications/settings/kdpkg/debian/control +++ b/ubuntu/_base/applications/settings/kdpkg/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kdpkg-trinity diff --git a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/kima/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/applications/settings/kima/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/kima/debian/compat +++ b/ubuntu/_base/applications/settings/kima/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control index 75e8156c6..8d21a1c39 100644 --- a/ubuntu/_base/applications/settings/kima/debian/control +++ b/ubuntu/_base/applications/settings/kima/debian/control @@ -2,7 +2,7 @@ Source: kima-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, tdelibs14-trinity-dev, libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386] Standards-Version: 3.8.4 diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/kiosktool/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/applications/settings/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/compat +++ b/ubuntu/_base/applications/settings/kiosktool/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control index 48f6bd9a1..7ccf337ad 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/control +++ b/ubuntu/_base/applications/settings/kiosktool/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Pedro Jurado Maqueda <melenas@kdehispano.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kiosktool-trinity diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/kkbswitch/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/applications/settings/kkbswitch/debian/compat b/ubuntu/_base/applications/settings/kkbswitch/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/kkbswitch/debian/compat +++ b/ubuntu/_base/applications/settings/kkbswitch/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/control b/ubuntu/_base/applications/settings/kkbswitch/debian/control index 7830b8afc..062a4acc4 100644 --- a/ubuntu/_base/applications/settings/kkbswitch/debian/control +++ b/ubuntu/_base/applications/settings/kkbswitch/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package@lists.alioth.debian.org> Uploaders: Baruch Even <baruch@debian.org>, Lior Kaplan <kaplan@debian.org>, Shachar Shemesh <shachar@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxkbfile-dev Standards-Version: 3.7.3 Homepage: http://kkbswitch.sourceforge.net/ diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/klcddimmer/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/applications/settings/klcddimmer/debian/compat b/ubuntu/_base/applications/settings/klcddimmer/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/klcddimmer/debian/compat +++ b/ubuntu/_base/applications/settings/klcddimmer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/control b/ubuntu/_base/applications/settings/klcddimmer/debian/control index 14a27e356..c18e2f223 100644 --- a/ubuntu/_base/applications/settings/klcddimmer/debian/control +++ b/ubuntu/_base/applications/settings/klcddimmer/debian/control @@ -2,7 +2,7 @@ Source: klcddimmer-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, tdelibs14-trinity-dev Standards-Version: 3.7.3 Homepage: http://klcddimeer.sourceforge.net/ diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/kmyfirewall/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/applications/settings/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/compat +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control index 7754434bd..5c4cc4d06 100644 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/control +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/control @@ -2,7 +2,7 @@ Source: kmyfirewall-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), tdelibs14-trinity-dev (>= 3.3.0), chrpath, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://kmyfirewall.sourceforge.net/ diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs deleted file mode 100644 index 90247b9a0..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs +++ /dev/null @@ -1,10 +0,0 @@ -export kde_prefix=/opt/trinity -export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/tde -export infodir=/opt/trinity/share/info -export mandir=/opt/trinity/share/man -export qtdir=/opt/trinity/share/qt3 -export kde_cgidir=/opt/trinity/lib/cgi-bin -export kde_confdir=/etc/trinity -export kde_htmldir=/opt/trinity/share/doc/tde/HTML -configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install index 3a28b6931..311ed806e 100644 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/install +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/install @@ -1 +1,2 @@ debian/kmyfirewall.xpm opt/trinity/share/pixmaps +debian/kmyfirewall-trinity/opt/trinity/share/man/man1/* diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 deleted file mode 100644 index cff01643d..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 +++ /dev/null @@ -1,162 +0,0 @@ -.TH kmyfirewall "1" "January 2004" TDE "TDE Application" -.SH NAME -kmyfirewall \- TDE iptables front\-end to easily create a "Personal Firewall" -.SH SYNOPSIS -.B kmyfirewall -[\fIQt\-options\fR] [\fITDE\-options\fR] [\fIURL\fR] -.SH DESCRIPTION -This manual page documents briefly the -.B kmyfirewall -TDE Application. -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -KMyFirewall attempts to make it easier to setup iptables based firewalls on -Linux systems. It will be the right tool if you like to have a so called -"Personal Firewall" running on your Linux box, but don\'t have the time and/or -the interest to spend hours in front of the iptables manual just to setup a -Firewall that keeps the "bad" people out -.SH OPTIONS -.SS "General Options" -.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\fR, \fB\-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS "Qt options:" -.TP -.BI \-\-display \ displayname -Use the X-server display \fIdisplayname\fP. -.TP -.BI \-\-session \ sessionId -Restore the application for the given \fIsessionId\fP. -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8-bit display. -.TP -.BI \-\-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 -.B \-nograb, use \fB\-dograb\fR to override. -.TP -.B \-\-sync -switches to synchronous mode for debugging. -.TP -.BI "\-\-fn\fR, \fP\-\-font" \ fontname -defines the application font. -.TP -.BI "\-\-bg\fR, \fB\-\-background" \ color -sets the default background color and an -application palette (light and dark shades are -calculated). -.TP -.BI "\-\-fg\fR, \fB\-\-foreground" \ color -sets the default foreground color. -.TP -.BI \-\-btn\fR, \fB\-\-button \ color -sets the default button color. -.TP -.BI \-\-name \ name -sets the application name. -.TP -.BI \-\-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 -.BI \-\-inputstyle \ inputstyle -sets XIM (X Input Method) input style. Possible -values are -.BR onthespot ", " overthespot ", " offthespot and root . -.TP -.BI \-\-im " XIM\-server" -set XIM server. -.TP -.B \-\-noxim -disable XIM. -.TP -.B \-\-reverse -mirrors the whole layout of widgets. -.SS "TDE options:" -.TP -.BI \-\-caption \ caption -Use \fIcaption\fP as name in the titlebar. -.TP -.BI \-\-icon \ icon -Use \fIicon\fP as the application icon. -.TP -.BI \-\-miniicon \ icon -Use \fIicon\fP as the icon in the titlebar. -.TP -.BI \-\-config \ filename -Use alternative configuration file. -.TP -.BI \-\-dcopserver \ server -Use the DCOP Server specified by \fIserver\fP. -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps. -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager. -.TP -.BI \-\-style \ style -sets the application GUI style. -.TP -.BI \-\-geometry \ geometry -sets the client geometry of the main widget. -.SH AUTHOR -KMyFirewall was written by -.nh -.ad l -Christian Hubinger <e9806056@student.tuwien.ac.at>. -.hy -.br -This manual page was prepared by -.nh -.ad l -Alberto Gonzalez Iniesta <agi@inittab.org> -.hy -for the Debian GNU/Linux system (but may be used by others). -.SH "SEE ALSO" -If the -.B khelpcenter -program is properly installed at your site, the command -.IP -.B khelpcenter help:/kmyfirewall -.PP -should give you access to the complete manual. -.P -Alternatively the manual can be browsed in -.B konqueror -giving it the URL help:/kmyfirewall - diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages deleted file mode 100644 index fab755280..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/kmyfirewall.1 diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules index 8b7e87e26..76a0f44d3 100755 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules +++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules @@ -12,5 +12,4 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine binary-install/kmyfirewall-trinity:: rm -f debian/$(cdbs_curpkg)/opt/trinity/lib/*.so - mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ chmod +x debian/$(cdbs_curpkg)/opt/trinity/share/apps/kmyfirewall/scripts/installer/linux/*.sh diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch deleted file mode 100644 index 42dfe005b..000000000 --- a/ubuntu/_base/applications/settings/kmyfirewall/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/kmyfirewall/kmyfirewall-(.*)\.tar\.bz2 diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source deleted file mode 100644 index 96fb271ab..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source +++ /dev/null @@ -1,3 +0,0 @@ -This package uses the quilt patch management system. - -Please refer to /usr/share/doc/quilt/README.source for further information. diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog deleted file mode 100644 index 58dd721cb..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog +++ /dev/null @@ -1,373 +0,0 @@ -knetworkmanager8-trinity (1:0.8-0ubuntu12) karmic; urgency=low - - * UI tweaks for discoverability - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 26 Oct 2009 17:44:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu10) karmic; urgency=low - - * Fixed VPN reauthentication request dialog failure when used with the permanent storage option - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 06 Oct 2009 19:31:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu7) karmic; urgency=low - - * Fixed various minor glitches - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 03 Oct 2009 12:29:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu6) karmic; urgency=low - - * Repaired poor usability for new wireless connections - * Repaired poor usability for connection management - * VPN connections now remember login information when asked - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Tue, 29 Sep 2009 09:39:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu5) karmic; urgency=low - - * Repaired VPN plugins - * VPNC now allows hashed group password - * PPTP repaired and enabled - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 28 Sep 2009 14:51:00 -0600 - -knetworkmanager-trinity (1:0.8-0ubuntu4) karmic; urgency=low - - * Patched backend for new NM0.8 API - * Repaired poor usability in the "new connection" tasktray menu - * Repaired poor usability in the available devices tasktray menu - * Moved to /opt/trinity - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 22 Aug 2009 23:34:00 -0600 - -knetworkmanager (1:0.7~~svn941706-1) unstable; urgency=low - - * Updated SVN snapshot (r941706). - * debian/patches/04-dbus_access.patch - - Most of the relevant changes have been merged upstream. The patch now - only contains the Debian specific group "netdev" section. - * debian/control - - Bump Standards-Version to 3.8.1. No further changes. - - -- Michael Biebl <biebl@debian.org> Fri, 20 Mar 2009 22:59:51 +0100 - -knetworkmanager (1:0.7~~svn931033-2) unstable; urgency=low - - * debian/patches/05-no_blank_psk.patch - - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails - to validate them. Closes: #517213 - Patch by Dan Williams, thanks! - - -- Michael Biebl <biebl@debian.org> Tue, 03 Mar 2009 00:34:15 +0100 - -knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low - - * Merge experimental branch into unstable. Remaining changes: - - Remove 07-indicate_manual_config.patch, obsolete. - * debian/control - - Wrap Build-Depends. - - Bump Build-Depends on debhelper to (>= 7). - * debian/compat - - Bump debhelper compat level to 7. - * debian/rules - - Include debhelper.mk before any other files as recommended by the cdbs - documentation. - * Update SVN snapshot to r931033. - - -- Michael Biebl <biebl@debian.org> Wed, 25 Feb 2009 10:54:39 +0100 - -knetworkmanager (1:0.7~~svn908338-2) experimental; urgency=low - - * debian/patches/04-dbus_access.patch - - Update D-Bus names and interfaces for NM 0.7. Closes: #511526 - - Remove bare send_interface directives to avoid non-deterministic allow - messages with no interface. Closes: #510757 - - Do not allow unpriviledged processes to ask for a users' connections. - - Allow introspection by default. - - -- Michael Biebl <biebl@debian.org> Thu, 05 Feb 2009 01:52:22 +0100 - -knetworkmanager (1:0.7~~svn908338-1) experimental; urgency=low - - * Updated SVN snapshot (r908338). - * debian/rules - - Stop moving icons around, fixed upstream. - * debian/patches/01-configure_package_name.patch - - Make sure we set the correct PACKAGE name when generating the build - system so the translations are installed properly. - * debian/network-manager-kde.lintian-overrides - - Updated for the latest lintian changes. - - -- Michael Biebl <biebl@debian.org> Sun, 11 Jan 2009 06:52:06 +0100 - -knetworkmanager (1:0.7~~svn897092-1) experimental; urgency=low - - * SVN snapshot of the upcoming 0.7 release (for NM 0.7). - * debian/control - - Add Build-Depends on pkg-config. - - Bump Build-Depends on nm-* packages to (>= 0.7.0). - - Add Build-Depends on libdbus-1-qt3-dev (>= 0.8.1). - - Bump Build-Depends on debhelper to (>= 6.0.7) for dh_lintian. - - Bump Depends on network-manager to (>= 0.7.0). - - Bump Standards-Version to 3.8.0. Add README.source as recommended by the - new policy. - * debian/rules - - Install autostart desktop file into /usr/share/autostart/. - - Install icons into /usr/share/icons/hicolor/ so KDE4 can find them. - Closes: #487303 - - Add support for both libtool 1.x and 2.x. - * Switch patch management system to quilt. - * debian/patches/04-dbus_access.patch - - Refresh and update. - - -- Michael Biebl <biebl@debian.org> Tue, 16 Dec 2008 04:18:10 +0100 - -knetworkmanager (1:0.2.2-2) unstable; urgency=low - - * debian/patches/07-indicate_manual_config.patch - - manual-means-online: If there are interfaces that are not managed by - NetworkManager because they have custom configuration in - /etc/network/interfaces, we assume to be online and show a wired network - icon indicating manual network configuration. - * debian/control - - Add Build-Depends on pkg-config. - - -- Michael Biebl <biebl@debian.org> Wed, 14 Jan 2009 08:22:11 +0100 - -knetworkmanager (1:0.2.2-1) unstable; urgency=low - - * New upstream release. - - Improved tray icon animation using mng files. Closes: #394815 - - Improved LEAP security. Closes: #470709 - * Removed patches - - debian/patches/01-fix_french_translation.patch (merged upstream) - - debian/patches/02-linux_types.patch (obsolete) - - debian/patches/03-awk_path.patch (fixed upstream) - - debian/patches/05-desktop_file_fixes.patch (merged upstream) - * debian/knetworkmanager.linda - - Remove the linda override file, linda is dead. - * debian/{knetworkmanager.lintian -> network-manager-kde.lintian-overrides} - - Rename the lintian override file so it is automatically installed by - dh_lintian. - * debian/rules - - Drop the no longer required install rules for the override files. - - Drop the install rule for the autostart file. It's provided by upstream - now. - * debian/copyright - - Update the authors list. - * debian/control - - Bump Build-Depends on libnl-dev (>= 1.1). - - Drop Build-Depends on kapptemplate. The upstream tarball ships a proper - admin/ directory again. - * debian/watch - - New download location at ftp.kde.org. - - -- Michael Biebl <biebl@debian.org> Fri, 04 Apr 2008 19:41:02 +0200 - -knetworkmanager (1:0.2-3) unstable; urgency=low - - * debian/control - - Use the new "Homepage:" field to specify the upstream URL. - - The Vcs-* fields are now officially supported, so remove the XS- prefix. - - Bump Standards-Version to 3.7.3. No further changes required. - - Fix a few capitalization errors in the package description. - - -- Michael Biebl <biebl@debian.org> Fri, 11 Jan 2008 02:08:24 +0100 - -knetworkmanager (1:0.2-2) unstable; urgency=low - - * Rebuild against network-manager 0.6.5 to enable phase2 and leap - authentication support. - * debian/rules - - Remove debian/stamp-bootstrap on clean. This fixes a FTBFS if package is - built twice in a row. Closes: #442621 - * debian/control - - Add Build-Conflicts: autoconf2.13. Closes: #441046 - * debian/menu - - Set section to Applications/Network/Monitoring which seems to be the - most appropriate amongst the available sections. - * debian/patches/05-desktop_file_fixes.patch - - Fix the *.desktop files to be compliant to the fd.o menu and desktop - entry spec. - - -- Michael Biebl <biebl@debian.org> Sun, 16 Sep 2007 21:01:25 +0200 - -knetworkmanager (1:0.2-1) unstable; urgency=low - - * New upstream release. - * debian/patches/05-leap_support.patch - - Removed, merged upstream. - * debian/patches/06-version_check.patch - - Removed, merged upstream. - * The upstream tarball does not ship an admin/ directory. Build-Depend on - kapptemplate, so we can copy it from there. - * debian/menu - - Update to new menu hierarchy and add a longtitle. - - -- Michael Biebl <biebl@debian.org> Wed, 25 Jul 2007 17:10:36 +0200 - -knetworkmanager (1:0.2~svn678822-3) unstable; urgency=low - - * debian/patches/06-version_check.patch - - Added. Fixes the problem with knetworkmanager no longer connecting - automatically upon login. Closes: #431255 - If you are upgrading from a previous 0.2 svn snapshot, you may have to - clear the list of trusted networks in the configuration dialog. - - -- Michael Biebl <biebl@debian.org> Sun, 01 Jul 2007 11:47:00 +0200 - -knetworkmanager (1:0.2~svn678822-2) unstable; urgency=low - - * debian/patches/02-linux_types.patch - - Pass "-std=gnu++98" to CXXFLAGS. Otherwise the type __u64 is not defined - in linux-libc-dev for ANSI C/C89. Closes: #430795 - - -- Michael Biebl <biebl@debian.org> Thu, 28 Jun 2007 06:08:04 +0200 - -knetworkmanager (1:0.2~svn678822-1) unstable; urgency=low - - * SVN snapshot of the upcoming 0.2 release which has native VPN plugin - support. Closes: #415742 - * debian/control - - Add XS-Vcs-* fields. - - Add Recommends: network-manager-vpnc, network-manager-openvpn. - * debian/rules - - Compile with openvpn and vpnc support. - - * Removed patches that were merged upstream: - - debian/patches/05-no_deserialize.patch - - debian/patches/06-pretty_notification.patch - - debian/patches/07-overlay_icon_vpn.patch - - debian/patches/08-disable_sm.patch - - debian/patches/09-dbus_bool_t.patch - - * debian/patches/02-linux_types.patch - - Added. Needed to workaround a problem in libnl. - * debian/patches/03-awk_path.patch - - Added. In Debian awk is installed in /usr/bin. - * debian/patches/04-dbus_access.patch - - Do not remove the dbus at_console access check but make it an - alternative to the Debian netdev group policy. Closes: #426467 - * debian/patches/05-leap_support.patch - - Added. Do not fail to compile if LEAP support is not available. - - -- Michael Biebl <biebl@debian.org> Fri, 22 Jun 2007 21:08:32 +0100 - -knetworkmanager (1:0.1-4) unstable; urgency=low - - * Actually install the autostart file for knetworkmanager. - Thanks to Yannick Roehlly for spotting this glitch. - - -- Michael Biebl <biebl@debian.org> Fri, 12 Jan 2007 11:26:28 +0100 - -knetworkmanager (1:0.1-3) unstable; urgency=low - - * Pull some features and bug fixes from svn: - - debian/patches/05-no_deserialize.patch - + Don't call deserialize on encryption object to avoid warning of - libnm-util. Closes: #391486 - - debian/patches/06-pretty_notification.patch - + Prettify notification messages. - - debian/patches/07-overlay_icon_vpn.patch - + Show overlay icon (lock) for active VPN connections. - - debian/patches/08-disable_sm.patch - + Disable session management to avoid a deadlock when accessing tdewallet. - Install an autostart file into /usr/share/autostart/ instead. - Closes: #406162 - - debian/patches/09-dbus_bool_t.patch - + Use dbus_bool_t instead of bool. Closes: #398974 - * debian/patches/01-fix_french_translation.patch - - Added patch from Emmanuel Bouthenot which fixes some errors in the - French translation. Closes: #402285 - - -- Michael Biebl <biebl@debian.org> Tue, 9 Jan 2007 16:31:52 +0100 - -knetworkmanager (1:0.1-2) unstable; urgency=low - - * Update maintainer email address to biebl@debian.org. - - -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:02:03 +0200 - -knetworkmanager (1:0.1-1) unstable; urgency=low - - * Finally the 0.1 release. Woohoo! - - Use an epoch to fix the versioning scheme I managed to mess up. - - Fixes a crash when removing network objects for a nonexistent network - interface. Closes: #390052 - * debian/patches/01-no_network_status.patch - - Removed, fixed upstream. - * debian/patches/03-configure.patch - - Removed, fixed upstream. - * Dropped the build-dep on kapptemplate. The upstream tarball now ships a - proper admin/ directory. - * debian/patches/02-dialup.patch - - Removed. Also dropped the Recommends: pppconfig. pppconfig can't - generate entries for /etc/network/interfaces yet. - - -- Michael Biebl <biebl@teco.edu> Fri, 29 Sep 2006 19:18:08 +0200 - -knetworkmanager (0.09+0.1r586773-1) unstable; urgency=low - - * Updated to svn revision 586773. - * Do not refer to non existent khelpcenter help:/knetworkmanager/ in man - page. Closes: #385642 - - -- Michael Biebl <biebl@teco.edu> Wed, 20 Sep 2006 19:46:52 +0200 - -knetworkmanager (0.09+0.1r577960-1) unstable; urgency=low - - * Updated to svn revision 577960. - - Access TDEWallet on demand, not on startup. Closes: #379606 - * Added a Recommends: pppconfig. Closes: #380316 - - -- Michael Biebl <biebl@teco.edu> Mon, 28 Aug 2006 01:14:29 +0200 - -knetworkmanager (0.09+0.1r560817-1) unstable; urgency=medium - - * Updated to svn revision 560817. - * Removed 04-gnome_keyring_daemon.patch, fixed upstream. - * Added 04-dbus_access.patch. Fixes D-Bus access rights. - Closes: #379309, #379364 - * Enabled dial up support. Set pppconfig as configuration utility. - Closes: #376071 - * Reload D-Bus after installation. Closes: #379307 - * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379820 - - -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:33:31 +0200 - -knetworkmanager (0.09+0.1r550737-1) unstable; urgency=low - - * Updated to svn revision 550737. - * Added 01-no_network_status.patch which removes a build dependency on - networkstatus. - * Removed 03-configure_notifications.patch, merged upstream. - * This version does not ship an admin/ directory. Added a build dependency - on kapptemplate and modified debian/rules to copy it from kapptemplate. - * Bumped Standards-Version to 3.7.2, no further changes required. - * Updated homepage URL. - * Added 04-gnome_keyring_daemon.patch which sets the correct path to the - gnome-keyring-daemon binary. VPN plugins use gnome-keyring-daemon to store - their passwords. - - -- Michael Biebl <biebl@teco.edu> Wed, 14 Jun 2006 17:16:07 +0200 - -knetworkmanager (0.09+0.1r527269-1) unstable; urgency=low - - * New upstream release. - * Removed 01-xdg_app.patch, merged upstream. - * Added 03-configure_notifications.patch, this patch modifies the context - menu of the systray applet to provide quick access to the notification - settings. - * Added a "Provides: knetworkmanager" to make the package installable by its - upstream name. - * Initial upload. Closes: #351069 - - -- Michael Biebl <biebl@teco.edu> Thu, 27 Apr 2006 08:01:39 +0200 - -knetworkmanager (0.09+0.1r5964-1) unstable; urgency=low - - * Initial release. - - -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 21:43:56 +0100 - diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control deleted file mode 100644 index c4f849687..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/control +++ /dev/null @@ -1,37 +0,0 @@ -Source: knetworkmanager8-trinity -Section: tde -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, - debhelper (>= 9~), - pkg-config, - tdelibs14-trinity-dev, - libnm-util-dev (>= 0.7.0), - libnm-glib-dev (>= 0.7.0), - network-manager-dev (>= 0.7.0), - network-manager-dev (<< 0.8.9), - libhal-dev, - libdbus-1-tqt-dev, - libiw-dev, - libnl-dev (>= 1.1), - quilt, - network-manager-vpnc, - network-manager-openvpn, - network-manager-strongswan, - network-manager-pptp, - automake, autoconf, libtool, libltdl-dev -Standards-Version: 3.8.4 -Homepage: http://opensuse.org/Projects/KNetworkManager - -Package: network-manager-kde-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0), network-manager (<< 0.8.9) -Replaces: network-manager-kde-kde3 (<< 4:14.0.0~), network-manager-kde-trinity (<< 4:14.0.0~) -Breaks: network-manager-kde-kde3 (<< 4:14.0.0~), network-manager-kde-trinity (<< 4:14.0.0~) -Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp -Provides: knetworkmanager-trinity -Conflicts: network-manager-kde -Description: TDE systray applet for controlling NetworkManager [Trinity] - Systray applet for controlling network connections managed by - NetworkManager. It is mainly written for Trinity but also works for - other desktop environments like GNOME or Xfce. diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright deleted file mode 100644 index 2490de254..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright +++ /dev/null @@ -1,34 +0,0 @@ -This package was debianized by Michael Biebl <biebl@teco.edu> on -Fri, 3 Feb 2006 05:53:06 +0100. - -It was downloaded from http://www.opensuse.org - -Upstream Authors: - Timo Hoenig <thoenig@suse.de> - Will Stephenson <wstephenson@suse.de> - Stefan Bogner <sbogner@suse.de> - Helmut Schaa <hschaa@suse.de> - Valentine Sinitsyn <e_val@inbox.ru> - -Copyright: - Copyright (C) 2005, 2006 Novell, Inc. - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -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/applications/settings/knetworkmanager8/debian/knetworkmanager.1 b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1 deleted file mode 100644 index e4f5073db..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1 +++ /dev/null @@ -1,145 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH KNETWORKMANAGER 1 "Feb 2006" "Trinity Desktop Environment" "A NetworkManager front-end for TDE" -.SH NAME -knetworkmanager -\- A NetworkManager front-end for TDE -.SH SYNOPSIS -knetworkmanager [Qt\-options] [TDE\-options] -.SH DESCRIPTION -A NetworkManager front-end for TDE -.SH OPTIONS -.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 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 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 - -.SH SEE ALSO -.BR networkmanager (1) -.SH AUTHORS -.nf -Timo Hoenig <thoenig@suse.de> -.br -Stefan Bogner <sbogner@suse.de> -.br -Will Stephenson <wstephenson@suse.de> -.br - diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages deleted file mode 100644 index e2859341f..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/knetworkmanager.1 diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu deleted file mode 100644 index cc47df4d0..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(network-manager-kde-trinity): \ - needs="X11" \ - section="Applications/Network/Monitoring" \ - title="KNetworkManager" \ - longtitle="A TDE frontend for NetworkManager" \ - command="/opt/trinity/bin/knetworkmanager" diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides deleted file mode 100644 index b5316fc73..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -network-manager-kde: package-name-doesnt-match-sonames libtdeinit-knetworkmanager -network-manager-kde: shlib-without-versioned-soname opt/trinity/lib/libtdeinit_knetworkmanager.so libtdeinit_knetworkmanager.so diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst deleted file mode 100644 index fdd4e51ca..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - configure) - # Ask D-Bus to reload the config file - if [ -x "/etc/init.d/dbus" ]; then - invoke-rc.d dbus force-reload || true - fi - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules deleted file mode 100755 index d38592f45..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/make -f - -# Currently is not possible to build piklab with --enable-final -DEB_BUILD_OPTIONS += noopt - -include /usr/share/cdbs/1/rules/debhelper.mk -include debian/cdbs/debian-tde.mk - -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -DEB_INSTALL_DOCS_ALL := -XNEWS -XTODO - -DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp - -binary-install/network-manager-kde-trinity:: - # Install autostart file - install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \ - debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop - mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/ diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch deleted file mode 100644 index ad7a7be91..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -ftp://ftp.kde.org/pub/kde/stable/apps/Trinity.x/network/knetworkmanager-(.*)\.tar\.gz diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian deleted file mode 100644 index b0302c211..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian +++ /dev/null @@ -1,107 +0,0 @@ -Debian kde-extras Team ----------------------- - -1. Contacts ------------ - -General help requests - <debian-kde@lists.debian.org> mailing list - #debian-kde on irc - -Packaging queries - <debian-qt-kde@lists.debian.org> mailing list - #debian-qt-kde on irc - -Maintainers - <pkg-kde-extras@lists.alioth.debian.org> mailing list - - -2. Subversion repository ------------------------- - -You can browse it only at: - -http://svn.debian.org/wsvn/pkg-kde/kde-extras/ - -To "checkout" the repository use these commands: - - $ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Authorized SSH keys are controlled at https://alioth.debian.org/account/ - -The repository layout is: - -- packagename/ - - trunk/ - - branches/ - - tags/ - - 0.7.2-1/ - - 0.7.2-2/ - - 0.7.2-2ubuntu1/ - - 0.7.2-2ubuntu2/ - - 0.7.2-2ubuntu3/ - - 0.8.0/ - ... - -If only one version of the package is available at the time, development must -be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new -release is made. - -When, at some point, the need to have two different versions at the same time -arises (for example, if we need a version to be in unstable and a different one -to be in experimental), experimental development will be made in trunk/ and -if a new unstable package needs to be cooked, copying -tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the -trick. - -3. Using svn-buildpackage --------------------------- - -Packages with an upstream tarball will require you to set the mergeWithUpstream -property first (from the package root) so that svn-buildpackage will look for -the .orig.tar.gz in the ../tarballs directory. - - % svn propset mergeWithUpstream 1 debian - -Please note that this only works for packages which have only the debian/ -directory committed. Consequently, you must use CDBS's simple-patchsys.mk or -dpatch to modify the upstream sources. - -After you have finished and committed your Debian patches via - - % svn commit [PACKAGE] - -as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build -your package with the following commands: - - % svn-buildpackage --svn-ignore-new -rfakeroot - -Please, don't commit tarballs/ or build-area/ directories to SVN. - -4. Tarballs and Build-area directories ------------------------------------- - -During pkg development before uploaded to debian the tarballs can be found at: - - http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/ - -You need to place those dirs in the parent directory of the one from which you're -running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs -in 'pkgname'/ dir, at the same level as trunk/ - -If you want to compile inside one version in tags/ dir, you'll need to place those -dirs inside that dir. Of course the easiest and cleanest way of doing it is -by making a symlink of those dirs inside tags/ dir. - -5. Using svn-inject -------------------- - -To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1) -as follows: - - svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras - -Type in your alioth password a few hundred times :-) and your package should be -uploaded to the archive. Note you will also need to manually copy the -package.orig.tar.gz to your tarballs directory. The -o option is important as -this ensures that we 'Only keep modified files under SVN control' diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/debian-tde.mk index f36e3527c..b031e6981 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/tde-guidance/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 | \ diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/compat b/ubuntu/_base/applications/settings/tde-guidance/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/compat +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control index ace8cb486..547203533 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/control +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/control @@ -4,26 +4,23 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, chrpath, tdelibs14-trinity-dev, - libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, - pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev, - python-support (>= 0.6) | dh-python, python-all, python-all-dev, x11proto-scrnsaver-dev, python-tqt-dev, hwdata +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + python3-setuptools, python3-sip-tqt-dev, libpythonize0-trinity-dev, pytde-dev Standards-Version: 3.8.4 Package: tde-guidance-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, init | sysv-rc, guidance-backends-trinity, hwdata, python-all, python-all-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, pytdeextensions-trinity, python3-pytde, guidance-backends-trinity, python3-all, python3-all-dev Replaces: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~) Breaks: kde-guidance-kde3 (<< 4:14.0.0~), kde-guidance-trinity (<< 4:14.0.0~) Conflicts: guidance-power-manager, kde-guidance-powermanager -Provides: ${python:Provides} +Provides: ${python3:Provides} Description: collection of TDE system administration tools for GNU/Linux [Trinity] - Guidance currently consists of four programs designed to help you + Guidance currently consists of three programs designed to help you look after your system: o userconfig - User and Group administration o serviceconfig - Service/daemon administration o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration . These tools are available in Trinity Control Center, System Settings or can be run as standalone applications. @@ -32,11 +29,11 @@ Description: collection of TDE system administration tools for GNU/Linux [Trinit Package: guidance-backends-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python-all, python-all-dev -Replaces: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~) -Breaks: guidance-backends-kde3 (<< 4:14.0.0~), guidance-backends-trinity (<< 4:14.0.0~) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-all, python3-all-dev +Replaces: guidance-backends-trinity (<< 4:14.0.0~) +Breaks: guidance-backends-trinity (<< 4:14.0.0~) Conflicts: guidance-power-manager, kde-guidance-powermanager -Provides: ${python:Provides} +Provides: ${python3:Provides} Description: collection of system administration tools for GNU/Linux [Trinity] This package contains the platform neutral backends used in the Guidance configuration tools. diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs index 724e08449..ca0272abf 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/docs +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.docs @@ -1,2 +1,3 @@ +AUTHORS README TODO diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install index d292fc8d3..d9e850d6c 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install @@ -1,3 +1 @@ -opt/trinity/share/python-support/guidance-backends-trinity/MicroHAL.py -opt/trinity/share/python-support/guidance-backends-trinity/wineread.py -opt/trinity/share/python-support/guidance-backends-trinity/winewrite.py +/usr/lib/python*/dist-packages/tde-guidance/MicroHAL.py diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 deleted file mode 100644 index d3076cc3c..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.TH "MOUNTCONFIG" "1" "aout 2, 2005" "" "" -.SH "NAME" -mountconfig \- disk and filesystem administration tool -.SH "SYNOPSIS" -.B mountconfig -.RI [ options ] -.br -.SH "DESCRIPTION" -This manual page documents briefly the -.B mountconfig -commands. This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBmountconfig\fP is a disk and filesystem administration tool. -.SH "OPTIONS" -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`\-'). -A summary of options is included below. -.TP -.B \-\-help -Show summary of options. -.TP -.B \-\-help\-qt -Show QT specific help (common for all QT apps). -.TP -.B \-\-help\-tde -Show TDE specific help (common for all TDE apps). -.TP -.B \-\-help\-all -Show the complete help. -.TP -.B \-\-author -Show program author(s). -.TP -.B \-v, \-\-version -Show version of program. -.TP -.B \-\-license -Show program license. -.SH "SEE ALSO" -.BR displayconfig (1), -.BR displayconfig-restore (1), -.BR serviceconfig (1), -.BR userconfig (1). -.br -.SH "AUTHOR" -mountconfig was written by <simon@simonzone.com>. -.PP -This manual page was written by Fathi Boudra <fboudra@free.fr>, -for the Debian project (but may be used by others). diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat b/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat deleted file mode 100644 index 0cfbf0888..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk deleted file mode 100644 index 1a1ec9a8e..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk +++ /dev/null @@ -1,297 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Colin Walters <walters@debian.org> -# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org> -# -# Description: manage Python public modules build -# This class is designed to work with Python packages using the -# 'distutils' build system and comply to the new policy established -# during summer 2006. Use of the debhelper class to make use of the -# new dh_python is strongly advised. (This is still left as optional -# in line with CDBS' flexible behavior.) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02111-1307 USA. -# - -# This class provides rules for old and new Python policy. Leaving -# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and -# pycentral methods are available to comply with new policy. Don't forget -# to update your 'debian/control'. (Build-Depends are correctly generated -# if you are using the auto control generation feature.) - -# Once all old-style packages are removed before etch, some of the old -# can be refactored or removed. - - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_python_distutils -_cdbs_class_python_distutils = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - - -# check python system -cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) -cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) -cdbs_pycompat = $(cdbs_selected_pycompat) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - # warning pysupport compatibility mode - ifneq (, $(cdbs_use_xs_field)) - $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.) - endif # use XS field (compat) -else - ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - else - ifneq (, $(DEB_PYTHON_SYSTEM)) - $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) - else - ifneq (, $(cdbs_use_xs_field)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - ifneq (, $(cdbs_selected_pycompat)) - ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - endif # use pycompat - endif # unknown method - endif # pycentral -endif # pysupport - - -ifndef DEB_PYTHON_SYSTEM -DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7 -else -# default package is the first one declared in 'debian/control' -# (override if necessary) -DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))) -DEB_PYTHON_PRIVATE_MODULES_DIRS = -endif - -# common variables -DEB_PYTHON_SETUP_CMD = setup.py -DEB_PYTHON_CLEAN_ARGS = -a -DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build" -DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr - - -ifndef DEB_PYTHON_SYSTEM -########################### old policy method ########################### - -$(warning =======================================================) -$(warning Your package does not conform to the new Python policy.) -$(warning Please consider updating. Here is some documentation:) -$(warning http://wiki.debian.org/DebianPython/NewPolicy) -$(warning http://wiki.debian.org/DebianPythonFAQ) -$(warning =======================================================) - -# make: *** No rule to make target `voodoo'. Stop. -DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -# If no versioned python library packages found, grab all simpler ones -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -endif - -cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg)))) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) - - -# See if this package doesn't appear to need to be compiled by multiple -# Python versions. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -else -$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -# This class can optionally utilize debhelper's "dh_python" command. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# Ignore errors from this rule. In a tarball build, the file may not -# exist. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -clean:: - -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else -clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) - -$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : - -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif - -else -########################## new policy methods ########################### - -# Calculate cdbs_python_build_versions -cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control)) -cdbs_python_current_version := $(shell pyversions -vd) -ifeq (all, $(cdbs_python_module_arch)) - # check if current is in build versions - ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) - cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) - cdbs_python_build_versions := $(cdbs_python_compile_version) - else - cdbs_python_build_versions := $(cdbs_python_current_version) - endif -else -cdbs_python_build_versions := $(shell pyversions -vr) -endif # archall - -# check if build is possible -ifeq (, $(cdbs_python_build_versions)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -$(error invalid setting in debian/pyversions) -else -$(error invalid setting for XS-Python-Version) -endif # system selected -endif # build versions empty - - -# Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43) -ifeq (all, $(cdbs_python_module_arch)) - ifneq (, $(cdbs_python_compile_version)) - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) - else - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) - endif -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) -endif -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) -endif - - -cdbs_python_current_binary := $(shell pyversions -d) -cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1)) - -# build stage -common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions)) -python-build-stamp-%: -ifeq (all, $(cdbs_python_module_arch)) - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -else - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -endif # archall detection - touch $@ - - -# install stage -ifeq (all, $(cdbs_python_module_arch)) -common-install-arch common-install-indep:: python-install-py -python-install-py: - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -else -common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions)) -python-install-%: - cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -endif # archall detection - - -# This class can optionally use debhelper's commands. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -else - dh_pycentral -p$(cdbs_curpkg) -endif - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# clean stage -clean:: $(addprefix python-clean-, $(cdbs_python_build_versions)) -python-clean-%: -ifeq (all, $(cdbs_python_module_arch)) - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif # archall detection - -clean:: -ifeq (, $(cdbs_selected_pycompat)) - echo "$(cdbs_pycompat)" >debian/pycompat -endif # use pycompat - rm -f python-build-stamp-* - -endif - - -########################## all policy methods ########################### - -# Calling setup.py clean may create .pyc files, so we need a final cleanup -# pass here. -clean:: - find . -name '*.pyc' -exec rm '{}' ';' - -endif diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions b/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions deleted file mode 100644 index b3dc41ebc..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.5- diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules index 28dfb8c47..a6797f19a 100755 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/rules +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules @@ -1,170 +1,17 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity -PYSUPPORT_INST_PATH = /opt/trinity/share/python-support -GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity -export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH) - include /usr/share/cdbs/1/rules/debhelper.mk -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - include debian/python-distutils-jaunty.mk -else - include /usr/share/cdbs/1/class/python-distutils.mk -endif -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_UPDATE_RCD_PARAMS := multiuser -DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 -PYSUPPORT_PATH = $(DEB_DESTDIR)$(PYSUPPORT_INST_PATH) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde -LDFLAGS_APPEND := -L/opt/trinity/lib - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - -install/tde-guidance-trinity:: - # install icons to right place - install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png - install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kcmpartitions.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png - install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-user.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png - install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/32-wine.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png - install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/daemons.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png - install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png - install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/userconfig.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png - install -D -p -m0644 $(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png \ - $(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png - - # install lintian overrides - install -D -p -m0644 debian/tde-guidance-trinity.lintian-overrides \ - $(DEB_DESTDIR)/usr/share/lintian/overrides/tde-guidance-trinity - - # fix binary-or-shlib-defines-rpath - chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/trinity/kcm_*.so* - - # fix executable-not-elf-or-script - chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png - - # fix the link properly - mkdir -p debian/tde-guidance-trinity/opt/trinity/bin - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/mountconfig.py mountconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/serviceconfig.py serviceconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/userconfig.py userconfig) - (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/wineconfig.py wineconfig) -# (cd debian/tde-guidance-trinity/opt/trinity/bin; ln -sf $(GUIDANCE_INST_PATH)/grubconfig.py grubconfig) - - # move python modules in PYSUPPORT_PATH - mkdir -p $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/tde-guidance-trinity -# cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/tde-guidance-trinity - - # fix script-not-executable - chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/fuser.py -# chmod 0755 $(PYSUPPORT_PATH)/tde-guidance-trinity/grubconfig.py - - : # Replace all '#!' calls to python with /usr/bin/python - : # and make them executable - for i in `find debian/tde-guidance-trinity -type f`; do \ - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $$i > $$i.temp; \ - if cmp --quiet $$i $$i.temp; then \ - rm -f $$i.temp; \ - else \ - mv -f $$i.temp $$i; \ - chmod 755 $$i; \ - echo "fixed interpreter: $$i"; \ - fi; \ - done - -install/guidance-backends-trinity:: - mkdir -p $(PYSUPPORT_PATH)/guidance-backends-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity - cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity - -clean:: - rm -rf build - - rm -rf doc/en/*html doc/en/*bz2 - rm -f serviceconfig/kcm_serviceconfig.cpp - rm -f mountconfig/kcm_mountconfig.cpp - rm -f displayconfig/kcm_displayconfig.cpp - rm -f userconfig/kcm_userconfig.cpp - rm -f install_log.txt - rm -f po/*.gmo - rm -f po/*.pot - - # clean up edited .desktop etc files - if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \ - sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \ - for file in `cat LIST`; do \ - sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \ - done; \ - rm -f LIST; \ - fi - -common-install-prehook-impl:: - # generate form implementation using pytde user interface compiler - - mkdir -p po - touch list - find -name "*.py" >> list - xgettext -ki18n -LPython -flist -o po/guidance.pot - rm list - - for file in po/*pot; do \ - sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \ - done - - # generate .po files for .desktop etc files - if [ -z $${KUBUNTU_DESKTOP_POT} ]; then \ - KUBUNTU_DESKTOP_POT=$(DEB_SOURCE_PACKAGE); \ - fi; \ - echo KUBUNTU_DESKTOP_POT: $${KUBUNTU_DESKTOP_POT}; \ - if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \ - sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \ - cat LIST; \ - perl /usr/lib/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \ - msguniq --to-code=UTF-8 --no-wrap -o desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null; \ - python /usr/lib/kubuntu-desktop-i18n/msgsplit desktop.$${KUBUNTU_DESKTOP_POT}; \ - mv desktop.$${KUBUNTU_DESKTOP_POT} po/desktop_$${KUBUNTU_DESKTOP_POT}.pot; \ - rm -f desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \ - # add translation domain to files \ - for file in `cat LIST`; do \ - echo X-Ubuntu-Gettext-Domain=desktop_$${KUBUNTU_DESKTOP_POT} >> $${file}; \ - done; \ - rm -f LIST; \ - fi - - rm -f tde-guidance-trinity/usr/share/python-support/tde-guidance-trinity/.version +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 deleted file mode 100644 index 8ef180de8..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.TH "SERVICECONFIG" "1" "aout 2, 2005" "" "" -.SH "NAME" -serviceconfig \- Service/daemon administration tool -.SH "SYNOPSIS" -.B serviceconfig -.RI [ options ] -.br -.SH "DESCRIPTION" -This manual page documents briefly the -.B serviceconfig -commands. This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBserviceconfig\fP is a service/daemon administration tool. -.SH "OPTIONS" -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`\-'). -A summary of options is included below. -.TP -.B \-\-help -Show summary of options. -.TP -.B \-\-help\-qt -Show QT specific help (common for all QT apps). -.TP -.B \-\-help\-tde -Show TDE specific help (common for all TDE apps). -.TP -.B \-\-help\-all -Show the complete help. -.TP -.B \-\-author -Show program author(s). -.TP -.B \-v, \-\-version -Show version of program. -.TP -.B \-\-license -Show program license. -.SH "SEE ALSO" -.BR displayconfig (1), -.BR displayconfig-restore (1), -.BR mountconfig (1), -.BR userconfig (1). -.br -.SH "AUTHOR" -serviceconfig was written by <simon@simonzone.com>. -.PP -This manual page was written by Fathi Boudra <fboudra@free.fr>, -for the Debian project (but may be used by others). diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install index e6a81f4d4..d39b3faac 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install @@ -1,68 +1,16 @@ -opt/trinity/lib/trinity/kcm_serviceconfig.la -opt/trinity/lib/trinity/kcm_userconfig.la -opt/trinity/lib/trinity/kcm_mountconfig.la -opt/trinity/lib/trinity/kcm_wineconfig.la -opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png -opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png -opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png -opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png -opt/trinity/share/icons/crystalsvg/16x16/apps/daemons.png -opt/trinity/share/icons/crystalsvg/16x16/apps/disksfilesystems.png -opt/trinity/share/icons/crystalsvg/16x16/apps/userconfig.png -opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png -opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2 -opt/trinity/share/doc/tde/HTML/en/guidance/index.html -opt/trinity/share/applications/tde/serviceconfig.desktop -opt/trinity/share/applications/tde/userconfig.desktop -opt/trinity/share/applications/tde/mountconfig.desktop -opt/trinity/share/applications/tde/wineconfig.desktop -opt/trinity/share/apps/guidance/pics/laserwarn.png -opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png -opt/trinity/share/apps/guidance/pics/hi16-encrypted.png -opt/trinity/share/apps/guidance/pics/hi32-user.png -opt/trinity/share/apps/guidance/pics/hi32-group.png -opt/trinity/share/apps/guidance/pics/hi32-identity.png -opt/trinity/share/apps/guidance/pics/hi32-password.png -opt/trinity/share/apps/guidance/pics/kcmpartitions.png -opt/trinity/share/apps/guidance/pics/trinity1.png -opt/trinity/share/apps/guidance/pics/trinity2.png -opt/trinity/share/apps/guidance/pics/trinity3.png -opt/trinity/share/apps/guidance/pics/trinity4.png -opt/trinity/share/apps/guidance/pics/trinity5.png -opt/trinity/share/apps/guidance/pics/trinity6.png -opt/trinity/share/apps/guidance/pics/hi32-samba.png -opt/trinity/share/apps/guidance/pics/hi16-hdd.png -opt/trinity/share/apps/guidance/pics/hi16-cdrom.png -opt/trinity/share/apps/guidance/pics/hi16-burner.png -opt/trinity/share/apps/guidance/pics/hi16-floppy.png -opt/trinity/share/apps/guidance/pics/hi16-blockdevice.png -opt/trinity/share/apps/guidance/pics/hi16-password.png -opt/trinity/share/apps/guidance/pics/hi16-memory.png -opt/trinity/share/apps/guidance/pics/hi16-network.png -opt/trinity/share/apps/guidance/pics/hi16-lock.png -opt/trinity/share/apps/guidance/pics/hi16-usbpen.png -opt/trinity/share/apps/guidance/pics/greenled.png -opt/trinity/share/apps/guidance/pics/greyled.png -opt/trinity/share/apps/guidance/pics/exec.png -opt/trinity/share/apps/guidance/pics/file.png -opt/trinity/share/apps/guidance/pics/important.png -opt/trinity/share/apps/guidance/pics/tux.png -opt/trinity/share/apps/guidance/pics/user.png -opt/trinity/share/apps/guidance/pics/32-wine.png -opt/trinity/share/apps/guidance/pics/kdewinewizard.png -opt/trinity/share/python-support/tde-guidance-trinity/SMBShareSelectDialog.py -opt/trinity/share/python-support/tde-guidance-trinity/SimpleCommandRunner.py -opt/trinity/share/python-support/tde-guidance-trinity/fuser.py -opt/trinity/share/python-support/tde-guidance-trinity/fuser_ui.py -#opt/trinity/share/python-support/tde-guidance-trinity/grubconfig.py -opt/trinity/share/python-support/tde-guidance-trinity/mountconfig.py -opt/trinity/share/python-support/tde-guidance-trinity/serviceconfig.py -opt/trinity/share/python-support/tde-guidance-trinity/sizeview.py -opt/trinity/share/python-support/tde-guidance-trinity/unixauthdb.py -opt/trinity/share/python-support/tde-guidance-trinity/userconfig.py -opt/trinity/share/python-support/tde-guidance-trinity/wineconfig.py -opt/trinity/lib/trinity/kcm_serviceconfig.so -opt/trinity/lib/trinity/kcm_userconfig.so -opt/trinity/lib/trinity/kcm_mountconfig.so -opt/trinity/lib/trinity/kcm_wineconfig.so -usr/share/lintian/overrides/tde-guidance-trinity +opt/trinity/bin +opt/trinity/lib/trinity +opt/trinity/share/applications/tde +opt/trinity/share/apps/guidance/pics +opt/trinity/share/doc +opt/trinity/share/icons/crystalsvg +opt/trinity/share/man/man1 +usr/lib/python*/dist-packages/tde-guidance/SMBShareSelectDialog.py +usr/lib/python*/dist-packages/tde-guidance/SimpleCommandRunner.py +usr/lib/python*/dist-packages/tde-guidance/fuser.py +usr/lib/python*/dist-packages/tde-guidance/fuser_ui.py +usr/lib/python*/dist-packages/tde-guidance/mountconfig.py +usr/lib/python*/dist-packages/tde-guidance/serviceconfig.py +usr/lib/python*/dist-packages/tde-guidance/sizeview.py +usr/lib/python*/dist-packages/tde-guidance/unixauthdb.py +usr/lib/python*/dist-packages/tde-guidance/userconfig.py diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides index f151ee69f..e83480662 100644 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides @@ -1,4 +1,2 @@ # false positive warnings from lintian -tde-guidance-trinity: postinst-has-useless-call-to-ldconfig -tde-guidance-trinity: postrm-has-useless-call-to-ldconfig tde-guidance-trinity: package-has-a-duplicate-relation depends diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst deleted file mode 100644 index af8e365b5..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Remove shutdown and reboot links; this init script does not need them. -rm -f /etc/rc0.d/K20tde-guidance /etc/rc6.d/K20tde-guidance - -#remove script from older times -update-rc.d -f displayconfig-hwprobe.py remove - -#DEBHELPER# diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 deleted file mode 100644 index 1fda3dd19..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp <n> insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.TH "USERCONFIG" "1" "aout 2, 2005" "" "" -.SH "NAME" -userconfig \- user and group administration tool -.SH "SYNOPSIS" -.B userconfig -.RI [ options ] -.br -.SH "DESCRIPTION" -This manual page documents briefly the -.B userconfig -commands. This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBuserconfig\fP is an user and group administration tool. -.SH "OPTIONS" -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`\-'). -A summary of options is included below. -.TP -.B \-\-help -Show summary of options. -.TP -.B \-\-help\-qt -Show QT specific help (common for all QT apps). -.TP -.B \-\-help\-tde -Show TDE specific help (common for all TDE apps). -.TP -.B \-\-help\-all -Show the complete help. -.TP -.B \-\-author -Show program author(s). -.TP -.B \-v, \-\-version -Show version of program. -.TP -.B \-\-license -Show program license. -.SH "SEE ALSO" -.BR displayconfig (1), -.BR displayconfig-restore (1), -.BR mountconfig (1), -.BR serviceconfig (1). -.br -.SH "AUTHOR" -userconfig was written by <simon@simonzone.com>. -.PP -This manual page was written by Fathi Boudra <fboudra@free.fr>, -for the Debian project (but may be used by others). diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/watch b/ubuntu/_base/applications/settings/tde-guidance/debian/watch deleted file mode 100644 index 19912c171..000000000 --- a/ubuntu/_base/applications/settings/tde-guidance/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/tde-systemsettings/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/applications/settings/tde-systemsettings/debian/compat b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat +++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control index 0da5ee76a..9ab49cc98 100644 --- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control +++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control @@ -2,7 +2,7 @@ Source: tde-systemsettings-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-systemsettings-trinity diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/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/applications/settings/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control index 6ab8cc8fc..1c572b7d4 100644 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control @@ -2,8 +2,8 @@ Source: tdenetworkmanager-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, - cmake-trinity, ninja-build, +Build-Depends: cdbs, debhelper (>= 10~), quilt, + tde-cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev, libnl-3-dev | libnl-dev (>= 1.1) diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian index 22bd678da..93aadf394 100644 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian @@ -1,5 +1,3 @@ network-manager-tde: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdenetworkmanager.so network-manager-tde: package-name-doesnt-match-sonames libtdeinit-tdenetworkmanager -network-manager-tde: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so -network-manager-tde: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdenetworkmanager.so diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst deleted file mode 100644 index df7b9dba2..000000000 --- a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# postinst script for network-manager-tde - -set -e - -if [ "$1" = "configure" ] ; then - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/tdesudo/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/applications/settings/tdesudo/debian/compat b/ubuntu/_base/applications/settings/tdesudo/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/tdesudo/debian/compat +++ b/ubuntu/_base/applications/settings/tdesudo/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/control b/ubuntu/_base/applications/settings/tdesudo/debian/control index 0742eb9dd..8809724e2 100644 --- a/ubuntu/_base/applications/settings/tdesudo/debian/control +++ b/ubuntu/_base/applications/settings/tdesudo/debian/control @@ -2,7 +2,7 @@ Source: tdesudo-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdesudo-trinity diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/settings/wlassistant/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/applications/settings/wlassistant/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/settings/wlassistant/debian/compat +++ b/ubuntu/_base/applications/settings/wlassistant/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control index f1908c8ab..1b45a6f07 100644 --- a/ubuntu/_base/applications/settings/wlassistant/debian/control +++ b/ubuntu/_base/applications/settings/wlassistant/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev Standards-Version: 3.8.4 Package: wlassistant-trinity diff --git a/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/dolphin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/dolphin/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/applications/system/dolphin/debian/compat b/ubuntu/_base/applications/system/dolphin/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/dolphin/debian/compat +++ b/ubuntu/_base/applications/system/dolphin/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/dolphin/debian/control b/ubuntu/_base/applications/system/dolphin/debian/control index a6b83f6dd..9ba8e229c 100644 --- a/ubuntu/_base/applications/system/dolphin/debian/control +++ b/ubuntu/_base/applications/system/dolphin/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libkonq4-trinity-dev, tdebase-trinity-dev Standards-Version: 3.8.4 Package: dolphin-trinity diff --git a/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/katapult/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/katapult/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/applications/system/katapult/debian/compat b/ubuntu/_base/applications/system/katapult/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/katapult/debian/compat +++ b/ubuntu/_base/applications/system/katapult/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/katapult/debian/control b/ubuntu/_base/applications/system/katapult/debian/control index 5583560d3..e36558fc3 100644 --- a/ubuntu/_base/applications/system/katapult/debian/control +++ b/ubuntu/_base/applications/system/katapult/debian/control @@ -2,7 +2,7 @@ Source: katapult-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, libxi-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxi-dev Standards-Version: 3.8.4 Package: katapult-trinity diff --git a/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kbfx/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kbfx/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/applications/system/kbfx/debian/compat b/ubuntu/_base/applications/system/kbfx/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kbfx/debian/compat +++ b/ubuntu/_base/applications/system/kbfx/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kbfx/debian/control b/ubuntu/_base/applications/system/kbfx/debian/control index e82ef297c..29ad9b721 100644 --- a/ubuntu/_base/applications/system/kbfx/debian/control +++ b/ubuntu/_base/applications/system/kbfx/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbfx-trinity diff --git a/ubuntu/_base/applications/system/kbfx/debian/postinst b/ubuntu/_base/applications/system/kbfx/debian/postinst deleted file mode 100644 index e95a6906b..000000000 --- a/ubuntu/_base/applications/system/kbfx/debian/postinst +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# postinst script for kbfx - -set -e - -case "$1" in - configure) - ldconfig - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kcmautostart/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kcmautostart/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/applications/system/kcmautostart/debian/compat b/ubuntu/_base/applications/system/kcmautostart/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kcmautostart/debian/compat +++ b/ubuntu/_base/applications/system/kcmautostart/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kcmautostart/debian/control b/ubuntu/_base/applications/system/kcmautostart/debian/control index 32c10296f..cf5da73c2 100644 --- a/ubuntu/_base/applications/system/kcmautostart/debian/control +++ b/ubuntu/_base/applications/system/kcmautostart/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcontrol-autostart-trinity diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kdbusnotification/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kdbusnotification/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/applications/system/kdbusnotification/debian/compat b/ubuntu/_base/applications/system/kdbusnotification/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kdbusnotification/debian/compat +++ b/ubuntu/_base/applications/system/kdbusnotification/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kdbusnotification/debian/control b/ubuntu/_base/applications/system/kdbusnotification/debian/control index e5e6d5469..bfebf027e 100644 --- a/ubuntu/_base/applications/system/kdbusnotification/debian/control +++ b/ubuntu/_base/applications/system/kdbusnotification/debian/control @@ -2,7 +2,7 @@ Source: kdbusnotification-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, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev Standards-Version: 3.8.4 Package: kdbusnotification-trinity diff --git a/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/klamav/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/klamav/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/applications/system/klamav/debian/compat b/ubuntu/_base/applications/system/klamav/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/klamav/debian/compat +++ b/ubuntu/_base/applications/system/klamav/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/klamav/debian/control b/ubuntu/_base/applications/system/klamav/debian/control index 6e37ec7ee..833f05123 100644 --- a/ubuntu/_base/applications/system/klamav/debian/control +++ b/ubuntu/_base/applications/system/klamav/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Scott Kitterman <scott@kitterman.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libclamav-dev (>= 0.102~) Standards-Version: 3.8.4 Package: klamav-trinity diff --git a/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/knemo/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/knemo/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/applications/system/knemo/debian/compat b/ubuntu/_base/applications/system/knemo/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/knemo/debian/compat +++ b/ubuntu/_base/applications/system/knemo/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/knemo/debian/control b/ubuntu/_base/applications/system/knemo/debian/control index 447402a7d..e325d1a14 100644 --- a/ubuntu/_base/applications/system/knemo/debian/control +++ b/ubuntu/_base/applications/system/knemo/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libiw-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libiw-dev Standards-Version: 3.8.4 Package: knemo-trinity diff --git a/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/knetload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/knetload/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/applications/system/knetload/debian/compat b/ubuntu/_base/applications/system/knetload/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/knetload/debian/compat +++ b/ubuntu/_base/applications/system/knetload/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/knetload/debian/control b/ubuntu/_base/applications/system/knetload/debian/control index e1286fc48..ba4059f72 100644 --- a/ubuntu/_base/applications/system/knetload/debian/control +++ b/ubuntu/_base/applications/system/knetload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev (>= 4:3.4.2) Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/ubuntu/_base/applications/system/knetload/debian/patches/series b/ubuntu/_base/applications/system/knetload/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/system/knetload/debian/patches/series +++ b/ubuntu/_base/applications/system/knetload/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/knetstats/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/knetstats/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/applications/system/knetstats/debian/compat b/ubuntu/_base/applications/system/knetstats/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/knetstats/debian/compat +++ b/ubuntu/_base/applications/system/knetstats/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/knetstats/debian/control b/ubuntu/_base/applications/system/knetstats/debian/control index ae8580131..f559e7a13 100644 --- a/ubuntu/_base/applications/system/knetstats/debian/control +++ b/ubuntu/_base/applications/system/knetstats/debian/control @@ -2,7 +2,7 @@ Source: knetstats-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://knetstats.sourceforge.net/ diff --git a/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kooldock/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kooldock/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/applications/system/kooldock/debian/compat b/ubuntu/_base/applications/system/kooldock/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kooldock/debian/compat +++ b/ubuntu/_base/applications/system/kooldock/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kooldock/debian/control b/ubuntu/_base/applications/system/kooldock/debian/control index 9af925609..8ad561f40 100644 --- a/ubuntu/_base/applications/system/kooldock/debian/control +++ b/ubuntu/_base/applications/system/kooldock/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Homepage: http://sourceforge.net/projects/kooldock/ diff --git a/ubuntu/_base/applications/system/kooldock/debian/docs b/ubuntu/_base/applications/system/kooldock/debian/docs index c17f03764..76c3076c9 100644 --- a/ubuntu/_base/applications/system/kooldock/debian/docs +++ b/ubuntu/_base/applications/system/kooldock/debian/docs @@ -1,4 +1,3 @@ AUTHORS -NEWS -README +README.md TODO diff --git a/ubuntu/_base/applications/system/kpowersave/debian/changelog b/ubuntu/_base/applications/system/kpowersave/debian/changelog deleted file mode 100644 index 555de82cf..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/changelog +++ /dev/null @@ -1,372 +0,0 @@ -kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low - - * Karmic rebuild - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 Jul 2009 16:08:00 -0600 - -kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low - - * Moved Trinity to /opt/trinity - * Integrated properly with KDE4.2+ - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 05 March 2009 29:52:00 -0600 - -kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low - - * Added -trinity suffix - - -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 14 Dec 2008 15:12:00 -0600 - -kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low - - * Merge from debian unstable, remaining changes: - - debian/patches/kubuntu_02_messages_target.diff - - Modified maintainer field per specification - - -- Harald Sitter <apachelogger@ubuntu.com> Fri, 25 Jan 2008 09:54:46 +0000 - -kpowersave (0.7.3-2) unstable; urgency=low - - * debian/control - - Bump Standards-Version to 3.7.3. No further changes required. - - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support. - Let the hal package depend on the correct suspend framework. - - -- Michael Biebl <biebl@debian.org> Fri, 25 Jan 2008 06:02:09 +0100 - -kpowersave (0.7.3-1ubuntu1) hardy; urgency=low - - * Merge from debian unstable. - * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class. - * Remaining Ubuntu changes: - - debian/patches/kubuntu_02_messages_target.diff - - -- Jonathan Patrick Davies <jpatrick@kubuntu.org> Wed, 24 Oct 2007 20:41:44 +0200 - -kpowersave (0.7.3-1) unstable; urgency=low - - * New upstream release. - - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy (). - Closes: #422057 - * debian/control - - Use the new "Homepage:" field to specify the upstream URL. - - Add a Build-Conflicts against autoconf2.13. - * debian/menu - - Update to the new menu spec. - * debian/patches/10-kpowersave-crash-on-getenv.patch - - Removed, fixed upstream. - * debian/patches/06-handle_failed_suspend.patch - - Removed, merged upstream. - * debian/patches/05-restore_window.patch - - Removed, merged upstream. - * debian/patches/04-default_config.patch - - Updated, wodim is now already in the application blacklist that is - provided by upstream. - - -- Michael Biebl <biebl@debian.org> Thu, 04 Oct 2007 12:48:39 +0200 - -kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low - - * Merge from debian unstable. - * Remaining Ubuntu changes: - * debian/control: change Maintainer field - * debian/patches/kubuntu_01_kdepot.patch - * debian/patches/kubuntu_02_messages_target.diff - - -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 19 May 2007 13:22:26 +1000 - -kpowersave (0.7.2-3) unstable; urgency=low - - * debian/patches/10-kpowersave-crash-on-getenv.patch - - Fixes a crash when the environment variable DESKTOP_SESSION is not set. - Patch by Pierre Habouzit, thanks! Closes: #422420 - - -- Michael Biebl <biebl@debian.org> Wed, 25 Apr 2007 21:07:05 +0200 - -kpowersave (0.7.2-2) unstable; urgency=low - - * Upload to unstable. - * debian/patches/05-restore_window.patch - - Pull from svn. Properly restore minimized configuration dialog. - Closes: #413638 - * debian/patches/06-handle_failed_suspend.patch - - Pull from svn. Check the return code of the Suspend() method and display - a message box if it failed. Closes: #413811 - - -- Michael Biebl <biebl@debian.org> Wed, 25 Apr 2007 20:40:41 +0200 - -kpowersave (0.7.2-1ubuntu1) feisty; urgency=low - - * Merge from debian experimental - * Dropped Ubuntu changes: - * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not - conflict anymore - * debian/rules: remove dh_iconcache - done by cdbs - * Remaining Ubuntu changes: - * debian/control: change Maintainer field - * debian/patches/kubuntu_01_kdepot.patch - * debian/patches/kubuntu_02_messages_target.diff - - -- Luka Renko <lure@ubuntu.com> Mon, 19 Mar 2007 22:30:13 +0100 - -kpowersave (0.7.2-1) experimental; urgency=low - - * New upstream release. Closes: #412647 - * debian/patches/01-autoconf_2.6.patch, - debian/patches/02-close_dialog_on_destroy.patch - - Removed, merged upstream. - * debian/patches/04-default_config.patch - - Add wodim to application blacklist. - - Do not unmount external media on suspend. - kded/mediamanager in Debian is missing a patch which would allow that. - * Beginning with this version, the dependency on powersaved as backend has - been dropped. All the heavy lifting is done via HAL now. - Update debian/control accordingly: - - Remove build dependency on libpowersave-dev. - - Remove dependency on powersaved, add a versioned dependency on - hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support). - - For proper suspend/resume support, hal should use one of the existing - suspend frameworks. Add Recommends on these packages. - - Update the package description. - - -- Michael Biebl <biebl@debian.org> Mon, 5 Mar 2007 07:24:09 +0100 - -kpowersave (0.7.2-0ubuntu1) feisty; urgency=low - - * New upstream release: uses HAL directly (no powersave dependency) - * Changes: - * drop 01-autoconf_2.6.patch: included upstream - * drop 02-close_dialog_on_destroy.patch: included upstream - * drop 03-reset_blankonly_to_default.patch: fixed upstream - * update kubuntu_01_kdepot.patch to apply - * drop Build-Depends on libpowersave-dev: now uses HAL - * drop Depends on powersaved: now uses HAL - * update Maintainer field - * UVF exception approved by MOTU https://launchpad.net/bugs/88793 - - -- Luka Renko <lure@ubuntu.com> Wed, 28 Feb 2007 22:35:46 +0100 - -kpowersave (0.6.2-5ubuntu1) feisty; urgency=low - - * Merge from debian unstable, remaining changes: - - Added dh_iconcache - - Add kubuntu_02_messages_target.diff fix messages - target for .pot generation - - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta - - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce - its removal. - - -- ville palo <vi64pa@gmail.com> Sun, 21 Jan 2007 09:21:00 +0000 - -kpowersave (0.6.2-5) unstable; urgency=low - - * Prepend a sequence number to all patches. - * debian/patches/03-reset_blankonly_to_default.patch - - Added. Reset tdescreensaver settings to correct default values on scheme - changes and on application shutdown. - Patch by Modestas Vainius, thanks! Closes: #399473 - - -- Michael Biebl <biebl@debian.org> Sat, 20 Jan 2007 19:49:40 +0100 - -kpowersave (0.6.2-4) unstable; urgency=low - - * debian/patches/close_dialog_on_destroy.patch - - Added. Correctly close the information dialog when activated over dcop. - Closes: #398201 - - -- Michael Biebl <biebl@debian.org> Mon, 13 Nov 2006 06:05:56 +0100 - -kpowersave (0.6.2-3) unstable; urgency=low - - * Update maintainer email address to biebl@debian.org. - - -- Michael Biebl <biebl@debian.org> Fri, 20 Oct 2006 00:04:12 +0200 - -kpowersave (0.6.2-2ubuntu2) edgy; urgency=low - - * Rebuild against dbus 0.90 - - -- Sebastian Dröge <slomo@ubuntu.com> Wed, 30 Aug 2006 22:04:58 +0200 - -kpowersave (0.6.2-2ubuntu1) edgy; urgency=low - - * Merge from debian unstable. - - -- Luka Renko <lure@ubuntu.com> Sat, 12 Aug 2006 17:17:17 +0200 - -kpowersave (0.6.2-2) unstable; urgency=medium - - * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824 - - -- Michael Biebl <biebl@teco.edu> Tue, 25 Jul 2006 23:10:10 +0200 - -kpowersave (0.6.2-1) unstable; urgency=low - - * New upstream release. - - Display correct warning message if user lacks permissions to connect to - powersaved over dbus. Closes: #356609 - * Requires powersave 0.12.8 or newer. - - -- Michael Biebl <biebl@teco.edu> Sat, 24 Jun 2006 19:16:02 +0200 - -kpowersave (0.6.1-1) unstable; urgency=low - - * New upstream release. - * Corrected typo in package description. Closes: #364191 - * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream. - * Bumped Standards-Version to 3.7.2, no further changes required. - - -- Michael Biebl <biebl@teco.edu> Mon, 15 May 2006 02:28:48 +0200 - -kpowersave (0.6.0-1ubuntu4) dapper; urgency=low - - * Added dh_iconcache - - -- Sarah Hobbs <hobbsee@ubuntu.com> Sat, 13 May 2006 20:16:04 +1000 - -kpowersave (0.6.0-1ubuntu3) dapper; urgency=low - - * Add kubuntu_02_messages_target.diff fix messages - target for .pot generation - - -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 14 Apr 2006 15:03:01 +0000 - -kpowersave (0.6.0-1ubuntu2) dapper; urgency=low - - * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta - - -- Anthony Mercatante <tonio@ubuntu.com> Thu, 13 Apr 2006 00:40:57 +0200 - -kpowersave (0.6.0-1ubuntu1) dapper; urgency=low - - * Added kpowersave-fix-utf8_in_eventrc.diff - - -- Luka Renko <lure.net@gmail.com> Wed, 12 Apr 2006 19:39:57 +0200 - -kpowersave (0.6.0-1) unstable; urgency=low - - * New upstream release. - * Requires powersave 0.12.7 or newer. - * Added build dependency on libxtst-dev. - * Added kpowersave-fix-utf8_in_eventrc.diff. - - -- Michael Biebl <biebl@teco.edu> Mon, 17 Apr 2006 18:21:14 +0200 - -kpowersave (0.5.11-1ubuntu1) dapper; urgency=low - - * New upstream release. - - -- Luka Renko <lure.net@gmail.com> Sun, 26 Mar 2006 18:59:38 +0200 - -kpowersave (0.5.11-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl <biebl@teco.edu> Thu, 23 Mar 2006 09:45:35 +0100 - -kpowersave (0.5.10-1ubuntu1) dapper; urgency=low - - * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal. - - -- Michael Biebl <biebl@teco.edu> Thu, 9 Mar 2006 23:05:33 +0100 - -kpowersave (0.5.10-1) unstable; urgency=low - - * New upstream release. - * Requires powersave 0.12.2 or newer. - - -- Michael Biebl <biebl@teco.edu> Tue, 7 Mar 2006 23:45:01 +0100 - -kpowersave (0.5.9-1) unstable; urgency=low - - * New upstream release. - * Requires powersave 0.12.1 or newer. - - -- Michael Biebl <biebl@teco.edu> Thu, 2 Mar 2006 18:43:24 +0100 - -kpowersave (0.5.8-1) unstable; urgency=low - - * New upstream release. - * Bumped debhelper compatibility to 5. - - -- Michael Biebl <biebl@teco.edu> Tue, 21 Feb 2006 10:51:35 +0100 - -kpowersave (0.5.7-1) unstable; urgency=low - - * New upstream release. - - kpowersave now shows correct instructions how to start the powersaved - daemon. Closes: #352218 - - Layout problem in the information dialog has been fixed. Closes: #352684 - * Corrected formatting of the homepage url in the long description. - - -- Michael Biebl <biebl@teco.edu> Tue, 14 Feb 2006 23:27:37 +0100 - -kpowersave (0.5.6-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl <biebl@teco.edu> Tue, 7 Feb 2006 02:51:39 +0100 - -kpowersave (0.5.5-1) unstable; urgency=low - - * New upstream release. - * Removed build dependency on libcpufreq-dev as it is now correctly handled - by libpowersave-dev. - - -- Michael Biebl <biebl@teco.edu> Tue, 31 Jan 2006 01:32:36 +0100 - -kpowersave (0.5.4-1) unstable; urgency=low - - * New upstream release. - - -- Michael Biebl <biebl@teco.edu> Mon, 23 Jan 2006 23:14:39 +0100 - -kpowersave (0.5.3-1) unstable; urgency=low - - * New upstream release. - * Requires powersave 0.11.5 or newer. - - -- Michael Biebl <biebl@teco.edu> Wed, 18 Jan 2006 05:10:26 +0100 - -kpowersave (0.5.2-1ubuntu1) dapper; urgency=low - - * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting - automatically in GNOME (Closes: Malone #32340). - - -- Raphaël Pinson <raphink@ubuntu.com> Sat, 4 Mar 2006 17:22:09 +0100 - -kpowersave (0.5.2-1) unstable; urgency=low - - * New upstream release. - * Removed patches absolute_build_path_fix.diff and sound_files_path.diff, - fixed upstream. - * Tightened dependencies on powersave, version 0.11.2 or newer is required. - * Use Debian libtool and regenerate the autotools files. - + Added build dependencies to automake1.9, autoconf and libtool. - * hal and dbus are now mandatory. Added the corresponding build - dependencies. - * Removed the build dependency on libqt3-compat-headers. Package has been - fixed upstream to compile cleanly without it. - - -- Michael Biebl <biebl@teco.edu> Mon, 16 Jan 2006 02:02:45 +0100 - -kpowersave (0.5.0-1) unstable; urgency=low - - * New upstream release. - * This release was not uploaded to unstable. - - -- Michael Biebl <biebl@teco.edu> Tue, 10 Jan 2006 02:25:11 +0100 - -kpowersave (0.4.5-2) unstable; urgency=low - - * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with - powersaved (>= 0.10). - - -- Michael Biebl <biebl@teco.edu> Sun, 8 Jan 2006 18:00:08 +0100 - -kpowersave (0.4.5-1) unstable; urgency=low - - * Initial release. Closes: #329922 - - -- Michael Biebl <biebl@teco.edu> Wed, 9 Nov 2005 00:53:24 +0100 - diff --git a/ubuntu/_base/applications/system/kpowersave/debian/compat b/ubuntu/_base/applications/system/kpowersave/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ubuntu/_base/applications/system/kpowersave/debian/control b/ubuntu/_base/applications/system/kpowersave/debian/control deleted file mode 100644 index b69ba98ed..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/control +++ /dev/null @@ -1,42 +0,0 @@ -Source: kpowersave-trinity -Section: tde -Priority: optional -Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev -Standards-Version: 3.8.4 -Homepage: http://sourceforge.net/projects/powersave/ - -Package: kpowersave-trinity -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1) -Replaces: kpowersave-kde3 (<< 4:14.0.0~), kpowersave-trinity (<< 4:14.0.0~) -Breaks: kpowersave-kde3 (<< 4:14.0.0~), kpowersave-trinity (<< 4:14.0.0~) -Description: HAL based power management applet for Trinity - KPowersave is a TDE systray applet which allows to control the power - management settings and policies of your computer. - It relies on HAL to do the heavy lifting. - . - Current feature list: - * support for ACPI, APM and PMU - * trigger suspend to disk/ram and standby - * switch cpu frequency policy (between: performance, dynamic and powersave) - * applet icon with information about AC state, battery fill and battery - (warning) states - * applet tooltip with information about battery fill and remaining battery - time/percentage - * autosuspend (to suspend the machine if the user has been inactive for a - defined time) - * a global configurable blacklist with programs which prevent autosuspend - (e.g. videoplayer and cd burning tools) - * trigger lock screen and select the lock method - * KNotify support - * online help - * localisations for many languages - KPowersave supports schemes with following configurable specific - settings for: - * screensaver - * DPMS - * autosuspend - * scheme specific blacklist for autosuspend - * notification settings diff --git a/ubuntu/_base/applications/system/kpowersave/debian/copyright b/ubuntu/_base/applications/system/kpowersave/debian/copyright deleted file mode 100644 index a1557e62e..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/copyright +++ /dev/null @@ -1,28 +0,0 @@ -This package was debianized by Michael Biebl <biebl@teco.edu> on -Sun, 25 Sep 2005 01:12:21 +0200. - -It was downloaded from http://sourceforge.net/projects/powersave/ - -Copyright Holders: - Danny Kukawka <dkukawka@suse.de> - Thomas Renninger <trenn@suse.de> - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -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/applications/system/kpowersave/debian/install b/ubuntu/_base/applications/system/kpowersave/debian/install deleted file mode 100644 index 7b00dd534..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/install +++ /dev/null @@ -1 +0,0 @@ -debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda deleted file mode 100644 index 35bdc35cd..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.linda +++ /dev/null @@ -1,4 +0,0 @@ -Tag: lib-not-in-shlibs - -Tag: no-shlib-file -Data: /opt/trinity/lib/libtdeinit_*.so diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian deleted file mode 100644 index 8f6135226..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave-trinity.lintian +++ /dev/null @@ -1,5 +0,0 @@ -kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave -kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so -kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so - diff --git a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm b/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm deleted file mode 100644 index 99d178492..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/kpowersave.xpm +++ /dev/null @@ -1,628 +0,0 @@ -/* XPM */ -static char * kpowersave_xpm[] = { -"32 32 593 2", -" c None", -". c #6D2121", -"+ c #783738", -"@ c #743E40", -"# c #5D2F30", -"$ c #3E1618", -"% c #8A0200", -"& c #982306", -"* c #A75C4B", -"= c #D3B8BC", -"- c #E9E0E1", -"; c #E7E7ED", -"> c #DDDFE7", -", c #CCCBD7", -"' c #B3ADBB", -") c #827583", -"! c #6A3227", -"~ c #410B00", -"{ c #080000", -"] c #AE381A", -"^ c #C79676", -"/ c #D8C9B7", -"( c #B3B7C2", -"_ c #F2F8FF", -": c #EBEDF4", -"< c #D8D9E3", -"[ c #CBCBD8", -"} c #BEC0CF", -"| c #B4B5C9", -"1 c #A0A4BD", -"2 c #9B90A1", -"3 c #B08583", -"4 c #8F493D", -"5 c #340B02", -"6 c #A71F09", -"7 c #D5BEA2", -"8 c #F1FFFF", -"9 c #EEF2F6", -"0 c #999AAD", -"a c #C8C8D7", -"b c #CFCFDB", -"c c #C2C2D0", -"d c #B6B6C6", -"e c #A8A8BC", -"f c #9B9BB1", -"g c #8685A0", -"h c #8D8EA6", -"i c #AFB8CD", -"j c #ABAFC6", -"k c #9F534D", -"l c #1C0000", -"m c #B63F26", -"n c #DAC1A4", -"o c #DCD9DF", -"p c #EEF3F6", -"q c #B0B6C4", -"r c #AEB0C4", -"s c #BDBECF", -"t c #B2B3C6", -"u c #A6A7BB", -"v c #9A9BB1", -"w c #8C8EA5", -"x c #797D94", -"y c #98A0B4", -"z c #B3BCD0", -"A c #A99EAF", -"B c #C46347", -"C c #2B0C00", -"D c #B63C1A", -"E c #FED76A", -"F c #E2BE8D", -"G c #DCB4A6", -"H c #D6BCBA", -"I c #B3ABB9", -"J c #A9A7B9", -"K c #A4A5B7", -"L c #9EA1B1", -"M c #9798A9", -"N c #9392A1", -"O c #A2969F", -"P c #C29994", -"Q c #CD866F", -"R c #DC6A3D", -"S c #B42A0E", -"T c #160101", -"U c #B53817", -"V c #FFDA34", -"W c #FFF727", -"X c #FCE43C", -"Y c #F5B84C", -"Z c #EDA45F", -"` c #E79B6C", -" . c #E39872", -".. c #E2926F", -"+. c #E08764", -"@. c #E07853", -"#. c #DF623C", -"$. c #DA4925", -"%. c #C83415", -"&. c #B10E04", -"*. c #900000", -"=. c #180000", -"-. c #B53918", -";. c #FFD83B", -">. c #FFF30F", -",. c #FBED00", -"'. c #F2BD00", -"). c #EB8F02", -"!. c #E4650D", -"~. c #DE3B14", -"{. c #D71E15", -"]. c #CF180F", -"^. c #C60D07", -"/. c #BA0100", -"(. c #B10000", -"_. c #AA0000", -":. c #AB0000", -"<. c #980000", -"[. c #170000", -"}. c #FFF312", -"|. c #FBEC00", -"1. c #F2BA00", -"2. c #EA8B00", -"3. c #E45A00", -"4. c #DE2200", -"5. c #D40000", -"6. c #CC0000", -"7. c #C00000", -"8. c #A20103", -"9. c #8D0811", -"0. c #7F1825", -"a. c #6D293B", -"b. c #474158", -"c. c #60637E", -"d. c #7D7D99", -"e. c #9292AB", -"f. c #77779C", -"g. c #FDEE00", -"h. c #F9BF00", -"i. c #E68600", -"j. c #CC5100", -"k. c #AB260B", -"l. c #95161A", -"m. c #83232C", -"n. c #803D48", -"o. c #875E6B", -"p. c #8D7C8A", -"q. c #9698A7", -"r. c #A5ABB8", -"s. c #B7BCC6", -"t. c #CBC7CD", -"u. c #D0CBCF", -"v. c #C7C4CC", -"w. c #CAC9CF", -"x. c #9F9FB8", -"y. c #262641", -"z. c #B63915", -"A. c #FFD838", -"B. c #FFF413", -"C. c #F9EA00", -"D. c #99822F", -"E. c #8D7B67", -"F. c #958B89", -"G. c #A2A5A9", -"H. c #B4BABD", -"I. c #C6CDCE", -"J. c #D2DADA", -"K. c #D5DCE2", -"L. c #CDD5DF", -"M. c #BCC5D7", -"N. c #A0B5D8", -"O. c #83A5D9", -"P. c #6B98DB", -"Q. c #5A8FDE", -"R. c #3C80E3", -"S. c #5E8AD2", -"T. c #B4B0BE", -"U. c #3F3F61", -"V. c #AA372A", -"W. c #F9D742", -"X. c #FFFC02", -"Y. c #B1AB13", -"Z. c #6F7184", -"`. c #EDF1F8", -" + c #EAECEF", -".+ c #CBD4E0", -"++ c #B2C6E0", -"@+ c #97B7E0", -"#+ c #84ADE2", -"$+ c #79A8E5", -"%+ c #6DA2E9", -"&+ c #5E9CED", -"*+ c #5299F8", -"=+ c #509AFD", -"-+ c #529BFE", -";+ c #509CFF", -">+ c #4094FF", -",+ c #3D7EE0", -"'+ c #B4B3C0", -")+ c #5D5C7F", -"!+ c #9D363D", -"~+ c #D1D0B4", -"{+ c #FFF856", -"]+ c #A29E28", -"^+ c #72727F", -"/+ c #E5E2E1", -"(+ c #94B7DB", -"_+ c #97C2EF", -":+ c #A3CBF7", -"<+ c #A6CEFC", -"[+ c #AAD0FF", -"}+ c #ABD1FF", -"|+ c #A1CAFF", -"1+ c #94C4FF", -"2+ c #8ABDFF", -"3+ c #7EB6FF", -"4+ c #6DACFF", -"5+ c #559EFF", -"6+ c #4195FF", -"7+ c #2877EB", -"8+ c #9DA6C2", -"9+ c #767292", -"0+ c #0E0E1C", -"a+ c #9F3636", -"b+ c #C7CED6", -"c+ c #EBEDF5", -"d+ c #BEBCAD", -"e+ c #606061", -"f+ c #D3CECE", -"g+ c #9ABEE5", -"h+ c #D5EBFF", -"i+ c #EEF4FF", -"j+ c #D2E5FF", -"k+ c #BFDAFF", -"l+ c #ACD0FF", -"m+ c #9BC7FF", -"n+ c #8FBFFF", -"o+ c #7FB6FF", -"p+ c #4F9BFF", -"q+ c #2B84FD", -"r+ c #1875F6", -"s+ c #0E6AF1", -"t+ c #075DE3", -"u+ c #8498C5", -"v+ c #8E89A3", -"w+ c #161629", -"x+ c #C8CFCE", -"y+ c #E8EAEB", -"z+ c #D1D1D7", -"A+ c #5C5C5D", -"B+ c #BBB7B7", -"C+ c #A6C0DF", -"D+ c #AAD1FD", -"E+ c #DEECFF", -"F+ c #C4DDFF", -"G+ c #B4D4FF", -"H+ c #A4CAFF", -"I+ c #9AC5FF", -"J+ c #76B1FF", -"K+ c #2C89FF", -"L+ c #016BFE", -"M+ c #0064F8", -"N+ c #005FEE", -"O+ c #005AE5", -"P+ c #0050DD", -"Q+ c #6588C7", -"R+ c #A09AB0", -"S+ c #2A2A44", -"T+ c #C9CFCF", -"U+ c #E5E7E7", -"V+ c #E0E0E0", -"W+ c #676767", -"X+ c #A3A1A1", -"Y+ c #B8C4D9", -"Z+ c #93BFF0", -"`+ c #D6E9FF", -" @ c #BDD9FF", -".@ c #ACCFFF", -"+@ c #A3CAFF", -"@@ c #7BB5FF", -"#@ c #2386FF", -"$@ c #0472FF", -"%@ c #006AFC", -"&@ c #0065F4", -"*@ c #005FEA", -"=@ c #005AE3", -"-@ c #004FDB", -";@ c #4B78C9", -">@ c #A5A0B1", -",@ c #454569", -"'@ c #E4E6E6", -")@ c #E7E7E7", -"!@ c #7D7D7E", -"~@ c #898788", -"{@ c #C7CAD5", -"]@ c #89B6EA", -"^@ c #C7E1FF", -"/@ c #B6D5FF", -"(@ c #ABCEFF", -"_@ c #86BBFF", -":@ c #2F8EFF", -"<@ c #117BFF", -"[@ c #0570FF", -"}@ c #0068F8", -"|@ c #0063F0", -"1@ c #005DE7", -"2@ c #0059DF", -"3@ c #004CD6", -"4@ c #3369CD", -"5@ c #A3A2B4", -"6@ c #585880", -"7@ c #909090", -"8@ c #717072", -"9@ c #C6C4CB", -"0@ c #84AFE7", -"a@ c #B5D7FF", -"b@ c #B5D4FF", -"c@ c #96C4FF", -"d@ c #3A96FF", -"e@ c #1C82FF", -"f@ c #0D77FF", -"g@ c #006BFD", -"h@ c #0066F4", -"i@ c #0061EC", -"j@ c #005BE4", -"k@ c #0055DB", -"l@ c #004ED3", -"m@ c #0D51CB", -"n@ c #9298B7", -"o@ c #6B6A90", -"p@ c #0B0B17", -"q@ c #E5E6E6", -"r@ c #E6E6E6", -"s@ c #9F9F9F", -"t@ c #636265", -"u@ c #BFBABC", -"v@ c #80AAE1", -"w@ c #9FC9FF", -"x@ c #A8CEFF", -"y@ c #4EA1FF", -"z@ c #2489FF", -"A@ c #187EFF", -"B@ c #0069FA", -"C@ c #005EE8", -"D@ c #0058DF", -"E@ c #0052D7", -"F@ c #004DCE", -"G@ c #0047C8", -"H@ c #7B8CBA", -"I@ c #7E7B9B", -"J@ c #1D1D34", -"K@ c #E5E5E5", -"L@ c #AAAAAB", -"M@ c #5E5E60", -"N@ c #B3ADAC", -"O@ c #90ADDA", -"P@ c #78B4FC", -"Q@ c #61ADFF", -"R@ c #2D90FF", -"S@ c #2185FF", -"T@ c #0E78FF", -"U@ c #016CFE", -"V@ c #0066F5", -"W@ c #005CE4", -"X@ c #0055DC", -"Y@ c #0050D3", -"Z@ c #004ACB", -"`@ c #003AC2", -" # c #617CC1", -".# c #8C89A2", -"+# c #2D2D4C", -"@# c #E4E4E4", -"## c #B5B5B5", -"$# c #606062", -"%# c #9D9A9B", -"&# c #ABB6CF", -"*# c #3D94F7", -"=# c #3C9CFF", -"-# c #2C8DFF", -";# c #1A80FF", -"># c #0772FF", -",# c #0068FB", -"'# c #0062F2", -")# c #005BEA", -"!# c #0053E2", -"~# c #004FD9", -"{# c #024BCF", -"]# c #094DC7", -"^# c #1950C0", -"/# c #6681C0", -"(# c #8987A0", -"_# c #41416E", -":# c #E3E3E3", -"<# c #BCBCBC", -"[# c #69696B", -"}# c #858488", -"|# c #BDBAC5", -"1# c #3E8DEF", -"2# c #3094FF", -"3# c #1C84FF", -"4# c #0473FF", -"5# c #0069FD", -"6# c #0364F2", -"7# c #1464E5", -"8# c #296AD7", -"9# c #4A7ACB", -"0# c #6281BF", -"a# c #7B8CB9", -"b# c #9098B4", -"c# c #ABAAB7", -"d# c #B4B2B9", -"e# c #B8B7BD", -"f# c #AAAAB9", -"g# c #8080A3", -"h# c #5B5B8F", -"i# c #A03838", -"j# c #E2E2E2", -"k# c #727274", -"l# c #727276", -"m# c #BDB6BB", -"n# c #508DE5", -"o# c #1579F9", -"p# c #347FE8", -"q# c #5287D9", -"r# c #6B8DCB", -"s# c #8699C1", -"t# c #9BA4BC", -"u# c #BAB8C0", -"v# c #CCC6C4", -"w# c #D1CCC9", -"x# c #D3D0CE", -"y# c #D3D0D6", -"z# c #D1D2E3", -"A# c #D4D6EE", -"B# c #DADBF6", -"C# c #DCDEE9", -"D# c #D4D4D4", -"E# c #BFBFC4", -"F# c #A6A6B9", -"G# c #8686AD", -"H# c #56568C", -"I# c #3E3E79", -"J# c #A13434", -"K# c #CAD4D4", -"L# c #7C7C7D", -"M# c #67676A", -"N# c #ACABB4", -"O# c #AAB1CA", -"P# c #AAB1C9", -"Q# c #C5C2C7", -"R# c #D3CCCA", -"S# c #D7D1D0", -"T# c #DAD7D8", -"U# c #DEDCE0", -"V# c #D8D9EA", -"W# c #CCCFF1", -"X# c #C5C8F6", -"Y# c #C5C9FA", -"Z# c #CACDFF", -"`# c #D0D3FF", -" $ c #D7DAFF", -".$ c #E1E3FF", -"+$ c #EAECFF", -"@$ c #EDEEFD", -"#$ c #E2E3E7", -"$$ c #CBCBC7", -"%$ c #C8C8C4", -"&$ c #BDBDC0", -"*$ c #9E9EAF", -"=$ c #6A6A9D", -"-$ c #840808", -";$ c #C18B8B", -">$ c #EBF3F3", -",$ c #E8F0F0", -"'$ c #BDC2C2", -")$ c #878A8A", -"!$ c #616367", -"~$ c #B1B1B4", -"{$ c #D0CECC", -"]$ c #DEDBD8", -"^$ c #E4E4E2", -"/$ c #E6E6E5", -"($ c #E7E8EA", -"_$ c #D2D4F9", -":$ c #B9BEFD", -"<$ c #B0B5FF", -"[$ c #B4B9FF", -"}$ c #BFC3FF", -"|$ c #C9CEFF", -"1$ c #D5D8FF", -"2$ c #DDDFFF", -"3$ c #E4E7FC", -"4$ c #E3E4EF", -"5$ c #DADBDF", -"6$ c #D1D1D2", -"7$ c #C5C5C5", -"8$ c #B1B1B1", -"9$ c #959595", -"0$ c #717170", -"a$ c #606056", -"b$ c #676782", -"c$ c #17172F", -"d$ c #5C0303", -"e$ c #9E4545", -"f$ c #C08787", -"g$ c #B59F9F", -"h$ c #8F8787", -"i$ c #5D5C5F", -"j$ c #777A7E", -"k$ c #9DA0A4", -"l$ c #B1B2B2", -"m$ c #BCBBBB", -"n$ c #C5C5C3", -"o$ c #D3D3D3", -"p$ c #E1E1E1", -"q$ c #DDDDEA", -"r$ c #D4D6F5", -"s$ c #CED1FD", -"t$ c #D4D6FD", -"u$ c #DDDEF5", -"v$ c #DBDCE7", -"w$ c #D8D8DB", -"x$ c #D0CFCF", -"y$ c #C0C1BF", -"z$ c #ACACAB", -"A$ c #959594", -"B$ c #82827F", -"C$ c #737370", -"D$ c #64646D", -"E$ c #595973", -"F$ c #565680", -"G$ c #48487B", -"H$ c #0D0D1B", -"I$ c #2C0000", -"J$ c #4B0E0E", -"K$ c #541717", -"L$ c #521516", -"M$ c #430E10", -"N$ c #442329", -"O$ c #59535C", -"P$ c #777882", -"Q$ c #97979B", -"R$ c #A7A7A8", -"S$ c #AFAFAE", -"T$ c #BABAB6", -"U$ c #CBCAC6", -"V$ c #D7D8D8", -"W$ c #D9D9DB", -"X$ c #D2D1CF", -"Y$ c #C4C3C1", -"Z$ c #B0AFAD", -"`$ c #9B9B99", -" % c #8B8B88", -".% c #7E7E7D", -"+% c #74747B", -"@% c #66667E", -"#% c #5A5A82", -"$% c #44446F", -"%% c #29294B", -"&% c #131329", -"*% c #06060E", -"=% c #131319", -"-% c #2C2C37", -";% c #545463", -">% c #757584", -",% c #8D8D94", -"'% c #989897", -")% c #A1A19E", -"!% c #A9A9A7", -"~% c #A2A29F", -"{% c #91918E", -"]% c #848484", -"^% c #7A7A85", -"/% c #696983", -"(% c #535376", -"_% c #363659", -":% c #1F1F3C", -"<% c #0D0D1A", -"[% c #12121C", -"}% c #333345", -"|% c #5A5A6F", -"1% c #737385", -"2% c #88888E", -"3% c #7E7E89", -"4% c #686882", -"5% c #50506E", -"6% c #30304C", -"7% c #16162A", -"8% c #080811", -"9% c #1A1A29", -"0% c #2E2E44", -"a% c #26263C", -"b% c #11111F", -" ", -" . + @ # $ ", -" % & * = - ; > , ' ) ! ~ { ", -" ] ^ / ( _ : < [ } | 1 2 3 4 5 ", -"6 7 8 9 0 a b c d e f g h i j k l ", -"m n o p q r s t u v w x y z A B C ", -"D E F G H I J K L M N O P Q R S T ", -"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ", -"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ", -"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ", -"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ", -"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ", -"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ", -"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ", -"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ", -"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ", -"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ", -"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ", -"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ", -"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ", -"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ", -"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ", -"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ", -"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ", -"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ", -"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$", -" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$", -" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ", -" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ", -" [%}%|%1%2%3%4%5%6%7%8% ", -" 9%0%a%b% ", -" "}; diff --git a/ubuntu/_base/applications/system/kpowersave/debian/menu b/ubuntu/_base/applications/system/kpowersave/debian/menu deleted file mode 100644 index c875d9194..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/menu +++ /dev/null @@ -1,7 +0,0 @@ -?package(kpowersave-trinity):\ - needs="X11"\ - section="Applications/System/Monitoring"\ - title="KPowersave"\ - longtitle="Battery monitor and general power management"\ - icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\ - command="/opt/trinity/bin/kpowersave" diff --git a/ubuntu/_base/applications/system/kpowersave/debian/postinst b/ubuntu/_base/applications/system/kpowersave/debian/postinst deleted file mode 100644 index cf7c41189..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for kpowersave-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/system/kpowersave/debian/postrm b/ubuntu/_base/applications/system/kpowersave/debian/postrm deleted file mode 100644 index 99bd13d89..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/postrm +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kpowersave-trinity - -if [ -z "$package_name" ]; then - print >&2 "Internal Error. Please report a bug." - exit 1; -fi - -case "$1" in - remove) - dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh - ;; - purge) - ;; - upgrade) - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/system/kpowersave/debian/preinst b/ubuntu/_base/applications/system/kpowersave/debian/preinst deleted file mode 100644 index 3fe8514bd..000000000 --- a/ubuntu/_base/applications/system/kpowersave/debian/preinst +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kpowersave-trinity - -if [ -z "$package_name" ]; then - print >&2 "Internal Error. Please report a bug." - exit 1; -fi - -case "$1" in - install) - divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"` - if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then - dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh" - divert="" - fi - dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh - ;; - upgrade) - divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"` - if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then - dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh" - divert="" - fi - if [ -z "$divert" ]; then - dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh - fi - ;; - abort-upgrade) - ;; - *) echo "$0: didn't understand being called with \`$1'" 1>&2 - exit 0;; -esac - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/krusader/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/krusader/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/applications/system/krusader/debian/compat b/ubuntu/_base/applications/system/krusader/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/krusader/debian/compat +++ b/ubuntu/_base/applications/system/krusader/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/krusader/debian/control b/ubuntu/_base/applications/system/krusader/debian/control index 98b03a2c2..0dc597981 100644 --- a/ubuntu/_base/applications/system/krusader/debian/control +++ b/ubuntu/_base/applications/system/krusader/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, libkonq4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://krusader.sourceforge.net diff --git a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kshutdown/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kshutdown/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/applications/system/kshutdown/debian/compat b/ubuntu/_base/applications/system/kshutdown/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kshutdown/debian/compat +++ b/ubuntu/_base/applications/system/kshutdown/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kshutdown/debian/control b/ubuntu/_base/applications/system/kshutdown/debian/control index 96b27b2e7..ef9690fce 100644 --- a/ubuntu/_base/applications/system/kshutdown/debian/control +++ b/ubuntu/_base/applications/system/kshutdown/debian/control @@ -2,7 +2,7 @@ Source: kshutdown-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, tdelibs14-trinity-dev Standards-Version: 3.8.1 Package: kshutdown-trinity diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/ksystemlog/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/ksystemlog/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/applications/system/ksystemlog/debian/compat b/ubuntu/_base/applications/system/ksystemlog/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/ksystemlog/debian/compat +++ b/ubuntu/_base/applications/system/ksystemlog/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/ksystemlog/debian/control b/ubuntu/_base/applications/system/ksystemlog/debian/control index 87c685c42..3dc228b22 100644 --- a/ubuntu/_base/applications/system/ksystemlog/debian/control +++ b/ubuntu/_base/applications/system/ksystemlog/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: ksystemlog-trinity diff --git a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/kvkbd/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/kvkbd/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/applications/system/kvkbd/debian/compat b/ubuntu/_base/applications/system/kvkbd/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/kvkbd/debian/compat +++ b/ubuntu/_base/applications/system/kvkbd/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/kvkbd/debian/control b/ubuntu/_base/applications/system/kvkbd/debian/control index 9c315cf0b..fcff08f9b 100644 --- a/ubuntu/_base/applications/system/kvkbd/debian/control +++ b/ubuntu/_base/applications/system/kvkbd/debian/control @@ -2,7 +2,7 @@ Source: kvkbd-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libxtst-dev, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libxtst-dev, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://pan4os.info/main/index.php diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog new file mode 100644 index 000000000..434ce69fc --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/changelog @@ -0,0 +1,67 @@ +polkit-agent-tde (0.99.1-2) unstable; urgency=low + + * Port to TDE and package renaming + * Initial release for TDE + + -- Michele Calgaro <michele.calgaro@yahoo.it> Sun, 19 Dec 2021 18:12:00 +0900 + +polkit-kde-1 (0.99.1-1) unstable; urgency=low + + * Team upload. + + [ Felix Geyer ] + * New upstream release. + - Drop fix_dialog_focus.diff, applied upstream. + - Remove non-functional checkbox "Remember password". (Closes: #691104) + * Remove obsolete /etc/xdg/autostart/polkit-kde-authentication-agent-1.desktop + on upgrade. (Closes: #645440) + * Bump Standards-Version to 3.9.4, no changes needed. + + [ Pino Toscano ] + * The rebuild changes the tdebase-runtime dependency to kde-runtime. + (Closes: #716849) + * Update Vcs-* headers + + -- Felix Geyer <fgeyer@debian.org> Mon, 12 Aug 2013 11:58:57 +0200 + +polkit-kde-1 (0.99.0-3) unstable; urgency=low + + [ Scott Kitterman ] + * Add debian/patches/fix_dialog_focus.diff from Kubuntu + - Prevents the auth dialog from popping up in the background where it can't + be seen + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Jun 2011 11:38:30 +0300 + +polkit-kde-1 (0.99.0-2) unstable; urgency=low + + [ Modestas Vainius ] + * Bump Standards-Version to 3.9.2: no changes needed. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 May 2011 00:28:45 +0300 + +polkit-kde-1 (0.99.0-1) experimental; urgency=low + + * New upstream release. + + [ Modestas Vainius ] + * Add Vcs fields to debian/control. + * Switch to dhmk based debian-qt-kde.mk. + + [ José Manuel SantamarÃa Lema ] + * Bump Standards-Version to 3.9.1, no changes needed. + * Bump libpolkit-qt-1-dev build depend to 0.99.0. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 23 Mar 2011 01:30:52 +0200 + +polkit-kde-1 (0.95.1-2) unstable; urgency=low + + * Update debian/control: add policykit-1 dependency. + + -- Fathi Boudra <fabo@debian.org> Mon, 22 Mar 2010 09:08:17 +0100 + +polkit-kde-1 (0.95.1-1) unstable; urgency=low + + * Initial release. (Closes: #571531) + + -- Fathi Boudra <fabo@debian.org> Thu, 25 Feb 2010 20:43:18 +0100 diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/control b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control new file mode 100644 index 000000000..7fb2e0d3b --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/control @@ -0,0 +1,25 @@ +Source: polkit-agent-tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> +Uploaders: Fathi Boudra <fabo@debian.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libpolkit-tqt-dev +Standards-Version: 3.9.4 +Section: libs + +Package: polkit-agent-tde +Architecture: any +Provides: polkit-1-auth-agent +Replaces: tde-ubuntu-integration +Breaks: tde-ubuntu-integration +Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1 +Conflicts: tde-ubuntu-integration +Description: TDE dialogs for PolicyKit + PolicyKit is an application-level toolkit for defining and handling the policy + that allows unprivileged processes to speak to privileged processes. + . + It is a framework for centralizing the decision making process with respect to + granting access to privileged operations for unprivileged (desktop) applications. + . + PolicyKit-agent-tde provides a D-Bus session bus service that is used to + bring up authentication dialogs used for obtaining privileges. diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright new file mode 100644 index 000000000..a9cebd94f --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/copyright @@ -0,0 +1,52 @@ +This code was ported to TDE and packaged for Debian by: + Michele Calgaro <michele.calgaro@yahoo.it> +and is based on the code downloaded from Debian Snapshot Archive at: + https://snapshot.debian.org/package/polkit-kde-1/0.99.1-1/ + +Original polkit-kde-1 code was packaged for Debian by: + + Fathi Boudra <fabo@debian.org> on Fri, 15 Jan 2010 12:50:13 +0100 + +It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/ + +Upstream Authors: + + Jaroslav Reznik <jreznik@redhat.com> + Gökçen Eraslan <gokcen@pardus.org.tr> + Dario Freddi <drf@kde.org> + Daniel Nicoletti <dantti85-pk@yahoo.com.br> + Dirk Mueller <mueller@kde.org> + +Copyright: + + Copyright (C) 2009 Jaroslav Reznik + Copyright (C) 2007-2008 Gökçen Eraslan + Copyright (C) 2008-2009 Dario Freddi + Copyright (C) 2008 Daniel Nicoletti + Copyright (C) 2008 Dirk Mueller + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2' and +`/usr/share/common-licenses/GPL-3'. + +The Debian packaging is: + + Copyright (C) 2010 Fathi Boudra <fabo@debian.org> + +and is licensed under the GPL version 2 or any later version. diff --git a/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs new file mode 100644 index 000000000..6f12db508 --- /dev/null +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README diff --git a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series index e69de29bb..e69de29bb 100644 --- a/ubuntu/_base/applications/office/kile/debian/patches/.gitignore +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/patches/series diff --git a/ubuntu/_base/applications/system/kpowersave/debian/rules b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules index 9bd279c93..a6797f19a 100755 --- a/ubuntu/_base/applications/system/kpowersave/debian/rules +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/rules @@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_INSTALL_DOCS_ALL := AUTHORS NEWS - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -16,8 +14,4 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_GCC_VISIBILITY="ON" - -install/kpowersave-trinity:: - install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg) - install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg) + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/source/format b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/format +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/format diff --git a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/applications/misc/fusion-icon/debian/source/options +++ b/ubuntu/_base/applications/system/polkit-agent-tde/debian/source/options diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/compat b/ubuntu/_base/applications/system/smartcardauth/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/smartcardauth/debian/compat +++ b/ubuntu/_base/applications/system/smartcardauth/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/smartcardauth/debian/control b/ubuntu/_base/applications/system/smartcardauth/debian/control index a034b10be..97c6fb93e 100644 --- a/ubuntu/_base/applications/system/smartcardauth/debian/control +++ b/ubuntu/_base/applications/system/smartcardauth/debian/control @@ -2,7 +2,7 @@ Source: smartcardauth Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, pkg-config, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev Standards-Version: 3.8.4 Package: smartcardauth diff --git a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/tastymenu/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/tastymenu/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/applications/system/tastymenu/debian/compat b/ubuntu/_base/applications/system/tastymenu/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/tastymenu/debian/compat +++ b/ubuntu/_base/applications/system/tastymenu/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/tastymenu/debian/control b/ubuntu/_base/applications/system/tastymenu/debian/control index e45a57ac9..3b1ca1154 100644 --- a/ubuntu/_base/applications/system/tastymenu/debian/control +++ b/ubuntu/_base/applications/system/tastymenu/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Marco Martin <notmart@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxau-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxau-dev Standards-Version: 3.8.0 Package: tastymenu-trinity diff --git a/ubuntu/_base/applications/system/tastymenu/debian/docs b/ubuntu/_base/applications/system/tastymenu/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/ubuntu/_base/applications/system/tastymenu/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO diff --git a/ubuntu/_base/applications/system/tastymenu/debian/patches/series b/ubuntu/_base/applications/system/tastymenu/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/system/tastymenu/debian/patches/series +++ b/ubuntu/_base/applications/system/tastymenu/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/system/tdebluez/debian/changelog b/ubuntu/_base/applications/system/tdebluez/debian/changelog new file mode 100644 index 000000000..d779b284e --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/changelog @@ -0,0 +1,12 @@ +tdebluez-trinity (4:14.1.0-0debian10.1.1+eko1) unstable; urgency=low + + * Build for buster. + + -- Emanoil Kotsev <deloptes@gmail.com> Sat, 02 Nov 2019 22:00:00 +0100 + +tdebluez (4:14.1.0-0debian9.0.5+eko1) unstable; urgency=low + + * Rework of Dbus interface to Bluez5 for TDE 14.1. + + -- Emanoil Kotsev <deloptes@gmail.com> Sat, 29 Sep 2018 22:00:00 +0100 + diff --git a/ubuntu/_base/applications/system/tdebluez/debian/compat b/ubuntu/_base/applications/system/tdebluez/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/system/tdebluez/debian/control b/ubuntu/_base/applications/system/tdebluez/debian/control new file mode 100644 index 000000000..dcfa46b04 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/control @@ -0,0 +1,76 @@ +Source: tdebluez-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libdbus-1-tqt-dev +Build-Depends-Indep: doxygen, graphviz +Standards-Version: 3.8.0 + +Package: tdebluez-trinity +Section: tde +Architecture: any +Depends: ${shlibs:Depends}, bluez (>= 5~), bluez-obexd (>= 5~) +Suggests: pulseaudio-module-bluetooth +Description: TDE Bluetooth Framework + The TDE Bluetooth Framework is a set of tools built on top of Linux' Bluetooth + stack BlueZ5. It provides easy access to the most common Bluetooth profiles and + makes data exchange with Bluetooth devices like phones and PDAs as + straightforward as possible. + . + Features: + * tdebluez -- a tray applet to handle incoming inquiries and control + adapters and devices + * tdebluezauth -- authentication agent + * tdeioclient -- cli to obex + +Package: libtdebluez-trinity +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, bluez (>= 5~) +Description: Bluetooth library for TDE + This package is part of the TDE Bluetooth Framework. + It contains a Bluetooth library for TDE. + . + See the 'tdebluez-trinity' package for more informations. + +Package: libtdeobex-trinity +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, bluez-obexd (>= 5~) +Description: Obex library for TDE + This package is part of the TDE Bluetooth Framework. + It contains a Bluetooth library for TDE. + . + See the 'tdebluez-trinity' package for more informations. + +Package: libtdebluez-trinity-dev +Architecture: any +Section: libdevel +Depends: libtdebluez-trinity (= ${binary:Version}) +Description: development files for libtdebluez + This package is part of the TDE Bluetooth Framework. + It contains the development files for libtdebluez. + . + See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations. + +Package: libtdeobex-trinity-dev +Architecture: any +Section: libdevel +Depends: libtdeobex-trinity (= ${binary:Version}) +Description: development files for libtdeobex + This package is part of the TDE Bluetooth Framework. + It contains the development files for libtdeobex. + . + See the 'tdebluez-trinity' and 'tdebluez-trinity-api-doc' package for more informations. + +Package: tdebluez-trinity-api-doc +Section: doc +Architecture: all +Description: developer documentation for the libtdebluez-trinity and libtdeobex-trinity libraries + This package contains documentation for the libtdebluez-trinity and libtdeobex-trinity libraries of + use more for developers creating applications which use the libtdebluez-trinity and libtdeobex-trinity + libraries, than regular users. + . + This package is part of the provided bindings for the Trinity TQt interface. + . + See the tdebluez-trinity description for more information about tdebluez in general. diff --git a/ubuntu/_base/applications/system/tdebluez/debian/copyright b/ubuntu/_base/applications/system/tdebluez/debian/copyright new file mode 100644 index 000000000..7fc5c091b --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Emanoil Kotsev <deloptes@gmail.com> +on Fri, 19 Sep 2003 18:47:31 +0200. + +It was downloaded from http://bluetooth.kmobiletools.org + +Ported to TDE by Emanoil Kotsev <deloptes@gmail.com> +on Tue, 22 Nov 2016 17:23:21 +0100. + +Upstream Authors: + + Emanoil Kotsev <deloptes@gmail.com> + +Copyright: + + (C) 2018 Emanoil Kotsev <deloptes@gmail.com> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The documentations provided with kdebluetooth is distributed under +the GNU Free Documentation License (FDL). They are considered free with +regards to the Debian Free Software Guidelines (DFSG) because they don't +contain any unmodifiable parts (invariant sections). + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. + diff --git a/ubuntu/_base/applications/system/tdebluez/debian/docs b/ubuntu/_base/applications/system/tdebluez/debian/docs new file mode 100644 index 000000000..b43bf86b5 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install new file mode 100644 index 000000000..6425a944e --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity-dev.install @@ -0,0 +1,3 @@ +opt/trinity/include/tdebluez/* +opt/trinity/lib/libtdebluez.so +opt/trinity/share/cmake/libtdebluez.cmake diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install new file mode 100644 index 000000000..72a1ac2a2 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdebluez-trinity.install @@ -0,0 +1,2 @@ +opt/trinity/lib/libtdebluez.la +opt/trinity/lib/libtdebluez.so.* diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install new file mode 100644 index 000000000..e60909e04 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity-dev.install @@ -0,0 +1,3 @@ +opt/trinity/include/tdeobex/* +opt/trinity/lib/libtdeobex.so +opt/trinity/share/cmake/libtdeobex.cmake diff --git a/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install new file mode 100644 index 000000000..2557b6e5f --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/libtdeobex-trinity.install @@ -0,0 +1,2 @@ +opt/trinity/lib/libtdeobex.la +opt/trinity/lib/libtdeobex.so.* diff --git a/ubuntu/_base/applications/system/tdebluez/debian/rules b/ubuntu/_base/applications/system/tdebluez/debian/rules new file mode 100755 index 000000000..9c17d4c4c --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_KDE_APIDOX := yes + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format b/ubuntu/_base/applications/system/tdebluez/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format +++ b/ubuntu/_base/applications/system/tdebluez/debian/source/format diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/system/tdebluez/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options +++ b/ubuntu/_base/applications/system/tdebluez/debian/source/options diff --git a/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install new file mode 100644 index 000000000..50a3931d0 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity-api-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/tdebluez-trinity-api/HTML/en/* diff --git a/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install new file mode 100644 index 000000000..80063c949 --- /dev/null +++ b/ubuntu/_base/applications/system/tdebluez/debian/tdebluez-trinity.install @@ -0,0 +1,27 @@ +opt/trinity/bin/tdebluez +opt/trinity/bin/tdebluezauth +opt/trinity/bin/tdebluezioclient +opt/trinity/lib/trinity/tdebluez.so +opt/trinity/lib/trinity/tdebluez.la +opt/trinity/lib/libtdeinit_tdebluez.so +opt/trinity/lib/libtdeinit_tdebluez.la +opt/trinity/lib/trinity/tdeio_bluetooth.so +opt/trinity/lib/trinity/tdeio_bluetooth.la +opt/trinity/lib/trinity/tdeio_obex.so +opt/trinity/lib/trinity/tdeio_obex.la +opt/trinity/share/apps/tdebluez/icons/* +opt/trinity/share/doc/tde/HTML/* +opt/trinity/share/apps/tdebluez/eventsrc +opt/trinity/share/apps/tdebluez/tde-settings-network-bluetooth.directory +opt/trinity/share/applications/tde/tdebluez.desktop +opt/trinity/share/applications/tde/tdebluezauth.desktop +opt/trinity/share/autostart/tdebluez.autostart.desktop +opt/trinity/share/icons +opt/trinity/share/locale +opt/trinity/share/mimelnk/bluetooth/* +opt/trinity/share/services/bluetooth.protocol +opt/trinity/share/services/obexftp.protocol +opt/trinity/share/services/obexopp.protocol +opt/trinity/share/apps/konqsidebartng/virtual_folders/services/bluetooth_sidebarentry.desktop +opt/trinity/share/apps/konqsidebartng/virtual_folders/services/obex_sidebarentry.desktop +/etc/dbus-1/system.d/org.trinitydesktop.tdebluez.conf diff --git a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/tdedocker/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/tdedocker/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/applications/system/tdedocker/debian/compat b/ubuntu/_base/applications/system/tdedocker/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/tdedocker/debian/compat +++ b/ubuntu/_base/applications/system/tdedocker/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/tdedocker/debian/control b/ubuntu/_base/applications/system/tdedocker/debian/control index c2bc9a5c0..c21879563 100644 --- a/ubuntu/_base/applications/system/tdedocker/debian/control +++ b/ubuntu/_base/applications/system/tdedocker/debian/control @@ -2,7 +2,7 @@ Source: tdedocker-trinity Section: x11 Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libxpm-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libxpm-dev Standards-Version: 3.7.2 Package: tdedocker-trinity diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/tdepowersave/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/tdepowersave/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/applications/system/tdepowersave/debian/compat b/ubuntu/_base/applications/system/tdepowersave/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/tdepowersave/debian/compat +++ b/ubuntu/_base/applications/system/tdepowersave/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/control b/ubuntu/_base/applications/system/tdepowersave/debian/control index 4a715d99b..b0b75e675 100644 --- a/ubuntu/_base/applications/system/tdepowersave/debian/control +++ b/ubuntu/_base/applications/system/tdepowersave/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-1-tqt-dev Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/powersave/ diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/docs b/ubuntu/_base/applications/system/tdepowersave/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/ubuntu/_base/applications/system/tdepowersave/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/rules b/ubuntu/_base/applications/system/tdepowersave/debian/rules index 01e5357b6..58af3504b 100755 --- a/ubuntu/_base/applications/system/tdepowersave/debian/rules +++ b/ubuntu/_base/applications/system/tdepowersave/debian/rules @@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_INSTALL_DOCS_ALL := AUTHORS NEWS - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -20,4 +18,3 @@ DEB_CMAKE_EXTRA_FLAGS := \ install/tdepowersave-trinity:: install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity - install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda deleted file mode 100644 index ff5153632..000000000 --- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.linda +++ /dev/null @@ -1,4 +0,0 @@ -Tag: lib-not-in-shlibs - -Tag: no-shlib-file -Data: /usr/trinity/lib/libtdeinit_*.so diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian index e27c64261..f89a3be85 100644 --- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian +++ b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.lintian @@ -1,5 +1,3 @@ tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave -tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so -tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so diff --git a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst b/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst deleted file mode 100644 index a00246bd9..000000000 --- a/ubuntu/_base/applications/system/tdepowersave/debian/tdepowersave-trinity.postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# postinst script for tdepowersave-trinity - -set -e - -if [ "$1" = "configure" ] ; then - # force ldconfig due to tdeinit library - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk index 5b4e8bfd7..aba508624 100644 --- a/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/cdbs/debian-tde.mk @@ -57,6 +57,15 @@ ifndef _cdbs_class_cmake include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) endif +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches endif @@ -73,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 | \ @@ -193,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; \ @@ -214,7 +228,7 @@ debian/stamp-kde-apidox: common-install-indep:: common-install-kde-apidox common-install-kde-apidox:: - $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR)) + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) cleanbuilddir:: -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/tdesshaskpass/debian/compat +++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/tdesshaskpass/debian/control b/ubuntu/_base/applications/system/tdesshaskpass/debian/control index dd6674b51..02382a5e9 100644 --- a/ubuntu/_base/applications/system/tdesshaskpass/debian/control +++ b/ubuntu/_base/applications/system/tdesshaskpass/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Armin Berres <trigger+debian@space-based.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev Standards-Version: 3.8.0 Package: tdesshaskpass-trinity diff --git a/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/system/yakuake/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/system/yakuake/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/applications/system/yakuake/debian/compat b/ubuntu/_base/applications/system/yakuake/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/system/yakuake/debian/compat +++ b/ubuntu/_base/applications/system/yakuake/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/system/yakuake/debian/control b/ubuntu/_base/applications/system/yakuake/debian/control index 0692e6ab1..6d3c001d0 100644 --- a/ubuntu/_base/applications/system/yakuake/debian/control +++ b/ubuntu/_base/applications/system/yakuake/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libltdl-dev Standards-Version: 3.8.4 Homepage: http://extragear.kde.org/apps/yakuake/ diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog new file mode 100644 index 000000000..39785e5c7 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/changelog @@ -0,0 +1,6 @@ +tdeio-appinfo-trinity (0.1.5-0) testing; urgency=low + + * First TDE release + + -- Michele Calgaro <michele.calgaro@yahoo.it> Sat, 25 Aug 2018 21:56:00 +0900 + diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control new file mode 100644 index 000000000..3b616818e --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/control @@ -0,0 +1,16 @@ +Source: tdeio-appinfo-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Robert Hogan <robert@roberthogan.net> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev +Standards-Version: 3.8.4 + +Package: tdeio-appinfo-trinity +Architecture: any +Depends: ${shlibs:Depends} +Description: TDEIO slave for the appinfo protocol + Adds support for the "appinfo:" protocol + to Konqueror and other TDE applications. + . + This enables you to perform appinfo: searches in TDE. diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright new file mode 100644 index 000000000..f64b4fdd9 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/copyright @@ -0,0 +1,11 @@ +This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on +Sat, 08 May 2022 20:11:00 +0900 + +Copyright: + This program was initially written by Robert Hogan <robert@roberthogan.net> + +License: + You are free to distribute this software under the terms of + the GNU General Public License 2 or higher. + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL'. diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/patches/series diff --git a/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules new file mode 100755 index 000000000..16f2fa011 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function +# Also include the main Trinity path +ifeq ("$(LD_LIBRARY_PATH)", "") +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib +else +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib +endif +export LD_LIBRARY_PATH + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DBUILD_ALL="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/ubuntu/_base/applications/system/kpowersave/debian/source/format b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/ubuntu/_base/applications/system/kpowersave/debian/source/format +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/format diff --git a/ubuntu/_base/applications/system/kpowersave/debian/source/options b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/ubuntu/_base/applications/system/kpowersave/debian/source/options +++ b/ubuntu/_base/applications/tdeio/tdeio-appinfo/debian/source/options diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-apt/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/applications/tdeio/tdeio-apt/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control index 67b389d0e..ff1e186ca 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-apt/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Emmanuel Bouthenot <kolter@openics.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-apt-trinity diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/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/applications/tdeio/tdeio-ftps/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control index d1455f685..feb19c97d 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-ftps/debian/control @@ -2,7 +2,7 @@ Source: tdeio-ftps-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, tdelibs14-trinity-dev Standards-Version: 3.8.3 Package: tdeio-ftps-trinity diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/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/applications/tdeio/tdeio-gopher/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control index 2752551e6..578f51c5a 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Albert Astals Cid <aacid@kde.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-gopher-trinity diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/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/applications/tdeio/tdeio-locate/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control index fe7ee58c4..094ec1441 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Tobi Vollebregt <tobivollebregt@gmail.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, bzip2, python-all +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-locate-trinity diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs new file mode 100644 index 000000000..76c3076c9 --- /dev/null +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README.md +TODO diff --git a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules index c9e6b78b0..a6797f19a 100755 --- a/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules +++ b/ubuntu/_base/applications/tdeio/tdeio-locate/debian/rules @@ -1,35 +1,17 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_KDE_APIDOX := yes - -CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) - DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-sword/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/applications/tdeio/tdeio-sword/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control index a0a34a244..dd1d46eaa 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/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/applications/tdeio/tdeio-umountwrapper/debian/compat b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat +++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control index c0a1dda6c..9e47a2bdf 100644 --- a/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control +++ b/ubuntu/_base/applications/tdeio/tdeio-umountwrapper/debian/control @@ -2,7 +2,7 @@ Source: tdeio-umountwrapper-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tdeio-umountwrapper-trinity diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 deleted file mode 100644 index 6bc424f8e..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4 +++ /dev/null @@ -1,13 +0,0 @@ -# This file was written by TDE -# You can edit it in the Trinity control center, under "GTK Styles and Fonts" - -include "/usr/share/themes/Qt/gtk-2.0/gtkrc" - -style "user-font" -{ - font_name="Sans Serif 9" -} -widget_class "*" style "user-font" - -gtk-theme-name="Qt" -gtk-font-name="Sans Serif 9" diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 deleted file mode 100644 index e25e89fd4..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4 +++ /dev/null @@ -1,13 +0,0 @@ -# This file was written by TDE -# You can edit it in the Trinity control center, under "GTK Styles and Fonts" - -include "/usr/share/themes/Qt/gtk-2.0/gtkrc" - -style "user-font" -{ - font_name="Tahoma 10" -} -widget_class "*" style "user-font" - -gtk-theme-name="Qt" -gtk-font-name="Tahoma 10" diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/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/applications/themes/gtk-qt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control index ceaa8edc8..a61cbc58b 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev (>= 2.10.1) Standards-Version: 3.8.4 Package: gtk-qt-engine-trinity diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs index 5502ed8f4..76c3076c9 100644 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine-trinity.docs @@ -1,3 +1,3 @@ -NEWS -README +AUTHORS +README.md TODO diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh deleted file mode 100644 index b477f5ce2..000000000 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Make sure our customised gtkrc file is loaded. -export GTK2_RC_FILES=$HOME/.gtkrc-2.0-kde4 diff --git a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules index 8f250b682..a6797f19a 100755 --- a/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk-qt-engine/debian/rules @@ -1,34 +1,17 @@ #!/usr/bin/make -f -# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function -# Also include the main Trinity path -ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib -else -LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib -endif -export LD_LIBRARY_PATH - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ - -DLIB_SUFFIX="" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ - -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ - -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" \ - -DAUTODETECT_QT_DIRS="ON" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ - -DBUILD_ALL="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -binary-install/gtk-qt-engine-trinity:: - mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ - cp -Rp $(CURDIR)/debian/gtk-qt-engine.rc.sh $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control index 8b7033112..7396b1661 100644 --- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libcairo2-dev, libgtk-3-dev, libpango1.0-dev Standards-Version: 3.8.4 Package: gtk3-tqt-engine-trinity diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules index 1a185d594..a6797f19a 100755 --- a/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules +++ b/ubuntu/_base/applications/themes/gtk3-tqt-engine/debian/rules @@ -1,39 +1,17 @@ #!/usr/bin/make -f -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) - -# The default gzip compressor has been changed in dpkg >= 1.17.0. -deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ - sed -e "s|.*version ||" -e "s| .*||" | \ - xargs -r dpkg --compare-versions 1.17.0 lt \ - && echo xz || echo gzip) -ifeq ($(deb_default_compress),gzip) -DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ - && echo xz || echo bzip2) -endif - -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: -ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" "" - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh -endif -ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" - cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh -endif - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/kgtk-qt3/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/applications/themes/kgtk-qt3/debian/compat b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat +++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control index 9bc5efa75..5ff259535 100644 --- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/control +++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/control @@ -2,7 +2,7 @@ Source: kgtk-qt3-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, libgtk2.0-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libgtk2.0-dev Standards-Version: 3.8.4 Homepage: http://trinity.pearsoncomputing.net diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs b/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian index f7e4ea7f5..794921e5e 100644 --- a/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian +++ b/ubuntu/_base/applications/themes/kgtk-qt3/debian/kgtk-qt3-trinity.lintian @@ -1,8 +1,2 @@ kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkgtk2.so kgtk-qt3-trinity: no-shlibs-control-file opt/trinity/lib/kgtk/libkqt3.so - -kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so -kgtk-qt3-trinity: postinst-must-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so - -kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkgtk2.so -kgtk-qt3-trinity: postrm-should-call-ldconfig opt/trinity/lib/kgtk/libkqt3.so diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/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/applications/themes/ksplash-engine-moodin/debian/compat b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat +++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control index 9d9159705..5b8ab8b3a 100644 --- a/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control +++ b/ubuntu/_base/applications/themes/ksplash-engine-moodin/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, ksplash-trinity +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, ksplash-trinity Standards-Version: 3.8.4 Package: ksplash-engine-moodin-trinity diff --git a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat +++ b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control index a8384ff60..dcfc6981b 100644 --- a/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control +++ b/ubuntu/_base/applications/themes/qt4-tqt-theme-engine/debian/control @@ -2,7 +2,7 @@ Source: qt4-tqt-theme-engine Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 10~), quilt, cdbs, tdelibs14-trinity-dev, libqt4-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: qt4-tqt-theme-engine diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tde-style-baghira/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/applications/themes/tde-style-baghira/debian/compat b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat +++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control index 53546d21d..5001c8667 100644 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/control +++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev, libxtst-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libxtst-dev Standards-Version: 3.8.0 Package: tde-style-baghira-trinity diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series +++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian index 475315ddc..b021de201 100644 --- a/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian +++ b/ubuntu/_base/applications/themes/tde-style-baghira/debian/tde-style-baghira-trinity.lintian @@ -1,6 +1,4 @@ tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/libbaghirastarter.so tde-style-baghira-trinity: no-shlibs-control-file opt/trinity/lib/usermanager_panelapplet.so -tde-style-baghira-trinity: postinst-must-call-ldconfig opt/trinity/lib/libbaghirastarter.so -tde-style-baghira-trinity: postrm-should-call-ldconfig opt/trinity/lib/libbaghirastarter.so tde-style-baghira-trinity: several-sonames-in-same-package usermanager_panelapplet.so libbaghirastarter.so tde-style-baghira-trinity: package-name-doesnt-match-sonames usermanager-panelapplet libbaghirastarter diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tde-style-domino/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tde-style-domino/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/applications/themes/tde-style-domino/debian/compat b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-domino/debian/compat +++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/control b/ubuntu/_base/applications/themes/tde-style-domino/debian/control index 84e9929b2..fd59eeb97 100644 --- a/ubuntu/_base/applications/themes/tde-style-domino/debian/control +++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jonathan Patrick Davies <jpatrick@kubuntu.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.7.3 Homepage: http://kde-look.org/content/show.php?content=42804 diff --git a/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series +++ b/ubuntu/_base/applications/themes/tde-style-domino/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/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/applications/themes/tde-style-ia-ora/debian/compat b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control index 60390be44..9daa84f38 100644 --- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev, libgtk2.0-dev Standards-Version: 3.8.0 Package: tde-style-ia-ora-trinity diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series +++ b/ubuntu/_base/applications/themes/tde-style-ia-ora/debian/patches/series @@ -1 +0,0 @@ - diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tde-style-lipstik/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/applications/themes/tde-style-lipstik/debian/compat b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat +++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control index c9665f695..45054b2b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control +++ b/ubuntu/_base/applications/themes/tde-style-lipstik/debian/control @@ -2,7 +2,7 @@ Source: tde-style-lipstik-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-lipstik-trinity diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog b/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog new file mode 100644 index 000000000..fd3fb7e76 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/changelog @@ -0,0 +1,125 @@ +tde-style-polyester-trinity (1.0.3-2) unstable; urgency=low + + * Initial release for TDE + + -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 22 Mar 2024 21:04:00 +0900 + +kde-style-polyester (1.0.3-1) unstable; urgency=low + + * New upstream release (Closes: 442928) + * Hardcode the uic usage to use uic-qt3 + * Bump standards + * Move homepage from description to header + * Don't ignore errors on make clean + * Add some explicit linkage when needed + * --as-needed + + -- Sune Vuorela <debian@pusling.com> Sat, 26 Jan 2008 18:14:24 +0100 + +kde-style-polyester (1.0.1-1) unstable; urgency=low + + [ Sarah Hobbs ] + * New Upstream Version. + * Added 03_GCC4.3_FTBFS_fix.diff. (Closes: #419799) + Thanks to Martin Michlmayr for reporting and for the patch. + * Removed 01_autoconf2.6-fixes.diff - fixed upstream. + + [ Sune Vuorela ] + * Thanks to Sarah Hobbs for adding the new upstream version. + + -- Sune Vuorela <debian@pusling.com> Fri, 18 May 2007 00:27:53 +0200 + +kde-style-polyester (1.0-3) unstable; urgency=low + + * Upload to unstable + + -- Sune Vuorela <debian@pusling.com> Fri, 13 Apr 2007 23:36:44 +0200 + +kde-style-polyester (1.0-2) experimental; urgency=low + + * The glib-and-their-way-to-not-respect-$HOME-sucks-bigtime release + * Use librsvg2-bin to convert the svg files to .png files instead of + inkscape (Closes: #413939) + * Run the create-buttons.sh with sh -e to make sure that build fails if the + svg to png conversion fails + * Use nice quilt (>>0.40) to manage patches + + -- Sune Vuorela <debian@pusling.com> Tue, 20 Mar 2007 09:29:17 +0100 + +kde-style-polyester (1.0-1) experimental; urgency=low + + * New upstream release + * Build buttons.h on the fly instead of relying on the upstream buttons.h. + the uic command generates apparantly endian-specific code. + (Closes: #410373) + * Experimental because of etch + + -- Sune Vuorela <debian@pusling.com> Tue, 6 Mar 2007 23:42:32 +0100 + +kde-style-polyester (1.0~beta1-1) unstable; urgency=low + + * New upstream release + * Ack NMU ; thanks Marga and Arjan (Closes: #379812) + + -- Sune Vuorela <debian@pusling.com> Thu, 28 Sep 2006 15:38:46 +0200 + +kde-style-polyester (0.9.2-1.1) unst able; urgency=low + + * Non-maintainer upload to fix Failure To Build From Source due to the lack + of support of autoconf 2.6. Thanks to Arjan Oosting for the patch. + (Closes: #379812) + + -- Margarita Manterola <marga@debian.org> Wed, 2 Aug 2006 17:15:23 -0300 + +kde-style-polyester (0.9.2-1) unstable; urgency=low + + * New upstream release + * Fixes copyright file + * Taking over after Michael Biebls initial work. Thank you. + * Renaming source pacage + * Initial upload. Closes: #338635 + + -- Sune Vuorela <debian@pusling.com> Sat, 27 May 2006 18:45:00 +0000 + +polyester (0.9-1) unstable; urgency=low + + * New upstream release. + * Bumped Standards-Version to 3.7.2, no further changes required. + + -- Michael Biebl <biebl@teco.edu> Mon, 10 Apr 2006 03:39:16 +0200 + +polyester (0.8.5-1) unstable; urgency=low + + * New upstream release. + * Skipped version 0.8. + + -- Michael Biebl <biebl@teco.edu> Wed, 8 Mar 2006 23:24:38 +0100 + +polyester (0.7.1-1) unstable; urgency=low + + * New upstream release. + * Bumped debhelper compatibility to 5. + + -- Michael Biebl <biebl@teco.edu> Wed, 22 Feb 2006 15:42:53 +0100 + +polyester (0.7-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@teco.edu> Sat, 14 Jan 2006 22:29:58 +0100 + +polyester (0.6.9-1) unstable; urgency=low + + * New upstream release. + + -- Michael Biebl <biebl@teco.edu> Sun, 8 Jan 2006 18:26:00 +0100 + +polyester (0.6.5-1) unstable; urgency=low + + * Initial release. + * Use Debian libtool and regenerate the autotools files. + + Add build dependencies to automake1.9, autoconf and libtool. + + Patch makefile_am.diff adds missing libraries needed for linking. + + -- Michael Biebl <biebl@teco.edu> Mon, 19 Dec 2005 11:47:20 +0100 + diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/control b/ubuntu/_base/applications/themes/tde-style-polyester/debian/control new file mode 100644 index 000000000..1e46cfe80 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/control @@ -0,0 +1,15 @@ +Source: tde-style-polyester-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev, librsvg2-bin +Standards-Version: 3.7.3 + +Package: tde-style-polyester-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Polyester widget style and twin decoration for TDE + Widget style and twin decoration both aim to maintain a good balance between + eyecandy and simplicity. Widget style is based on Plastik, window decoration + is based on Smoothblend. diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright b/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright new file mode 100644 index 000000000..e2d3d0919 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/copyright @@ -0,0 +1,16 @@ +This package was debianized for TDE by: + Michele Calgaro <michele.calgaro@yahoo.it> Fri, 22 Mar 2024 18:03:00 +0900. + +This package was originally debianized by: + Michael Biebl <biebl@teco.edu> on Fri, 11 Nov 2005 17:13:08 +0100. + +Original authors: + Marco Martin <notmart@gmail.com> + + Window decoration: + based on Smootblend by + Ryan Nickell <p0z3r@users.sourceforge.net> + + Widget style: + based on Plastik by + Sandro Giessl <ceebx@users.sourceforge.net> diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/patches/series diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules new file mode 100755 index 000000000..a6797f19a --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/applications/themes/tde-style-polyester/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/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/applications/themes/tde-style-qtcurve/debian/compat b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat +++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control index 00bacf730..797ea1d4a 100644 --- a/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control +++ b/ubuntu/_base/applications/themes/tde-style-qtcurve/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Bastian Venthur <venthur@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: tde-style-qtcurve-trinity diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/tdmtheme/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/tdmtheme/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/applications/themes/tdmtheme/debian/compat b/ubuntu/_base/applications/themes/tdmtheme/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/tdmtheme/debian/compat +++ b/ubuntu/_base/applications/themes/tdmtheme/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/tdmtheme/debian/control b/ubuntu/_base/applications/themes/tdmtheme/debian/control index 163e85e3b..f636eac7e 100644 --- a/ubuntu/_base/applications/themes/tdmtheme/debian/control +++ b/ubuntu/_base/applications/themes/tdmtheme/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Kel Modderman <kel@otaku42.de>, Fathi Boudra <fabo@debian.org>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://beta.smileaf.org/projects diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/twin-style-crystal/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/applications/themes/twin-style-crystal/debian/compat b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat +++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control index acac16a6d..37311104c 100644 --- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/control +++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.8.4 Package: twin-style-crystal-trinity diff --git a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs index e845566c0..0b6e0f321 100644 --- a/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs +++ b/ubuntu/_base/applications/themes/twin-style-crystal/debian/docs @@ -1 +1,2 @@ -README +AUTHORS +README.md diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/twin-style-dekorator/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/applications/themes/twin-style-dekorator/debian/compat b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat +++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control index 4625fc1f0..f075cb563 100644 --- a/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control +++ b/ubuntu/_base/applications/themes/twin-style-dekorator/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdebase-trinity-dev Standards-Version: 3.7.2 Package: twin-style-dekorator-trinity diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog new file mode 100644 index 000000000..7b0f84239 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/changelog @@ -0,0 +1,5 @@ +twin-style-fahrenheit-trinity (0.1-0) unstable; urgency=low + + * Initial release for TDE + + -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 17 Oct 2023 20:48:00 +0900 diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control new file mode 100644 index 000000000..9be6b38e1 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/control @@ -0,0 +1,12 @@ +Source: twin-style-fahrenheit-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev +Standards-Version: 3.6.2 + +Package: twin-style-fahrenheit-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: TDE window decoration + This is a port of the KDE 3.2's version of Fahrenheit window decoration diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright new file mode 100644 index 000000000..7ba2bdbcc --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/copyright @@ -0,0 +1,8 @@ +This package was debianized by Michele Calgaro <michele.calgaro@yahoo.it> on +Tue, 17 Oct 2023 20:48:00 +0900 + +It was downloaded from https://www.trinity-look.org/p/1100374 + +Original authors: + Peter Clark <theclarks@mail.ru> + David Johnson <david@usermode.org> diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/patches/series diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules new file mode 100755 index 000000000..a6797f19a --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-fahrenheit/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog new file mode 100644 index 000000000..b58d7112d --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/changelog @@ -0,0 +1,6 @@ +twin-style-machbunt-trinity (0.1-1) unstable; urgency=low + + * Initial release for TDE + + -- Mavridis Philippe <mavridisf@gmail.com> Sun, 16 Oct 2022 11:07:15 +0900 + diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control new file mode 100644 index 000000000..59237598a --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/control @@ -0,0 +1,15 @@ +Source: twin-style-machbunt-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Adrian Schroeter <adrian@suse.de>, Gerd Fleischer <gerdfleischer@web.de> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev +Standards-Version: 3.6.2 + +Package: twin-style-machbunt-trinity +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: TDE window decoration from SUSE 9.1/9.2 + This is a port of the KDE Window decoration extracted from SUSE 9.1/9.2. + . + An example color scheme is provided too. diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright new file mode 100644 index 000000000..dfd1f265b --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/copyright @@ -0,0 +1,31 @@ +This code was ported to TDE by: + Mavridis Philippe <mavridisf@gmail.com> +and packaged for Debian by: + Michele Calgaro <michele.calgaro@yahoo.it> + +Original authors and copyright: + Adrian Schroeter <adrian@suse.de> + Gerd Fleischer <gerdfleischer@web.de> + +On Debian systems, the complete text of the GNU Library General Public +License can be found in `/usr/share/common-licenses/LGPL'. + +For the rest of the package this license applies: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02111-1301, USA. + +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/applications/themes/twin-style-machbunt/debian/patches/series b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/patches/series diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules new file mode 100755 index 000000000..a6797f19a --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/applications/themes/twin-style-machbunt/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/themes/twin-style-suse2/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/applications/themes/twin-style-suse2/debian/compat b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat +++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control index 52c1269a5..dcb0af17d 100644 --- a/ubuntu/_base/applications/themes/twin-style-suse2/debian/control +++ b/ubuntu/_base/applications/themes/twin-style-suse2/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Adrian Neumaier <adrian@firehand.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, tdebase-trinity-dev Standards-Version: 3.6.2 Package: twin-style-suse2-trinity diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages b/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages deleted file mode 100644 index 0737a321e..000000000 --- a/ubuntu/_base/applications/utilities/abakus/debian/abakus-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/abakus.1 diff --git a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1 b/ubuntu/_base/applications/utilities/abakus/debian/abakus.1 deleted file mode 100644 index 1411beebd..000000000 --- a/ubuntu/_base/applications/utilities/abakus/debian/abakus.1 +++ /dev/null @@ -1,143 +0,0 @@ -.\" This file was generated by kdemangen.pl -.TH ABAKUS 1 "Oct 2005" "Trinity Desktop Environment" "A simple keyboard-driven calculator" -.SH NAME -abakus -\- A simple keyboard-driven calculator -.SH SYNOPSIS -abakus [Qt\-options] [TDE\-options] -.SH DESCRIPTION -A simple keyboard-driven calculator -.SH OPTIONS -.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 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 -.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 - -.SH SEE ALSO -Full user documentation is available through the TDE Help Center. You can also enter the URL -.BR help:/abakus/ -directly into konqueror or you can run -.BR "`khelpcenter help:/abakus/'" -from the command-line. -.br -.SH AUTHORS -.nf -Michael Pyne <michael.pyne@kdemail.net> -.br - diff --git a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/abakus/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/abakus/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/applications/utilities/abakus/debian/compat b/ubuntu/_base/applications/utilities/abakus/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/abakus/debian/compat +++ b/ubuntu/_base/applications/utilities/abakus/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/abakus/debian/control b/ubuntu/_base/applications/utilities/abakus/debian/control index 5a44c5979..b0beacffc 100644 --- a/ubuntu/_base/applications/utilities/abakus/debian/control +++ b/ubuntu/_base/applications/utilities/abakus/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Steffen Joeris <steffen.joeris@skolelinux.de> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, imagemagick, bison, flex Standards-Version: 3.8.4 Package: abakus-trinity diff --git a/ubuntu/_base/applications/utilities/abakus/debian/rules b/ubuntu/_base/applications/utilities/abakus/debian/rules index 3c72c1e14..aaf4d4db4 100755 --- a/ubuntu/_base/applications/utilities/abakus/debian/rules +++ b/ubuntu/_base/applications/utilities/abakus/debian/rules @@ -41,8 +41,5 @@ common-install-arch:: install -D -m 644 debian/abakus.xpm debian/abakus-trinity/opt/trinity/share/pixmaps/abakus.xpm dh_icons -pabakus-trinity -binary-install/abakus-trinity:: - mv debian/abakus-trinity/usr/share/man debian/abakus-trinity/opt/trinity/share/ - clean:: rm -f debian/abakus.xpm diff --git a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/filelight/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/filelight/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/applications/utilities/filelight/debian/compat b/ubuntu/_base/applications/utilities/filelight/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/filelight/debian/compat +++ b/ubuntu/_base/applications/utilities/filelight/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/filelight/debian/control b/ubuntu/_base/applications/utilities/filelight/debian/control index ecb9a9aed..9aee2dca8 100644 --- a/ubuntu/_base/applications/utilities/filelight/debian/control +++ b/ubuntu/_base/applications/utilities/filelight/debian/control @@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Ral Snchez Siles <rasasi78@gmail.com> Standards-Version: 3.8.4 -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, xutils +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, xutils Homepage: http://www.methylblue.com/filelight/ Package: filelight-trinity diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/kbarcode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/kbarcode/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/applications/utilities/kbarcode/debian/compat b/ubuntu/_base/applications/utilities/kbarcode/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/kbarcode/debian/compat +++ b/ubuntu/_base/applications/utilities/kbarcode/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/kbarcode/debian/control b/ubuntu/_base/applications/utilities/kbarcode/debian/control index 1aba23e5f..abea8a792 100644 --- a/ubuntu/_base/applications/utilities/kbarcode/debian/control +++ b/ubuntu/_base/applications/utilities/kbarcode/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kbarcode-trinity diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/kchmviewer/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/kchmviewer/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/applications/utilities/kchmviewer/debian/compat b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/kchmviewer/debian/compat +++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/kchmviewer/debian/control b/ubuntu/_base/applications/utilities/kchmviewer/debian/control index 90312196c..5eb117c7d 100644 --- a/ubuntu/_base/applications/utilities/kchmviewer/debian/control +++ b/ubuntu/_base/applications/utilities/kchmviewer/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libchm-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libchm-dev Standards-Version: 3.8.4 Homepage: http://www.kchmviewer.net/ diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/kcpuload/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/kcpuload/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/applications/utilities/kcpuload/debian/compat b/ubuntu/_base/applications/utilities/kcpuload/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/kcpuload/debian/compat +++ b/ubuntu/_base/applications/utilities/kcpuload/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/kcpuload/debian/control b/ubuntu/_base/applications/utilities/kcpuload/debian/control index 103ad3799..19f52b886 100644 --- a/ubuntu/_base/applications/utilities/kcpuload/debian/control +++ b/ubuntu/_base/applications/utilities/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Helen Faulkner <helen@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/kdirstat/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/kdirstat/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/applications/utilities/kdirstat/debian/compat b/ubuntu/_base/applications/utilities/kdirstat/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/kdirstat/debian/compat +++ b/ubuntu/_base/applications/utilities/kdirstat/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/kdirstat/debian/control b/ubuntu/_base/applications/utilities/kdirstat/debian/control index cd70dab54..ec7a51718 100644 --- a/ubuntu/_base/applications/utilities/kdirstat/debian/control +++ b/ubuntu/_base/applications/utilities/kdirstat/debian/control @@ -2,7 +2,7 @@ Source: kdirstat-trinity Section: misc 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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://kdirstat.sourceforge.net/ diff --git a/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/keep/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/keep/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/applications/utilities/keep/debian/compat b/ubuntu/_base/applications/utilities/keep/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/keep/debian/compat +++ b/ubuntu/_base/applications/utilities/keep/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/keep/debian/control b/ubuntu/_base/applications/utilities/keep/debian/control index ba782249c..39ea15546 100644 --- a/ubuntu/_base/applications/utilities/keep/debian/control +++ b/ubuntu/_base/applications/utilities/keep/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: keep-trinity diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/knutclient/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/knutclient/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/applications/utilities/knutclient/debian/compat b/ubuntu/_base/applications/utilities/knutclient/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/knutclient/debian/compat +++ b/ubuntu/_base/applications/utilities/knutclient/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/knutclient/debian/control b/ubuntu/_base/applications/utilities/knutclient/debian/control index abf0e03fa..31a76b958 100644 --- a/ubuntu/_base/applications/utilities/knutclient/debian/control +++ b/ubuntu/_base/applications/utilities/knutclient/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Arnaud Quette <aquette@debian.org> Standards-Version: 3.8.4 -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev Homepage: http://www.knut.noveradsl.cz/knutclient/ Package: knutclient-trinity diff --git a/ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk new file mode 100644 index 000000000..aba508624 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/debian-tde.mk @@ -0,0 +1,251 @@ +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Christopher L Cheney <ccheney@debian.org> +# Copyright © 2019 TDE Team +# Description: A class for TDE packages; sets TDE environment variables, etc +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +ifndef _cdbs_bootstrap +_cdbs_scripts_path ?= /usr/lib/cdbs +_cdbs_rules_path ?= /usr/share/cdbs/1/rules +_cdbs_class_path ?= /usr/share/cdbs/1/class +endif + +ifndef _cdbs_class_debian-qt-kde +_cdbs_class_debian-qt-kde := 1 + +# for dh_icons +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4) + +# Note: This _must_ be included before autotools.mk, or it won't work. +common-configure-arch common-configure-indep:: debian/stamp-cvs-make +debian/stamp-cvs-make: +ifndef _cdbs_class_cmake + cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in +ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" "" + cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh +endif +ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" "" + cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh +endif + $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist; +endif + touch debian/stamp-cvs-make + +include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) + +ifdef _cdbs_tarball_dir +DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) +else +DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) +endif + +ifndef _cdbs_class_cmake +include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix) +endif + +ifdef _cdbs_class_cmake +ifneq "$(wildcard /usr/bin/ninja)" "" +MAKE = ninja -v +DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) +DEB_MAKE_INSTALL_TARGET = install +DEB_CMAKE_NORMAL_ARGS += -GNinja +endif +endif + +ifndef _cdbs_rules_patchsys_quilt +DEB_PATCHDIRS := debian/patches/common debian/patches +endif + +export kde_cgidir = \$${libdir}/cgi-bin +export kde_confdir = \$${sysconfdir}/trinity +export kde_htmldir = \$${datadir}/doc/tde/HTML + +DEB_KDE_ENABLE_FINAL := yes +DEB_INSTALL_DOCS_ALL := + +DEB_DH_MAKESHLIBS_ARGS_ALL := -V +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_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 | \ + sed -e "s|.*version ||" -e "s| .*||" | \ + xargs -r dpkg --compare-versions 1.17.0 lt \ + && echo xz || echo gzip) +ifeq ($(deb_default_compress),gzip) +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) +endif + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb + ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) + cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,) + else + cdbs_kde_enable_final = + endif +endif + +ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_final = + cdbs_kde_enable_debug = --enable-debug=yes +else + cdbs_kde_enable_debug = --disable-debug +endif + +ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) + cdbs_kde_enable_debug = --enable-debug=full +endif + +DEB_BUILD_PARALLEL ?= true + +cdbs_configure_flags += \ + --with-qt-dir=/usr/share/qt3 \ + --disable-rpath \ + --with-xinerama \ + $(cdbs_kde_enable_final) \ + $(cdbs_kde_enable_debug) + + +# This is a convenience target for calling manually. +# It's not part of the build process. +buildprep: clean apply-patches +ifndef _cdbs_class_cmake + $(MAKE) -f admin/Makefile.common dist +endif + debian/rules clean + +.tdepkginfo: + echo "# TDE package information" >.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo + dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo + date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo + +post-patches:: .tdepkginfo + +common-build-arch:: debian/stamp-man-pages +debian/stamp-man-pages: + if ! test -d debian/man/out; then mkdir -p debian/man/out; fi + for f in $$(find debian/man -name '*.sgml'); do \ + docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ + done + for f in $$(find debian/man -name '*.man'); do \ + soelim -I debian/man $$f \ + > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ + done + touch debian/stamp-man-pages + +common-binary-indep:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_INDEP_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + +common-binary-arch:: + ( set -e; \ + tmpf=`mktemp debian/versions.XXXXXX`; \ + perl debian/cdbs/versions.pl >$$tmpf; \ + for p in $(DEB_ARCH_PACKAGES); do \ + cat $$tmpf >>debian/$$p.substvars; \ + done; \ + rm -f $$tmpf ) + # update multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ + sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ + done + +clean:: + rm -rf debian/man/out + -rmdir debian/man + rm -f debian/stamp-man-pages + rm -rf debian/shlibs-check + # revert multi-arch path in install files + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ + [ ! -f $$a.arch ] || \ + mv $$a.arch $$a; \ + done + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi + if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + if test -e debian/$(cdbs_curpkg).presubj; then \ + 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; \ + for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \ + pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ + echo Building $$pkg HTML docs...; \ + mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \ + done + for pkg in $(DOC_HTML_PRUNE) ; do \ + rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \ + done + +common-build-indep:: debian/stamp-kde-apidox +debian/stamp-kde-apidox: + $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox) + touch $@ + +common-install-indep:: common-install-kde-apidox +common-install-kde-apidox:: + $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox) + +cleanbuilddir:: + -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR)) + +clean:: +ifndef _cdbs_class_cmake + if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \ + cd $(DEB_SRCDIR); \ + find . -name Makefile.in -print | \ + xargs --no-run-if-empty rm -f; \ + rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \ + configure configure.files configure.in stamp-h.in \ + subdirs; \ + fi +endif + rm -f .tdepkginfo + rm -f debian/stamp-kde-apidox + rm -f debian/stamp-cvs-make + +endif diff --git a/ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl new file mode 100644 index 000000000..1b110f7af --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/cdbs/versions.pl @@ -0,0 +1,19 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`; +my ($version3, $version3_next); +my ($version2, $version2_next); + +($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/; +($version2 = $version3) =~ s/\.[^.]+$//; + +($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; +($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; + +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/_base/applications/utilities/kommando/debian/changelog b/ubuntu/_base/applications/utilities/kommando/debian/changelog new file mode 100644 index 000000000..6259ef8bc --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/changelog @@ -0,0 +1,67 @@ +kommando-trinity (0.5.2-0) unstable; urgency=low + + * Trinity version + + -- Michele Calgaro <michele.calgaro@yahoo.it> Sun, 23 Jul 2023 11:50:46 +0900 + +kommando (0.5.1-2) unstable; urgency=low + + * Upload to unstable + + -- Sune Vuorela <debian@pusling.com> Fri, 13 Apr 2007 23:49:21 +0200 + +kommando (0.5.1-1) experimental; urgency=low + + * New upstream release. + - Removing kommandorc from root of tarball. + * Removing patch to move conffile. Integrated upstream. + * kommando is now a kded module, not a stand alone program. + - menu file removed. + - man page removed. + - NEWS.Debian added. + + -- Sune Vuorela <debian@pusling.com> Thu, 28 Dec 2006 16:47:01 +0100 + +kommando (0.4.1-2) unstable; urgency=low + + * Fixed problems with moving of kommandorc + + -- Sune Vuorela <debian@pusling.com> Sun, 29 Jan 2006 19:54:32 +0100 + +kommando (0.4.1-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela <debian@pusling.com> Fri, 27 Jan 2006 22:26:33 +0000 + +kommando (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela <debian@pusling.com> Wed, 25 Jan 2006 22:06:50 +0000 + +kommando (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela <debian@pusling.com> Sat, 19 Nov 2005 22:35:44 +0000 + +kommando (0.2-2) unstable; urgency=low + + * Passes lintian + * First debian release Closes: #336607 + + -- Sune Vuorela <debian@pusling.com> Tue, 1 Nov 2005 13:00:00 +0100 + +kommando (0.2-1) unstable; urgency=low + + * New upstream release + + -- Sune Vuorela <debian@pusling.com> Sun, 2 Oct 2005 21:51:18 +0000 + +kommando (0.1.2-1) unstable; urgency=low + + * Initial release + + -- Sune Vuorela <debian@pusling.com> Tue, 27 Sep 2005 21:37:53 +0000 + diff --git a/ubuntu/_base/applications/utilities/kommando/debian/compat b/ubuntu/_base/applications/utilities/kommando/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/compat @@ -0,0 +1 @@ +10 diff --git a/ubuntu/_base/applications/utilities/kommando/debian/control b/ubuntu/_base/applications/utilities/kommando/debian/control new file mode 100644 index 000000000..e29e23d86 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/control @@ -0,0 +1,15 @@ +Source: kommando-trinity +Section: tde +Priority: optional +Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> +XSBC-Original-Maintainer: Sune Vuorela <debian@pusling.com> +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libxmu-dev +Standards-Version: 3.8.4 + +Package: kommando-trinity +Architecture: any +Depends: ${shlibs:Depends} +Description: a TDE wheel-menu to quickly pick menu items with the mouse + It allows rapid access to user defined applications and shell + commands and is of course a nice piece of eyecandy to improve the + look and usability of TDE. diff --git a/ubuntu/_base/applications/utilities/kommando/debian/copyright b/ubuntu/_base/applications/utilities/kommando/debian/copyright new file mode 100644 index 000000000..be9aabb0b --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/copyright @@ -0,0 +1,39 @@ +This code was ported to TDE and packaged for Debian by: + Michele Calgaro <michele.calgaro@yahoo.it> +and is based on the code downloaded from Debian Snapshot Archive at: + https://snapshot.debian.org/package/kommando/0.5.1-/ +and from the KDE store: + https://store.kde.org/p/1081202/ +All original code was released under GPL2 license. + +Original code was packaged for Debian by: + Sune Vuorela <debian@pusling.com> on +Tue, 27 Sep 2005 21:37:53 +0000. + +It was downloaded from http://www.kde-look.org/content/show.php?content=29514 + +Copyright Holder (C) 2005,2006: Daniel Stoeckel <the_docter (at) gmx.net> + +License: + + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2005-2007, Sune Vuorela <debian@pusling.com> and +is licensed under the GPL, see above. + diff --git a/ubuntu/_base/applications/utilities/kommando/debian/docs b/ubuntu/_base/applications/utilities/kommando/debian/docs new file mode 100644 index 000000000..6f83607c1 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff --git a/ubuntu/_base/applications/utilities/kommando/debian/patches/series b/ubuntu/_base/applications/utilities/kommando/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/patches/series diff --git a/ubuntu/_base/applications/utilities/kommando/debian/rules b/ubuntu/_base/applications/utilities/kommando/debian/rules new file mode 100755 index 000000000..a6797f19a --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/cmake.mk +include debian/cdbs/debian-tde.mk + +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" diff --git a/ubuntu/_base/applications/utilities/kommando/debian/source/format b/ubuntu/_base/applications/utilities/kommando/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/applications/utilities/kommando/debian/source/options b/ubuntu/_base/applications/utilities/kommando/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/applications/utilities/kommando/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/kompose/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/kompose/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/applications/utilities/kompose/debian/compat b/ubuntu/_base/applications/utilities/kompose/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/kompose/debian/compat +++ b/ubuntu/_base/applications/utilities/kompose/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/kompose/debian/control b/ubuntu/_base/applications/utilities/kompose/debian/control index 86be6e3a1..a808f8827 100644 --- a/ubuntu/_base/applications/utilities/kompose/debian/control +++ b/ubuntu/_base/applications/utilities/kompose/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libimlib2-dev, libx11-dev, libxdamage-dev, libxcomposite-dev Standards-Version: 3.8.4 Package: kompose-trinity diff --git a/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/krename/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/krename/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/applications/utilities/krename/debian/compat b/ubuntu/_base/applications/utilities/krename/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/krename/debian/compat +++ b/ubuntu/_base/applications/utilities/krename/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/krename/debian/control b/ubuntu/_base/applications/utilities/krename/debian/control index e6add2a1c..1e62c4a05 100644 --- a/ubuntu/_base/applications/utilities/krename/debian/control +++ b/ubuntu/_base/applications/utilities/krename/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Richard A. Johnson <nixternal@ubuntu.com> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libx11-dev, libxext-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, perl Standards-Version: 3.8.4 Package: krename-trinity diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/ksensors/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/ksensors/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/applications/utilities/ksensors/debian/compat b/ubuntu/_base/applications/utilities/ksensors/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/ksensors/debian/compat +++ b/ubuntu/_base/applications/utilities/ksensors/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/ksensors/debian/control b/ubuntu/_base/applications/utilities/ksensors/debian/control index 8212563ba..497a3b570 100644 --- a/ubuntu/_base/applications/utilities/ksensors/debian/control +++ b/ubuntu/_base/applications/utilities/ksensors/debian/control @@ -2,7 +2,7 @@ Source: ksensors-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libsensors4-dev, tdelibs14-trinity-dev, imagemagick +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libsensors-dev | libsensors4-dev, tdelibs14-trinity-dev, imagemagick Build-Conflicts: autoconf2.13 Standards-Version: 3.8.3 diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/mathemagics/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/mathemagics/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/applications/utilities/mathemagics/debian/compat b/ubuntu/_base/applications/utilities/mathemagics/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/mathemagics/debian/compat +++ b/ubuntu/_base/applications/utilities/mathemagics/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/mathemagics/debian/control b/ubuntu/_base/applications/utilities/mathemagics/debian/control index 84de6a15a..3128539a1 100644 --- a/ubuntu/_base/applications/utilities/mathemagics/debian/control +++ b/ubuntu/_base/applications/utilities/mathemagics/debian/control @@ -2,7 +2,7 @@ Source: mathemagics-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, tdelibs14-trinity-dev Standards-Version: 3.8.4 Package: mathemagics-trinity diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk index f36e3527c..aba508624 100644 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/applications/utilities/qalculate-tde/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/applications/utilities/qalculate-tde/debian/compat b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control index dc6bfaba3..4cce4bb33 100644 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control @@ -3,7 +3,7 @@ Section: math Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Vincent Legout <vincent@legout.info> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6) +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6) Standards-Version: 3.8.4 Homepage: http://qalculate.sourceforge.net/ diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs new file mode 100644 index 000000000..0b6e0f321 --- /dev/null +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/docs @@ -0,0 +1,2 @@ +AUTHORS +README.md diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series index 8b1378917..e69de29bb 100644 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/patches/series @@ -1 +0,0 @@ - |