Rearranged applications folder into sub categories.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

175 files changed, 9170 insertions, 0 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
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/changelog b/ubuntu/_base/applications/settings/kdpkg/debian/changelog
new file mode 100644
index 000000000..2c3e7dd4d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/changelog
@@ -0,0 +1,11 @@
+kdpkg-trinity (0.1-0ubuntu2) lucid; urgency=low
+
+  * Initial Lucid build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 02 Apr 2010 21:20:00 -0600
+
+kdpkg (0.1-0ubuntu1) intrepid; urgency=low
+
+  * Initial release (LP: #201709)
+
+ -- Alexander Kopf <kopf-alexander@gmx.de>  Thu, 03 Jul 2008 22:15:34 +0200
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/compat b/ubuntu/_base/applications/settings/kdpkg/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/control b/ubuntu/_base/applications/settings/kdpkg/debian/control
new file mode 100644
index 000000000..ef413b9de
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/control
@@ -0,0 +1,16 @@
+Source: kdpkg-trinity
+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
+Standards-Version: 3.8.4
+
+Package: kdpkg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, apt, dpkg (>=1.14), sudo-trinity, menu
+Replaces: kdpkg-kde3 (<< 4:14.0.0~), kdpkg-trinity (<< 4:14.0.0~)
+Breaks: kdpkg-kde3 (<< 4:14.0.0~), kdpkg-trinity (<< 4:14.0.0~)
+Description: TDE frontend for dpkg [Trinity]
+ kdpkg is a utility for installing .deb package files.
+ It is similar to gdebi, except that kdpkg is a TDE application
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/copyright b/ubuntu/_base/applications/settings/kdpkg/debian/copyright
new file mode 100644
index 000000000..a0a9c1d0d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Fabian Wuertz <xadras@sidux.com> on
+Fri, 3 Sep 2007 19:52:51 +0100.
+
+It was downloaded from http://www.wuertz.org/downloads
+
+Upstream Author: Fabian Wuertz <xadras@sidux.com>
+
+Copyright:
+	(C) 2008 Fabian Wuertz <xadras@sidux.com>
+
+	The following file are from knxcc
+	(C) 2006 Andreas Loibl <andreas@andreas-loibl.de>
+	process.cpp                  klamp/process.cpp
+	                             klamp-install/process.cpp
+	process.h                    klamp/process.h
+	                             klamp-install/process.h
+
+	--- icons ---
+
+	The following icons are from kde-icons-nuovext
+	(C) 2005 Alexandre Moore <alexandre.moore@gmail.com>
+	cancel.png                   in klamp/kdpkgdialog.ui
+	                             in klamp-install/installdialog.ui
+	info.png                     in klamp/kdpkgdialog.ui
+
+	The following icons are from tdelibs-data
+	(c) 2002 Kalle Dalheimer <kalle@kde.org> and many others
+	wizard.png                   in klamp/kdpkgdialog.ui
+	                             in klamp-install/installdialog.ui
+	messagebox_warning.png       in klamp-install/installdialog.ui
+
+	The following icon is from kde-icons-crystalproject
+	(C) 2005 Everaldo Coelho <everaldo@everaldo.com>
+	help.png                     in klamp/kdpkgdialog.ui
+	                             in klamp-install/installdialog.ui
+	package.png                  in klamp/kdpkgdialog.ui
+	                             in klamp-install/installdialog.ui
+
+License:
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License version 2 as
+	published by the Free Software Foundation.
+
+	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
+	Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+	MA 02110-1301, USA.
+
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Alexander Kopf <kopf-alexander@gmx.de> and
+is licensed under the GPL, see above.
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/docs b/ubuntu/_base/applications/settings/kdpkg/debian/docs
new file mode 100644
index 000000000..62deb0497
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/docs
@@ -0,0 +1 @@
+AUTHORS
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/patches/series b/ubuntu/_base/applications/settings/kdpkg/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/rules b/ubuntu/_base/applications/settings/kdpkg/debian/rules
new file mode 100755
index 000000000..5a0da42af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/kdpkg/debian/source/format b/ubuntu/_base/applications/settings/kdpkg/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/kdpkg/debian/source/options b/ubuntu/_base/applications/settings/kdpkg/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kdpkg/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kima/debian/changelog b/ubuntu/_base/applications/settings/kima/debian/changelog
new file mode 100644
index 000000000..9cc006cef
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/changelog
@@ -0,0 +1,26 @@
+kima-trinity (0.7.3.2-0ubuntu2) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 Nov 2009 19:10:00 -0600
+
+kima (0.7.3.2-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+  * Change Maintainer email
+
+ -- Breuil Cyril <cyrilb856@ubuntu.com>  Sat, 23 Jun 2007 16:13:07 +0200
+
+kima (0.7.3.1-0ubuntu1) gutsy; urgency=low
+
+  * New upstream release
+
+ -- Breuil Cyril <cyrilbport@gmail.com>  Sun, 10 Jun 2007 20:20:32 +0200
+
+kima (0.7.1-0ubuntu1) gutsy; urgency=low
+
+  * Initial release (LP: #113211)
+  * Orig tarball repacked to add the full text of the GFDL.and LGPL
+
+ -- Breuil Cyril <cyrilbport@gmail.com>  Tue,  8 May 2007 01:20:34 +0200
+
diff --git a/ubuntu/_base/applications/settings/kima/debian/compat b/ubuntu/_base/applications/settings/kima/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/kima/debian/control b/ubuntu/_base/applications/settings/kima/debian/control
new file mode 100644
index 000000000..75e8156c6
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/control
@@ -0,0 +1,19 @@
+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,
+ libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
+Standards-Version: 3.8.4
+
+Package: kima-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kima-kde3 (<< 4:14.0.0~), kima-trinity (<< 4:14.0.0~)
+Breaks: kima-kde3 (<< 4:14.0.0~), kima-trinity (<< 4:14.0.0~)
+Description: kicker monitoring applet [Trinity]
+ This applet monitors various temperature,
+ frequency and fan sources in your kicker
+ panel.
+ .
+  Homepage: http://www.elliptique.net/~ken/kima/
diff --git a/ubuntu/_base/applications/settings/kima/debian/copyright b/ubuntu/_base/applications/settings/kima/debian/copyright
new file mode 100644
index 000000000..8facbcf30
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/copyright
@@ -0,0 +1,67 @@
+This package was debianized by Breuil Cyril <cyrilbport@gmail.com> on
+Tue,  8 May 2007 01:20:34 +0200.
+
+It was downloaded from http://www.elliptique.net/~ken/kima/
+
+Upstream Author: Ken Werner <ken.werner@web.de>
+
+Copyright (C) 2005-2007 by Ken Werner <ken.werner@web.de>
+Copyright (C) 2007 by Johannes Schaub
+Copyright (C) 2006 by Valentine Sinitsyn
+Copyright (C) 2005  Mattia Dongili <malattia@linux.it>
+Copyright (C) 1997 Janos Farkas <chexum@shadow.banki.hu>
+Copyright (C) 2002 by the KDE developers
+Copyright (C) 2001 Stephan Kulow <coolo@kde.org>
+Copyright 1998 Kalle Dalheimer <kalle@kde.org>
+Copyright (C) 2005 by Adriaan de Groot
+Copyright 1998 Kalle Dalheimer <kalle@kde.org>
+
+
+License:
+
+   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 of the License, 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 Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+
+The Debian packaging is (C) 2007, Breuil Cyril <cyrilbport@gmail> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+Documentation is licensed under FDL
+   Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.2
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+   Texts.  A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+those files : acinclude.m4 admin/conf.change.pl acinclude.m4.in admin/.svn/text-base/conf.change.pl.svn-base admin/.svn/text-base/acinclude.m4.in.svn-base:dnl
+admin/.svn/text-base/doxygen.sh.svn-base
+admin/doxygen.sh admin/acinclude.m4.in:dnl are licensed under LGPL
+    This files are free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser 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 Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'
+
diff --git a/ubuntu/_base/applications/settings/kima/debian/docs b/ubuntu/_base/applications/settings/kima/debian/docs
new file mode 100644
index 000000000..1a4f0317f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+FAQ
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/kima/debian/rules b/ubuntu/_base/applications/settings/kima/debian/rules
new file mode 100755
index 000000000..7ae24f493
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/rules
@@ -0,0 +1,20 @@
+#!/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
+
+WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_NVCONTROL="$(WITH_NVCONTROL)"
diff --git a/ubuntu/_base/applications/settings/kima/debian/source/format b/ubuntu/_base/applications/settings/kima/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/kima/debian/source/options b/ubuntu/_base/applications/settings/kima/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kima/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/changelog b/ubuntu/_base/applications/settings/kiosktool/debian/changelog
new file mode 100644
index 000000000..550c04bb0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/changelog
@@ -0,0 +1,92 @@
+kiosktool-trinity (1.0-2.0ubuntu0) maverick; urgency=low
+
+  * Trinity rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 15 Oct 2011 04:19:00 -0600
+
+kiosktool (1.0-1.1ubuntu6) hardy; urgency=low
+
+  * Rebuild with recent g++ compiler version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 Apr 2008 11:24:40 +0000
+
+kiosktool (1.0-1.1ubuntu5) gutsy; urgency=low
+
+  * Add kubuntu_03_sudo_support.diff to support sudo
+  * Add depend on tdesudo
+  * Move maintainer to XSBC-Original-Maintainer: 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 20 Jul 2007 16:57:11 +0100
+
+kiosktool (1.0-1.1ubuntu4) edgy; urgency=low
+
+  * Rebuild so it doesnt depend on libgamin0
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Tue, 25 Jul 2006 13:25:55 +1000
+
+kiosktool (1.0-1.1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_kmenu.diff use the correct menu file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 18 Dec 2005 15:46:35 +0000
+
+kiosktool (1.0-1.1ubuntu2) dapper; urgency=low
+
+  * Add automake1.9 build-dep
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 17:43:36 +0000
+
+kiosktool (1.0-1.1ubuntu1) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 14 Dec 2005 11:35:56 +0000
+
+kiosktool (1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Trigger rebuild for the Qt/KDE transition, no source changes needed.
+    (Closes: #327996)
+
+ -- Adeodato Simó <asp16@alu.ua.es>  Tue, 27 Sep 2005 16:07:52 +0200
+
+kiosktool (1.0-1) unstable; urgency=low
+
+  * Released kiosktool 1.0
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Tue, 26 Apr 2005 22:38:16 +0200
+
+kiosktool (0.9-2) unstable; urgency=low
+
+  * Solved a problem with upstream sources due to some messages translated to Spanish
+  * Changed description
+  * First Debian upload, closes: #267595
+  * Erased line Categories=Qt;TDE;System in kiosktool.desktop because this file is installed in Utilities category
+  
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed,  5 Jan 2005 15:18:17 +0100
+
+kiosktool (0.9-1) unstable; urgency=low
+
+   * Released kiosktool 0.9
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 13 Oct 2004 14:57:28 +0200
+ 
+kiosktool (0.8-1) unstable; urgency=low
+
+   * First use of cdbs for packaging
+   * Created a man page with kdemangen.pl (thanks to Dominique Devriese)	
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Mon, 23 Aug 2004 11:53:37 +0200
+
+kiosktool (0.7-1) unstable; urgency=low
+
+   * Correct a semantic error in description
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
+
+kiosktool (0.6-1) unstable; urgency=low
+
+   * Initial release
+
+ -- Pedro Jurado Maqueda <melenas@kdehispano.org>  Wed, 7 Jul 2004 15:19:42 +0200
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/compat b/ubuntu/_base/applications/settings/kiosktool/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/control b/ubuntu/_base/applications/settings/kiosktool/debian/control
new file mode 100644
index 000000000..48f6bd9a1
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/control
@@ -0,0 +1,17 @@
+Source: kiosktool-trinity
+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
+Standards-Version: 3.8.4
+
+Package: kiosktool-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, tdesudo-trinity
+Replaces: kiosktool-trinity (<< 4:14.0.0~)
+Breaks: kiosktool-trinity (<< 4:14.0.0~)
+Description: tool to configure the TDE kiosk framework
+ A Point&Click tool for system administrators to enable 
+ TDE's KIOSK features or otherwise preconfigure TDE for 
+ groups of users.
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/copyright b/ubuntu/_base/applications/settings/kiosktool/debian/copyright
new file mode 100644
index 000000000..a88b1d8d2
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Pedro Jurado Maqueda <melenas@kdehispano.org> on
+Fri, 14 Jul 2004 12:49:42 +0200.
+
+It was downloaded from ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/admin
+
+Upstream Author: Waldo Bastian <waldo@kde.org>
+
+Copyright:
+	2003, 2004  Waldo Bastian <bastian@kde.org>
+	2004        Martijn Klingens <klingens@kde.org>
+
+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; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/docs b/ubuntu/_base/applications/settings/kiosktool/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
new file mode 100644
index 000000000..1ee900501
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/kubuntu_03_sudo_support.diff
@@ -0,0 +1,157 @@
+--- kiosktool/kiosktool/kioskrun.h	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.h	2007-07-18 17:47:04.000000000 +0100
+@@ -37,6 +37,18 @@
+ 
+ class KioskGui;
+ 
++class NETACCESS {
++ public:
++  static bool exists(const KURL &url, bool source, TQWidget *window);
++  static bool mkdir(const KURL &url, TQWidget *window, int permissions=-1);
++  static TQString lastErrorString();
++  static int lastError();
++  static bool file_copy (const KURL &src, const KURL &dest, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool del(const KURL &url, TQWidget *window);
++  static bool file_move(const KURL &src, const KURL &target, int permissions=-1, bool overwrite=false, bool resume=false, TQWidget *window=0L);
++  static bool copy(const KURL &src, const KURL &target, TQWidget *window);
++};
++
+ class KioskRun : public TQObject
+ {
+   friend class KioskGui;
+--- kiosktool/kiosktool/kioskrun.cpp	2005-04-25 10:46:33.000000000 +0100
++++ kiosktool/kiosktool/kioskrun.cpp	2007-07-20 16:56:07.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #include <tqdir.h>
+ #include <tqfile.h>
++#include <tqprocess.h>
+ 
+ #include <tdeapplication.h>
+ #include <tdecmdlineargs.h>
+@@ -45,10 +46,124 @@
+ #include "kiosksync.h"
+ 
+ #include <tdeio/netaccess.h>
+-#define NETACCESS	TDEIO::NetAccess
++// Kiosktool wants to use fish://root@localhost/... which won't work on Kubuntu because we don't run ssh by default, we don't allow ssh to do root logins and root doesn't even have a password, so implement the functions here for local copies using tdesu instead
++// #define NETACCESS	TDEIO::NetAccess
+ 
+ #undef DEBUG_ENTRIES
+ 
++bool NETACCESS::exists(const KURL &url, bool source, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = TDEIO::NetAccess::exists(url, source, window);
++    return result;
++  }
++}
++
++bool NETACCESS::mkdir(const KURL &url, TQWidget *window, int permissions)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("tdesudo");
++    proc.addArgument("mkdir " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      TDEApplication::kapp->processEvents();
++    }
++    bool exists = TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = TDEIO::NetAccess::mkdir(url, window, permissions);
++    return result;
++  }
++}
++
++TQString NETACCESS::lastErrorString()
++{
++  return "Error in Kiosktool Kubuntu modifications";
++}
++
++int NETACCESS::lastError()
++{
++  return 0;
++}
++
++bool NETACCESS::file_copy(const KURL &src, const KURL &dest, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (dest.protocol() == "fish" && dest.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("tdesudo");
++    proc.addArgument("cp " + src.path() + " " + dest.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      TDEApplication::kapp->processEvents();
++    }
++
++    TQProcess proc2;
++    proc2.addArgument("tdesudo");
++    proc2.addArgument("chmod 0644 " + dest.path());
++    proc2.launch(buffer);
++    while (!proc2.normalExit()) {
++      TDEApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(dest.path());
++    return exists;
++  } else {
++    bool result = TDEIO::NetAccess::file_copy(src, dest, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++bool NETACCESS::del(const KURL &url, TQWidget *window)
++{
++  if (url.protocol() == "fish" && url.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("tdesudo");
++    proc.addArgument("rm " + url.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      TDEApplication::kapp->processEvents();
++    }
++    bool exists = !TQFile::exists(url.path());
++    return exists;
++  } else {
++    bool result = TDEIO::NetAccess::del(url, window);
++    return result;
++  }
++}
++
++bool NETACCESS::file_move(const KURL &src, const KURL &target, int permissions, bool overwrite, bool resume, TQWidget *window)
++{
++  if (target.protocol() == "fish" && target.host() == "localhost") {
++    TQProcess proc;
++    proc.addArgument("tdesudo");
++    proc.addArgument("mv " + src.path() + " " + target.path());
++    TQByteArray buffer;
++    proc.launch(buffer);
++    while (!proc.normalExit()) {
++      TDEApplication::kapp->processEvents();
++    }
++
++    bool exists = TQFile::exists(target.path());
++    return exists;
++  } else {
++    bool result = TDEIO::NetAccess::file_move(src, target, permissions, overwrite, resume, window);
++    return result;
++  }
++}
++
++//only used for local files
++bool NETACCESS::copy(const KURL &src, const KURL &target, TQWidget *window)
++{
++  return TDEIO::NetAccess::copy(src, target, window);
++}
++
+ KioskRun *KioskRun::s_self = 0;
+ 
+ KioskRun::KioskRun( TQObject* parent, const char* name)
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/patches/series b/ubuntu/_base/applications/settings/kiosktool/debian/patches/series
new file mode 100644
index 000000000..f6cd6dac1
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_03_sudo_support.diff
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/rules b/ubuntu/_base/applications/settings/kiosktool/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/source/format b/ubuntu/_base/applications/settings/kiosktool/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/kiosktool/debian/source/options b/ubuntu/_base/applications/settings/kiosktool/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kiosktool/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/changelog b/ubuntu/_base/applications/settings/kkbswitch/debian/changelog
new file mode 100644
index 000000000..6317d0066
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/changelog
@@ -0,0 +1,68 @@
+kkbswitch-trinity (1.4.3-8) unstable; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Sun, 18 Aug 2013 15:51:15 +0200
+
+kkbswitch (1.4.3-8) unstable; urgency=low
+
+  * Update mapping based on xorg layouts (Closes: #466031)
+  * Upgrade to standards version 3.7.3 (no changes needed)
+
+ -- Lior Kaplan <kaplan@debian.org>  Mon, 14 Apr 2008 00:42:58 +0300
+
+kkbswitch (1.4.3-7) unstable; urgency=low
+
+  * Fix typos in kbconfigdlg.cpp thanks to Esko Arajärvi <edu@iki.fi>
+  * Update Belarusian translation by Pavel Piatruk (Closes: #446558)
+  * Add Finnish translation by Esko Arajärvi (Closes: #448278)
+  * Replace kkbswitch.xpm with a non empty image.
+  * kkbswitch.desktop: complay with the FreeDesktop specification.
+
+ -- Lior Kaplan <kaplan@debian.org>  Sat, 01 Dec 2007 17:38:46 +0200
+
+kkbswitch (1.4.3-6) unstable; urgency=low
+
+  * Update menu file to new menu policy, use Applications/System/Language 
+    Environment instead of Apps/Tools
+  * Do not ignore errors in make clean
+
+ -- Baruch Even <baruch@debian.org>  Sat, 07 Jul 2007 22:23:04 +0300
+
+kkbswitch (1.4.3-5) unstable; urgency=low
+
+  * Fix FTBFS when built twice in a row (Closes: #424458)
+
+ -- Lior Kaplan <kaplan@debian.org>  Thu, 07 Jun 2007 23:06:17 +0300
+
+kkbswitch (1.4.3-4) unstable; urgency=low
+
+  * Update mapping between xorg layouts, countries' names and their spoken
+    languages (based on KDE data). (Closes: #368550)
+  * Remove extra .desktop file. (Closes: #406142)
+
+ -- Lior Kaplan <kaplan@debian.org>  Sat, 28 Apr 2007 21:08:08 +0300
+
+kkbswitch (1.4.3-3) unstable; urgency=low
+
+  * Add Belarusian translation by Pavel Piatruk (Closes: #381933)
+  * debian/control: Add kdebase-data to suggests, as it has the flags' icons.
+  * debian/rules: Copy .desktop file to it's right location.
+  * kkbswitch.1: Fix location of the KDE documentation.
+
+ -- Lior Kaplan <kaplan@debian.org>  Thu, 14 Sep 2006 22:40:21 +0300
+
+kkbswitch (1.4.3-2) unstable; urgency=low
+
+  * Adds Swedish translation by Daniel Nylander (Closes: #354949)
+  * Upgrade to standards version 3.7.2 (no changes needed)
+
+ -- Lior Kaplan <kaplan@debian.org>  Sat, 20 May 2006 23:35:31 -0500
+
+kkbswitch (1.4.3-1) unstable; urgency=low
+
+  * Initial Release (Closes: #278648)
+  * Based on package by Shlomi Loubaton <shlomister@gmail.com>
+
+ -- Lior Kaplan <webmaster@guides.co.il>  Wed,  7 Sep 2005 02:01:14 +0300
+
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/compat b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/control b/ubuntu/_base/applications/settings/kkbswitch/debian/control
new file mode 100644
index 000000000..7830b8afc
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/control
@@ -0,0 +1,32 @@
+Source: kkbswitch-trinity
+Section: tde
+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
+Standards-Version: 3.7.3
+Homepage: http://kkbswitch.sourceforge.net/
+
+Package: kkbswitch-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: tdebase-data-trinity, xkb-data-extra-trinity
+Description: keyboard layout indicator for TDE
+ KKBSwitch displays an icon in the system tray that indicates which layout is 
+ currently active and enables you to switch layouts by clicking the icon or by 
+ selecting from the menu. It works with all desktop environments.
+ .
+ Features include:
+   - Configurable icons for the keyboard layouts.
+   - The "toggle mode" to toggle between the two most recently-used keyboard 
+     layouts.
+   - Choose to use a global layout or per-application or per-window layouts.
+   - Configurable keyboard shortcuts.
+
+Package: xkb-data-extra-trinity
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Enhances: xkb-data
+Description: Additional data for xkb
+ This package contains additional keyboard layout definitions for xkb.
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/copyright b/ubuntu/_base/applications/settings/kkbswitch/debian/copyright
new file mode 100644
index 000000000..69cc5c934
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Shlomi Loubaton <shlomister@gmail.com> on
+Sat, 19 Feb 2005 19:57:47 +0200.
+
+It was downloaded from http://kkbswitch.sourceforge.net
+
+Copyright Holder: 2001-2004 Leonid Zeitlin <lz@europe.com>
+
+Upstream Author: Leonid Zeitlin <lz@europe.com>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+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/kkbswitch/debian/kkbswitch-trinity.dirs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
new file mode 100644
index 000000000..8a625f92e
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.dirs
@@ -0,0 +1 @@
+opt/trinity/share/applications
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
new file mode 100644
index 000000000..8be342631
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.install
@@ -0,0 +1,2 @@
+debian/tmp/opt/trinity
+icons/kkbswitch.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
new file mode 100644
index 000000000..e8422ae40
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/kkbswitch-trinity.menu
@@ -0,0 +1,7 @@
+?package(kkbswitch-trinity):\
+    needs="X11" \
+    hints="TDE,Keyboard" \
+    section="Applications/System/Language Environment" \
+    title="KKBSwitch" \
+    command="/opt/trinity/bin/kkbswitch" \
+    icon="/opt/trinity/share/pixmaps/kkbswitch.xpm"
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/rules b/ubuntu/_base/applications/settings/kkbswitch/debian/rules
new file mode 100755
index 000000000..0f666b3ca
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
+
+binary-install/kkbswitch-trinity::
+	dh_testdir
+	# is installed in xkb-data-extra-trinity package
+	rm debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/ru_ua
+	rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/source/format b/ubuntu/_base/applications/settings/kkbswitch/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/source/options b/ubuntu/_base/applications/settings/kkbswitch/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
new file mode 100644
index 000000000..590af08e4
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.dirs
@@ -0,0 +1 @@
+/usr/share/X11/xkb/symbols
diff --git a/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
new file mode 100644
index 000000000..53bc85b55
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kkbswitch/debian/xkb-data-extra-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/share/X11/xkb/symbols/ru_ua usr/share/X11/xkb/symbols
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/changelog b/ubuntu/_base/applications/settings/klcddimmer/debian/changelog
new file mode 100644
index 000000000..c7731210d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/changelog
@@ -0,0 +1,6 @@
+klcddimmer-trinity (0.3-0) unstable; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 21 Aug 2013 21:11:10 +0200
+
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/compat b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/control b/ubuntu/_base/applications/settings/klcddimmer/debian/control
new file mode 100644
index 000000000..14a27e356
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/control
@@ -0,0 +1,15 @@
+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
+Standards-Version: 3.7.3
+Homepage: http://klcddimeer.sourceforge.net/
+
+Package: klcddimmer-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: smartdimmer
+Description: Applet to adjust LCD brightness for TDE
+ KLcdDimmer is applet for simple adjust LCD brightness.
+ Notice that this applet relies on an external program to get/set the brightness.
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/copyright b/ubuntu/_base/applications/settings/klcddimmer/debian/copyright
new file mode 100644
index 000000000..e8fb907ba
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Slávek Banko <slavek.banko@axis.cz> on
+Wed, 21 Aug 2013 21:11:10 +0200.
+
+It was downloaded from http://klcddimmer.sourceforge.net
+
+Copyright Holder: 2006-2007 Lorenzo Bettini
+
+Upstream Author:  Lorenzo Bettini
+
+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.
+
+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/klcddimmer/debian/docs b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
new file mode 100644
index 000000000..6f83607c1
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/rules b/ubuntu/_base/applications/settings/klcddimmer/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/source/format b/ubuntu/_base/applications/settings/klcddimmer/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/klcddimmer/debian/source/options b/ubuntu/_base/applications/settings/klcddimmer/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/klcddimmer/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog b/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
new file mode 100644
index 000000000..cfe55d3e4
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/changelog
@@ -0,0 +1,75 @@
+kmyfirewall-trinity (1.1.1-1~1ubuntu1) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+kmyfirewall-trinity (1.1.1-1~1ubuntu0) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
+
+kmyfirewall-trinity (1.1.1-1~0ubuntu2) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 20 Dec 2008 12:38:00 -0600
+
+kmyfirewall (1.1.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Applied the following patched from Ubuntu, thanks Matvey Kozhev:
+    - Added debian/watch.
+    - Added debian/kmfinstallerplugin.desktop, tweaked for Lintian
+      cleanliness.
+    - Added debian/kmyfirewall.desktop, tweaked for Lintian cleanliness.
+    - Added debian/kmyfirewall.xpm.
+    - Added debian/install to install the desktop and xpm files.
+    - Updated debian/menu.
+    - debian/compat: Bumped to 5.
+    - debian/rules:
+      * Removed dh_installdirs call, not needed.
+      * Delete /usr/lib/*.so, leave only *.so.0.
+      * Strip /usr/lib rpath with chrpath.
+      * Do not ignore make distclean output.
+      * Moved config.guess/config.sub copy commands from clean to configure.
+      * Replaced dh_iconcache with dh_icons.
+      * Added dh_desktop.
+  * Bumped Standards-Version to 3.7.3.0.
+  * debian/copyright: Added copyright notice
+  * Fixed HTML docs path. (Closes: #408677)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Sun, 10 Feb 2008 13:33:13 +0100
+
+kmyfirewall (1.0-2) unstable; urgency=low
+
+  * Bumped Standards-Version to 3.6.2.0, no change.
+  * Fixed FSF address.
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Sat, 17 Dec 2005 23:45:33 +0100
+
+kmyfirewall (1.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Sat, 17 Dec 2005 13:42:07 +0100
+
+kmyfirewall (0.9.6.2-2) unstable; urgency=low
+
+  * Rebuilt package for the Qt/KDE transition
+    (Closes: #327003, #327979)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 13 Sep 2005 14:47:35 +0200
+
+kmyfirewall (0.9.6.2-1) unstable; urgency=low
+
+  * The 'Three Wise Men' release.
+  * Initial Release. (Closes: #247871)
+    Thanks a lot to Alejandro Exojo Piqueras <suy@badopi.org> for
+    letting me take this package and for his initial work on it.
+  * Added manpage for kmyfirewall.
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 04 Jan 2005 20:17:02 +0100
+
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/compat b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/control b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
new file mode 100644
index 000000000..7754434bd
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/control
@@ -0,0 +1,24 @@
+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
+Standards-Version: 3.8.4
+Homepage: http://kmyfirewall.sourceforge.net/
+
+Package: kmyfirewall-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kmyfirewall-kde3 (<< 4:14.0.0~), kmyfirewall-trinity (<< 4:14.0.0~)
+Breaks: kmyfirewall-kde3 (<< 4:14.0.0~), kmyfirewall-trinity (<< 4:14.0.0~)
+Description: iptables based firewall configuration tool for TDE [Trinity]
+ 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.
+ .
+ There is also the possibility to save entire rule sets, so you only have to
+ configure your rule set one time and then you can use it on several computers
+ giving each of them a similar configuration (p.e. school networks, office,
+ university etc.)
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
new file mode 100644
index 000000000..8429d407e
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Alejandro Exojo Piqueras <suy@badopi.org> on
+Tue, 13 Apr 2004 16:16:38 +0200.
+
+It was downloaded from http://kmyfirewall.sourceforge.net
+
+Upstream Author: Christian Hubinger <e9806056@student.tuwien.ac.at>
+
+Copyright:
+Copyright (c) 2001-2004 Christian Hubinger <chubinger@irrsinnig.org>
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   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/kmyfirewall/debian/debiandirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
new file mode 100644
index 000000000..90247b9a0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/debiandirs
@@ -0,0 +1,10 @@
+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/dirs b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
new file mode 100644
index 000000000..f0312285e
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/dirs
@@ -0,0 +1,2 @@
+opt/trinity/bin
+opt/trinity/share/doc/tde/HTML/en
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/docs b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/install b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
new file mode 100644
index 000000000..3a28b6931
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/install
@@ -0,0 +1 @@
+debian/kmyfirewall.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
new file mode 100644
index 000000000..3a562e7c0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmfinstallerplugin.desktop
@@ -0,0 +1,44 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-TDE-ServiceType=KMyFirewall/Installer
+X-TDE-Library=libkmfinstallerplugin
+
+Name=KMyFirewall Installer Plugin
+Name[bg]=При�тавка-ин�талатор на KMyFirewall
+Name[br]=Lugent stalier KMyFirewall
+Name[bs]=KMyFirewall dodatak za instalaciju
+Name[ca]=Connector d'instal·lació per a KMyFirewall
+Name[cs]=Modul instalátoru KMyFirewall
+Name[de]=KMyFirewall Installationsprogramm
+Name[el]=Π�όσθετο εγκατάστασης για το KMyFirewall
+Name[es]=Complemento de instalación de KMyFirewall
+Name[et]=KMyFirewalli paigaldamisplugin
+Name[fr]=Module d'installation de KMyFirewall
+Name[gl]=Extensión de Instalazón de KMyFirewall
+Name[hi]=के-माइ-फायरवाल संस�थापक प�लगइन
+Name[hu]=KMyFirewall telepítőmodul
+Name[it]=Plugin di installazione di KMyFirewall
+Name[ja]=KMyFirewall インストーラ プラグイン
+Name[ka]=KMyFirewall დ�ყენების მ�დული
+Name[nl]=KMyFirewall Installatieplugin
+Name[pa]=KMyFirewall ਇੰਸਟਾਲਰ ਪਲੱਗਿੰਨ
+Name[pl]=Wtyczka instalatora KMyFirewall
+Name[pt]='Plugin' de Instalação do KMyFirewall
+Name[pt_BR]=Plug-in Instaldor par ao KMyFirewall
+Name[ru]=KMyFirewall - Модуль у�тановки
+Name[sr]=KMyFirewall-ов прикључак за ин�талирање
+Name[sr@Latn]=KMyFirewall-ov priklju�ak za instaliranje
+Name[sv]=Installationsdel för Min brandvägg
+Name[ta]=KMyதீச�ச�வர� நிற�வ�பவரைச� சொர�க�
+Name[tr]=KMyFirewall Kurulum Eklentisi
+Name[uk]=Втулок в�тановленн� KMyFirewall
+Name[xx]=xxKMyFirewall Installer Pluginxx
+Name[zh_CN]=KMyFirewall 安装程��件
+
+[PropertyDef::X-KMyFirewall-Platform]
+Type=TQString
+
+[PropertyDef::X-KMyFirewall-Language]
+Type=TQString
+
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1 b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
new file mode 100644
index 000000000..cff01643d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.1
@@ -0,0 +1,162 @@
+.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/kmyfirewall.desktop b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
new file mode 100644
index 000000000..57f12ad9c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.desktop
@@ -0,0 +1,35 @@
+[Desktop Entry]
+Type=Application
+MimeType=application/x-kmyfirewall;application/x-kmyfirewall-kmfrs;application/x-kmyfirewall-kmfgrs;application/x-kmyfirewall-kmfnet;
+Icon=kmyfirewall
+Exec=/opt/trinity/bin/kmyfirewall %u
+Terminal=false
+Categories=Qt;TDE;System;
+Name=KMyFirewall
+Name[sv]=Min brandvägg
+Name[xx]=xxKMyFirewallxx
+GenericName=Firewall Configuration Tool
+GenericName[bg]=�а�тройване на защитна �тена
+GenericName[es]=Herramienta de configuración de cortafuegos
+GenericName[et]=Tulemüüri seadistamistööriist
+GenericName[it]=Strumento di configurazione di KMyFirewall
+GenericName[nl]=Firewall-configuratieprogramma
+GenericName[pt]=Ferramenta de Configuração da Firewall
+GenericName[pt_BR]=Ferramenta de Configuração da Firewall
+GenericName[sr]=�лат за подешавање заштитног зида
+GenericName[sr@Latn]=�лат за подешавање заштитног зида
+GenericName[sv]=Verktyg för brandväggsinställning
+GenericName[xx]=xxFirewall Configuration Toolxx
+Comment=Firewall Configuration Tool
+Comment[bg]=�а�тройване на KMyFirewall
+Comment[es]=Herramienta de configuración de cortafuegos
+Comment[et]=Tulemüüri seadistamistööriist
+Comment[it]=Strumento di configurazione di KMyFirewall
+Comment[ms]=Alatan Tetapan Firewall
+Comment[nl]=Firewall-configuratieprogramma
+Comment[pt]=Ferramenta de Configuração da Firewall
+Comment[pt_BR]=Ferramenta de Configuração da Firewall
+Comment[sr]=�лат за подешавање заштитног зида
+Comment[sr@Latn]=�лат за подешавање заштитног зида
+Comment[sv]=Verktyg för inställning av brandvägg
+Comment[xx]=xxFirewall Configuration Toolxx
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
new file mode 100644
index 000000000..3d58b81ff
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/kmyfirewall.xpm
@@ -0,0 +1,369 @@
+/* XPM */
+static char * kmyfirewall_xpm[] = {
+"32 32 334 2",
+"  	c None",
+". 	c #FE0000",
+"+ 	c #E60000",
+"@ 	c #E10000",
+"# 	c #EA0000",
+"$ 	c #EF0000",
+"% 	c #E40000",
+"& 	c #DA0000",
+"* 	c #D70000",
+"= 	c #DC0000",
+"- 	c #F50F0F",
+"; 	c #F02525",
+"> 	c #EE4949",
+", 	c #EB6C6C",
+"' 	c #F89999",
+") 	c #FBAFAF",
+"! 	c #FDC4C4",
+"~ 	c #FDCACA",
+"{ 	c #FCC2C2",
+"] 	c #FBB2B2",
+"^ 	c #F59494",
+"/ 	c #E87272",
+"( 	c #DD4343",
+"_ 	c #D42929",
+": 	c #EF0808",
+"< 	c #ED5858",
+"[ 	c #F29191",
+"} 	c #F7BCBC",
+"| 	c #FBC8C8",
+"1 	c #FCCCCC",
+"2 	c #FDCCCC",
+"3 	c #FECCCC",
+"4 	c #FBC9C9",
+"5 	c #F6B7B7",
+"6 	c #ED9999",
+"7 	c #D54D4D",
+"8 	c #BF1313",
+"9 	c #E82525",
+"0 	c #EB7F7F",
+"a 	c #F8CCCC",
+"b 	c #FACCCC",
+"c 	c #FBCCCC",
+"d 	c #F9CCCC",
+"e 	c #F6C6C6",
+"f 	c #E58E8E",
+"g 	c #B91A1A",
+"h 	c #DE0000",
+"i 	c #E46969",
+"j 	c #F4BEBE",
+"k 	c #F8C9C9",
+"l 	c #F9C9C9",
+"m 	c #FAC9C9",
+"n 	c #FCC9C9",
+"o 	c #FDC9C9",
+"p 	c #FECBCB",
+"q 	c #FECFCF",
+"r 	c #FEC9C9",
+"s 	c #F7C9C9",
+"t 	c #F5C5C5",
+"u 	c #D55C5C",
+"v 	c #AF0A0A",
+"w 	c #CC0000",
+"x 	c #EEA4A4",
+"y 	c #F3B5B5",
+"z 	c #F5B5B5",
+"A 	c #F7B5B5",
+"B 	c #F9B5B5",
+"C 	c #FAB5B5",
+"D 	c #FBB5B5",
+"E 	c #FCB5B5",
+"F 	c #FDC3C3",
+"G 	c #FFF1F1",
+"H 	c #FDB9B9",
+"I 	c #F6B5B5",
+"J 	c #F4B5B5",
+"K 	c #F2B5B5",
+"L 	c #E88B8B",
+"M 	c #C81818",
+"N 	c #9E0000",
+"O 	c #EE0000",
+"P 	c #C90000",
+"Q 	c #EB9393",
+"R 	c #F0A2A2",
+"S 	c #F2A2A2",
+"T 	c #F4A2A2",
+"U 	c #F6A2A2",
+"V 	c #F7A2A2",
+"W 	c #F9A2A2",
+"X 	c #FAA2A2",
+"Y 	c #FCBDBD",
+"Z 	c #FFF5F5",
+"` 	c #FCB3B3",
+" .	c #F8A2A2",
+"..	c #F5A2A2",
+"+.	c #F3A2A2",
+"@.	c #F1A2A2",
+"#.	c #EFA2A2",
+"$.	c #E57D7D",
+"%.	c #CC1616",
+"&.	c #B00000",
+"*.	c #8F0000",
+"=.	c #F20000",
+"-.	c #D20000",
+";.	c #C30000",
+">.	c #C80000",
+",.	c #DC4747",
+"'.	c #E97C7C",
+").	c #ED8282",
+"!.	c #EF8282",
+"~.	c #F28282",
+"{.	c #F48282",
+"].	c #F68888",
+"^.	c #F9A6A6",
+"/.	c #FDD9D9",
+"(.	c #FFFFFF",
+"_.	c #FDE4E4",
+":.	c #F89898",
+"<.	c #F48484",
+"[.	c #F38282",
+"}.	c #F08282",
+"|.	c #EE8282",
+"1.	c #EC8282",
+"2.	c #E97F7F",
+"3.	c #D83E3E",
+"4.	c #C80505",
+"5.	c #BD0000",
+"6.	c #A20000",
+"7.	c #C50000",
+"8.	c #D11111",
+"9.	c #DE4343",
+"0.	c #E86969",
+"a.	c #EB6969",
+"b.	c #EE6969",
+"c.	c #F06969",
+"d.	c #F37878",
+"e.	c #FBCECE",
+"f.	c #FFF7F7",
+"g.	c #FEF2F2",
+"h.	c #F69999",
+"i.	c #F59999",
+"j.	c #EF7070",
+"k.	c #EC6969",
+"l.	c #EA6969",
+"m.	c #E66666",
+"n.	c #DF4B4B",
+"o.	c #CD0B0B",
+"p.	c #C60000",
+"q.	c #BF0000",
+"r.	c #B40000",
+"s.	c #7C0000",
+"t.	c #D40000",
+"u.	c #C70000",
+"v.	c #CD0000",
+"w.	c #D20101",
+"x.	c #DB1E1E",
+"y.	c #E13535",
+"z.	c #E74343",
+"A.	c #E94646",
+"B.	c #F06C6C",
+"C.	c #FCE4E4",
+"D.	c #FFFCFC",
+"E.	c #FACECE",
+"F.	c #FAD8D8",
+"G.	c #EC6363",
+"H.	c #E54141",
+"I.	c #E13838",
+"J.	c #D81A1A",
+"K.	c #D00404",
+"L.	c #CA0000",
+"M.	c #BB0000",
+"N.	c #940000",
+"O.	c #FD0000",
+"P.	c #D00000",
+"Q.	c #D50202",
+"R.	c #D90808",
+"S.	c #DF1414",
+"T.	c #E21D1D",
+"U.	c #EA4F4F",
+"V.	c #FBDCDC",
+"W.	c #FFFEFE",
+"X.	c #FDEFEF",
+"Y.	c #EC7171",
+"Z.	c #DD1212",
+"`.	c #D90909",
+" +	c #D30101",
+".+	c #CF0000",
+"++	c #A10000",
+"@+	c #6C0000",
+"#+	c #E70000",
+"$+	c #BE0000",
+"%+	c #CB0000",
+"&+	c #CE0000",
+"*+	c #D30000",
+"=+	c #D60000",
+"-+	c #DC1010",
+";+	c #EA6565",
+">+	c #E53B3B",
+",+	c #F8C7C7",
+"'+	c #FCEBEB",
+")+	c #DA1111",
+"!+	c #D50303",
+"~+	c #D10000",
+"{+	c #C00000",
+"]+	c #BC0000",
+"^+	c #AD0000",
+"/+	c #7B0000",
+"(+	c #DB0000",
+"_+	c #D50000",
+":+	c #DD2828",
+"<+	c #F7CACA",
+"[+	c #F6BCBC",
+"}+	c #E45656",
+"|+	c #E04545",
+"1+	c #C10000",
+"2+	c #B30000",
+"3+	c #810000",
+"4+	c #E25050",
+"5+	c #FBE7E7",
+"6+	c #F9DFDF",
+"7+	c #BA0000",
+"8+	c #840000",
+"9+	c #E76A6A",
+"0+	c #FDF4F4",
+"a+	c #FEFAFA",
+"b+	c #FEF8F8",
+"c+	c #C40000",
+"d+	c #C20000",
+"e+	c #E66B6B",
+"f+	c #FDF3F3",
+"g+	c #F2A7A7",
+"h+	c #EA7777",
+"i+	c #F5C7C7",
+"j+	c #830000",
+"k+	c #D90000",
+"l+	c #E66767",
+"m+	c #ED8989",
+"n+	c #E34848",
+"o+	c #F1A8A8",
+"p+	c #DD0000",
+"q+	c #E44C4C",
+"r+	c #FBE0E0",
+"s+	c #FBE5E5",
+"t+	c #E64E4E",
+"u+	c #E23535",
+"v+	c #F2A5A5",
+"w+	c #FADCDC",
+"x+	c #F8D6D6",
+"y+	c #DB2020",
+"z+	c #D50404",
+"A+	c #740000",
+"B+	c #D80000",
+"C+	c #E75858",
+"D+	c #EF8989",
+"E+	c #F3A3A3",
+"F+	c #EA5E5E",
+"G+	c #DF0D0D",
+"H+	c #DE0B0B",
+"I+	c #E33232",
+"J+	c #F7C6C6",
+"K+	c #EF9B9B",
+"L+	c #DB1818",
+"M+	c #620000",
+"N+	c #E00C0C",
+"O+	c #F29696",
+"P+	c #E52727",
+"Q+	c #EC5E5E",
+"R+	c #F28F8F",
+"S+	c #E20D0D",
+"T+	c #E00000",
+"U+	c #EE7A7A",
+"V+	c #DF0B0B",
+"W+	c #900000",
+"X+	c #420000",
+"Y+	c #E20000",
+"Z+	c #E30404",
+"`+	c #F18080",
+" @	c #EC4646",
+".@	c #E61010",
+"+@	c #EA3434",
+"@@	c #E50404",
+"#@	c #EF6B6B",
+"$@	c #E51717",
+"%@	c #630000",
+"&@	c #E80000",
+"*@	c #E90000",
+"=@	c #EC2020",
+"-@	c #FCD4D4",
+";@	c #EB1010",
+">@	c #EE3434",
+",@	c #FAC7C7",
+"'@	c #FEF3F3",
+")@	c #F69898",
+"!@	c #9D0000",
+"~@	c #EC0000",
+"{@	c #ED0000",
+"]@	c #F34C4C",
+"^@	c #FCCDCD",
+"/@	c #FCDBDB",
+"(@	c #F24F4F",
+"_@	c #F89D9D",
+":@	c #FFF9F9",
+"<@	c #F78A8A",
+"[@	c #F02424",
+"}@	c #700000",
+"|@	c #F30000",
+"1@	c #F40000",
+"2@	c #F40C0C",
+"3@	c #FA7676",
+"4@	c #FA7C7C",
+"5@	c #F51C1C",
+"6@	c #F73F3F",
+"7@	c #F62525",
+"8@	c #6F0000",
+"9@	c #F80000",
+"0@	c #F70000",
+"a@	c #F80404",
+"b@	c #F80808",
+"c@	c #DF0000",
+"d@	c #960000",
+"e@	c #710000",
+"f@	c #9A0000",
+"g@	c #F00000",
+"h@	c #A80000",
+"i@	c #800000",
+"j@	c #F10000",
+"k@	c #F90000",
+"l@	c #FC0000",
+"m@	c #660000",
+"n@	c #750000",
+"o@	c #8D0000",
+"p@	c #980000",
+"q@	c #A00000",
+"r@	c #9C0000",
+"s@	c #690000",
+"                                                                ",
+"                      . + @ # $ % & * =                         ",
+"                - ; > , ' ) ! ~ { ] ^ / ( _                     ",
+"              : < [ } | 1 2 3 3 2 2 1 4 5 6 7 8                 ",
+"            9 0 a b c 1 2 3 3 3 3 2 2 c b d e f g               ",
+"          h i j k l m n o o p q r o n 4 m l s t u v             ",
+"        h w x y z A B C D E F G H E C B A I J K L M N           ",
+"      O P P Q R S T U V W X Y Z ` X  .V ..+.@.#.$.%.&.*.        ",
+"    =.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.        ",
+"    % 7.;.>.8.9.0.a.b.c.d.e.f.(.g.h.i.j.k.l.m.n.o.p.q.r.s.      ",
+"    t.5.;.u.v.w.x.y.z.A.B.C.(.(.D.E.F.G.H.I.J.K.L.p.q.M.N.      ",
+"  O.;.5.;.u.w P.Q.R.S.T.U.V.(.(.(.W.X.Y.Z.`. +.+P 7.q.M.++@+    ",
+"  #+M.$+;.u.%+&+*+=+-+;+>+,+(.(.(.(.(.'+)+!+~+v.P 7.{+]+^+/+    ",
+"  (+M.q.;.u.%+&+-._+:+<+[+'+(.(.(.(.(.(.}+|+P.v.P 7.1+5.2+3+    ",
+"  t.$+1+7.u.%+&+~+t.4+5+(.(.(.(.(.(.(.(.(.6+.+v.P u.;.{+7+8+    ",
+"  t.1+;.p.>.%+&+~+*+9+0+(.(.(.(.a+b+(.(.(.6+.+v.L.u.c+d+$+8+    ",
+"  _+7.p.P %+&+P.-.e+f+(.(.(.(.(.g+h+(.(.(.i+~+.+v.L.u.p.{+j+    ",
+"  k+>.L.w &+P.~+t.l+(.(.(.(.(.(.m+n+(.(.(.o+-.~+.+v.%+P {+3+    ",
+"  p+&+.+~+-.*+_+* q+(.(.r+'+r+s+t+u+v+w+(.x+y+z+*+-..+&+M.A+    ",
+"  (+*+*+t._+* B+& C+(.(.D+z E+F+G+H+I+J+(.D.K+L+=+_+*+*+&.M+    ",
+"    t.k+(+(+p+p+N+O+(.(.P+Q+R+S+T+@ T+G.(.(.U+V+= (+& k+W+X+    ",
+"    P.(+T+T+@ Y+Z+`+(.(. @.@+@@@% % % #@(.X.$@Y+@ T+T+_+%@      ",
+"      ~++ #+&@&@*@=@-@D.h.;@# # # # >@,@'@)@&@&@#+#+h !@        ",
+"      $+@ ~@~@~@{@{@]@^@/@(@{@{@{@{@_@:@<@[@{@~@~@~@p.}@        ",
+"        $+Y+|@1@|@1@1@2@3@4@1@1@1@5@6@7@1@1@1@1@=.(+8@          ",
+"          $+$ 9@0@0@9@9@a@b@9@9@9@9@9@9@0@0@0@0@c@d@            ",
+"            ^+B+9@O.O.O.O.O.O.O.O.O.O.O.O.O.|@*+e@              ",
+"              f@;.$ . . . . . . . . . . . g@h@A+                ",
+"                  i@2+.+&@j@k@l@9@j@Y+&+N m@                    ",
+"                      n@o@p@q@6.r@N.i@s@X+                      ",
+"                                                                ",
+"                                                                "};
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
new file mode 100644
index 000000000..fab755280
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/manpages
@@ -0,0 +1 @@
+debian/kmyfirewall.1
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/menu b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu
new file mode 100644
index 000000000..7280ce1ad
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/menu
@@ -0,0 +1,6 @@
+?package(kmyfirewall-trinity):needs="X11" \
+  section="Applications/System/Security" \
+  title="KMyFirewall" \
+  hints="TDE" \
+  icon="kmyfirewall.xpm" \
+  command="/opt/trinity/bin/kmyfirewall"
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/rules b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
new file mode 100755
index 000000000..8b7e87e26
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
+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)
+
+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/source/format b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/kmyfirewall/debian/watch b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
new file mode 100644
index 000000000..42dfe005b
--- /dev/null
+++ b/ubuntu/_base/applications/settings/kmyfirewall/debian/watch
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..96fb271ab
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/README.source
@@ -0,0 +1,3 @@
+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/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
new file mode 100644
index 000000000..58dd721cb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/changelog
@@ -0,0 +1,373 @@
+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
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/control b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
new file mode 100644
index 000000000..c4f849687
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/control
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/copyright
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 000000000..e4f5073db
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/knetworkmanager.1
@@ -0,0 +1,145 @@
+.\" 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
new file mode 100644
index 000000000..e2859341f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/manpages
@@ -0,0 +1 @@
+debian/knetworkmanager.1
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
new file mode 100644
index 000000000..cc47df4d0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/menu
@@ -0,0 +1,6 @@
+?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
new file mode 100644
index 000000000..b5316fc73
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.lintian-overrides
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..fdd4e51ca
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/network-manager-kde-trinity.postinst
@@ -0,0 +1,16 @@
+#!/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
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
new file mode 100755
index 000000000..d38592f45
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/rules
@@ -0,0 +1,24 @@
+#!/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
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
new file mode 100644
index 000000000..ad7a7be91
--- /dev/null
+++ b/ubuntu/_base/applications/settings/knetworkmanager8/debian/watch
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..b0302c211
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/README.Debian
@@ -0,0 +1,107 @@
+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/tde-guidance/debian/changelog b/ubuntu/_base/applications/settings/tde-guidance/debian/changelog
new file mode 100644
index 000000000..fb3aec362
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/changelog
@@ -0,0 +1,1103 @@
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.15) karmic; urgency=low
+
+  * Repaired displayconfig scripting and paths
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 25 Oct 2009 21:47:00 -0600
+
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.5) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 26 Jul 2009 17:59:00 -0600
+
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu17.4) jaunty; urgency=low
+
+  * Rebuild against Python 2.6
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 Apr 2009 22:44:00 -0600
+
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu16.5) intrepid; urgency=low
+
+  * Fixed broken links (closes bug #58)
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 03 Apr 2009 11:18:00 -0600
+
+tde-guidance-trinity (0.8.0svn20080103-0ubuntu16.4) intrepid; urgency=low
+
+  * Added -trinity suffix, altered paths
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 08 Mar 2009 16:31:00 -0600
+
+tde-guidance (0.8.0svn20080103-0ubuntu16.2) hardy-proposed; urgency=low
+
+  * kubuntu_35_displayconfig_detect_nvidia_driver.patch:
+    - Detect proprietary driver 'nvidia' again as some of the nvidia
+      driver files used for detection has been moved. (LP: #271655)
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 18 Sep 2008 14:24:31 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low
+
+  [ Anthony Fok ]
+  * kubuntu_32_displayconfig_update_refresh_rate.patch:
+    - The refresh rate was not updated for the selected resolution, so
+      resolution change could fail. (LP: #82279)
+  * kubuntu_33_displayconfig_add_new_video_cards.patch:
+    - Added 8086:29b2 for "Intel Q35";
+  * debian/copyright: s/FDL/GFDL/;
+
+  [ Andreas Wenning ]
+  * kubuntu_34_kde-powermanager_no_lid_special_behaviour_disable.patch:
+    - No need to call power plugged/unplugged in init if no lid is
+      found; this just make us crash. (LP: #231163)
+  * Edited kubuntu_23_kde-powermanager_gpmhelper.patch to prevent
+    multiple brightness- or hibernate-calls happening on certain
+    machines. Already implemented for sleep-calls. (LP: #207473)
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 05 Jun 2008 16:24:38 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low
+
+  * kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch:
+    - don't try to restart HAL if it is not running, let gpm displays
+      "the battery has been removed" so that the user knows that he
+      can't relay on gpm to check his battery state
+    - don't try to restart DBus at all, it's not supported upstream and
+      can cause trouble
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Thu, 17 Apr 2008 14:18:43 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_29_kde-powermanager_display_consumption_rate.patch to
+    display current consumption rate. (LP: #214774).
+  * Readded kubuntu_30_displayconfig_no_xorg_correct_detection.patch
+    which doesn't break the api. displayconfig will detect the hardware
+    automatically and write a xorg.conf if none is present on startup.
+    (LP: #203378).
+
+  [ Yuriy Kozlov ]
+  * Added kubuntu_31_wineconfig_no_i18_on_keys.patch to remove i18n from
+    dictionary keys, which caused crashes on non en_US locales.  Should be
+    removed if synced with upstream. (LP: #82723)
+
+ -- Yuriy Kozlov <yuriy-kozlov@kubuntu.org>  Sun, 13 Apr 2008 12:49:35 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low
+
+  * Disable kubuntu_30_displayconfig_no_xorg_correct_detection.patch. It
+    breaks the API, and the previous change did not even state a bug number.
+    This broke jockey, displayconfig-gtk, and other reverse dependencies and
+    is absolutely inappropriate right before a release. (LP: #214914 and a
+    magnitude of 100 duplicates)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Sat, 12 Apr 2008 18:17:24 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu13) hardy; urgency=low
+
+  * Added kubuntu_30_displayconfig_no_xorg_correct_detection.patch
+    so we will detect the hardware automatically and write a xorg.conf
+    if none is present on startup.
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 10 Apr 2008 00:59:19 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu12) hardy; urgency=low
+
+  * Patch kubuntu_28_kde-powermanager_i18n_strings.patch adds missing
+    translatable string.
+
+ -- Andreas Wenning <awen@awen.dk>  Wed, 09 Apr 2008 00:13:18 +0200
+
+tde-guidance (0.8.0svn20080103-0ubuntu11) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_24_displayconfig_no_gamma.patch: As we cannot check if
+    the video driver supports live gamma changes, we should catch any
+    exceptions generated by lacking support. (LP: #201092, #201468).
+  * Added kubuntu_25_kde-powermanager_allways_change_brightness.patch
+    which disables the internal check for not setting the same bright-
+    ness as last time. Some laptops can change brightness in hardware
+    and other programs can change it through HAL, so we should allways
+    try to change the brightness.
+
+  [ Guillaume Martres ]
+  * Added kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch so
+    the powermanager better handles dbus/hal restarts. (LP: #123812).
+
+  [ Scott Kitterman ]
+  * Added kubuntu_27_displayconfig-restore_try_getsize_again.patch to try to
+    get size from screen 0 if the first attempt failed (LP: #206509)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 05 Apr 2008 20:06:50 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_21_kde-powermanager_unique-check.patch:
+    - Fixed guidance-power-managers check for being a unique app.
+  * Added kubuntu_23_kde-powermanager_gpmhelper.patch:
+    - Added gpmhelper.py to listen for HAL button-events and issue
+      dcop calls to guidance-power-manager.
+    - guidance-power-manager will now start gpmhelper.py.
+    - Patched setup.py to build/install gpmhelper.py
+  * Changed debian/rules and debian/tde-guidance-powermanager.install
+    to install gpmhelper.py
+  * Added depends for tde-guidance-powermanager to python-gobject as
+    this is the only mainloop to work with DBusGMainLoop.
+
+  [ Scott Kitterman ]
+  * In kubuntu_14_displayconfig_no_xorg_no_serverlayout.patch simplify fake
+    xorg.conf invented if it's missing - match xorg.conf generatedy by
+    Hardy's Bulletproof X
+  * Update kununtu_13_displayconfig_add_new_monitors.patch with new monitors
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 30 Mar 2008 19:11:55 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu9) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_22_userconfig_utf8.patch which fixes unicode problems present
+    under some locales. (LP: #205487)
+
+  [ Scott Kitterman ]
+  * Add kubuntu_20_displayconfig_dynamic_driver_list.patch to dynamically list
+    all available driver vendors and not depend on a hard coded list 
+    (LP: #149793)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 29 Mar 2008 23:10:20 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu8) hardy; urgency=low
+
+  * Update kubuntu_12_powermanager_survive_no_brightness.patch so it correctly
+    catches the error (LP: #183656)
+  * Add kubuntu_18_displayconfig_no_resolutions.patch so displayconfig doesn't
+    crash if current display size or refresh rate can't be fetched
+    (LP: #147721)
+  * Add kubuntu_19_powermanager_new_names.patch to use new hal keys 
+    (LP: #204768)
+    - Patch thanks to Mikael Gerdin
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 25 Mar 2008 11:48:16 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu7) hardy; urgency=low
+
+  * Added debian/patches/kubuntu_17_kde-powermanager_brightness.patch
+    which fixes the brightness slider when number of brightness levels
+    is too small.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 17 Mar 2008 23:02:36 +0100
+
+tde-guidance (0.8.0svn20080103-0ubuntu6) hardy; urgency=low
+
+  * Bump standards version to 3.7.3 without further change
+  * Rename kubuntu_14_displayconfig_survive_no_serverlayout.patch to be
+    kubuntu_14_displayconfig_no_xorg_no_serverlayout.patch
+    - Don't crash if xorg.conf is missing (LP: #93749):
+      - In xorgconfig, create an emtpy xorg.conf if none exists and lie and 
+        pretend a minimal, largely generic xorg.conf exists
+      - In xorgconfig, if not running with Admin priviledges just trap the no
+        xorg.conf error and continue
+      - In displayconfig, assume xorg.conf belongs in /etc/X11 and create it
+        if it happens to be missing when trying to save out a configuration
+      - This is not a fully satisfactory solution to this problem - users will
+        have to select their monitor, restart X, and then make their settings
+    - In xorgconfig, as previously patched, add a ServerLayout section if an
+      existing xorg.conf is missing one (LP: #173768)
+  * Add kubuntu_16_displayconfig_no_xrrqueryextention.patch to avoid crashing
+    if the XRRQueryExtension is not found (LP: #146945)
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 17 Mar 2008 15:23:49 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu5) hardy; urgency=low
+
+  * debian/patches/kubuntu_15_powermanager_suspend.patch so we can
+    suspend.
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 13 Mar 2008 11:33:46 +0100
+
+tde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
+
+  * Add kubuntu_14_displayconfig_survive_no_serverlayout.patch so 
+    displaymanager doesn't crash if xorg.conf has no ServerLayout section 
+    (LP: #173768)
+  * Add to kubuntu_12_powermanager_survive_no_brightness.patch so it doesn't
+    crash if DBUS thinks there is brightness, but is wrong
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 12 Mar 2008 10:19:57 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low
+
+  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
+    to pytdeextensions in mountconfig so that pyqt3 no longer needs to be
+    patched to provide -dev files in the regular package (LP: #197867)
+  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
+    thinks a proprietary driver is installed, but it can't find it, it 
+    will try to find a non-proprietary driver instead of crashing (LP: #198269)
+  * Add kubuntu_11_wineconfg_amd64.patch so that wineconfig looks in the right
+    dir for wine on AMD64 (LP: #151982) - Patch should be removed for the next
+    svn snapshot or release as a fix has been committed upstream already
+  * Add kubuntu_12_powermanager_survive_no_brightness.patch so that if the old
+    brightness cannot be gotten from DBUS, powermanager won't crash 
+    (LP: #183656) and (LP: #198071)
+  * Add kununtu_13_displayconfig_add_new_monitors.patch to update MonitorsDB
+    with a upstream snapshot of MonitorsDB from hwdata (LP: #192899)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 09 Mar 2008 19:53:42 -0400
+
+tde-guidance (0.8.0svn20080103-0ubuntu2) hardy; urgency=low
+
+  * Revert inadvertent upload meant for PPA
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 04 Mar 2008 16:52:29 -0500
+
+tde-guidance (0.8.0svn20080103-0ubuntu1) hardy; urgency=low
+
+  * New svn snapshot, includes fixes for .pot file
+  * Add kubuntu_07_powermanager_i18n.patch:
+    - guidance-power-manager.py loads the correct .pot file
+  * Cleaned debian/rules:
+    - Installs the *.py files generated with i18n options in it
+  * Fixed debian/control, for good build-depends on python-trinity:
+    - Build needs a patched kdepyuic
+  * Added patch kubuntu_08_nice_groups_and_privileges.patch:
+    - Fixes LP: #156508
+    - Patch by Manuel Amador <rudd-o@rudd-o.com>
+
+ -- Anthony Mercatante <tonio@kubuntu>  Thu, 03 Jan 2008 22:37:28 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu7) gutsy; urgency=low
+
+  * Add workaround to displayconfig-restore.py for 151311
+    kubuntu_06_displayconfig_fix_intel_dpi.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Oct 2007 15:53:45 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu6) gutsy; urgency=low
+
+  [ Jonathan Riddell ] * Add kubuntu_05_displayconfig_fix.diff with
+  fix from Sebastian Heinline for bug which resulted in falsely
+  restart X requests.
+
+  [ Luka Renko ]
+  * Disk & Filesystems does not work on non-English/unicode systems.
+    Patch provided by Liam Keene. (LP: #141023)
+    debian/patches/kubuntu_04_disk_unicode.diff
+  * Install Xsession startup script (displayconfig-restore) in 
+    tde-guidance package as it is KDE specific. (LP: #146730)
+
+ -- Luka Renko <lure@ubuntu.com>  Tue, 09 Oct 2007 19:57:37 +0200
+
+tde-guidance (0.8.0svn20070928-0ubuntu5) gutsy; urgency=low
+
+  * Make guidance-backends replace/conflicts old tde-guidance
+    Closes LP: #133810
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Oct 2007 12:44:15 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu4) gutsy; urgency=low
+
+  * Remove kubuntu_04_no_ati_dualhead.diff, it conflicts with patch 03
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 05 Oct 2007 12:22:27 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu3) gutsy; urgency=low
+
+  * Add kubuntu_04_no_ati_dualhead.diff from Sebastian Heinlein, 
+    the latest free ATI drivers do no longer support the classic xinerama
+    dual head configuration.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Oct 2007 21:47:47 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu2) gutsy; urgency=low
+
+  * Add kubuntu_03_displayconfig_updates.diff with updates from SVN by glatzor
+   - Disable dual head support for intel and ati driver
+   - Add the MonitorLayout option for Intel in LAYOUT_DUAL too
+   - work around for a common crashed in isResolutionSettingsChanged()
+   - Add an allowModule and disableModule to the ModuleSection class
+   - The driver in the xorg.conf should always override the driver of
+     the detected gfx card model
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 23:25:16 +0100
+
+tde-guidance (0.8.0svn20070928-0ubuntu1) gutsy; urgency=low
+
+  * New snapshot, includes
+   - Update monitor definitions - fixes LP: #113520 #113514
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Sep 2007 11:47:59 +0100
+
+tde-guidance (0.8.0svn20070727-0ubuntu6) gutsy; urgency=low
+
+  * Fix for crash when loading xorg.conf's using the "Disable" keyword
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu,  6 Sep 2007 10:56:03 -0700
+
+tde-guidance (0.8.0svn20070727-0ubuntu5) gutsy; urgency=low
+
+  * Update tde-guidance replaces/conflicts guidance-backends
+    closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/133810
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 05 Sep 2007 18:59:44 +0100
+
+tde-guidance (0.8.0svn20070727-0ubuntu4) gutsy; urgency=low
+
+  * Fixed an issue where you cannot not select the primary group for a user
+    in the secondary ListPickerDialog()
+   - Closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/47412
+   - Added kubuntu_02_primary_group_change.diff
+
+ -- Stefan Skotte <sfs@enhance-it.dk>  Mon, 03 Sep 2007 22:17:07 +0200
+
+tde-guidance (0.8.0svn20070727-0ubuntu3) gutsy; urgency=low
+
+  * Update from Uwe Koziolek <uwe.koziolek@gmx.net>
+    The attached files includes updates for pcitables. The data are
+    crosschecked against the readme from the NVIDIA-drivers and the
+    C-sourcecode from x.org xserver-xorg-video-nv
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Aug 2007 15:34:26 +0100
+
+tde-guidance (0.8.0svn20070727-0ubuntu2) gutsy; urgency=low
+
+  * Build-dep on python-qt-dev
+  * Add kubuntu_01_infimport.diff to install infiimport.py file, closes
+    https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/131669
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Aug 2007 10:53:06 +0100
+
+tde-guidance (0.8.0svn20070727-0ubuntu1) gutsy; urgency=low
+
+  * New upstream snapshot
+  * Remove all patches, applied upstream
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 18:00:13 +0100
+
+tde-guidance (0.8.0-1ubuntu9) gutsy; urgency=low
+
+  * Add debian/patches/xorgconfig_dexconf_style.patch: Change xorgconfig.py's
+    style of written xorg.conf files to closely match dexconf's: Capitalize
+    keywords, and use tabs instead of two spaces for indentation.
+  * debian/control: Set Ubuntu maintainer.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 19 Jun 2007 19:10:11 +0200
+
+tde-guidance (0.8.0-1ubuntu8) gutsy; urgency=low
+
+  * Fix symlink to displayconfig-restore
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jun 2007 13:16:25 +0100
+
+tde-guidance (0.8.0-1ubuntu7) gutsy; urgency=low
+
+  * Fix tde-guidance's replaces to allow installation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 09:42:36 +0000
+
+tde-guidance (0.8.0-1ubuntu6) gutsy; urgency=low
+
+  * Fix path in /usr/bin/guidance-power-manager
+  * Add replaces to old package on tde-guidance
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 21:35:55 +0000
+
+tde-guidance (0.8.0-1ubuntu5) gutsy; urgency=low
+
+  * Remove excessive dependencies from guidance-backends
+  * Split up python-central directories to avoid overlapping files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 14:47:30 +0000
+
+tde-guidance (0.8.0-1ubuntu4) gutsy; urgency=low
+
+  * Move pyversion to correctly named pyversions, to build with python 2.5
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 16:00:50 +0000
+
+tde-guidance (0.8.0-1ubuntu3) gutsy; urgency=low
+
+  * Fix versioned build depends to python-qt3 not python-trinity
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 13:23:18 +0100
+
+tde-guidance (0.8.0-1ubuntu2) gutsy; urgency=low
+
+  * Build-dep on python-qt3 >= 3.17.2-1ubuntu2 for compile fix
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 31 May 2007 11:59:26 +0100
+
+tde-guidance (0.8.0-1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian, remaining change:
+   - kubuntu_01_enable_wineconfig.diff
+   - pyversion is 2.5
+  * Add wineconfig to description in control
+  * Split out platform neutral stuff into guidance-backends
+  * Add patches from displayconfig-gtk
+   - MonitorLayout.patch
+   - fix_intel_dualhead.patch
+   - noconifg.patch
+   - enable_native_cloning_for_i810.patch
+   - fix_multiple_screens_laptop.patch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 May 2007 15:54:26 +0100
+
+tde-guidance (0.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Fathi Boudra ]
+  * Add x11proto-scrnsaver-dev build dependency.
+  * Update tde-guidance.install:
+    * Add wineconfig icons.
+    * Remove bytecompiled modules (pyc).
+    * Remove fuser_ui.ui file.
+  * Remove old displayconfig-hwprobe.py init links in tde-guidance.postinst.
+  * Update tde-guidance-powermanager.install. Add powermanager_ui.py.
+  * Remove pycompat file. Deprecated.
+  * Update rules:
+    * Use DEB_DH_INSTALL_ARGS.
+    * Add wineconfig icons.
+    * Update powermanager icons/pics path.
+    * Add preliminary grubconfig support.
+    * Merge Ubuntu related changes (interpreter fix and clean desktop files).
+    * Merge Ubuntu common-install-prehook-impl target.
+  * Merge Ubuntu patches:
+    * 10_wineconfig_icon: fix icon name in .desktop file.
+    * 11_no_cpu_freq: fix no cpu frequency scaling.
+    * 12_pm_fix_indentation_actioncollection: fix indentation.
+    * 13_nvidia_typo: fix crash with nvidia non-free driver.
+    * 14_powermanager_fixes: fix shows discharging if battery full.
+
+  [ Mark Purcell ]
+  * Add debian/watch.
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 18 May 2007 19:45:51 +0200
+
+tde-guidance (0.8.0-0ubuntu5) feisty; urgency=low
+
+  * Update kubuntu_06_powermanager_fixes.diff with fix from
+    https://launchpad.net/bugs/104794 comment 7
+    fixes shows dischanging if battery full.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Apr 2007 10:50:55 +0100
+
+tde-guidance (0.8.0-0ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_05_nvidia_typo.diff fix crash with nvidia non-free driver
+  * Add kubuntu_06_powermanager_fixes.diff with fixes from trunk
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  9 Apr 2007 23:47:13 +0100
+
+tde-guidance (0.8.0-0ubuntu3) feisty; urgency=low
+
+  * Remove old displayconfig-hwprobe.py init links in tde-guidance.postinst
+    closes https://bugs.launchpad.net/ubuntu/+source/tde-guidance/+bug/99203
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 16:29:18 +0100
+
+tde-guidance (0.8.0-0ubuntu2) feisty; urgency=low
+
+  * Add kubuntu_03_no_cpu_freq.diff, fix https://launchpad.net/bugs/99198
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 31 Mar 2007 11:33:39 +0100
+
+tde-guidance (0.8.0-0ubuntu1) feisty; urgency=low
+
+  * Non-snapshot release for feisty
+  * Add kubuntu_02_wineconfig_icon.diff fix icon name in .desktop file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Mar 2007 12:17:30 +0100
+
+tde-guidance (0.7.1~svn20070205-0ubuntu1) feisty; urgency=low
+
+  * New upstream snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 05 Feb 2007 11:52:27 +0100
+
+tde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
+
+  [ Fathi Boudra ]
+  * New release from svn r630094. (Closes: #397508, #405880)
+  * Remove useless patch typos_setup and force_python2.4_script.
+  * control:
+    * Add libxss-dev to build-depends.
+    * Remove python-dbus depends on tde-guidance.
+    * Add Conflicts: python2.4-iconvcodec on tde-guidance.
+    * Add tde-guidance depends on tde-guidance-powermanager.
+    * Remove Conflicts: klaptopdaemon, kpowersave on tde-guidance-powermanager
+  * tde-guidance.install: replace versioned python by wildcard on ixf86misc.so.
+  * tde-guidance-powermanager.install: use wildcard for battery pics.
+  * rules:
+    * Replace hardcoded python version by wildcard.
+    * Enable wineconfig.
+    * Fix powermanager icons.
+
+  [ Mark Purcell ]
+  * Add ./debian/rules get-orig-source for http://buildserver.net
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun,  4 Feb 2007 12:27:42 +0100
+
+tde-guidance (0.7.1~svn20070129-0ubuntu1) feisty; urgency=low
+
+  * New upstream snapshot
+  * Add kubuntu_01_enable_wineconfig.diff to enable wineconfig in
+    system settings (experimental)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 29 Jan 2007 18:03:53 +0000
+
+tde-guidance (0.7.1~svn20070111-0ubuntu7) feisty; urgency=low
+
+  * Add kubuntu_02_powermanage.diff from trunk, stop it breaking
+    when cpufreq is disabled
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 18 Jan 2007 15:44:26 +0000
+
+tde-guidance (0.7.1~svn20070111-0ubuntu6) feisty; urgency=low
+
+  * Remove debian/patches/12_force_python2.4_script.diff.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 16 Jan 2007 12:44:50 +0100
+
+tde-guidance (0.7.1~svn20070111-0ubuntu5) feisty; urgency=low
+
+  * Use the unversioned interpreter name for the scripts.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 15:47:46 +0000
+
+tde-guidance (0.7.1~svn20070111-0ubuntu4) feisty; urgency=low
+
+  * debian/pyversions: Nice file to hardcode the python version.
+  * debian/rules: Don't hardcode the python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 09:22:54 +0000
+
+tde-guidance (0.7.1~svn20070111-0ubuntu3) feisty; urgency=low
+
+  * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:18:02 +0000
+
+tde-guidance (0.7.1~svn20070111-0ubuntu2) feisty; urgency=low
+
+  * Drop some duplicate icons from tde-guidance-powermanager
+    (already in tde-guidance package)
+
+ -- Luka Renko <lure@ubuntu.com>  Tue,  9 Jan 2007 20:15:54 +0100
+
+tde-guidance (0.7.1~svn20070111-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot. Fixes powermanager icons.
+  * Fixed debian/control, tde-guidance doesn't depend on
+    python-dbus and tde-guidance-powermanager depends on
+    tde-guidance.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 17:07:35 +0100
+
+tde-guidance (0.7.1~svn20070110-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot. Fixes critical crash on startup.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 13:45:32 +0100
+
+tde-guidance (0.7.1~svn20070109-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 01:55:47 +0100
+
+tde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+  * Clean powermanager/icon content
+  * Fixed guidance-power-manager.py to use correctly all
+    charging/discharging icons
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 15 Dec 2006 03:51:54 +0100
+
+tde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low
+
+  * Rebuilt against new pytde.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100
+
+tde-guidance (0.7.1~svn20061124-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+  * Removed obsolete kubuntu_10_critical_threshold.diff
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  24 Nov 2006 01:00:28 +0200
+
+tde-guidance (0.7.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #386636)
+  * Update maintainers
+    * Maintainer: KDE Extras Team
+    * Uploaders: Mark Purcell and Fathi Boudra
+  * Put package in unstable
+  * Remove 10_branch_r542306.diff and 11_password_expire.diff patches
+  * Add 10_typos_setup.diff to fix typos in setup.py
+  * Sync with ubuntu package:
+    * add power manager applet
+    * remove stop script symlinks from rc0 and rc6
+    * control:
+      * add python-trinity-dev to build-depends
+      * add python-dbus and sysv-rc to depends
+      * add tde-guidance-powermanager package
+    * pyversions: replace "2.4-" by "2.4", since build fails using python 2.5,
+      problem to import kdedistutils
+    * rules:
+      * Don't add extra /usr prefix when creating symlinks for
+        {display,mount,service,user}config and displayconfig-restore
+      * add tde-guidance-powermanager install
+      * create a script to launch guidance-power-manager instead of a link
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon, 21 Aug 2006 10:34:01 +0200
+
+tde-guidance (0.7.0-0ubuntu4) edgy; urgency=low
+
+  * Edit debian/rules to generate .pot file
+    Closes Malone No 67614
+  * Remove Conflicts: klaptopdaemon, kpowersave from tde-guidance-powermanager
+    allows people to do apt-get install kde
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 20:05:01 +0000
+
+tde-guidance (0.7.0-0ubuntu3) edgy; urgency=low
+
+  * Make tde-guidance conflict on python2.4-iconvcodec
+    Closes Malone No 62223
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 14:34:54 +0100
+
+tde-guidance (0.7.0-0ubuntu2) edgy; urgency=low
+
+  * kubuntu_10_critical_threshold.diff added, reduce safety threshold
+    for percentage charged to 10% in order to prevent automatic critical
+    action to be performed when remaining time is not reported properly.
+    Use threshold also for low battery warning notification to prevent 
+    false alarms.
+    Closes LP #64752, #67081
+
+  * kubuntu_20_lid_hibernate.diff added, to fix double hibernate action
+    when user has selected hibernate as action on lid close.
+    Closes LP #65885
+
+ -- Luka Renko <lure@ubuntu.com>  Sat, 21 Oct 2006 15:10:50 +0200
+
+tde-guidance (0.7.0-0ubuntu1) edgy; urgency=low
+
+  * Bump version number for an Edgy release
+  * Fixes bugs 64053 and 64978
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Oct 2006 20:05:22 +0100
+
+tde-guidance (0.6.7svn20061006-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  10 Oct 2006 16:04:28 +0200
+
+tde-guidance (0.6.7svn20060919-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+  * Split out power manager applet into new package so it can be removed 
+    or installed standalone
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 14:52:11 +0100
+
+tde-guidance (0.6.7svn20060914-0ubuntu2) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Sep 2006 17:26:27 +0100
+
+tde-guidance (0.6.7svn20060914-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes power-manager improvement
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  14 Sep 2006 20:54:28 +0200
+
+tde-guidance (0.6.7svn20060906-0ubuntu2) edgy; urgency=low
+
+  * Changed debian/rules to create a script to launch
+    guidance-power-manager instead of a link. Fixes the logout issue
+    in kde and klipper, kbluetoothd not launching since power-manager
+    wasn't in the background.
+  * Temporary changed debian/pyversions, replacing "2.4-" by "2.4",
+    since build fails using python 2.5, problem to import kdedistutils
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sun,  10 Sep 2006 13:45:28 +0200
+
+tde-guidance (0.6.7svn20060906-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes displayconfig usability fixes, 
+    powerconfig fixes and new powerconfig icons
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 13:22:28 +0100
+
+tde-guidance (0.6.7svn20060829-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 14:35:20 +0100
+
+tde-guidance (0.6.7svn20060810-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+  * Adds power manager applet for 
+    https://launchpad.net/distros/ubuntu/+spec/kubuntu-power-management
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Aug 2006 08:56:24 -0400
+
+tde-guidance (0.6.7-3ubuntu2) edgy; urgency=low
+
+  * debian/rules: Don't add extra /usr prefix when creating symlinks
+    for {display,mount,service,user}config & displayconfig-restore
+    (Closes Ubuntu: #54742).
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Mon, 31 Jul 2006 21:55:39 -0400
+
+tde-guidance (0.6.7-3ubuntu1) edgy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Jul 2006 18:39:47 +0100
+
+tde-guidance (0.6.7-3) experimental; urgency=low
+
+  * Fixed displayconfig-hwprobe.py in tde-guidance.init (Closes: #376779)
+
+ -- Fathi Boudra <fboudra@free.fr>  Wed,  5 Jul 2006 08:35:08 +0200
+
+tde-guidance (0.6.7-2) experimental; urgency=low
+
+  * Converted package to python-support
+  * Added pycompat and pyversions
+  * Force to use python2.4 (Closes: #375443)
+  * Added to Build-Depends: python-support, python-all-dev
+  * Removed source.lintian-overrides
+  * Cleaned up rules
+  * Added 12_force_python2.4_script.diff to force python2.4 in scripts
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 30 Jun 2006 14:44:46 +0200
+
+tde-guidance (0.6.7-1) experimental; urgency=low
+
+  * Initial Debian release (Closes: #340144)
+  * Merged with Ubuntu
+  * Converted to cdbs
+  * Updated debian/copyright according to GFDL documentations
+  * Updated postinst and postrm with debhelper token
+  * Added source lintian override for indirect build dependency
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu,  8 Jun 2006 17:08:06 +0200
+
+tde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_02_passwordexpire.diff from branch,
+    set local passexpirewarn (not global variable of same name) 
+    prevents UnboundLocalError, closes malone #47090
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 28 May 2006 14:34:10 +0100
+
+tde-guidance (0.6.7-0ubuntu3) dapper; urgency=low
+
+  * Change init number of displayconfig-hwprobe.py to 60, 
+    in line with Ubuntu policy
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 26 May 2006 14:18:42 +0100
+
+tde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_01_branch.diff
+    - Adds Dutch Translations to .desktop files
+    - Fixes serviceconfig.py would sometimes fail on non-English systems.
+      (Closes Malone bug #43313).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 19 May 2006 02:09:48 +0300
+
+tde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * Dutch translation added (Rinse de Vries)
+  * BUG: Displayconfig would fail if the monitor frequency settings in xorg.conf
+    contained extra spaces. (Malong bug #38692)
+  * BUG: Displayconfig would not add the lowest screen resolution available to
+    the modes list in the xorg.conf's Screen section/Display subsection.
+  * French translation added from Launchpad Rossetta.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 May 2006 01:38:55 +0300
+
+tde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: Serviceconfig didn't correctly remove links in runlevel directories.
+    (Malone bug #39404)
+  * BUG: In Serviceconfig, toggling the "Start during boot" checkbox using the
+    context menu would fail. (Malone bug #34252)
+  * BUG: displayconfig-restore.py was would fail with "global name 'syslog'
+    undefined". (Malone bug #40683)
+  * BUG: Displayconfig had trouble picking a driver gfxcard model entry instead
+    of the detected default (e.g. VESA). (Malone bug #41127)
+  * BUG: Displayconfig would fail when writing out a xorg.conf that contained
+    non-ascii characters. (Malone bug #41474)
+  * Work around for an annoying bug in PyQt/PyKDE that causes the tools to
+    crash on exit if a dialog window has been used.
+  * BUG: The file paths used in displayconfig for checking for the proprietary
+    nvidia driver were wrong or out of date.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 14:18:26 +0100
+
+tde-guidance (0.6.5-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_01_broken_script.diff comment out invalid python in
+    displayconfig script
+ 
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Apr 2006 00:38:46 +0100
+
+tde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: services that have not been installed via apt would cause long loops
+    a lot of dpkg queries. Only query dpkg db once.
+  * BUG: Serviceconfig's Apply button doesn't work. It should actually be Close
+    (Malone #38582)
+  * BUG: Changing an user's password can change another password for a different
+    user (Malone bug #39444)
+  * BUG: Displayconfig would fail at startup on systems with an nVidia 7800 GTX.
+    (Malone bug #32915 for Rob Hughes)
+  * BUG: Serviceconfig would crash if the windows is closed quickly after
+    serviceconfig appears.
+  * BUG: userconfig would fail at startup if an entry in /etc/passwd refered to
+    a group that is not defined in /etc/group. (Malone bug #34311)
+  * BUG: Userconifg. Manually typing in or editing the list of secondary groups
+    for a user had no effect. (Malone bug #37212)
+  * BUG: Displayconfig fails to detect the presence of the proprietary ATI and
+    nVidia drivers. (The location of some of the driver files had been recently
+    changed).
+  * BUG: displayconfig-restore.py would calculated the needed DPI at login using
+    stale screen information which would sometimes result in the wrong DPI.
+  * BUG: Numerious small bugs and compatibility problems in mountconfig.
+  * BUG: When browsing for a SMB share, mountconfig now correctly catches the
+    authentication information entered by the user into the smaller popup from
+    kio.
+  * Displayconfig now assumes that dualhead/clone mode is supported if the
+    laptop-detect script detects a laptop.
+  * Displayconfig now uses the clone mode support in the i810 driver.
+  * Displayconfig now only offers resolutions that both monitors support when
+    using clone mode.
+  * Displayconfig now supports clone mode on any setup that also supports
+    xinerama.
+  * BUG: Mountconfig failed to take into account that the order of the
+    user/users, exec/noexc, suid/nosuid etc options in /etc/fstab is significant.
+    (thanks Christoph Wiesen)
+  * French translations added to the desktop files. (Anthony Mercatante) 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Apr 2006 18:35:40 +0100
+
+tde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: All of the tools no longer write out config files under ~/.kde when
+    running as root. This should stop the annoying creation of config files
+    that can't be overwritten by the normal user.
+  * Userconfig is now by default not quite as tall. This should help stop
+    it from appearing too big in systemsettings.
+  * Displayconfig updated to also recognise late model nVidia chipsets.
+  * BUG: Displayconfig didn't support Clone mode for the proprietary nVidia
+    driver.
+  * BUG: The tools now correctly specify which translation catalogue to use for
+    translations.
+  * The screen images in the dualhead widget make better use of available widget
+    space.
+  * Displayconfig: The 40guidance-displayconfig_restore script which is used by
+    the Xsession script during login via TDM/xdm, has now been fixed to not stop
+    the login in case of failure.
+  * BUG: Displayconfig was getting confused by unknown graphics cards and
+    crashing. (Malone bug #32915)
+  * BUG: Displayconfig still can't handling unicode in xorg.conf. (Malone bug
+    #34437).
+  * BUG: Displayconfig is now more forgiving when xorg.conf contains characters
+    that are illegal with respect to the system character encoding. (Malone bug
+    #36590).
+  * BUG: Displayconfig would have trouble detecting hardware on the PCI bus on
+    big endian architectures. (raphink)
+  * BUG: Displayconfig did not correctly handle situations where the X RandR
+    extension is missing.
+  * BUG: Displayconfig would fail when loading some xorg.conf files containing
+    multiple graphics card specifications. (Malone bug #37275, patch applied)
+  * BUG: Userconfig didn't respect the entered UID when creating a account.
+    (Malone bug #37722).
+  * Displayconfig: Added 1280x960 modes (60 & 75Hz).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  2 Apr 2006 21:46:15 +0100
+
+tde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
+
+  [ Fathi Boudra ]
+  * Sync with Debian package (not yet in archives)
+
+  [ Simon Edwards ]
+  * BUG: userconfig and unixauthdb didn't respect the ownership of system files
+    when update /etc/passwd and friends. (Malone bug #26175).
+  * BUG: userconfig and unixauthdb would fail if /etc/passwd, /etc/groups or
+    /etc/shadow contained blank lines.
+  * BUG: displayconfig now does a better job of detecting graphics PCI devices
+    and handling non-detected graphics cards. Instead of crashing, "generic
+    VESA" is used when the type of card can't be found. (Malone bug #32915)
+  * The DPI that displayconfig-restore.py uses at login time can now be
+    controlled by adding a line to ~/.kde/share/config/displayconfigrc
+    in the [General] section. Add "dpi=xserver" to use the default DPI
+    from the X server, or "dpi=100" to use 100 DPI for example.
+  * BUG: Widescreen modes were missing in displayconfig.
+  * Displayconfig: Monitors can now be specified as being standard aspect ratio
+    or widescreen.
+  * BUG: Using the xresprobe command in displayconfig would crash some people's
+    machines. The much more safer ddcprobe command is now used.
+    (Malone bug #33943)
+  * BUG: A bug is displayconfig stopped monitor model detection. The xresprobe
+    command didn't actually return the eisa ID of the connected monitor.
+    ddcprobe does though (see above).
+  * BUG: Displayconfig. Changes to the monitor model or image format are
+    shown immediately on the "Size & Orientation" tab, even if the screen is
+    currently being used.
+  * BUG: When userconfig asks about whether the home directory should be created
+    when creating a new account, sometimes the wrong directory name was shown in
+    the dialog.
+  * BUG: Powerbook screen mode "1280x854" add to displayconfig. (Malone bug
+    #34383).
+  * BUG: Displayconfig would throw an exception if the current display didn't
+    support DPMS. (Malone bug #34316).
+  * BUG: Most utilities would fail if they came across UTF-8 or unicode
+    characters. (Malone bug #34194).
+  * BUG: Displayconfig wouldn't correctly detect the presence of installed
+    proprietary drivers. (OculusAquilae)
+  * BUG: Displayconfig had trouble handling BusID rows in xorg.conf. This would
+    cause the xorg.conf to be incorrectly read. (Tonio)
+  * Added some extra methods to ScanPCI.py to aid debugging.
+  * BUG: Displayconfig would not save the user's display settings when running
+    in kcontrol or systemsettings. (Malone bug #35257)
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 17:39:48 +0100
+
+tde-guidance (0.6.3-1) unstable; urgency=low
+
+  * Merge with Ubuntu
+  * New upstream version
+  * Added displayconfig
+  * Removed README.Debian
+  * Fixed manpages
+  * Fixed old fsf address in copyright file
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 15:46:17 +0100
+
+tde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: Small bug in displayconfig that caused it to bug out around the 
+    newCustomMonitor() method.
+  * BUG: userconfig had space character just before the she-bang which really
+    caused some trouble the for the shell.
+  * BUG: Displayconfig: Selecting the "Plug n Play" monitor directly without
+    clicking on "Detect" meant that only a very small set of resolutions would
+    be written to xorg.conf.
+  * BUG: The DPI calculations in displayconfig-restore.py where broken. This
+    resulted in the wrong DPI being used.
+  * BUG: Displayconfig: The clone mode option is now correctly disabled for
+    Matrox cards (mga driver).
+  * BUG: Displayconfig would bug out if the monitor model in the xorg.conf was
+    anything other than Plug n Play.
+  * BUG: Displayconfig would bug out if the DPMS Standby setting was 0 and DPMS
+    enabled.
+  * Displayconfig is now shown in kcontrol under settings/hardware instead of
+    settings/system.
+  * BUG: Small bug in displayconfig that will causes displayconfig to bug out
+    when trying to detect the monitor and no EDID info is available.
+  * BUG: Small cosmetic bug in displayconfig where the some tabs were missing
+    margins when shown in kcontrol/system settings.
+  * BUG: displayconfig would bug out when detecting ATI dualhead cards.
+    (pci_device.text was None).
+
+  [ Jonathan Riddell ]
+  * Remove kubuntu_02_display_category.diff, now in SVN
+  * Remove kubuntu_03_userconfig_shebang.diff, now in SVN
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  5 Mar 2006 21:51:47 +0000
+
+tde-guidance (0.6.1-0ubuntu0) dapper; urgency=low
+
+  * New release, sets a fixed DPI for Xft
+  * Add run time dependency on pytdeextensions
+  * Add kubuntu_03_userconfig_shebang.diff fix extra space
+  * Change init script to run at S35, Malone No. 32268
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 22:22:25 +0000
+
+tde-guidance (0.6.0-0ubuntu1) dapper; urgency=low
+
+  * New release
+  * Implements Guidance sections of https://wiki.ubuntu.com/DebianSystemTools
+  * Add kubuntu_01_hardware_file_path.diff from SVN to use correct directory
+  * Add kubuntu_02_display_category.diff to put display into hardware category
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jan 2006 20:44:05 +0100
+
+tde-guidance (0.4.0+svn20060102-0ubuntu1) dapper; urgency=low
+
+  * New snapshot, displayconfig added
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  2 Jan 2006 22:53:34 +0000
+
+tde-guidance (0.4.0-0ubuntu5) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Dec 2005 00:25:05 +0000
+
+tde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
+
+  * Copy necessary icons to global icon directory
+  * Add GenericNames to .desktop files
+  * Avoid repetition in description
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Sep 2005 02:44:22 +0100
+
+tde-guidance (0.4.0-0ubuntu3) breezy; urgency=low
+
+  * Move files from /usr/lib/python2.4/site-packages/guidance 
+    to just /usr/lib/python2.4/site-packages
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Sep 2005 21:31:21 +0100
+
+tde-guidance (0.4.0-0ubuntu2) breezy; urgency=low
+
+  * Can't remove debian/docs, it's in the .orig
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 02:01:07 +0100
+
+tde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
+
+  * New upstream version
+  * Fix debian/rules for rename to tde-guidance
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 01:07:38 +0100
+
+tde-guidance (0.3.0+svn20050911-0ubuntu1) breezy; urgency=low
+
+  * Initial Ubuntu upload
+  * Install .py files into /usr/lib/python2.4/site-packages/guidance
+  * Change source and package name to tde-guidance to 
+    reduce namespace polution
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 11 Sep 2005 23:51:52 +0100
+
+guidance (0.3.0-1) unstable; urgency=low
+
+  * Initial release
+  * Removed displayconfig that doesn't work on debian yet
+  * Added manpages
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon,  1 Aug 2005 19:23:46 +0200
+
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/compat b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/control b/ubuntu/_base/applications/settings/tde-guidance/debian/control
new file mode 100644
index 000000000..ace8cb486
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/control
@@ -0,0 +1,45 @@
+Source: tde-guidance-trinity
+Section: tde
+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
+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
+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}
+Description: collection of TDE system administration tools for GNU/Linux [Trinity]
+ Guidance currently consists of four 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.
+ .
+  Homepage: http://www.simonzone.com/software/guidance
+
+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~)
+Conflicts: guidance-power-manager, kde-guidance-powermanager
+Provides: ${python:Provides}
+Description: collection of system administration tools for GNU/Linux [Trinity]
+ This package contains the platform neutral backends used in the
+ Guidance configuration tools.
+ .
+  Homepage: http://www.simonzone.com/software/guidance
+
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/copyright b/ubuntu/_base/applications/settings/tde-guidance/debian/copyright
new file mode 100644
index 000000000..d50783096
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/copyright
@@ -0,0 +1,432 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Mon,  1 Aug 2005 19:23:46 +0200.
+
+It was downloaded from http://www.simonzone.com/software/guidance
+
+Copyright Holders:
+   Simon Edwards <simon@simonzone.com>
+   Sebastian Kügler <sebas@vizzzion.org>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The documentations provided with tde-guidance is distributed under
+the GNU Free Documentation License (GFDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections). The complete text of
+the GNU Free Documentation License can be found below:
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/docs b/ubuntu/_base/applications/settings/tde-guidance/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/docs
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..d292fc8d3
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/guidance-backends-trinity.install
@@ -0,0 +1,3 @@
+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
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
new file mode 100644
index 000000000..d3076cc3c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/mountconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" 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/patches/series b/ubuntu/_base/applications/settings/tde-guidance/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat b/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/pycompat
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..1a1ec9a8e
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/python-distutils-jaunty.mk
@@ -0,0 +1,297 @@
+# -*- 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
new file mode 100644
index 000000000..b3dc41ebc
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/rules b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
new file mode 100755
index 000000000..54328b46d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/rules
@@ -0,0 +1,164 @@
+#!/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 kde/wineconfig/pics/16x16/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
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
new file mode 100644
index 000000000..8ef180de8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/serviceconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" 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/source/format b/ubuntu/_base/applications/settings/tde-guidance/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/source/options b/ubuntu/_base/applications/settings/tde-guidance/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
new file mode 100644
index 000000000..fe690a9c2
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.install
@@ -0,0 +1,64 @@
+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/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
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
new file mode 100644
index 000000000..f151ee69f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.lintian-overrides
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 000000000..af8e365b5
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/tde-guidance-trinity.postinst
@@ -0,0 +1,9 @@
+#!/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
new file mode 100644
index 000000000..1fda3dd19
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/userconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" 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
new file mode 100644
index 000000000..19912c171
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-guidance/debian/watch
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/changelog b/ubuntu/_base/applications/settings/tde-systemsettings/debian/changelog
new file mode 100644
index 000000000..244389e07
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/changelog
@@ -0,0 +1,257 @@
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu5) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu4) intrepid; urgency=low
+
+  * Removed long-broken Bluetooth configuration icon
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 April 2009 20:44:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu3) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 05 March 2009 01:11:00 -0600
+
+tde-systemsettings-trinity (0.0svn20070312-0ubuntu2) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 03 Dec 2008 18:44:00 -0600
+
+tde-systemsettings (0.0svn20070312-0ubuntu5) hardy; urgency=low
+
+  * Cleanup previous installed
+    /etc/xdg/menus/kde-applications-merged/system-settings-merge.menu
+    (LP: #127722)
+  * Add link for file association handling to system settings (LP: #50320)
+    - Added debian/patches/kubuntu_05_add_filetypes_submenu.diff:
+    - Patch from Slammer
+  * Fix "Settings Menu cannot launch default applications module"
+    - LP: #132688
+    - Patch from Marcus Harris
+  * Fix lintian warnings in debian/control:
+    - Standards-Version: 3.7.3
+    - Remove build-essential from Build-Depends
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Sat, 29 Dec 2007 12:23:42 +0100
+
+tde-systemsettings (0.0svn20070312-0ubuntu4) gutsy; urgency=low
+
+  * Added kubuntu_04_fix_share_submenu.diff, adds missing 'Desktop
+    Share' entry
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 15 Oct 2007 11:59:04 +0200
+
+tde-systemsettings (0.0svn20070312-0ubuntu3) gutsy; urgency=low
+
+  * Added kubuntu_02_checkadmin_fix.diff, fixes the way systemsettings
+    checks if kcm module requires admin privileges, to make it to work
+    the way kcontrol does.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 22 Aug 2007 13:02:07 +0200
+
+tde-systemsettings (0.0svn20070312-0ubuntu2) gutsy; urgency=low
+
+  * Use applications-merged not kde-applications-merged, XDG prefix
+    not used for merge directories, closes 
+    https://bugs.launchpad.net/ubuntu/gutsy/+source/tde-systemsettings/+bug/114286
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 01:57:42 +0100
+
+tde-systemsettings (0.0svn20070312-0ubuntu1) feisty; urgency=low
+
+  * New snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 12 Mar 2007 23:25:11 +0000
+
+tde-systemsettings (0.0svn20070104-0ubuntu3) feisty; urgency=low
+
+  * Added kubuntu_05_more_categories.diff to allow universe
+    apps with kcm to go in the right section
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 22 Jan 2007 18:56:37 +0100
+
+tde-systemsettings (0.0svn20070104-0ubuntu2) feisty; urgency=low
+
+  * Added kubuntu_04_kcmgtk to get gtk-qt-engines in the
+    Appearance section
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 19 Jan 2007 05:42:21 +0100
+
+tde-systemsettings (0.0svn20070104-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot
+  * Don't build with unsermake
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  4 Jan 2007 19:51:18 +0000
+
+tde-systemsettings (0.0svn20060929-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  29 Sep 2006 00:02:55 +0200
+
+tde-systemsettings (0.0svn20060908-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  8 Sep 2006 20:41:55 +0200
+
+tde-systemsettings (0.0svn20060906-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 20:51:55 +0000
+
+tde-systemsettings (0.0svn20060830-0ubuntu3) edgy; urgency=low
+
+  * Changed debian/rules to remove laptoppowermanagement.desktop
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:17:25 +0200
+
+tde-systemsettings (0.0svn20060830-0ubuntu2) edgy; urgency=low
+
+  * Changed debian/rules to install kde-settings-accessibility_ss.directory
+    correctly
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue,  5 Sep 2006 21:03:25 +0200
+
+tde-systemsettings (0.0svn20060830-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes changes for 
+    kubuntu-system-settings-usability by Simon Edwards
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed,  30 Aug 2006 16:03:25 +0200
+
+tde-systemsettings (0.0svn20060803-0ubuntu2) edgy; urgency=low
+
+  * Stopped tde-systemsettings installing
+    kde-settings-accessibility.directory (also in tdebase-data).
+    Closes bug #55135
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri,  4 Aug 2006 13:01:09 +1000
+
+tde-systemsettings (0.0svn20060803-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes changes for 
+    kubuntu-system-settings-usability by Simon Edwards
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  3 Aug 2006 16:44:25 +0100
+
+tde-systemsettings (0.0svn20060512-0ubuntu1) dapper; urgency=low
+
+  [ Jonathan Riddell ]
+  * New SVN snapshot, includes our Debian patches now 
+    upstream plus new translations
+
+  [ Anthony Mercatante ]
+  * Move componentchooser to components
+  * Show spellchecking
+  * Move kcmsmserver to components
+  * Move Accessibility to Personal
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 12 May 2006 16:10:16 +0300
+
+tde-systemsettings (0.0svn20060502-0ubuntu1) dapper; urgency=low
+
+  [ Jonathan Riddell ]
+  * New SVN snapshot
+  * Adds languages cs, ka, lt
+  * Bump standards-version to 3.6.2
+
+  [ Simon Edwards ]
+  * Support the "Close" button for modules that want it, 
+    closes Malone #38582
+  * Disable and enable the Reset button properly.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue,  2 May 2006 02:14:19 +0100
+
+tde-systemsettings (0.0svn20060413-0ubuntu1) dapper; urgency=low
+
+  * New SVN snapshot, no code changes only new translations 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 13 Apr 2006 17:31:56 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu4) dapper; urgency=low
+
+  * Fix format in kubuntu_02_update_menus.diff.
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 16:48:12 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu3) dapper; urgency=low
+
+  * Modify kubuntu_02_update_menus.diff to prevent k3bsetup from showing up.
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Fri, 17 Mar 2006 15:02:49 +0100
+
+tde-systemsettings (0.0svn20060314-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_03_no_tdebuildsycoca.diff, stop it running kbuildsycocoa 
+    during 'make install'
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 15 Mar 2006 01:12:43 +0000
+
+tde-systemsettings (0.0svn20060314-0ubuntu1) dapper; urgency=low
+
+  * New upstream snapshot, adds various bugfixes by Simon Edwards
+    - Remove text for the "reset" button and put the icon text 
+      of the right hand side.
+    - Fix when going from a module back to the module overview, the
+      last selected module icon would stay selected
+    - If the dialog contents don't fit then scrollbars are shown
+    - Fix the evil "This module is already loaded in systemsettings"
+      error.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Mar 2006 00:44:10 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu4) dapper; urgency=low
+
+  * Don't use DEB_AUTO_UPDATE_DEBIAN_CONTROL
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 18:52:52 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu3) dapper; urgency=low
+
+  * Add build-dep on automake1.9
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  8 Dec 2005 03:55:12 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu2) dapper; urgency=low
+
+  * Add build-dep on autoconf
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 18:26:47 +0000
+
+tde-systemsettings (0.0svn20051207-0ubuntu1) dapper; urgency=low
+
+  * New snapshot
+  * Rebuild for libstdc++ transition
+  * Add kubuntu_01_kdepot.diff to be able to generate .pot file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  7 Dec 2005 16:20:32 +0000
+
+tde-systemsettings (0.0svn20050613-0ubuntu3) breezy; urgency=low
+
+  * Add kubuntu_02_update_menus.diff, kde-settings-bluetooth.directory
+    and kde-settings-laptops.directory to tidy up menus
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 24 Sep 2005 18:11:08 +0100
+
+tde-systemsettings (0.0svn20050613-0ubuntu2) breezy; urgency=low
+
+  * Add kubuntu_01_only_show_in_kde.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Jun 2005 17:10:56 +0000
+
+tde-systemsettings (0.0svn20050613-0ubuntu1) breezy; urgency=low
+
+  * Initial Release.
+  * Added manpage (from docbook source).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu,  9 Jun 2005 13:04:26 +0000
+
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/control b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
new file mode 100644
index 000000000..0da5ee76a
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/control
@@ -0,0 +1,15 @@
+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
+Standards-Version: 3.8.4
+
+Package: tde-systemsettings-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kcontrol-trinity
+Replaces: kde-systemsettings-kde3 (<< 4:14.0.0~), kde-systemsettings-trinity (<< 4:14.0.0~)
+Breaks: kde-systemsettings-kde3 (<< 4:14.0.0~), kde-systemsettings-trinity (<< 4:14.0.0~)
+Description: easy to use control centre for TDE
+ System preferences is a replacement for the TDE
+ Control Centre with an improved user interface.
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/copyright b/ubuntu/_base/applications/settings/tde-systemsettings/debian/copyright
new file mode 100644
index 000000000..04a4bdce1
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/copyright
@@ -0,0 +1,36 @@
+This package was debianised by Jonathan Riddell <jriddell@ubuntu.com> on
+Thu,  9 Jun 2005 13:04:26 +0000.
+
+Debian packagers:
+    Copyright (C) 2005 Jonathan Riddell <jriddell@ubuntu.com>
+
+Upstream Author:
+    Benjamin Charles Meyer <ben+kubuntusystempreferences@meyerhome.net>
+
+Copyright and license:
+
+All the software and systemsettings.1.docbook is GPL:
+
+    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 of the License, 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.
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+Copyright
+
+all the software:
+
+    Copyright (C) 2005 by Benjamin Charles Meyer <ben+kubuntusystempreferences@meyerhome.net>
+
+debian/systemsettings.1.docbook :
+
+    Copyright (C) 2005 by Jonathan Riddell <jriddell@ubuntu.com>
+
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
new file mode 100644
index 000000000..0eb1e7d11
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/docs
@@ -0,0 +1,4 @@
+AUTHOR
+
+
+
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/patches/series b/ubuntu/_base/applications/settings/tde-systemsettings/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/format b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/options b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst b/ubuntu/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
new file mode 100644
index 000000000..f7b840ea2
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tde-systemsettings/debian/tde-systemsettings-trinity.preinst
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+case "$1" in
+
+    upgrade)
+
+	# Remove wrong previous used file/dir:
+	FILE="/etc/xdg/menus/kde-applications-merged/system-settings-merge.menu"
+	SUBDIR="/etc/xdg/menus/kde-applications-merged"
+        if [ ! -L "$SUBDIR" ] && [ -d "$SUBDIR" ]; then
+		if [ -f "$FILE" ]; then rm -f "$FILE"; fi
+		rmdir --ignore-fail-on-non-empty "$SUBDIR"
+	fi
+    ;;
+
+    install|abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0
+
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/changelog b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/changelog
new file mode 100644
index 000000000..b54d300ab
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/changelog
@@ -0,0 +1,5 @@
+tdenetworkmanager-trinity (1:0.0-0ubuntu0) karmic; urgency=low
+
+  * Initial release
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 10 Sep 2012 09:02:00 -0600
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
new file mode 100644
index 000000000..6ab8cc8fc
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/control
@@ -0,0 +1,23 @@
+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,
+ tdelibs14-trinity-dev,
+ libiw-dev,
+ libnl-3-dev | libnl-dev (>= 1.1)
+Standards-Version: 3.8.4
+Homepage: http://www.trinitydesktop.org/
+
+Package: network-manager-tde
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
+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
+Provides: tdenetworkmanager-trinity
+Description: TDE systray applet for controlling networking [Trinity]
+ Systray applet for controlling network connections managed by 
+ a TDE network backend. It is mainly written for Trinity but also works for 
+ other desktop environments like GNOME or Xfce.
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/copyright b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/copyright
new file mode 100644
index 000000000..2490de254
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/copyright
@@ -0,0 +1,34 @@
+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/tdenetworkmanager/debian/menu b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/menu
new file mode 100644
index 000000000..7172f7ae8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/menu
@@ -0,0 +1,6 @@
+?package(network-manager-tde): \
+	needs="X11" \
+	section="Applications/Network/Monitoring" \
+  	title="TDENetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
+	command="/opt/trinity/bin/tdenetworkmanager"
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
new file mode 100644
index 000000000..22bd678da
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.lintian
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..df7b9dba2
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/network-manager-tde.postinst
@@ -0,0 +1,12 @@
+#!/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/tdenetworkmanager/debian/patches/series b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
new file mode 100755
index 000000000..5a0da42af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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/tdenetworkmanager/debian/source/format b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/options b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdenetworkmanager/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/changelog b/ubuntu/_base/applications/settings/tdesudo/debian/changelog
new file mode 100644
index 000000000..636573beb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/changelog
@@ -0,0 +1,111 @@
+tdesudo-trinity (4:2.5.1-4ubuntu0) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+tdesudo-trinity (4:2.5.1-3ubuntu8) intrepid; urgency=low
+
+  * Moved Trinity to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 01 March 2009 23:25:00 -0600
+
+tdesudo-trinity (4:2.5.1-3ubuntu6) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 04 Nov 2008 08:49:00 -0600
+
+tdesudo (2.5.1-0ubuntu3) hardy; urgency=low
+
+  * Improved kubuntu_02_spaced_args.patch:
+    - Now deals with -c command option too
+  * Added kubutu_04_nice_password_prompt.patch:
+    - Fixed dialog when typing commands like "ls *"
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 21 Apr 2008 09:20:30 +0200
+
+tdesudo (2.5.1-0ubuntu2) hardy; urgency=low
+
+  * Added kubuntu_02_spaced_args.patch:
+    - Closes LP: #209831
+  * Added kubuntu_03_export_kdesycoca.patch:
+    - Closes LP: #175909
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 17 Apr 2008 23:47:16 +0200
+
+tdesudo (2.5.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream release. Fixes issue building towards gcc 4.3.0
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 28 Mar 2008 15:27:57 +0100
+
+tdesudo (2.5-0ubuntu1) hardy; urgency=low
+
+  * New upstream release. Closes LP: #203690
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 18 Mar 2008 23:49:19 +0100
+
+tdesudo (2.4-0ubuntu1) hardy; urgency=low
+
+  * New upstream release. Closes LP: #187053
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 18 Feb 2008 13:43:57 +0100
+
+tdesudo (2.3-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sun, 17 Feb 2008 02:34:43 +0100
+
+tdesudo (2.2-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 04 Feb 2008 20:07:55 +0100
+
+tdesudo (2.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream release.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 24 Jan 2008 13:44:16 +0100
+
+tdesudo (2.0-0ubuntu1) hardy; urgency=low
+
+  * New upstream release :
+    - Closes LP: #157043, #162823, #144970, #148255,#172749, #173319
+  * Fixed packaging to divert both binary and manpage.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 04 Dec 2007 16:41:58 +0100
+
+tdesudo (1.4-0ubuntu1) hardy; urgency=low
+
+  * New upstream release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 20 Nov 2007 12:46:56 +0100
+
+tdesudo (1.3-0ubuntu1) hardy; urgency=low
+
+  * New upstream release. Closes LP: #163417
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 19 Nov 2007 20:36:49 +0100
+
+tdesudo (1.2-0ubuntu2) hardy; urgency=low
+
+  * Reupload as the build farm should now be fixed
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 12 Nov 2007 12:22:07 +0100
+
+tdesudo (1.2-0ubuntu1) hardy; urgency=low
+
+  * New upstream release, fixes the user's $HOME usage
+    potential corrupting files issue
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sat, 10 Nov 2007 12:58:57 +0100
+
+tdesudo (1.1-0ubuntu1) gutsy; urgency=low
+
+  * Initial release
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 01 Jun 2007 01:04:36 +0200
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/compat b/ubuntu/_base/applications/settings/tdesudo/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/control b/ubuntu/_base/applications/settings/tdesudo/debian/control
new file mode 100644
index 000000000..0742eb9dd
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/control
@@ -0,0 +1,15 @@
+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
+Standards-Version: 3.8.4
+
+Package: tdesudo-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, sudo, sudo-trinity
+Replaces: kdesudo-kde3 (<< 4:14.0.0~), kdesudo-trinity (<< 4:14.0.0~)
+Breaks: kdesudo-kde3 (<< 4:14.0.0~), kdesudo-trinity (<< 4:14.0.0~)
+Description: sudo frontend for Trinity
+ KdeSudo is a graphical frontend for the sudo utility.
+ It allows you to run programs as another user by entering your password.
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/copyright b/ubuntu/_base/applications/settings/tdesudo/debian/copyright
new file mode 100644
index 000000000..ee75c3d6d
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/copyright
@@ -0,0 +1,57 @@
+This package was debianized by Anthony Mercatante <tonio@ubuntu.com>
+on Fri, 01 Jun 2007 01:07:10 +0200
+
+It was downloaded from
+    https://code.launchpad.net/tdesudo
+
+This version is a fork of the original tdesudo from
+    http://ksudo.sourceforge.net/tdesudo/
+
+Upstream authors:
+    Robert Gruber
+    Anthony Mercatante
+    Martin Böhm
+    Jonathan Riddell
+
+Copyright:
+    (C) 2003 Robert Gruber <rgruber@users.sourceforge.net>
+    (C) 2007 Anthony Mercatante <tonio@ubuntu.com>
+    (C) 2007 Martin Böhm <martin.bohm@kubuntu.org
+    (C) 2007 Canonical Ltd (Jonathan Riddell <jriddell@ubuntu.com>)
+
+License:
+   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 of the License, 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+---
+
+The documentation is licensed under the terms of the GNU Free
+Documentation License version 1.2 with no Invariant Sections, no
+Front-Cover Texts and no Back-Cover Texts.
+
+On Debian systems, the complete text of the GNU GNU Free Documentation
+License can be found in `/usr/share/common-licenses/GFDL'.
+
+---
+
+The packaging in debian/ is licensed under the terms of the GNU General
+Public License either version 2 of the License, or
+(at your option) any later version.
+
+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/tdesudo/debian/docs b/ubuntu/_base/applications/settings/tdesudo/debian/docs
new file mode 100644
index 000000000..ca0272abf
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+README
+TODO
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/links b/ubuntu/_base/applications/settings/tdesudo/debian/links
new file mode 100644
index 000000000..faf8013c3
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/links
@@ -0,0 +1 @@
+opt/trinity/bin/tdesudo opt/trinity/bin/tdesu 
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/patches/series b/ubuntu/_base/applications/settings/tdesudo/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/postinst b/ubuntu/_base/applications/settings/tdesudo/debian/postinst
new file mode 100644
index 000000000..fae49d5b1
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/postinst
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  configure)
+    ;;
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/postrm b/ubuntu/_base/applications/settings/tdesudo/debian/postrm
new file mode 100644
index 000000000..af192c06b
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/postrm
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove \
+                /opt/trinity/bin/tdesu
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/preinst b/ubuntu/_base/applications/settings/tdesudo/debian/preinst
new file mode 100644
index 000000000..cb6630fa0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/preinst
@@ -0,0 +1,54 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdesudo-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    # remove old diversions if present
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu
+    fi
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then
+        dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu
+    fi
+
+    # add new diversion
+    dpkg-divert --package $package_name \
+    --divert /opt/trinity/bin/tdesu.distrib \
+    --rename /opt/trinity/bin/tdesu
+    ;;
+
+  upgrade)
+    # remove old diversion if present
+    divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"`
+    if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
+        dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu"
+    fi
+
+    # add new diversion
+    divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"`
+    if [ -z "$divert" ]; then
+        dpkg-divert --package $package_name \
+                    --divert /opt/trinity/bin/tdesu.distrib \
+                    --rename /opt/trinity/bin/tdesu
+    fi
+    ;;
+
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/rules b/ubuntu/_base/applications/settings/tdesudo/debian/rules
new file mode 100755
index 000000000..a6797f19a
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/source/format b/ubuntu/_base/applications/settings/tdesudo/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/tdesudo/debian/source/options b/ubuntu/_base/applications/settings/tdesudo/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/tdesudo/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian b/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
new file mode 100644
index 000000000..b0302c211
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/README.Debian
@@ -0,0 +1,107 @@
+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/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..f36e3527c
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/debian-tde.mk
@@ -0,0 +1,246 @@
+# -*- 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 = .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
+
+binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
+	set -e; \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
+		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
+		echo Building $$pkg HTML docs...; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+	done
+	for pkg in $(DOC_HTML_PRUNE) ; do \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+	done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+		cd $(DEB_SRCDIR); \
+		find . -name Makefile.in -print | \
+			xargs --no-run-if-empty rm -f; \
+		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+			configure configure.files configure.in stamp-h.in \
+			subdirs; \
+	fi
+endif
+	rm -f .tdepkginfo
+	rm -f debian/stamp-kde-apidox
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/changelog b/ubuntu/_base/applications/settings/wlassistant/debian/changelog
new file mode 100644
index 000000000..5eed797ea
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/changelog
@@ -0,0 +1,52 @@
+wlassistant-trinity (0.5.7-2~0ubuntu3) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 Jul 2009 16:08:00 -0600
+
+wlassistant-trinity (0.5.7-2~0ubuntu2) intrepid; urgency=low
+
+  * Moved to /opt/trinity
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Tue, 17 Mar 2009 15:13:00 -0600
+
+wlassistant-trinity (0.5.7-2~0ubuntu1) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 05 Jan 2009 21:15:00 -0600
+
+wlassistant (0.5.7-2) unstable; urgency=low
+
+  * Fix clean target: cleanbuilddir common-configure-arch::
+  * Remove Depends: tdelibs-bin - proper depends are pulled in via shlibs
+    - wlassistant uninstallable after tdelibs(4:3.5.7.dfsg.1-4) (Closes:
+    #437413)
+  * Move to Applications/Network/Monitoring:
+    - lintian fix menu-item-uses-apps-section
+
+ -- Mark Purcell <msp@debian.org>  Sun, 12 Aug 2007 17:00:41 +0100
+
+wlassistant (0.5.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Robust get-orig-source target
+  * Remove obsolete debian/TODO
+
+ -- Mark Purcell <msp@debian.org>  Mon, 23 Apr 2007 21:54:31 +1000
+
+wlassistant (0.5.6-1) unstable; urgency=low
+
+  * New upstream release
+  * New maintainer. (Closes: #410619: O: wlassistant -- KDE frontend for
+    wireless network connection - Debian Bug report logs)
+    - Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 18 Feb 2007 20:44:57 +0000
+
+wlassistant (0.5.5-1) unstable; urgency=low
+
+  * Initial release. (Closes: #322874)
+
+ -- Stan Vasilyev <stan.vasilyev@csun.edu>  Sat, 18 Feb 2006 14:10:18 -0800
+
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/compat b/ubuntu/_base/applications/settings/wlassistant/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/control b/ubuntu/_base/applications/settings/wlassistant/debian/control
new file mode 100644
index 000000000..f1908c8ab
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/control
@@ -0,0 +1,22 @@
+Source: wlassistant-trinity
+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
+Standards-Version: 3.8.4
+
+Package: wlassistant-trinity
+Architecture: any
+Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
+Replaces: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
+Breaks: wlassistant-kde3 (<< 4:14.0.0~), wlassistant-trinity (<< 4:14.0.0~)
+Recommends: dhcp3-client | dhcp-client | dhcpcd
+Description: User friendly TDE frontend for wireless network connection [Trinity]
+ Wireless Assistant scans for wireless access points and displays link quality,
+ encryption and other useful information. When user wants to connect to a
+ network, Wireless Assistant opens up its wizards and guides the user through
+ Wi-Fi settings. After a successful connection is made the settings are
+ remembered so next time the user won't have to enter them again.
+ .
+  Homepage: http://wlassistant.sourceforge.net/
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/copyright b/ubuntu/_base/applications/settings/wlassistant/debian/copyright
new file mode 100644
index 000000000..5179772ff
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/copyright
@@ -0,0 +1,25 @@
+This package was debianized by Stan Vasilyev <stan.vasilyev@csun.edu>
+and Achim Bohnet <ach@mpe.mpg.de> on Thu, 11 Aug 2005 23:31:05 -0700.
+
+It was downloaded from http://wlassistant.sf.net/
+
+Copyright (C) 2005 by Pawel Nawrocki <pnawrocki@interia.pl>
+
+License:
+
+     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 of the License, 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 02110-1301 USA 
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in the /usr/share/common-licenses/GPL file.
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/patches/series b/ubuntu/_base/applications/settings/wlassistant/debian/patches/series
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/patches/series
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/rules b/ubuntu/_base/applications/settings/wlassistant/debian/rules
new file mode 100755
index 000000000..b9e54f6a9
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/rules
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
+
+DEB_KDE_APIDOX := yes
+
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DLIB_SUFFIX="" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \
+ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \
+ -DAUTODETECT_QT_DIRS="ON" \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DBUILD_ALL="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/source/format b/ubuntu/_base/applications/settings/wlassistant/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/source/options b/ubuntu/_base/applications/settings/wlassistant/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/watch b/ubuntu/_base/applications/settings/wlassistant/debian/watch
new file mode 100644
index 000000000..42304de6e
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://sf.net/wlassistant/wlassistant-(.*)\.tar\.bz2	debian	svn-upgrade
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
new file mode 100644
index 000000000..fcaa89b00
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-16.xpm
@@ -0,0 +1,166 @@
+/* XPM */
+static char *wlassistant-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 144 2",
+"   c black",
+".  c #000101",
+"X  c #010101",
+"o  c #000303",
+"O  c #030000",
+"+  c #020202",
+"@  c #010606",
+"#  c #040505",
+"$  c gray2",
+"%  c #060606",
+"&  c #070707",
+"*  c #010800",
+"=  c #020E00",
+"-  c #0A0202",
+";  c #0F0000",
+":  c #09020A",
+">  c #0C050D",
+",  c gray3",
+"<  c #090909",
+"1  c #090A08",
+"2  c gray4",
+"3  c #0B0B0B",
+"4  c #0C0C0C",
+"5  c gray5",
+"6  c #0E0E0E",
+"7  c gray6",
+"8  c #031000",
+"9  c #051C00",
+"0  c #0F1010",
+"q  c #110000",
+"w  c #101010",
+"e  c #111111",
+"r  c #121012",
+"t  c gray7",
+"y  c #121313",
+"u  c #131313",
+"i  c gray8",
+"p  c #141515",
+"a  c #151515",
+"s  c #161616",
+"d  c gray9",
+"f  c #161919",
+"g  c #171919",
+"h  c #191919",
+"j  c #191A1A",
+"k  c gray10",
+"l  c #1B1B1B",
+"z  c #1B1D1D",
+"x  c gray11",
+"c  c #1D1C1C",
+"v  c #1D1D1D",
+"b  c #1E1C1E",
+"n  c gray12",
+"m  c #062200",
+"M  c #072C00",
+"N  c #083000",
+"B  c #093600",
+"V  c #0A3E00",
+"C  c #280000",
+"Z  c #330000",
+"A  c #3B0202",
+"S  c #3D0202",
+"D  c #3E0000",
+"F  c #202020",
+"G  c gray13",
+"H  c #222222",
+"J  c #222323",
+"K  c #232323",
+"L  c #222424",
+"P  c gray14",
+"I  c #252525",
+"U  c gray15",
+"Y  c #272727",
+"T  c #282727",
+"R  c #282828",
+"E  c gray16",
+"W  c #2A2A2A",
+"Q  c gray17",
+"!  c #2C2C2C",
+"~  c #2D2D2D",
+"^  c gray18",
+"/  c #302F2F",
+"(  c #313131",
+")  c #323232",
+"_  c #303434",
+"`  c gray21",
+"'  c #383939",
+"]  c gray23",
+"[  c #3F3F3F",
+"{  c #0E5400",
+"}  c #0F5E00",
+"|  c #106200",
+" . c #116600",
+".. c #116800",
+"X. c #116A00",
+"o. c #156E04",
+"O. c #127000",
+"+. c #157E00",
+"@. c #177E06",
+"#. c #197507",
+"$. c #267D15",
+"%. c #3F4040",
+"&. c #480000",
+"*. c #520000",
+"=. c #5D0000",
+"-. c #690000",
+";. c #404141",
+":. c #444545",
+">. c #464646",
+",. c #474646",
+"<. c #474448",
+"1. c #484848",
+"2. c #484949",
+"3. c gray29",
+"4. c #4A4B4B",
+"5. c #4C4C4C",
+"6. c #505252",
+"7. c gray37",
+"8. c gray44",
+"9. c #7B7B7B",
+"0. c #158000",
+"q. c #168800",
+"w. c #1AA000",
+"e. c #1CA800",
+"r. c #1DAB01",
+"t. c #1FB901",
+"y. c #348325",
+"u. c #378E26",
+"i. c #22B909",
+"p. c #2BC71B",
+"a. c #23D600",
+"s. c #25D103",
+"d. c #30C812",
+"f. c #25E200",
+"g. c #26FB03",
+"h. c #2AF802",
+"j. c #3AFF25",
+"k. c #4FDC34",
+"l. c #53F034",
+"z. c #62FF43",
+"x. c #868686",
+"c. c #9A9B9B",
+"v. c #ADACAC",
+"b. c None",
+/* pixels */
+"b.b.b.e 5 , , & , 4 & 5 & b.b.b.",
+"b.b.e 5 & w x G R U i , , , b.b.",
+"b.i 5 , G G h G x h P P e , & b.",
+"h e & U h G ;.%.' ] R l G & 5   ",
+"h , G x / ;.f 0 x L ' R l x , , ",
+"i e U U >.@ b.0.o.b.F ;.x P 5 e ",
+"e U G >.f b.@.p.i.B b.h ' x h e ",
+"e ( T 4., -.i.j.g. .1 6.5.G F e ",
+"e R U 4.p S +.a.e.V e c.7.F G u ",
+"f U U >.G b.m X.{ * b.v.4.G G h ",
+"h i ^ R _ ; } +.|   b.x.x ( i x ",
+"h e R R o b.o.w.q.= b.5.( Q h u ",
+"r x i i   b.#.d.r.9 b.b.4.u G   ",
+"b.i h   - b.$.l.s.N b.b.b.h < b.",
+"b.b.,   b.b.y.z.h.{   b., &   b.",
+"b.b.b.b.b.=.u.k.f.X.  b.b.b.b.b."
+};
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
new file mode 100644
index 000000000..110a71185
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.dirs
@@ -0,0 +1 @@
+opt/trinity/share/applications/tde
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
new file mode 100644
index 000000000..8fa4b0c87
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.docs
@@ -0,0 +1,4 @@
+doc/AUTHORS
+doc/NEWS
+doc/README
+doc/TODO
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
new file mode 100644
index 000000000..7465386d3
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.install
@@ -0,0 +1,3 @@
+debian/wlassistant.xpm     /opt/trinity/share/pixmaps/
+debian/wlassistant-16.xpm  /opt/trinity/share/pixmaps/
+
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
new file mode 100644
index 000000000..28b6283c0
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.manpage
@@ -0,0 +1,44 @@
+.TH "wlassistant" "1" "0.5.5" "Pawel Nawrocki <pnawrocki@interia.pl>" "net"
+.SH "NAME"
+.LP 
+Wireless Assistant
+.SH "SYNTAX"
+.LP 
+wlassistant [Qt\-options] [TDE\-options]
+
+Generic options:
+  \-\-help                    Show help about options
+  \-\-help\-qt                 Show Qt specific options
+  \-\-help\-tde                Show TDE specific options
+  \-\-help\-all                Show all options
+  \-\-author                  Show author information
+  \-v, \-\-version             Show version information
+  \-\-license                 Show license information
+  \-\-                        End of options
+.SH "DESCRIPTION"
+.LP 
+Wireless Assistant is a full\-featured TDE application with an intuitive interface. It scans for wireless access points and displays link quality, encryption and other useful information. When user wants to connect to a  network, Wireless Assistant opens up its wizards and guides the user through Wi\-Fi settings. After a successful connection is made the settings are remembered so next time the user won't have to enter them again. 
+
+Unlike other similar applications, Wireless Assistant requires virtually no  configuration, it is ready to use right after installation. Features include WEP  encryption, automatic (DHCP) and manual configuration, hidden ESSIDs and more.
+
+Main Features:
+
+\- Managed Networks Support
+
+\- WEP Encryption Support
+
+\- Not Broadcasted ("hidden") ESSIDs Support
+
+\- Per Network (AP) Configuration Profiles
+
+\- Automatic (DHCP, both dhcpcd and dhclient) and manual configuration options.
+
+The program uses wireless\-tools, route, ifconfig, dhcpcd/dhclient as its backends so they need to be installed.
+.SH "EXAMPLES"
+.LP 
+To run this program type:
+.LP 
+sudo wlassistant
+.SH "AUTHORS"
+.LP 
+Pawel Nawrocki <pnawrocki@interia.pl>
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
new file mode 100644
index 000000000..9e7286512
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant-trinity.menu
@@ -0,0 +1,10 @@
+?package(wlassistant-trinity):\
+        needs="X11"\
+        section="Applications/Network/Monitoring"\
+        hints="TDE"\
+        icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+        icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
+        title="wlassistant"\
+        command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
+
+
diff --git a/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
new file mode 100644
index 000000000..d1f52cbe8
--- /dev/null
+++ b/ubuntu/_base/applications/settings/wlassistant/debian/wlassistant.xpm
@@ -0,0 +1,289 @@
+/* XPM */
+static char *wlassistant[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 251 2",
+"   c black",
+".  c #010000",
+"X  c #010101",
+"o  c #000200",
+"O  c #020000",
+"+  c #030000",
+"@  c #020202",
+"#  c gray1",
+"$  c #000401",
+"%  c #000601",
+"&  c #050000",
+"*  c #040404",
+"=  c gray2",
+"-  c #060606",
+";  c #070707",
+":  c #000C02",
+">  c #000E03",
+",  c #090000",
+"<  c #0A0000",
+"1  c gray3",
+"2  c #090909",
+"3  c gray4",
+"4  c #0B0B0B",
+"5  c #0C0C0C",
+"6  c gray5",
+"7  c #0E0E0E",
+"8  c gray6",
+"9  c #001003",
+"0  c #001404",
+"q  c #001604",
+"w  c #001805",
+"e  c #001A05",
+"r  c #001E06",
+"t  c #110000",
+"y  c #120000",
+"u  c #140000",
+"i  c #150000",
+"p  c #160000",
+"a  c #180000",
+"s  c #1B0000",
+"d  c #1C0000",
+"f  c #1E0000",
+"g  c #101010",
+"h  c #111111",
+"j  c gray7",
+"k  c #131313",
+"l  c gray8",
+"z  c #151515",
+"x  c #161616",
+"c  c gray9",
+"v  c #181818",
+"b  c #191919",
+"n  c gray10",
+"m  c #1B1B1B",
+"M  c gray11",
+"N  c #1D1D1D",
+"B  c #1E1E1E",
+"V  c gray12",
+"C  c #002006",
+"Z  c #002407",
+"A  c #002607",
+"S  c #003209",
+"D  c #00360A",
+"F  c #00380B",
+"G  c #2B0000",
+"H  c #2E0000",
+"J  c #320000",
+"K  c #202020",
+"L  c gray13",
+"P  c #222222",
+"I  c #232323",
+"U  c gray14",
+"Y  c #252525",
+"T  c gray15",
+"R  c #272727",
+"E  c #282828",
+"W  c gray16",
+"Q  c #2A2A2A",
+"!  c gray17",
+"~  c #2C2C2C",
+"^  c #2D2D2D",
+"/  c gray18",
+"(  c #2F2F2F",
+")  c gray19",
+"_  c #313131",
+"`  c #323232",
+"'  c gray20",
+"]  c #343434",
+"[  c #353535",
+"{  c gray21",
+"}  c #373737",
+"|  c gray22",
+" . c #393939",
+".. c #3A3A3A",
+"X. c gray23",
+"o. c #3C3C3C",
+"O. c gray24",
+"+. c #3E3E3E",
+"@. c #3F3F3F",
+"#. c #00420C",
+"$. c #00440D",
+"%. c #00460D",
+"&. c #00480E",
+"*. c #004C0E",
+"=. c #004E0F",
+"-. c #00500F",
+";. c #00520F",
+":. c #005410",
+">. c #005610",
+",. c #015711",
+"<. c #005811",
+"1. c #005A11",
+"2. c #005C11",
+"3. c #005E12",
+"4. c #006012",
+"5. c #006212",
+"6. c #026214",
+"7. c #006413",
+"8. c #006A14",
+"9. c #006C14",
+"0. c #006E15",
+"q. c #007015",
+"w. c #007416",
+"e. c #007616",
+"r. c #037318",
+"t. c #007817",
+"y. c #4E0000",
+"u. c #4F0000",
+"i. c #500000",
+"p. c #520000",
+"a. c #530000",
+"s. c #5A0000",
+"d. c #5B0000",
+"f. c #5E0000",
+"g. c #5F0000",
+"h. c #610000",
+"j. c #640000",
+"k. c gray25",
+"l. c #414141",
+"z. c gray26",
+"x. c #444444",
+"c. c gray27",
+"v. c #464646",
+"b. c #484848",
+"n. c #494949",
+"m. c gray29",
+"M. c #4C4C4C",
+"N. c gray30",
+"B. c #4E4E4E",
+"V. c gray31",
+"C. c #535353",
+"Z. c gray33",
+"A. c #555555",
+"S. c #565656",
+"D. c gray34",
+"F. c #585858",
+"G. c #5A5A5A",
+"H. c #5B5B5B",
+"J. c #5D5D5D",
+"K. c #5F5F5F",
+"L. c #606060",
+"P. c gray38",
+"I. c #626262",
+"U. c gray39",
+"Y. c #646464",
+"T. c #686868",
+"R. c DimGray",
+"E. c gray42",
+"W. c #6D6D6D",
+"Q. c gray43",
+"!. c #6F6F6F",
+"~. c gray44",
+"^. c #717171",
+"/. c #727272",
+"(. c gray45",
+"). c #797979",
+"_. c gray48",
+"`. c #7B7B7B",
+"'. c #7C7C7C",
+"]. c gray49",
+"[. c #7E7E7E",
+"{. c #008018",
+"}. c #008619",
+"|. c #00881A",
+" X c #008C1A",
+".X c #00941C",
+"XX c #00961C",
+"oX c #00981D",
+"OX c #009A1D",
+"+X c #009C1D",
+"@X c #009E1E",
+"#X c #008A20",
+"$X c #0B8722",
+"%X c #1C9C34",
+"&X c #00A01E",
+"*X c #00A21E",
+"=X c #00A41F",
+"-X c #00A820",
+";X c #00AA20",
+":X c #00AC20",
+">X c #00B422",
+",X c #00B622",
+"<X c #07B528",
+"1X c #00B823",
+"2X c #0FB92F",
+"3X c #2FA746",
+"4X c #2DAF46",
+"5X c #3EBA55",
+"6X c #00C024",
+"7X c #00C425",
+"8X c #01C526",
+"9X c #00CC26",
+"0X c #00D428",
+"qX c #00D829",
+"wX c #00DA29",
+"eX c #0ED433",
+"rX c #00E62B",
+"tX c #00EC2C",
+"yX c #00E436",
+"uX c #00F22E",
+"iX c #01F32F",
+"pX c #00F42E",
+"aX c #00FA2F",
+"sX c #00FC2F",
+"dX c #01FF31",
+"fX c #02FE3E",
+"gX c #16E43D",
+"hX c #11FF3E",
+"jX c #03FF44",
+"kX c #17F140",
+"lX c #17FF43",
+"zX c #1BFD46",
+"xX c #3AE45A",
+"cX c #25FF63",
+"vX c #35F16E",
+"bX c #45CD5E",
+"nX c #5BFB79",
+"mX c #47FB82",
+"MX c #66FE9C",
+"NX c #70FE8A",
+"BX c #74FE8E",
+"VX c #76FE8F",
+"CX c #78FE91",
+"ZX c #868686",
+"AX c gray53",
+"SX c #898989",
+"DX c gray56",
+"FX c #939393",
+"GX c gray59",
+"HX c #9B9B9B",
+"JX c None",
+/* pixels */
+"JXJXJXJXJXJXJXJXJXJX4 4 8 8 8 8 8 8 8 4 -   JXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJX4 8 8 8 -           * * 8 8 8 - JXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJX4 k k 4       4 k 8 8 JXJXk     4 k 8   JXJXJXJXJXJX",
+"JXJXJXJXJX8 k 8 *     n Q { k.O.X.| / { 8 JX    8 8 - JXJXJXJXJX",
+"JXJXJXJXk l 4     k X.X./ U n l k n U / X.' 8 JX  4 l - JXJXJXJX",
+"JXJXJXl l 4     / v.E 8                 8 U O.L JXJX4 l - JXJXJX",
+"JXJXl l 8     { O.k     V b.R.Y.K.J.X.l JX  k X.Q   JX8 k   JXJX",
+"JXJXl k     { X.1   l N.!.J.O.' ' O.D.R.l.8 JX- X./     l k   JX",
+"JXl n - - { l.4   L W.D.V             V A.K.l JX4 O.L   - n -   ",
+"JXn k   l N.k   L [.O.        JXJXJXJX    O.W.l JXk l.4 JXk k   ",
+"n V     v./   n /.O.    JXJXJXJXJXJXJXJXJX  l.K.- JX{ /   - n - ",
+"n n   V m.8   A.K.-   JXJXJXJXa.u.JXJXJXJXJX- J.O.  k v.- JXV 8 ",
+"V 8   ' X.  n [.V   JXJXJX<.e.=X@X8.w JXJXJXJX/ W.8 JXO.L   k n ",
+"L - 8 m./   C.R.    JXJX<.#XvXcXdXwX0.: JXJXJX  /.U   ' '   4 V ",
+"L - l A.L   `.v.    JXJX7.yXMXmXaXrX&XS   JXJXJXW.O.  { X.  4 L ",
+"L - l A.n   `.X.  JXJXJXe.iXjXfXpXwX X$.  JXJXJX/.N.  { O.  4 U ",
+"U * k A.V   `.o.  JXJXJX2.0XiXtXwX;X0.D     JXJX`.N.  X.l.  4 U ",
+"U $ JXZ.L   /.N.  JXJXJXC |.6X1XOXq.<.0   JXJXJXZXO.  O.O.  4 Q ",
+"Q 4 JXN.]   m./.    JXJXJXA 4.0.4.;.r     JXJXJXSXU   O.X.  n U ",
+"Q 8   O.l.  n ZXU   JXJXJXJX*.e.0.D     JXJXJXDX`.8 k A.U   ' V ",
+"V L   k D.k JXC./.1 JXJXJXJX7.|.t.&.  JXJXJXGXFXv.  V K.-   ' k ",
+"4 / * JXN.O.  k U.k   JXJX6.e..X}.2.$   JXJX[.W.-   N.O.  l / - ",
+"JXU n   l K.v JX      JXJX>.}.;XXXq.:   JXJXJX    X.Y.8   / L   ",
+"JXk ) 1 JX{ H.8 JXJXJXJXJX:.OX1X=X{.w   JXJXJXJXv.K.Q   k { 8   ",
+"JXJXU U     X.l   JXJXJXJX>.2X7X>X.XA   JXJXJXJX/.X.  4 X.L     ",
+"JXJX1 ' V         JXJXJXJX6.xXeX6X:XS   JXJXJXJXJX    U / -   JX",
+"JXJXJX8 { v   JXJXJXJXJXJXr.nXgX9X6X$.  JXJXJXJXJXJXX.{ 4     JX",
+"JXJXJXJXl n   JXJXJXJXJXJX$XNXkXwX0X4.  JXJXJXJXJXJX/ k     JXJX",
+"JXJXJXJX      JXJXJXJXJX*.%XVXzXtXrX{.$   JXJXJXJXJX      JXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX;.4XVXlXaXpX@X:   JXJXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX;.bXCXhXdXdX7Xq   JXJXJXJXJXJXJXJXJXJXJX",
+"JXJXJXJXJXJXJXJXJXJXJXJX2.3X5X<X>X>X&XA   JXJXJXJXJXJXJXJXJXJXJX"
+};