summaryrefslogtreecommitdiffstats
path: root/debian/_base/applications/misc
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_base/applications/misc')
-rw-r--r--debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/bibletime/debian/compat2
-rw-r--r--debian/_base/applications/misc/bibletime/debian/control2
-rw-r--r--debian/_base/applications/misc/bibletime/debian/de/bibletime.1109
-rw-r--r--debian/_base/applications/misc/bibletime/debian/docs1
-rw-r--r--debian/_base/applications/misc/bibletime/debian/en/bibletime.1109
-rw-r--r--debian/_base/applications/misc/bibletime/debian/install4
-rwxr-xr-xdebian/_base/applications/misc/bibletime/debian/rules30
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat2
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control2
-rw-r--r--debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs2
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk251
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/compat2
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/control8
-rw-r--r--debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install8
-rwxr-xr-xdebian/_base/applications/misc/desktop-effects-tde/debian/rules34
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/changelog76
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/compat1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/control23
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/copyright31
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/fusion-icon.138
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm359
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/install1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/links1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/manpages1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/menu2
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/patches/series0
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/pycompat1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk260
-rwxr-xr-xdebian/_base/applications/misc/fusion-icon/debian/rules51
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/source/format1
-rw-r--r--debian/_base/applications/misc/fusion-icon/debian/source/options6
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/control2
-rw-r--r--debian/_base/applications/misc/kcmldap/debian/docs2
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/control2
-rw-r--r--debian/_base/applications/misc/kcmldapcontroller/debian/docs2
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/compat2
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/control2
-rw-r--r--debian/_base/applications/misc/kcmldapmanager/debian/docs2
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/compat2
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/control2
-rw-r--r--debian/_base/applications/misc/kerberostray/debian/docs1
-rw-r--r--debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk7
-rw-r--r--debian/_base/applications/misc/krecipes/debian/compat2
-rw-r--r--debian/_base/applications/misc/krecipes/debian/control2
-rw-r--r--debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install1
-rw-r--r--debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages1
-rw-r--r--debian/_base/applications/misc/krecipes/debian/krecipes.1187
-rwxr-xr-xdebian/_base/applications/misc/krecipes/debian/rules4
57 files changed, 365 insertions, 1341 deletions
diff --git a/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/bibletime/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/bibletime/debian/compat b/debian/_base/applications/misc/bibletime/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/bibletime/debian/compat
+++ b/debian/_base/applications/misc/bibletime/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/bibletime/debian/control b/debian/_base/applications/misc/bibletime/debian/control
index efb47392c..2f447bb7e 100644
--- a/debian/_base/applications/misc/bibletime/debian/control
+++ b/debian/_base/applications/misc/bibletime/debian/control
@@ -1,6 +1,6 @@
Source: bibletime-trinity
Section: tde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 9~), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev, libsword-dev, libclucene-dev, libboost-dev
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Standards-Version: 3.8.4
diff --git a/debian/_base/applications/misc/bibletime/debian/de/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
deleted file mode 100644
index a7b223af3..000000000
--- a/debian/_base/applications/misc/bibletime/debian/de/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Software für das Bibelstudium für TDE
-.SH "ÜBERSICHT"
-.B bibletime
-[
-\fIQt\-Optionen\fR
-]
-[
-\fITDE\-Optionen\fR
-]
-[
-\fIOptionen\fR
-]
-.SH "BESCHREIBUNG"
-Diese Manpage beschreibt die
-TDE\-Applikation
-.B bibletime
-und wurde für Debian GNU/Linux geschrieben, weil
-das Programm selbst keine Manpage mitbrachte.
-.P
-.B BibleTime
-ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium
-für UNIX\-Systeme.
-Es erfordert eine laufende TDE\-Umgebung und die Bibliothek SWORD.
-BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln,
-Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen
-Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern,
-drucken usw.).
-.SS "Einfache Optionen:"
-.TP
-\fB\-\-help\fR
-Optionen von "Hilfe zu" anzeigen
-.TP
-\fB\-\-help\-qt\fR
-Spezielle Optionen zu Qt anzeigen
-.TP
-\fB\-\-help\-tde\fR
-Spezielle Optionen zu TDE anzeigen
-.TP
-\fB\-\-help\-all\fR
-Alle Optionen anzeigen
-.TP
-\fB\-\-author\fR
-Autoren\-Information anzeigen
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Versionsinformation anzeigen
-.TP
-\fB\-\-license\fR
-Lizenz\-Info anzeigen
-.TP
-\fB\-\-\fR
-Ende der Optionen
-.SH "OPTIONEN"
-.TP
-\fB\-\-debug\fR
-Fehlermeldungen aktivieren
-.TP
-\fB\-\-ignore\-session\fR
-Die Startsitzung ignorieren, die beim letzten Beenden von BibleTime
-gespeichert wurde.
-.TP
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Die Standardbibel an der angegebenen Stelle \fIkey\fR öffnen.
-Verwenden Sie \fIrandom\fR, um eine zufällige Stelle aufzuschlagen.
-.SH "SIEHE AUCH"
-Die vollständige Dokumentation für
-.B bibletime
-und das
-.B Bibelstudium
-werden als DocBook\-Handbuch bereitgestellt. Wenn das Progamm
-.B khelpcenter
-richtig eingerichtet ist, sollte das Kommando
-.IP
-.B khelpcenter help:/bibletime
-.PP
-das komplette Handbuch zugänglich machen.
-.SH "FEHLER"
-Bitte melden Sie Fehler an
-.br
-http://bugs.trinitydesktop.org oder info@bibletime.info ,
-.br
-nicht direkt an die Autoren.
-.br
-.SH "AUTOREN"
-BibleTime wurde geschrieben von:
-.br
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br
-Martin Gruner <mg.pub@gmx.net>
-.br
-Nikolay Igotti <olonho@hotmail.com>
-.br
-Gary Sims <gary@garysims.co.uk>
-.br
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br
-James Ots <me@jamesots.com>
-.br
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P
-Diese Manpage wurde erstellt von
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-für Debian GNU/Linux (kann aber auch von anderen genutzt werden).
diff --git a/debian/_base/applications/misc/bibletime/debian/docs b/debian/_base/applications/misc/bibletime/debian/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/debian/_base/applications/misc/bibletime/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/_base/applications/misc/bibletime/debian/en/bibletime.1 b/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
deleted file mode 100644
index 46332c7d9..000000000
--- a/debian/_base/applications/misc/bibletime/debian/en/bibletime.1
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "TDE Application"
-.SH "NAME"
-bibletime \- Bible study tool for TDE
-.SH "SYNOPSIS"
-.B bibletime
-[
-\fIQt\-options\fR
-]
-[
-\fITDE\-options\fR
-]
-[
-\fIoptions\fR
-]
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B bibletime
-TDE Application.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-.P
-.B BibleTime
-is a free and easy to use bible study tool for UNIX systems.
-It requires a working TDE environment and the SWORD library.
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
-and lexicons) and powerful features to work with these texts (search in
-texts, write own notes, save, print etc.).
-.SS "Generic options:"
-.TP
-\fB\-\-help\fR
-Show help about options
-.TP
-\fB\-\-help\-qt\fR
-Show Qt specific options
-.TP
-\fB\-\-help\-tde\fR
-Show TDE specific options
-.TP
-\fB\-\-help\-all\fR
-Show all options
-.TP
-\fB\-\-author\fR
-Show author information
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-license\fR
-Show license information
-.TP
-\fB\-\-\fR
-End of options.
-.SH "OPTIONS"
-.TP
-\fB\-\-debug\fR
-Enable debug messages.
-.TP
-\fB\-\-ignore\-session\fR
-Ignore the startup session that was saved when BibleTime was closed
-the last time.
-.TP
-\fB\-\-open\-default\-bible\fR \fIkey\fR
-Open the default bible with the given \fIkey\fR.
-Use
-.I random
-to open at a random position.
-.SH "SEE ALSO"
-The full documentations for
-.B bibletime
-and
-.B bible study
-are maintained as docbook manuals. If the
-.B khelpcenter
-program is properly installed at your site, the command
-.IP
-.B khelpcenter help:/bibletime
-.PP
-should give you access to the complete manual.
-.SH "BUGS"
-Please use
-.br
-http://bugs.trinitydesktop.org or info@bibletime.info
-.br
-to report bugs, do not mail the authors directly.
-.br
-.SH "AUTHOR"
-BibleTime was written by
-.br
-.nh
-Joachim Ansorg <junkmail@joachim.ansorgs.de>
-.br
-Martin Gruner <mg.pub@gmx.net>
-.br
-Nikolay Igotti <olonho@hotmail.com>
-.br
-Gary Sims <gary@garysims.co.uk>
-.br
-Timothy R. Butler <tbutler@uninetsolutions.com>
-.br
-James Ots <me@jamesots.com>
-.br
-Fred Saalbach <saalbach@sybercom.net>
-.hy
-.P
-This manual page was prepared by
-.nh
-Erik Schanze <schanzi_@gmx.de>
-.hy
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/misc/bibletime/debian/install b/debian/_base/applications/misc/bibletime/debian/install
index dc727ccec..dcf290ae2 100644
--- a/debian/_base/applications/misc/bibletime/debian/install
+++ b/debian/_base/applications/misc/bibletime/debian/install
@@ -1,3 +1 @@
-bibletime.xpm /opt/trinity/share/pixmaps/
-en/bibletime.1 /opt/trinity/share/man/man1
-de/bibletime.1 /opt/trinity/share/man/de/man1
+debian/bibletime.xpm /opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/misc/bibletime/debian/rules b/debian/_base/applications/misc/bibletime/debian/rules
index 430b47715..a6797f19a 100755
--- a/debian/_base/applications/misc/bibletime/debian/rules
+++ b/debian/_base/applications/misc/bibletime/debian/rules
@@ -1,23 +1,17 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_DH_INSTALL_SOURCEDIR := debian
-
-DEB_BUILDDIR = $(DEB_SRCDIR)
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-DEB_CMAKE_CUSTOM_FLAGS := -DKGTK_KDE3=true -DKGTK_QT3=true
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-binary-install/bibletime-trinity::
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/*
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc
- chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/tips
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
index 55670d8c4..35441d9b7 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/control
@@ -2,7 +2,7 @@ Source: compizconfig-backend-tdeconfig-trinity
Section: libs
Priority: extra
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, compiz-trinity-dev, pkg-config, tdelibs14-trinity-dev, libcompizconfig0-trinity-dev
Standards-Version: 3.8.4
Package: compizconfig-backend-tdeconfig-trinity
diff --git a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
index 9737d93a4..38f031651 100644
--- a/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
+++ b/debian/_base/applications/misc/compizconfig-backend-tdeconfig/debian/docs
@@ -1,2 +1,2 @@
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..aba508624
--- /dev/null
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/debian-tde.mk
@@ -0,0 +1,251 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifdef _cdbs_class_cmake
+ifneq "$(wildcard /usr/bin/ninja)" ""
+MAKE = ninja -v
+DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
+DEB_MAKE_INSTALL_TARGET = install
+DEB_CMAKE_NORMAL_ARGS += -GNinja
+endif
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
+
+# The default gzip compressor has been changed in dpkg >= 1.17.0.
+deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
+ sed -e "s|.*version ||" -e "s| .*||" | \
+ xargs -r dpkg --compare-versions 1.17.0 lt \
+ && echo xz || echo gzip)
+ifeq ($(deb_default_compress),gzip)
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+endif
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+.tdepkginfo:
+ echo "# TDE package information" >.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
+ dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
+ date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
+
+post-patches:: .tdepkginfo
+
+common-build-arch:: debian/stamp-man-pages
+debian/stamp-man-pages:
+ if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+ for f in $$(find debian/man -name '*.sgml'); do \
+ docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
+ done
+ for f in $$(find debian/man -name '*.man'); do \
+ soelim -I debian/man $$f \
+ > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+ done
+ touch debian/stamp-man-pages
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
+ if test -e debian/$(cdbs_curpkg).lintian; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).lintian \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
+ fi
+ if test -e debian/$(cdbs_curpkg).presubj; then \
+ install -p -D -m644 debian/$(cdbs_curpkg).presubj \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
+ fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+ set -e; \
+ for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+ pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+ echo Building $$pkg HTML docs...; \
+ mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f .tdepkginfo
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/compat b/debian/_base/applications/misc/desktop-effects-tde/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/compat
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/control b/debian/_base/applications/misc/desktop-effects-tde/debian/control
index 9c981fe54..7bccf8499 100644
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/control
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/control
@@ -2,16 +2,16 @@ Source: desktop-effects-tde-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 9~), python-support (>= 0.6) | dh-python, python-all-dev
+Build-Depends-Indep: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs-trinity-dev,
+ dh-python, python3-all-dev, pytde-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
+X-Python3-Version: all
Package: desktop-effects-tde-trinity
Architecture: all
-Depends: ${python:Depends}, python-tqt, python-trinity-trinity
+Depends: ${python3:Depends}, python3-apt, python3-pytqt, python3-pytde
Replaces: desktop-effects-kde-trinity (<< 4:14.0.0~)
Breaks: desktop-effects-kde-trinity (<< 4:14.0.0~)
-XB-Python-Version: ${python:Versions}
Description: compiz setup tool for Trinity
A simple Compiz configuration tool for Trinity. Installs and sets Compiz
as the window manager.
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install b/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
deleted file mode 100644
index 2b6b93781..000000000
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/desktop-effects-tde-trinity.install
+++ /dev/null
@@ -1,8 +0,0 @@
-desktop-effects-tde /opt/trinity/bin/
-25enable-compiz /etc/X11/Xsession.d/
-DesktopEffects/DesktopEffectsCommon.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsDialog.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/DesktopEffectsTDE.py /opt/trinity/share/pyshared/DesktopEffects/
-DesktopEffects/__init__.py /opt/trinity/share/pyshared/DesktopEffects/
-data/* /opt/trinity/share/apps/desktop-effects-tde/
-desktop-effects-tde.desktop /opt/trinity/share/applications/
diff --git a/debian/_base/applications/misc/desktop-effects-tde/debian/rules b/debian/_base/applications/misc/desktop-effects-tde/debian/rules
index eef8add16..bcea12716 100755
--- a/debian/_base/applications/misc/desktop-effects-tde/debian/rules
+++ b/debian/_base/applications/misc/desktop-effects-tde/debian/rules
@@ -1,26 +1,20 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
binary-install/desktop-effects-tde-trinity::
- ${DH_PYTHON2} -pdesktop-effects-tde-trinity
+ dh_python3 -p $(cdbs_curpkg) --shebang=/usr/bin/python3 /opt/trinity/bin
diff --git a/debian/_base/applications/misc/fusion-icon/debian/changelog b/debian/_base/applications/misc/fusion-icon/debian/changelog
deleted file mode 100644
index 87f2b117a..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/changelog
+++ /dev/null
@@ -1,76 +0,0 @@
-fusion-icon-trinity (0.0.0+git20071028-0ubuntu1) jaunty; urgency=low
-
- * Added -trinity suffix
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 16 Apr 2009 19:57:00 -0600
-
-fusion-icon (0.0.0+git20071028-2ubuntu2) hardy; urgency=low
-
- * Rebuild package so that it uses the python-central's new directories,
- to avoid an installation error (LP: #207831).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 28 Mar 2008 00:22:47 +0100
-
-fusion-icon (0.0.0+git20071028-2ubuntu1) hardy; urgency=low
-
- * Manual sync to workaround .orig.tar.gz mismatch (LP: #204799).
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 20:55:03 +0100
-
-fusion-icon (0.0.0+git20071028-2) unstable; urgency=medium
-
- * debian/control:
- - Bump python-central build dependency's minimum version to 0.6.0.
- - Remove "${shlibs:Depends}" from Depends.
- * debian/rules:
- - Do not try to remove usr/lib, as python-central doesn't create it
- anymore now (Closes: #472010).
- - Remove unnecessary explicit dh_pycentral call.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Fri, 21 Mar 2008 19:57:39 +0100
-
-fusion-icon (0.0.0+git20071028-1) unstable; urgency=low
-
- * Initial upload to Debian (Closes: #461769).
- * debian/rules:
- - Change priority from "extra" to "optional".
- - Change the Maintainer to myself and add the python-apps team
- as Uploader.
- - Add SVN information.
- * debian/copyright:
- - Some formatting changes.
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 20 Jan 2008 21:34:55 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu2) hardy; urgency=low
-
- * patches/remove_shabangs.patch:
- - Remove Python shabangs
- * patches/update-desktop-file.patch:
- - Update .desktop file to match the current FD.o standards
- - Add Catalan and Spanish translations
- - Launch with the "--no-start" option, so that it doesn't reload
- Compiz when it's run from the menu
- * patches/glx_vendor_crash.patch:
- - Always define the self.glx_vendor variable, to avoid and
- AttributeError (LP: #175504)
- * Add a .xpm version of the icon (debian/fusion-icon.xpm) and a
- menu file (debian/menu, debian/install)
- * Symlink the .png icon to /usr/share/pixmaps, so that it's
- displayed in the menu and the tray (debian/links)
- * Add a manpage (debian/fusion-icon.1, debian/manpages)
- * debian/control:
- - Bump standards version to 3.7.3
- - Bump cdbs' and debhelper's minium versions.
- - Move python-central and intltool to Build-Depends-Indep
- - Add python-compizconfig dependency (LP: #174507)
- - Add python-qt4 as alternative dependency to python-gtk2
- - Change short description
-
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Tue, 11 Dec 2007 20:49:24 +0100
-
-fusion-icon (0.0.0+git20071028-0ubuntu1) hardy; urgency=low
-
- * Initial upload.
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Sun, 28 Oct 2007 11:28:19 -0400
diff --git a/debian/_base/applications/misc/fusion-icon/debian/compat b/debian/_base/applications/misc/fusion-icon/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/applications/misc/fusion-icon/debian/control b/debian/_base/applications/misc/fusion-icon/debian/control
deleted file mode 100644
index 853bb741f..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: fusion-icon-trinity
-Section: x11
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
-XS-Python-Version: all
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 9~), quilt, pkg-config, python-all-dev
-Build-Depends-Indep: python-support (>= 0.6) | dh-python
-Standards-Version: 3.8.4
-
-Package: fusion-icon-trinity
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Replaces: fusion-icon-trinity (<< 4:14.0.0~)
-Breaks: fusion-icon-trinity (<< 4:14.0.0~)
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 | python-qt4, python-compizconfig-trinity, compiz-trinity
-Description: tray icon to launch and manage Compiz Fusion [Trinity]
- The OpenCompositing Project brings 3D desktop visual effects that
- improve the usability and eye candy of the X Window System and provide
- increased productivity.
- .
- This package contains a tray icon that can launch Compiz and its
- decorators.
diff --git a/debian/_base/applications/misc/fusion-icon/debian/copyright b/debian/_base/applications/misc/fusion-icon/debian/copyright
deleted file mode 100644
index ae1ce34fa..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/copyright
+++ /dev/null
@@ -1,31 +0,0 @@
-This package was debianized by Michael Vogt <mvo@ubuntu.com>
-Wed, 28 Oct 2007 15:59:31 +0200.
-
-It was downloaded from git://anongit.compiz-fusion.org/users/crdlb/fusion-icon
-
-Upstream Author:
-
- Christopher Williams
-
-Copyright:
-
- Copyright (C) 2007 Christopher Williams
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 2007 Michael Vogt <mvo@ubuntu.com>,
-(C) 2008 Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>, and it
-is licensed under the GPL (see above).
diff --git a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1 b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
deleted file mode 100644
index 1b15860e1..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.TH FUSION\-ICON "1" "11 December 2007"
-.SH NAME
-fusion\-icon \- tray icon to launch and manage Compiz Fusion
-.SH SYNOPSIS
-.B fusion\-icon\fR [\fBOPTIONS\fR]
-.SH DESCRIPTION
-.PP
-This man page documents briefly the \fBfusion\-icon\fR command.
-\fBfusion\-icon\fR is a tray icon for easy window manager and window
-decorator switching, and it is being developed as part of the Open
-Compositing project.
-.SH OPTIONS
-.TP
-.B \-\-version
-Show \fBfusion\-icon\fR's version number and exit.
-.TP
-\fB\-s\fR <seconds>, \fB\-\-sleep\fR=<seconds>
-Sleep for \fIseconds\fR seconds before launching \fBfusion\-icon\fR.
-.TP
-\fB\-i\fR <interface>, \fB\-\-interface\fR=<interface>
-Try a certain interface first.
-.TP
-\fB\-u\fR, \fB\-\-no\-interface\fR
-Do not use any interface.
-.TP
-\fB\-f\fR, \fB\-\-force\-compiz\fR
-Start compiz regardless of environment or configuration.
-.TP
-\fB\-n\fR, \fB\-\-no\-start\fR
-Run, but do not start a window manager.
-
-.SH SEE ALSO
-.BR compiz (1)
-.PP
-
-.SH COPYRIGHT
-This manual page was written by Siegfried\-Angel Gevatter Pujals <rainct@ubuntu.com>.
-It is released under the GNU General Public License, version 2 or later.
diff --git a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm b/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
deleted file mode 100644
index fe0843739..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/fusion-icon.xpm
+++ /dev/null
@@ -1,359 +0,0 @@
-/* XPM */
-static char * fusion_icon_xpm[] = {
-"32 32 324 2",
-" c None",
-". c #C8E3FA",
-"+ c #D4E9FB",
-"@ c #FDFEFF",
-"# c #F0F5FB",
-"$ c #C6E2FA",
-"% c #CDE5FB",
-"& c #CBE6FB",
-"* c #C5E6FC",
-"= c #BEE7FB",
-"- c #B6E6FB",
-"; c #AAE3FB",
-"> c #9DDFFA",
-", c #93DCF9",
-"' c #E3F3FA",
-") c #E0EFF7",
-"! c #90BFE4",
-"~ c #77A8DF",
-"{ c #C3E0FA",
-"] c #C9E4FB",
-"^ c #C5E4FB",
-"/ c #C1E6FC",
-"( c #BAE6FB",
-"_ c #B3E5FB",
-": c #A7E2FB",
-"< c #9ADEFA",
-"[ c #8DDBF9",
-"} c #8CDBFB",
-"| c #A9D4E8",
-"1 c #0681C1",
-"2 c #017FBE",
-"3 c #429ECF",
-"4 c #82B7E0",
-"5 c #6EA3DC",
-"6 c #B9DCF9",
-"7 c #ACE1FA",
-"8 c #A1DEF9",
-"9 c #93DAF7",
-"0 c #87D6F7",
-"a c #87D7F8",
-"b c #9FCEE3",
-"c c #007DBD",
-"d c #007CBC",
-"e c #3C99CC",
-"f c #639FD9",
-"g c #B8DFF9",
-"h c #82D4F6",
-"i c #80D2F3",
-"j c #98CAE1",
-"k c #007CBB",
-"l c #007BBB",
-"m c #007BBA",
-"n c #5B9ED6",
-"o c #B7DDF9",
-"p c #7ECFF3",
-"q c #7EBBD6",
-"r c #89B8CC",
-"s c #7CCCEF",
-"t c #7DCFF3",
-"u c #91C5DE",
-"v c #007BB9",
-"w c #007AB9",
-"x c #5B9ED5",
-"y c #B6DEF7",
-"z c #77CBF0",
-"A c #79B9D4",
-"B c #ECF4FB",
-"C c #AEC6D2",
-"D c #77C1E0",
-"E c #8AC1DB",
-"F c #007AB8",
-"G c #0079B7",
-"H c #5B9DD5",
-"I c #B5DDF7",
-"J c #71C8EE",
-"K c #74B6D3",
-"L c #EEF6FD",
-"M c #EFF7FE",
-"N c #D7E3EB",
-"O c #7CB6D2",
-"P c #71C7ED",
-"Q c #70C7EE",
-"R c #83BDD8",
-"S c #0079B6",
-"T c #0078B6",
-"U c #5B9DD4",
-"V c #B4DCF8",
-"W c #6BC3EC",
-"X c #6FB2D1",
-"Y c #99BDCE",
-"Z c #6DBEE5",
-"` c #6BC2EC",
-" . c #7BB8D6",
-".. c #0078B5",
-"+. c #0077B4",
-"@. c #B4DBF7",
-"#. c #65BFE9",
-"$. c #6CAFD0",
-"%. c #C7D8E2",
-"&. c #6EB3D4",
-"*. c #64BEE9",
-"=. c #75B4D4",
-"-. c #0076B3",
-";. c #0076B2",
-">. c #B3DAF6",
-",. c #5FBAE6",
-"'. c #67ACCE",
-"). c #E7EFF6",
-"!. c #84B1C9",
-"~. c #60B9E4",
-"{. c #5EB9E6",
-"]. c #6EAFD0",
-"^. c #0075B2",
-"/. c #0075B1",
-"(. c #5B9CD3",
-"_. c #B3DAF5",
-":. c #59B6E3",
-"<. c #62A8CB",
-"[. c #B2C8D5",
-"}. c #60AFD5",
-"|. c #58B5E3",
-"1. c #68ABCE",
-"2. c #0074B0",
-"3. c #0074AF",
-"4. c #B1DAF5",
-"5. c #52B1E0",
-"6. c #5CA6C9",
-"7. c #CDE6F5",
-"8. c #8CC5E1",
-"9. c #85C1E1",
-"0. c #81BFDF",
-"a. c #7DBEDE",
-"b. c #71B7D9",
-"c. c #51B1E0",
-"d. c #50B1E0",
-"e. c #4FB0E0",
-"f. c #4DAFDF",
-"g. c #4AAEDF",
-"h. c #5EA5CA",
-"i. c #0073AF",
-"j. c #0073AE",
-"k. c #5B9CD2",
-"l. c #B0D9F4",
-"m. c #4CACDE",
-"n. c #59A2C8",
-"o. c #B5DCF1",
-"p. c #BCD7E6",
-"q. c #EAF4FB",
-"r. c #5CABD5",
-"s. c #45A9DD",
-"t. c #43A8DD",
-"u. c #41A7DC",
-"v. c #3FA6DC",
-"w. c #3DA5DC",
-"x. c #3CA5DB",
-"y. c #3AA4DB",
-"z. c #529EC5",
-"A. c #0072AD",
-"B. c #0072AC",
-"C. c #5B9BD2",
-"D. c #B0D7F4",
-"E. c #3DA4DA",
-"F. c #4D99C3",
-"G. c #DEF0FB",
-"H. c #43A3D7",
-"I. c #67A6C7",
-"J. c #BAD7E7",
-"K. c #35A0D7",
-"L. c #34A0D8",
-"M. c #4C99C2",
-"N. c #0071AC",
-"O. c #0071AB",
-"P. c #589AD1",
-"Q. c #AFD6F4",
-"R. c #2F9CD5",
-"S. c #4595C0",
-"T. c #ECF4FC",
-"U. c #64B0D9",
-"V. c #3A9ED4",
-"W. c #CFDEE7",
-"X. c #EBF4FC",
-"Y. c #68AACE",
-"Z. c #4495BF",
-"`. c #0071AA",
-" + c #0070AA",
-".+ c #0070A9",
-"++ c #5497CF",
-"@+ c #ACD6F3",
-"#+ c #2997D2",
-"$+ c #4091BE",
-"%+ c #9BC9E7",
-"&+ c #73A5C3",
-"*+ c #E1EFFC",
-"=+ c #D6E9F8",
-"-+ c #3497CD",
-";+ c #3E8FBB",
-">+ c #006FA9",
-",+ c #006FA8",
-"'+ c #4F95CE",
-")+ c #A6D2F2",
-"!+ c #2393CF",
-"~+ c #318FC2",
-"{+ c #2994CE",
-"]+ c #3491C4",
-"^+ c #CFE1F2",
-"/+ c #D6EAFC",
-"(+ c #92C3E1",
-"_+ c #378BB8",
-":+ c #006EA7",
-"<+ c #006EA6",
-"[+ c #4B91CD",
-"}+ c #A2CFF1",
-"|+ c #1F8ECD",
-"1+ c #1E8ECD",
-"2+ c #7DA8C4",
-"3+ c #CBE4FB",
-"4+ c #4699C9",
-"5+ c #3087B5",
-"6+ c #006DA6",
-"7+ c #006DA5",
-"8+ c #468ECB",
-"9+ c #9ECDF1",
-"0+ c #2691CD",
-"a+ c #2590CD",
-"b+ c #2490CD",
-"c+ c #2390CC",
-"d+ c #218FCC",
-"e+ c #1F8ECC",
-"f+ c #3A88B6",
-"g+ c #BEDCF7",
-"h+ c #C0DEFA",
-"i+ c #ACD3F3",
-"j+ c #1D8AC8",
-"k+ c #198ACA",
-"l+ c #188ACA",
-"m+ c #2A82B3",
-"n+ c #016EA5",
-"o+ c #0570A7",
-"p+ c #0972A8",
-"q+ c #4990CC",
-"r+ c #99C8EF",
-"s+ c #3798CF",
-"t+ c #3598CF",
-"u+ c #3497CF",
-"v+ c #3397CF",
-"w+ c #3296CE",
-"x+ c #3093CC",
-"y+ c #8DB1CF",
-"z+ c #B5D9F9",
-"A+ c #B4D8F9",
-"B+ c #6BAFDA",
-"C+ c #2891CC",
-"D+ c #2690CC",
-"E+ c #248FCB",
-"F+ c #218DCA",
-"G+ c #1E8CCA",
-"H+ c #1B8AC9",
-"I+ c #2880B2",
-"J+ c #0C74A9",
-"K+ c #1076AB",
-"L+ c #1378AC",
-"M+ c #177AAD",
-"N+ c #4E92CE",
-"O+ c #8DB5D9",
-"P+ c #9ECBF3",
-"Q+ c #94C7F1",
-"R+ c #85C0EA",
-"S+ c #72B3DF",
-"T+ c #61A7D4",
-"U+ c #539FCD",
-"V+ c #479BCD",
-"W+ c #3F9ACF",
-"X+ c #5394BD",
-"Y+ c #AAD3F8",
-"Z+ c #A9D3F8",
-"`+ c #A8D1F8",
-" @ c #4197CB",
-".@ c #3B99CF",
-"+@ c #3A98CF",
-"@@ c #3897CE",
-"#@ c #3696CE",
-"$@ c #398AB9",
-"%@ c #187BAD",
-"&@ c #1B7CAF",
-"*@ c #1E7EB0",
-"=@ c #2C85B7",
-"-@ c #4E93CB",
-";@ c #6096D1",
-">@ c #45596A",
-",@ c #5A7389",
-"'@ c #6D8CA6",
-")@ c #7EA0C0",
-"!@ c #8FB7DB",
-"~@ c #9ECAF2",
-"{@ c #97C9F3",
-"]@ c #A0CEF7",
-"^@ c #87C1EC",
-"/@ c #469DCF",
-"(@ c #49A0D2",
-"_@ c #489FD1",
-":@ c #469ED1",
-"<@ c #4590BC",
-"[@ c #2884B3",
-"}@ c #378ABD",
-"|@ c #5999CF",
-"1@ c #689AD1",
-"2@ c #486B90",
-"3@ c #45596B",
-"4@ c #59738B",
-"5@ c #6C8AA5",
-"6@ c #7DA1C1",
-"7@ c #8FB9DC",
-"8@ c #98C9F2",
-"9@ c #8CC3EE",
-"0@ c #7DB9E6",
-"a@ c #6DAFDA",
-"b@ c #65A6CE",
-"c@ c #639FD4",
-"d@ c #6B9CD0",
-"e@ c #47688C",
-"f@ c #475C6E",
-"g@ c #5B758C",
-"h@ c #7391AC",
-"i@ c #446385",
-" ",
-" ",
-" ",
-" ",
-" . + @ # ",
-" $ % & * = - ; > , ' ) ! ~ ",
-" { ] ^ / ( _ : < [ } } } } } } } | 1 2 3 4 5 ",
-" 6 7 8 9 0 a a a a a a a a a a a a a a b c c c d e f ",
-" g h i h h h h h h h h h h h h h h h h j d k k l m n ",
-" o p q r s p p p p p p t t t t t t t t u m m v w w x ",
-" y z A B C D z z z z z z z z z z z z z E w F F G G H ",
-" I J K L M N O P J J J J J J Q Q Q Q Q R G G S T T U ",
-" V W X L M M B Y Z W W W W W W ` ` ` ` .T ....+.+.U ",
-" @.#.$.L M M M M %.&.#.#.#.#.#.#.#.#.*.=.+.+.-.-.;.U ",
-" >.,.'.L M M M M M ).!.~.,.,.,.,.,.,.{.].-.;.^././.(. ",
-" _.:.<.L M M M M M M L [.}.|.|.|.|.|.|.1././.2.2.3.(. ",
-" 4.5.6.L M M M 7.8.9.0.a.b.c.c.d.e.f.g.h.3.3.i.j.j.k. ",
-" l.m.n.L M o.p.q.r.s.t.u.v.w.x.y.y.y.y.z.j.j.A.A.B.C. ",
-" D.E.F.L G.H.I.L J.K.L.L.L.L.L.L.L.L.L.M.B.B.N.O.O.P. ",
-" Q.R.S.T.U.R.V.W.X.Y.R.R.R.R.R.R.R.R.R.Z.O.`. + +.+++ ",
-" @+#+$+%+#+#+#+&+*+=+-+#+#+#+#+#+#+#+#+;+.+>+,+,+,+'+ ",
-" )+!+~+{+!+!+!+]+^+/+(+!+!+!+!+!+!+!+!+_+,+:+:+:+<+[+ ",
-" }+|+|+|+1+1+1+|+2+3+3+4+1+1+1+1+1+1+1+5+<+6+7+7+7+8+ ",
-" 9+0+0+a+b+c+d+e+f+g+h+i+j+k+k+k+k+l+l+m+7+7+n+o+p+q+ ",
-" r+s+t+u+v+v+w+w+x+y+z+A+B+C+D+E+F+G+H+I+p+J+K+L+M+N+ ",
-" O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@.@+@@@#@$@%@&@*@=@-@;@ ",
-" >@,@'@)@!@~@{@]@]@]@^@/@(@_@_@:@<@[@}@|@1@2@ ",
-" 3@4@5@6@7@8@9@0@a@b@c@d@e@ ",
-" f@g@h@i@ ",
-" ",
-" ",
-" "};
diff --git a/debian/_base/applications/misc/fusion-icon/debian/install b/debian/_base/applications/misc/fusion-icon/debian/install
deleted file mode 100644
index 7d4e26567..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.xpm usr/share/pixmaps
diff --git a/debian/_base/applications/misc/fusion-icon/debian/links b/debian/_base/applications/misc/fusion-icon/debian/links
deleted file mode 100644
index 51627e83a..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-opt/trinity/share/icons/hicolor/48x48/apps/fusion-icon.png opt/trinity/share/pixmaps/fusion-icon.png
diff --git a/debian/_base/applications/misc/fusion-icon/debian/manpages b/debian/_base/applications/misc/fusion-icon/debian/manpages
deleted file mode 100644
index 3ba122a39..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/fusion-icon.1
diff --git a/debian/_base/applications/misc/fusion-icon/debian/menu b/debian/_base/applications/misc/fusion-icon/debian/menu
deleted file mode 100644
index e85a21dbf..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(fusion-icon-trinity): needs="X11" section="Applications/System/Administration" title="Compiz Fusion Icon [Trinity]" \
- command="/opt/trinity/bin/fusion-icon" icon="/opt/trinity/share/pixmaps/fusion-icon.xpm"
diff --git a/debian/_base/applications/misc/fusion-icon/debian/patches/series b/debian/_base/applications/misc/fusion-icon/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/patches/series
+++ /dev/null
diff --git a/debian/_base/applications/misc/fusion-icon/debian/pycompat b/debian/_base/applications/misc/fusion-icon/debian/pycompat
deleted file mode 100644
index 0cfbf0888..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk b/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
deleted file mode 100644
index fbc70a624..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/python-distutils-custom.mk
+++ /dev/null
@@ -1,260 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Colin Walters <walters@debian.org>
-# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
-#
-# Description: manage Python public modules build
-# This class is designed to work with Python packages using the
-# 'distutils' build system and comply to the new policy established
-# during summer 2006. Use of the debhelper class to make use of the
-# new dh_python is strongly advised. (This is still left as optional
-# in line with CDBS' flexible behavior.)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02111-1307 USA.
-#
-
-# This class provides rules for old and new Python policy. Leaving
-# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and
-# pycentral methods are available to comply with new policy. Don't forget
-# to update your 'debian/control'. (Build-Depends are correctly generated
-# if you are using the auto control generation feature.)
-
-# Once all old-style packages are removed before etch, some of the old
-# can be refactored or removed.
-
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_python_distutils
-_cdbs_class_python_distutils = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
-
-
-# check python system
-cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
-cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
-cdbs_pycompat = $(cdbs_selected_pycompat)
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- # warning pysupport compatibility mode
- ifneq (, $(cdbs_use_xs_field))
- $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
- endif # use XS field (compat)
-else
- ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
- ifeq (, $(cdbs_selected_pycompat))
- cdbs_pycompat = 2
- endif # use pycompat
- else
- ifneq (, $(DEB_PYTHON_SYSTEM))
- $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
- else
- ifneq (, $(cdbs_use_xs_field))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- ifneq (, $(cdbs_selected_pycompat))
- ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
- $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
- endif
- endif # use pycompat
- endif # unknown method
- endif # pycentral
-endif # pysupport
-
-
-ifndef DEB_PYTHON_SYSTEM
-DEB_PYTHON_COMPILE_VERSION =
-DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5
-else
-# default package is the first one declared in 'debian/control'
-# (override if necessary)
-DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
-DEB_PYTHON_PRIVATE_MODULES_DIRS =
-endif
-
-# common variables
-DEB_PYTHON_SETUP_CMD = setup.py
-DEB_PYTHON_CLEAN_ARGS = -a
-DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
-
-
-ifndef DEB_PYTHON_SYSTEM
-########################### old policy method ###########################
-
-$(warning =======================================================)
-$(warning Your package does not conform to the new Python policy.)
-$(warning Please consider updating. Here is some documentation:)
-$(warning http://wiki.debian.org/DebianPython/NewPolicy)
-$(warning http://wiki.debian.org/DebianPythonFAQ)
-$(warning =======================================================)
-
-# make: *** No rule to make target `voodoo'. Stop.
-DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-# If no versioned python library packages found, grab all simpler ones
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
-endif
-
-cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
-
-common-build-arch common-build-indep:: common-build-impl
-common-build-impl::
- cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-
-
-# See if this package doesn't appear to need to be compiled by multiple
-# Python versions.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
- cd $(DEB_SRCDIR) && python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-else
-$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-endif
-
-$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
- cd $(DEB_SRCDIR) && python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
-
-# This class can optionally utilize debhelper's "dh_python" command. Just
-# be sure you include debhelper.mk before including this file.
-ifdef _cdbs_rules_debhelper
-
-DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python)
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
-endif
-
-
-# Ignore errors from this rule. In a tarball build, the file may not
-# exist.
-ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-clean::
- -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
-clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
-
-$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% :
- -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif
-
-else
-########################## new policy methods ###########################
-
-# Calculate cdbs_python_build_versions
-cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
-cdbs_python_current_version := $(shell pyversions -vd)
-ifeq (all, $(cdbs_python_module_arch))
- # check if current is in build versions
- ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
- cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
- cdbs_python_build_versions := $(cdbs_python_compile_version)
- else
- cdbs_python_build_versions := $(cdbs_python_current_version)
- endif
-else
-cdbs_python_build_versions := $(shell pyversions -vr)
-endif # archall
-
-# check if build is possible
-ifeq (, $(cdbs_python_build_versions))
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-$(error invalid setting in debian/pyversions)
-else
-$(error invalid setting for XS-Python-Version)
-endif # system selected
-endif # build versions empty
-
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
-ifeq (all, $(cdbs_python_module_arch))
- ifneq (, $(cdbs_python_compile_version))
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
- else
- CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
- endif
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
-endif
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
-else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
-endif
-
-
-cdbs_python_current_binary := $(shell pyversions -d)
-cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
-
-# build stage
-common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
-python-build-stamp-%:
-ifeq (all, $(cdbs_python_module_arch))
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-else
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
-endif # archall detection
- touch $@
-
-
-# install stage
-ifeq (all, $(cdbs_python_module_arch))
-common-install-arch common-install-indep:: python-install-py
-python-install-py:
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-else
-common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
-python-install-%:
- cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
-endif # archall detection
-
-
-# clean stage
-clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
-python-clean-%:
-ifeq (all, $(cdbs_python_module_arch))
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-else
- -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
-endif # archall detection
-
-clean::
-ifeq (, $(cdbs_selected_pycompat))
- echo "$(cdbs_pycompat)" >debian/pycompat
-endif # use pycompat
- rm -f python-build-stamp-*
-
-endif
-
-
-########################## all policy methods ###########################
-
-# Calling setup.py clean may create .pyc files, so we need a final cleanup
-# pass here.
-clean::
- find . -name '*.pyc' -exec rm '{}' ';'
-
-endif
diff --git a/debian/_base/applications/misc/fusion-icon/debian/rules b/debian/_base/applications/misc/fusion-icon/debian/rules
deleted file mode 100755
index a0c6906dd..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/rules
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
- include debian/python-distutils-custom.mk
-else
- include /usr/share/cdbs/1/class/python-distutils.mk
-endif
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
- sed -e "s|.*version ||" -e "s| .*||" | \
- xargs -r dpkg --compare-versions 1.17.0 lt \
- && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-endif
-
-post-patches::
- # make sure that python binary exists
- # since the existing code is still dependent on python2
- # and cdbs uses python as the default binary name
- test -x /usr/bin/python || ln -s python2 /usr/bin/python
-
-binary-install/fusion-icon-trinity::
- mkdir -p debian/fusion-icon-trinity/usr/local/lib
- cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
- rm -rf debian/fusion-icon-trinity/usr/local
- mkdir -p debian/fusion-icon-trinity/temp
- mv debian/fusion-icon-trinity/usr/lib debian/fusion-icon-trinity/temp
- mkdir -p debian/fusion-icon-trinity/opt/trinity
- cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
- rm -rf debian/fusion-icon-trinity/usr
- ${DH_PYTHON2} -pfusion-icon-trinity
- ###
- # Must be done after invoking dh_pysupport, otherwise python scripts will
- # end up in /usr/share/pyshare instead of dist-packages
- mkdir -p debian/fusion-icon-trinity/usr
- mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
- rm -rf debian/fusion-icon-trinity/temp
- ###
- mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity
- mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/
- rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity
- dh_icons
diff --git a/debian/_base/applications/misc/fusion-icon/debian/source/format b/debian/_base/applications/misc/fusion-icon/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/_base/applications/misc/fusion-icon/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/_base/applications/misc/fusion-icon/debian/source/options b/debian/_base/applications/misc/fusion-icon/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/debian/_base/applications/misc/fusion-icon/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/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldap/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldap/debian/compat b/debian/_base/applications/misc/kcmldap/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldap/debian/compat
+++ b/debian/_base/applications/misc/kcmldap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldap/debian/control b/debian/_base/applications/misc/kcmldap/debian/control
index f67cb5723..b8a62a2d1 100644
--- a/debian/_base/applications/misc/kcmldap/debian/control
+++ b/debian/_base/applications/misc/kcmldap/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Raphaël Pinson <raphink@raphink.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-bonding-trinity
diff --git a/debian/_base/applications/misc/kcmldap/debian/docs b/debian/_base/applications/misc/kcmldap/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldap/debian/docs
+++ b/debian/_base/applications/misc/kcmldap/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/compat b/debian/_base/applications/misc/kcmldapcontroller/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/compat
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/control b/debian/_base/applications/misc/kcmldapcontroller/debian/control
index 9b6de5bbe..ff1388334 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/control
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-controller-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, slapi-dev | slapd, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-controller-trinity
diff --git a/debian/_base/applications/misc/kcmldapcontroller/debian/docs b/debian/_base/applications/misc/kcmldapcontroller/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldapcontroller/debian/docs
+++ b/debian/_base/applications/misc/kcmldapcontroller/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/compat b/debian/_base/applications/misc/kcmldapmanager/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/compat
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/control b/debian/_base/applications/misc/kcmldapmanager/debian/control
index 072371003..189fbb3ce 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/control
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/control
@@ -2,7 +2,7 @@ Source: kcontrol-ldap-manager-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kcontrol-ldap-manager-trinity
diff --git a/debian/_base/applications/misc/kcmldapmanager/debian/docs b/debian/_base/applications/misc/kcmldapmanager/debian/docs
index 4e0e4ea4e..603f33020 100644
--- a/debian/_base/applications/misc/kcmldapmanager/debian/docs
+++ b/debian/_base/applications/misc/kcmldapmanager/debian/docs
@@ -1,3 +1,3 @@
AUTHORS
INSTALL
-README
+README.md
diff --git a/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/kerberostray/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/kerberostray/debian/compat b/debian/_base/applications/misc/kerberostray/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/kerberostray/debian/compat
+++ b/debian/_base/applications/misc/kerberostray/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/kerberostray/debian/control b/debian/_base/applications/misc/kerberostray/debian/control
index 0af0907f4..b4b65fb21 100644
--- a/debian/_base/applications/misc/kerberostray/debian/control
+++ b/debian/_base/applications/misc/kerberostray/debian/control
@@ -2,7 +2,7 @@ Source: kerberostray-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kerberostray-trinity
diff --git a/debian/_base/applications/misc/kerberostray/debian/docs b/debian/_base/applications/misc/kerberostray/debian/docs
index 62deb0497..0b6e0f321 100644
--- a/debian/_base/applications/misc/kerberostray/debian/docs
+++ b/debian/_base/applications/misc/kerberostray/debian/docs
@@ -1 +1,2 @@
AUTHORS
+README.md
diff --git a/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk b/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/misc/krecipes/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/debian/_base/applications/misc/krecipes/debian/compat b/debian/_base/applications/misc/krecipes/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/_base/applications/misc/krecipes/debian/compat
+++ b/debian/_base/applications/misc/krecipes/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/_base/applications/misc/krecipes/debian/control b/debian/_base/applications/misc/krecipes/debian/control
index 4c32c8ee2..cafce1080 100644
--- a/debian/_base/applications/misc/krecipes/debian/control
+++ b/debian/_base/applications/misc/krecipes/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
Uploaders: Matthias Julius <mdeb@julius-net.net>
-Build-Depends: cdbs, debhelper (>= 9~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
+Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, automake, libtool, chrpath, tdelibs14-trinity-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev
Standards-Version: 3.8.1
Homepage: http://krecipes.sourceforge.net/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
index 8c3677c1a..28bc4ff13 100644
--- a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
+++ b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.install
@@ -1,6 +1,7 @@
debian/tmp/opt/trinity/share/apps
debian/tmp/opt/trinity/share/icons
debian/tmp/opt/trinity/share/locale
+debian/tmp/opt/trinity/share/man/man1/krecipes.1
debian/tmp/opt/trinity/share/mimelnk
debian/krecipes.xpm opt/trinity/share/pixmaps/
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages b/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
deleted file mode 100644
index 196cdc430..000000000
--- a/debian/_base/applications/misc/krecipes/debian/krecipes-data-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/krecipes.1
diff --git a/debian/_base/applications/misc/krecipes/debian/krecipes.1 b/debian/_base/applications/misc/krecipes/debian/krecipes.1
deleted file mode 100644
index aaf56f777..000000000
--- a/debian/_base/applications/misc/krecipes/debian/krecipes.1
+++ /dev/null
@@ -1,187 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KRECIPES 1 "May 2009"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-Krecipes \- The TDE Cookbook
-.SH SYNOPSIS
-.B krecipes
-[Qt\-options] [TDE\-options] [options]
-.SH DESCRIPTION
-.B Krecipes
-is a program that lets you to manage your recipes, create shopping
-lists, choose a recipe based on available ingredients and plan your
-menu/diet in advance.
-.PP
-This manual page briefly describes its command line options.
-.SH OPTIONS
-This program follows the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.TP
-.B \-\-convert-sqlite3
-Convert the current SQLite 2.x database to SQLite 3 and exit
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS Qt options
-.TP
-.B \-\-display <displayname>
-Use the X\-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8-bit
-display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color cube on an 8-bit
-display, if the application is using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B --dograb
-running under a debugger can cause an implicit \-nograb, use \-dograb
-to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an application palette (light
-and dark shades are calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on an 8\-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible values are onthespot,
-overthespot, offthespot and root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS TDE options
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget \- see man X for the
-argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-
-.SH FILES
-.TP
-.I ~/.trinity/share/config/krecipesrc
-.B Krecipes
-configuration file
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You
-can also enter the URL
-.BR help:/krecipes/
-directly into konqueror or you can run
-.BR "khelpcenter help:/krecipes/"
-from the command\-line.
-
-.SH AUTHORS
-.nf
-Jason Kivlighn <jkivlighn@gmail.com>
-.br
-Unai Garro <ugarro@users.sourceforge.net>
-.br
-Cyril Bosselut <bosselut@b1project.com>
-.br
-.fi
-Please use http://bugs.trinitydesktop.org to report bugs; do not mail the authors
-directly.
-.PP
-This manual page was written by Matthias Julius <mdeb@julius-net.net>,
-for the Debian project (and may be used by others). Permission is
-granted to copy, distribute and/or modify this document under the
-terms of the GNU General Public License, Version 2 or any later
-version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in /usr/share/common\-licenses/GPL\-2.
diff --git a/debian/_base/applications/misc/krecipes/debian/rules b/debian/_base/applications/misc/krecipes/debian/rules
index e3708987f..523611ff9 100755
--- a/debian/_base/applications/misc/krecipes/debian/rules
+++ b/debian/_base/applications/misc/krecipes/debian/rules
@@ -33,10 +33,6 @@ binary-install/krecipes-trinity::
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-binary-install/krecipes-data-trinity::
- dh_testdir
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
clean::
dh_testdir
rm -f debian/stamp-bootstrap