diff options
Diffstat (limited to 'ubuntu/_base/applications/settings')
81 files changed, 142 insertions, 1764 deletions
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/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs index 62deb0497..0b6e0f321 100644 --- a/ubuntu/_base/applications/settings/kdpkg/debian/docs +++ b/ubuntu/_base/applications/settings/kdpkg/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md 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/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs index 1a4f0317f..1a960e71b 100644 --- a/ubuntu/_base/applications/settings/kima/debian/docs +++ b/ubuntu/_base/applications/settings/kima/debian/docs @@ -1,4 +1,4 @@ AUTHORS FAQ -README +README.md TODO 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/kiosktool/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs index 724e08449..6f7727790 100644 --- a/ubuntu/_base/applications/settings/kiosktool/debian/docs +++ b/ubuntu/_base/applications/settings/kiosktool/debian/docs @@ -1,2 +1,2 @@ -README +README.md TODO 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/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs index ca0272abf..76c3076c9 100644 --- a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs +++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs @@ -1,3 +1,3 @@ AUTHORS -README +README.md TODO 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/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs index 6f83607c1..46a4ca718 100644 --- a/ubuntu/_base/applications/settings/klcddimmer/debian/docs +++ b/ubuntu/_base/applications/settings/klcddimmer/debian/docs @@ -1,3 +1,3 @@ AUTHORS NEWS -README +README.md 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/patches/series b/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series deleted file mode 100644 index e69de29bb..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series +++ /dev/null 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/source/format b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options deleted file mode 100644 index 72f1f5450..000000000 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options +++ /dev/null @@ -1,6 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 - -# Don't run differences -diff-ignore = .* 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/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl index 1b110f7af..1b110f7af 100644 --- a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl +++ b/ubuntu/_base/applications/settings/tde-guidance/debian/cdbs/versions.pl 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/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs index 087bcaaa1..76c3076c9 100644 --- a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs +++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs @@ -1,5 +1,3 @@ -AUTHOR -README - - - +AUTHORS +README.md +TODO 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/docs b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs new file mode 100644 index 000000000..b43bf86b5 --- /dev/null +++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/docs @@ -0,0 +1 @@ +README.md 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/tdesudo/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs index ca0272abf..76c3076c9 100644 --- a/ubuntu/_base/applications/settings/tdesudo/debian/docs +++ b/ubuntu/_base/applications/settings/tdesudo/debian/docs @@ -1,3 +1,3 @@ AUTHORS -README +README.md TODO 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/settings/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs index 8fa4b0c87..960f99591 100644 --- a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs +++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs @@ -1,4 +1,4 @@ -doc/AUTHORS -doc/NEWS -doc/README -doc/TODO +AUTHORS +NEWS +README.md +TODO |