395 files changed, 10114 insertions, 347 deletions

diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/debian/lenny/applications/kdbg/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/debian/lenny/applications/kdbg/debian/cdbs/buildvars.mk
diff --git a/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/lenny/applications/kdbg/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdbg/debian/cdbs/kde.mk
diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/debian/lenny/applications/kdbg/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/debian/lenny/applications/kdbg/debian/cdbs/uploaders.mk
diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/lenny/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/kdbg/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/kdbg/debian/changelog b/debian/lenny/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/compat b/debian/lenny/applications/kdbg/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/compat
+++ b/debian/lenny/applications/kdbg/debian/compat
diff --git a/debian/lenny/applications/kdbg/debian/control b/debian/lenny/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/debian/lenny/applications/kdbg/debian/copyright b/debian/lenny/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/debian/lenny/applications/kdbg/debian/doc-base b/debian/lenny/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/debian/lenny/applications/kdbg/debian/docs b/debian/lenny/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/debian/lenny/applications/kdbg/debian/kdbg.1 b/debian/lenny/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/lenny/applications/kdbg/debian/kdbg.xpm b/debian/lenny/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/debian/lenny/applications/kdbg/debian/menu b/debian/lenny/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/debian/lenny/applications/kdbg/debian/rules b/debian/lenny/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/debian/lenny/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/debian/lenny/applications/knetworkmanager9/debian/source/format b/debian/lenny/applications/kdbg/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/source/format
+++ b/debian/lenny/applications/kdbg/debian/source/format
diff --git a/debian/lenny/applications/knetworkmanager9/debian/source/options b/debian/lenny/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/source/options
+++ b/debian/lenny/applications/kdbg/debian/source/options
diff --git a/debian/lenny/applications/knetworkmanager9/debian/README.source b/debian/lenny/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/README.source
+++ b/debian/lenny/applications/tdenetworkmanager/debian/README.source
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/kde.mk b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/debian/lenny/applications/knetworkmanager9/debian/cdbs/team-members b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/knetworkmanager9/debian/changelog b/debian/lenny/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/changelog
+++ b/debian/lenny/applications/tdenetworkmanager/debian/changelog
diff --git a/debian/lenny/applications/knetworkmanager9/debian/compat b/debian/lenny/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/compat
+++ b/debian/lenny/applications/tdenetworkmanager/debian/compat
diff --git a/debian/lenny/applications/knetworkmanager9/debian/control b/debian/lenny/applications/tdenetworkmanager/debian/control
index 6bc8c18a8..6bc8c18a8 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/control
+++ b/debian/lenny/applications/tdenetworkmanager/debian/control
diff --git a/debian/lenny/applications/knetworkmanager9/debian/control.in b/debian/lenny/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/control.in
+++ b/debian/lenny/applications/tdenetworkmanager/debian/control.in
diff --git a/debian/lenny/applications/knetworkmanager9/debian/copyright b/debian/lenny/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/copyright
+++ b/debian/lenny/applications/tdenetworkmanager/debian/copyright
diff --git a/debian/lenny/applications/knetworkmanager9/debian/manpages b/debian/lenny/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/manpages
+++ b/debian/lenny/applications/tdenetworkmanager/debian/manpages
diff --git a/debian/lenny/applications/knetworkmanager9/debian/menu b/debian/lenny/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/menu
+++ b/debian/lenny/applications/tdenetworkmanager/debian/menu
diff --git a/debian/lenny/applications/knetworkmanager9/debian/network-manager-tde.lintian b/debian/lenny/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/debian/lenny/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/debian/lenny/applications/knetworkmanager9/debian/network-manager-tde.postinst b/debian/lenny/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/debian/lenny/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/debian/lenny/applications/knetworkmanager9/debian/patches/series b/debian/lenny/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/patches/series
+++ b/debian/lenny/applications/tdenetworkmanager/debian/patches/series
diff --git a/debian/lenny/applications/knetworkmanager9/debian/rules b/debian/lenny/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/debian/lenny/applications/knetworkmanager9/debian/rules
+++ b/debian/lenny/applications/tdenetworkmanager/debian/rules
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/source/format b/debian/lenny/applications/tdenetworkmanager/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/source/format
+++ b/debian/lenny/applications/tdenetworkmanager/debian/source/format
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/source/options b/debian/lenny/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/source/options
+++ b/debian/lenny/applications/tdenetworkmanager/debian/source/options
diff --git a/debian/lenny/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/debian/lenny/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/debian/lenny/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/debian/lenny/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/buildvars.mk
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/kde.mk
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/team-members b/debian/lenny/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/team-members
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/debian/lenny/applications/tdepowersave/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/uploaders.mk
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/lenny/applications/tdepowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/lenny/applications/tdepowersave/debian/cdbs/versions.pl
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/changelog b/debian/lenny/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/changelog
+++ b/debian/lenny/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/compat b/debian/lenny/applications/tdepowersave/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/compat
+++ b/debian/lenny/applications/tdepowersave/debian/compat
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/control b/debian/lenny/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/control
+++ b/debian/lenny/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/copyright b/debian/lenny/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/copyright
+++ b/debian/lenny/applications/tdepowersave/debian/copyright
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/install b/debian/lenny/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/install
+++ b/debian/lenny/applications/tdepowersave/debian/install
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave.1 b/debian/lenny/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/debian/lenny/applications/tdepowersave/debian/kpowersave.1
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave.xpm b/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/manpages b/debian/lenny/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/manpages
+++ b/debian/lenny/applications/tdepowersave/debian/manpages
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/menu b/debian/lenny/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/menu
+++ b/debian/lenny/applications/tdepowersave/debian/menu
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/patches/.gitignore b/debian/lenny/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/debian/lenny/applications/tdepowersave/debian/patches/.gitignore
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/postrm b/debian/lenny/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/postrm
+++ b/debian/lenny/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/preinst b/debian/lenny/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/preinst
+++ b/debian/lenny/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/wheezy/applications/kpowersave-nohal/debian/rules
+++ b/debian/lenny/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/source/format b/debian/lenny/applications/tdepowersave/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/source/format
+++ b/debian/lenny/applications/tdepowersave/debian/source/format
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/source/options b/debian/lenny/applications/tdepowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/source/options
+++ b/debian/lenny/applications/tdepowersave/debian/source/options
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/watch b/debian/lenny/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/watch
+++ b/debian/lenny/applications/tdepowersave/debian/watch
diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/lenny/metapackages/rename-meta/debian/control
+++ b/debian/lenny/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/debian/squeeze/applications/kdbg/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/buildvars.mk
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/squeeze/applications/kdbg/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kdbg/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/uploaders.mk
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/squeeze/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kdbg/debian/changelog b/debian/squeeze/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/compat b/debian/squeeze/applications/kdbg/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/compat
+++ b/debian/squeeze/applications/kdbg/debian/compat
diff --git a/debian/squeeze/applications/kdbg/debian/control b/debian/squeeze/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/debian/squeeze/applications/kdbg/debian/copyright b/debian/squeeze/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/debian/squeeze/applications/kdbg/debian/doc-base b/debian/squeeze/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/debian/squeeze/applications/kdbg/debian/docs b/debian/squeeze/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/debian/squeeze/applications/kdbg/debian/kdbg.1 b/debian/squeeze/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/squeeze/applications/kdbg/debian/kdbg.xpm b/debian/squeeze/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/debian/squeeze/applications/kdbg/debian/menu b/debian/squeeze/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/debian/squeeze/applications/kdbg/debian/rules b/debian/squeeze/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/debian/squeeze/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/source/format b/debian/squeeze/applications/kdbg/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/source/format
+++ b/debian/squeeze/applications/kdbg/debian/source/format
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/source/options b/debian/squeeze/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/source/options
+++ b/debian/squeeze/applications/kdbg/debian/source/options
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/README.source b/debian/squeeze/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/README.source
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/README.source
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/kde.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/team-members b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/changelog b/debian/squeeze/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/changelog
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/changelog
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/compat b/debian/squeeze/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/compat
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/compat
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/control b/debian/squeeze/applications/tdenetworkmanager/debian/control
index 6bc8c18a8..6bc8c18a8 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/control
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/control
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/control.in b/debian/squeeze/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/control.in
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/control.in
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/copyright b/debian/squeeze/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/copyright
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/copyright
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/manpages b/debian/squeeze/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/manpages
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/manpages
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/menu b/debian/squeeze/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/menu
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/menu
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/network-manager-tde.lintian b/debian/squeeze/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/network-manager-tde.postinst b/debian/squeeze/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/patches/series b/debian/squeeze/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/patches/series
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/patches/series
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/rules b/debian/squeeze/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/debian/squeeze/applications/knetworkmanager9/debian/rules
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/rules
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/source/format b/debian/squeeze/applications/tdenetworkmanager/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/source/format
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/source/format
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/source/options b/debian/squeeze/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/source/options
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/source/options
diff --git a/debian/squeeze/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/debian/squeeze/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/debian/squeeze/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/buildvars.mk
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/kde.mk
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/team-members b/debian/squeeze/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/team-members
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/uploaders.mk
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/squeeze/applications/tdepowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/versions.pl
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/changelog b/debian/squeeze/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/changelog
+++ b/debian/squeeze/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/compat b/debian/squeeze/applications/tdepowersave/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/compat
+++ b/debian/squeeze/applications/tdepowersave/debian/compat
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/control b/debian/squeeze/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/control
+++ b/debian/squeeze/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/copyright b/debian/squeeze/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/copyright
+++ b/debian/squeeze/applications/tdepowersave/debian/copyright
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/install b/debian/squeeze/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/install
+++ b/debian/squeeze/applications/tdepowersave/debian/install
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave.1 b/debian/squeeze/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/debian/squeeze/applications/tdepowersave/debian/kpowersave.1
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave.xpm b/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/manpages b/debian/squeeze/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/manpages
+++ b/debian/squeeze/applications/tdepowersave/debian/manpages
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/menu b/debian/squeeze/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/menu
+++ b/debian/squeeze/applications/tdepowersave/debian/menu
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/patches/.gitignore b/debian/squeeze/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/debian/squeeze/applications/tdepowersave/debian/patches/.gitignore
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/postrm b/debian/squeeze/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/postrm
+++ b/debian/squeeze/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/preinst b/debian/squeeze/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/preinst
+++ b/debian/squeeze/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/rules
+++ b/debian/squeeze/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/source/format b/debian/squeeze/applications/tdepowersave/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/source/format
+++ b/debian/squeeze/applications/tdepowersave/debian/source/format
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/source/options b/debian/squeeze/applications/tdepowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/source/options
+++ b/debian/squeeze/applications/tdepowersave/debian/source/options
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/watch b/debian/squeeze/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/watch
+++ b/debian/squeeze/applications/tdepowersave/debian/watch
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/debian/wheezy/applications/kdbg/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/debian/wheezy/applications/kdbg/debian/cdbs/buildvars.mk
diff --git a/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/wheezy/applications/kdbg/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/wheezy/applications/kdbg/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/debian/wheezy/applications/kdbg/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/debian/wheezy/applications/kdbg/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/wheezy/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/kdbg/debian/cdbs/versions.pl
diff --git a/debian/wheezy/applications/kdbg/debian/changelog b/debian/wheezy/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/compat b/debian/wheezy/applications/kdbg/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/compat
+++ b/debian/wheezy/applications/kdbg/debian/compat
diff --git a/debian/wheezy/applications/kdbg/debian/control b/debian/wheezy/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/debian/wheezy/applications/kdbg/debian/copyright b/debian/wheezy/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/debian/wheezy/applications/kdbg/debian/doc-base b/debian/wheezy/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/debian/wheezy/applications/kdbg/debian/docs b/debian/wheezy/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/debian/wheezy/applications/kdbg/debian/kdbg.1 b/debian/wheezy/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/wheezy/applications/kdbg/debian/kdbg.xpm b/debian/wheezy/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/debian/wheezy/applications/kdbg/debian/menu b/debian/wheezy/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/debian/wheezy/applications/kdbg/debian/rules b/debian/wheezy/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/debian/wheezy/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/source/format b/debian/wheezy/applications/kdbg/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/source/format
+++ b/debian/wheezy/applications/kdbg/debian/source/format
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/source/options b/debian/wheezy/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/source/options
+++ b/debian/wheezy/applications/kdbg/debian/source/options
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/README.source b/debian/wheezy/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/README.source
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/README.source
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/kde.mk b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/team-members b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/changelog b/debian/wheezy/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/changelog
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/changelog
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/compat b/debian/wheezy/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/compat
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/compat
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/control b/debian/wheezy/applications/tdenetworkmanager/debian/control
index 6bc8c18a8..6bc8c18a8 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/control
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/control
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/control.in b/debian/wheezy/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/control.in
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/control.in
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/copyright b/debian/wheezy/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/copyright
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/copyright
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/manpages b/debian/wheezy/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/manpages
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/manpages
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/menu b/debian/wheezy/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/menu
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/menu
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/network-manager-tde.lintian b/debian/wheezy/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/network-manager-tde.postinst b/debian/wheezy/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/patches/series b/debian/wheezy/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/patches/series
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/patches/series
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/rules b/debian/wheezy/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/debian/wheezy/applications/knetworkmanager9/debian/rules
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/rules
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/format b/debian/wheezy/applications/tdenetworkmanager/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/format
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/source/format
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/options b/debian/wheezy/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/options
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/source/options
diff --git a/debian/wheezy/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/debian/wheezy/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/debian/wheezy/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/debian/wheezy/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/buildvars.mk
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/kde.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/kde.mk
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/team-members b/debian/wheezy/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/team-members
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/debian/wheezy/applications/tdepowersave/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/uploaders.mk
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/versions.pl b/debian/wheezy/applications/tdepowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/debian/wheezy/applications/tdepowersave/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/changelog b/debian/wheezy/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/changelog
+++ b/debian/wheezy/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/compat b/debian/wheezy/applications/tdepowersave/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/compat
+++ b/debian/wheezy/applications/tdepowersave/debian/compat
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/control b/debian/wheezy/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/control
+++ b/debian/wheezy/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/copyright b/debian/wheezy/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/copyright
+++ b/debian/wheezy/applications/tdepowersave/debian/copyright
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/install b/debian/wheezy/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/install
+++ b/debian/wheezy/applications/tdepowersave/debian/install
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave.1 b/debian/wheezy/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/debian/wheezy/applications/tdepowersave/debian/kpowersave.1
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave.xpm b/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/manpages b/debian/wheezy/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/manpages
+++ b/debian/wheezy/applications/tdepowersave/debian/manpages
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/menu b/debian/wheezy/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/menu
+++ b/debian/wheezy/applications/tdepowersave/debian/menu
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/patches/.gitignore b/debian/wheezy/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/debian/wheezy/applications/tdepowersave/debian/patches/.gitignore
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/postrm b/debian/wheezy/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/postrm
+++ b/debian/wheezy/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/preinst b/debian/wheezy/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/lenny/applications/kpowersave-nohal/debian/preinst
+++ b/debian/wheezy/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/lenny/applications/kpowersave-nohal/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/lenny/applications/kpowersave-nohal/debian/rules
+++ b/debian/wheezy/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/source/format b/debian/wheezy/applications/tdepowersave/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/source/format
+++ b/debian/wheezy/applications/tdepowersave/debian/source/format
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/source/options b/debian/wheezy/applications/tdepowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/source/options
+++ b/debian/wheezy/applications/tdepowersave/debian/source/options
diff --git a/debian/wheezy/applications/kpowersave-nohal/debian/watch b/debian/wheezy/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/debian/wheezy/applications/kpowersave-nohal/debian/watch
+++ b/debian/wheezy/applications/tdepowersave/debian/watch
diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/control
+++ b/debian/wheezy/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index 0ea182e45..3842b4c0b 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -198,6 +198,9 @@ rpmbuild -ba \
 eval "$(grep ^RET= ${LOGFILE})"
 set +x
 
+# Removes temporary source directory
+rm -rf "${SOURCEDIR}"
+
 if [ "${RET}" -gt 0 ]; then
 	exit ${RET}
 fi
@@ -208,7 +211,6 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
 	exit 2
 fi
 
-set -x
 rm -rf "${SOURCEDIR}"
 
 # Removes BUILDDIR if build succeeded
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-add_french_translations.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-add_french_translations.patch
new file mode 100644
index 000000000..b29138c3f
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-add_french_translations.patch
@@ -0,0 +1,1061 @@
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/kcmiccconfig.po tde-i18n-fr-3.5.10.p/messages/tdebase/kcmiccconfig.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/kcmiccconfig.po	1970-01-01 01:00:00.000000000 +0100
++++ tde-i18n-fr-3.5.10/messages/tdebase/kcmiccconfig.po	2011-12-18 12:12:34.087743324 +0100
+@@ -0,0 +1,76 @@
++# TDE 3.5.13 'iccconfig.cpp' translation
++
++#: iccconfig.cpp:82
++msgid "<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."
++msgstr "<b>Le profil de couleurs ICC global est un réglage système, et nécessite les droits d'administrateur.</b><br>Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous."
++
++#: iccconfig.cpp:155
++#: iccconfig.cpp:189
++msgid "Please enter the new profile name below:"
++msgstr "Veuillez indiquer le nom du nouveau profil:"
++
++#: iccconfig.cpp:159
++#: iccconfig.cpp:193
++msgid "ICC Profile Configuration"
++msgstr "Configuration du profil ICC"
++
++#: iccconfig.cpp:166
++#: iccconfig.cpp:200
++msgid "Error: A profile with that name already exists"
++msgstr "Erreur: Il existe déja un profil portant ce nom."
++
++#: iccconfig.cpp:406
++msgid ""
++"<h1>ICC Profile Configuration</h1> This module allows you to configure TDE support"
++" for ICC profiles. This allows you to easily color correct your monitor"
++" for a more lifelike and vibrant image."
++msgstr ""
++"<h1>Configuration du profil ICC</h1> Ce module vous permet de configurer le support"
++" ICC de Trinity. Il permet de calibrer  les couleurs de votre moniteur, "
++" afin d'obtenir une image plus vivante et plus vibrante."
++
++#: iccconfigbase.ui:31
++msgid "ICC Color Profile Configuration"
++msgstr "Configuration des profils de couleurs ICC"
++
++#: iccconfigbase.ui:42
++msgid "System Settings"
++msgstr "Paramètres Système"
++
++#: iccconfigbase.ui:53
++msgid "&Enable global ICC color profile support"
++msgstr "Activer le profil ICC global"
++
++#: iccconfigbase.ui:61
++#: iccconfigbase.ui:148
++msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)"
++msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)"
++
++#: iccconfigbase.ui:69
++#: iccconfigbase.ui:156
++msgid "ICC File"
++msgstr "Fichier ICC"
++
++#: iccconfigbase.ui:79
++msgid "User Settings"
++msgstr "Paramètres Utilisateurs"
++
++#: iccconfigbase.ui:90
++msgid "&Enable user ICC color profile support"
++msgstr "Activer le profil ICC utilisateur"
++
++#: iccconfigbase.ui:103
++msgid "Current Profile"
++msgstr "Profil actuel"
++
++#: iccconfigbase.ui:111
++msgid "Create New"
++msgstr "Créer"
++
++#: iccconfigbase.ui:119
++msgid "Rename"
++msgstr "Renommer"
++
++#: iccconfigbase.ui:140
++msgid "Settings for output"
++msgstr "Appliquer à la sortie"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/kdesktop.po tde-i18n-fr-3.5.10.p/messages/tdebase/kdesktop.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/kdesktop.po	2008-08-19 20:29:30.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/kdesktop.po	2011-12-18 18:12:48.482642367 +0100
+@@ -553,6 +553,36 @@
+ "</ul>\n"
+ "</qt>"
+ 
++# kdesktop/minicli_ui.ui:188
++msgid "Autocomplete shows available &applications"
++msgstr "L'autocomplétion affiche les &applications disponibles"
++
++# kdesktop/minicli_ui.ui:191
++msgid ""
++"<qt>When enabled, the system shows available applications in the autocompletion area."
++"</qt>"
++msgstr ""
++"<qt>Lorsque cette case est cochée, le système affiche les applications "
++"disponibles dans la zone d'autocomplétion.</qt>"
++
++
++# kdesktop/minicli_ui.ui:200
++msgid "Autocomplete uses &filesystem instead of history"
++msgstr "L'autocomplétion utilise le système de &fichiers au lieu de l'historique"
++
++# kdesktop/minicli_ui.ui:203
++msgid ""
++"<qt>This selects whether the filesystem and the past command history will be used for autocompletion."
++"</qt>"
++msgstr ""
++"<qt>En cochant cette case, l'autocomplétion utilise le système de fichiers à la place  de l'historique."
++"</qt>"
++
++
++# kdesktop/minicli_ui.ui:212
++msgid "Autocomplete uses &both history and filesystem"
++msgstr "L'autocomplétion utilise l'historique &et le système de fichiers"
++
+ #. i18n: file minicli_ui.ui line 199
+ #: rc.cpp:14
+ #, no-c-format
+@@ -1144,3 +1182,20 @@
+ "Cependant, certains écrans de veille\n"
+ "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
+ "pas les désactiver."
++
++### TDE 3.5.13 ###
++#: lockdlg.cc:109
++msgid "Desktop Session Locked"
++msgstr "Session de bureau verrouillée"
++
++#: lockdlg.cc:128
++msgid "This computer is in use and has been locked."
++msgstr "Cet ordinateur est en cours d'utilisation et a été verrouillé."
++
++#: lockdlg.cc:129
++msgid "Only '%1' may unlock this session."
++msgstr "Seul '%1' peut déverouiller cette session."
++
++#: lockdlg.cc:139
++msgid "This session has been locked since %1"
++msgstr "Cette session est verrouillée depuis %1"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/kicker.po tde-i18n-fr-3.5.10.p/messages/tdebase/kicker.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/kicker.po	2008-08-19 20:29:30.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/kicker.po	2011-12-18 20:30:31.365135597 +0100
+@@ -754,3 +754,292 @@
+ #, no-c-format
+ msgid "Custom size"
+ msgstr "Taille personnalisée"
++
++### TDE 3.5.13 ###
++#: panelextension.cpp:385
++msgid "&Launch Process Manager..."
++msgstr "Gestionnaire de taches..."
++
++## Kickoff menu (k_new_mnu.cpp) 
++msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
++msgstr "Utilisateur&nbsp;<b>%1</b>&nbsp;sur&nbsp;<b>%2</b>"
++
++msgid "Most commonly used applications and documents"
++msgstr "Applications et documents utilisés récemment"
++
++msgid "Search:"
++msgstr "Chercher:"
++
++msgid "List of installed applications"
++msgstr "Liste des applications installées"
++
++msgid ""
++"Information and configuration of your "
++"system, access to personal files, network resources and connected disk drives"
++msgstr ""
++"Informations et configuration de votre "
++"système, accès aux fichiers personnels, ressources réseau et disques connectés"
++
++msgid "Recently used applications and documents"
++msgstr "Applications et documents utilisés récemment"
++
++msgid ""
++"<qt>Logout, switch user, switch off or reset,"
++" suspend of the system"
++msgstr ""
++"<qt>Se déconnecter, changer d'utilisateur, éteindre,"
++" redémarrer ou interrompre le système"
++               
++msgid "<p align=\"center\"> <u>F</u>avorites</p>"
++msgstr "<p align=\"center\"> <u>F</u>avoris</p>"
++
++msgid "<p align=\"center\"><u>H</u>istory</p>"
++msgstr "<p align=\"center\"><u>H</u>istorique</p>"
++
++msgid "<p align=\"center\"> <u>C</u>omputer</p>"
++msgstr "<p align=\"center\"> <u>O</u>rdinateur</p>"
++
++msgid "<p align=\"center\"><u>A</u>pplications</p>"
++msgstr "<p align=\"center\"><u>A</u>pplications</p>"
++
++msgid "<p align=\"center\"><u>L</u>eave</p>"
++msgstr "<p align=\"center\"><u>Q</u>uitter</p>"
++
++msgid "Search Internet"
++msgstr "Chercher sur Internet"
++
++msgid "Search Index"
++msgstr "Chercher dans l'index"
++
++msgid "Applications, Contacts and Documents"
++msgstr "Applications, Concacts et Documents"
++
++msgid "Start '%1'"
++msgstr "Démarrer '%1'"
++
++msgid "Start '%1' (current)"
++msgstr "Démarrer '%1' (actuel)"
++
++msgid "Restart and boot directly into '%1'"
++msgstr "Redémarrer et amorcer directement '%1'"
++
++msgid "Start a parallel session"
++msgstr "Démarrer une session parallèle"
++
++msgid "Switch to Session of User '%1'"
++msgstr "Basculer vers la session de l'utilisateur '%1'"
++
++msgid "Session: %1"
++msgstr "Session: %1"
++
++msgid "New Applications"
++msgstr "Nouvelles Applications"
++
++msgid "Session"
++msgstr "Session"
++
++msgid "Logout"
++msgstr "Déconnexion"
++
++msgid "End session"
++msgstr "Terminer la session"
++
++msgid "Lock"
++msgstr "Verrouiller"
++
++msgid "Lock screen"
++msgstr "Verrouiller l'écran"
++
++msgid "Save current Session for next login"
++msgstr "Enregistrer la session courante pour la prochaine connexion"
++
++msgid "Manage parallel sessions"
++msgstr "Gérer les sessions parallèles"
++
++msgid "System"
++msgstr "Système"
++
++msgid "Shutdown Computer"
++msgstr "Eteindre l'ordinateur"
++
++msgid "Turn off computer"
++msgstr "Eteindre l'ordinateur"
++
++msgid "&Restart Computer"
++msgstr "&Redémarrer l'ordinateur"
++
++msgid "Restart and boot the default system"
++msgstr "Redémarrer et amorcer le système par défaut"
++
++msgid "Start Operating System"
++msgstr "Démarrer le système d'Exploitation"
++
++msgid "Restart and boot another operating system"
++msgstr "Redémarrer et amorcer un autre système d'exploitation"
++
++msgid "System Information"
++msgstr "Informations Système"
++
++msgid "System Folders"
++msgstr "Dossiers Système"
++
++msgid "Home Folder"
++msgstr "Dossier personnel"
++
++msgid "My Documents"
++msgstr "Mes Documents"
++
++msgid "Network Folders"
++msgstr "Dossiers Réseau"
++
++msgid ""
++"<center><b>%1</b></center>\n"
++"You do not have permission to execute "
++"this command."
++msgstr ""
++"<center><b>%1</b></center>\n"
++"Vous n'êst pas autorisé(e) à exécuter "
++"cette commande."
++
++msgid ""
++"<center><b>%1</b></center>\n"
++"Could not run the specified command."
++msgstr ""
++"<center><b>%1</b></center>\n"
++"La commande spécifiée n'a pas pu être exécutée."
++
++msgid ""
++"<center><b>%1</b></center>\n"
++"The specified command does not exist."
++msgstr ""
++"<center><b>%1</b></center>\n"
++"La commande spécifiée n'existe pas."
++
++msgid "Documents"
++msgstr "Documents"
++
++msgid "Open Addressbook at %1"
++msgstr "Ouvrir le carnet d'adresse à %1"
++
++msgid "- Add ext:type to specify a file extension."
++msgstr "- Ajouter ext:type pour indiquer une extension de fichier"
++
++msgid "- When searching for a phrase, add quotes."
++msgstr "- Pour chercher une phrase, ajouter des guillemets."
++
++msgid "- To exclude search terms, use the minus symbol in front."
++msgstr "- Pour exclure des éléments recherchés, utiliser le préfixe moins."
++
++msgid "- To search for optional terms, use OR."
++msgstr "- Pour chercher des termes optionnels, utiliser OR."
++
++msgid "- You can use upper and lower case."
++msgstr "- Vous pouvez écrire en majuscules ou minuscules."
++
++msgid "Search Quick Tips"
++msgstr "Astuces de la recherche rapide"
++
++msgid "%1 = %2"
++msgstr "%1 = %2"
++
++msgid "Send Email to %1"
++msgstr "Envoyer un Email à %1"
++
++msgid "Open Local File: %1"
++msgstr "Ouvrir le fichier local: %1"
++
++msgid "Open Local Dir: %1"
++msgstr "Ouvrir le répertoire local: %1"
++
++msgid "Open Remote Location: %1"
++msgstr "Ouvrir l'emplacement distant: %1"
++
++msgid "Run '%1'"
++msgstr "Exécuter '%1'"
++
++msgid "No matches found"
++msgstr "Aucune correspondance trouvée"
++
++msgid "top %1 of %2"
++msgstr "Haut %1 de %2"
++
++msgid "%1 (top %2 of %3)"
++msgstr "%1 (haut %2 de %3)"
++
++msgid "Do you really want to end the session?"
++msgstr "Voulez-vous vraiment terminer cette session ?"
++
++msgid "Logout Confirmation"
++msgstr "Confirmer la déconnexion"
++
++msgid "Do you really want to turn off the computer?"
++msgstr "Voulez-vous vraiment éteindre l'ordinateur ?"
++
++msgid "Shutdown Confirmation"
++msgstr "Confirmer l'arrêt"
++
++msgid "Shutdown"
++msgstr "Arrêter"
++
++msgid "Do you really want to reset the computer and boot (another operating system)?"
++msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer (un autre système d'exploitation) ?"
++
++msgid "Restart Confirmation"
++msgstr "Confirmer le redémarrage"
++
++msgid "Restart"
++msgstr "Redémarrer"
++
++msgid "Do you really want to reset the computer and boot Microsoft Windows"
++msgstr "Voulez-vous réellement redémarrer l'ordinateur et amorcer Windows"
++
++msgid "Start Windows Confirmation"
++msgstr "Confirmer le démarrage de Windows"
++
++msgid "Start Windows"
++msgstr "Démarrer Windows"
++
++msgid "Could not start Tomboy."
++msgstr "Impossible de démarrer Tomboy."
++
++msgid "Remove From Favorites"
++msgstr "Supprimer des favoris"
++
++msgid "Add to Favorites"
++msgstr "Ajouter aux favoris"
++
++msgid "Advanced"
++msgstr "Avancé"
++
++msgid "Clear Recently Used Applications"
++msgstr "Vider la liste d'applications récentes"
++
++msgid "Clear Recently Used Documents"
++msgstr "Vider la liste des documents récents"
++
++msgid "Media"
++msgstr "Media"
++
++msgid "(%1 available)"
++msgstr "(%1 disponible)"
++
++msgid "Directory: %1"
++msgstr "Répertoire: %1"
++
++msgid "Suspend Computer"
++msgstr "Mettre en veille l'ordinateur"
++
++msgid "Suspend to Disk"
++msgstr "Mettre en veille l'ordinateur (sur disque)"
++
++msgid "Pause without logging out"
++msgstr "Mettre en pause sans se déconnecter"
++
++msgid "Suspend to RAM"
++msgstr "Mettre en veille l'ordinateur (en RAM)"
++
++msgid "Standby"
++msgstr "Mettre en veille"
++
++msgid "Suspend failed"
++msgstr "La mise en veille a échoué"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/konsole.po tde-i18n-fr-3.5.10.p/messages/tdebase/konsole.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/konsole.po	2008-08-19 20:29:30.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/konsole.po	2011-12-18 12:12:34.093743256 +0100
+@@ -1475,3 +1475,8 @@
+ #: zmodem_dialog.cpp:28
+ msgid "&Stop"
+ msgstr "A&rrêter"
++
++### TDE 3.5.13 ###
++#: konsole.cpp:736
++msgid "&Open.."
++msgstr "Ouvrir.."
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/tderandr.po tde-i18n-fr-3.5.10.p/messages/tdebase/tderandr.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/tderandr.po	2008-08-19 20:29:30.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/tderandr.po	2011-12-18 12:12:34.094743245 +0100
+@@ -301,3 +301,33 @@
+ "_: Refresh rate in Hertz (Hz)\n"
+ "%1 Hz"
+ msgstr "%1 Hz"
++
++### TDE 3.5.13 ###
++
++#: tderandrtray.cpp:237
++msgid "Global Configuation"
++msgstr "Configuration Globale"
++
++#: tderandrtray.cpp:239
++msgid "Configure Color Profiles..."
++msgstr "Configurer les profils de couleurs ..."
++
++#: tderandrtray.cpp:249
++msgid "Configure Shortcut Keys..."
++msgstr "Configurer les raccourcis clavier..."
++
++#: tderandrtray.cpp:477
++msgid "Configure Display Color Profiles"
++msgstr "Configuration des profils de couleurs"
++
++#: tderandrbindings.cpp:29
++msgid "Display Control"
++msgstr "Paramètres d'affichage"
++
++#: tderandrbindings.cpp:31
++msgid "Switch Displays"
++msgstr "Permuter l'affichage"
++
++#: configdialog.cpp:49
++msgid "Global &Shortcuts"
++msgstr "Raccourcis Globaux"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/ksmserver.po tde-i18n-fr-3.5.10.p/messages/tdebase/ksmserver.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/ksmserver.po	2007-05-14 10:07:36.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/ksmserver.po	2011-12-18 12:12:34.095743233 +0100
+@@ -92,3 +92,14 @@
+ "_: current option in boot loader\n"
+ " (current)"
+ msgstr " (courant)"
++
++### TDE 3.5.13 ###
++
++#: shutdown.cpp:202
++msgid "Synchronizing remote folders"
++msgstr "Synchronisation des dossiers distants"
++
++#: shutdown.cpp:207
++msgid "Saving your settings..."
++msgstr "Enregistrement de vos paramètres ..."
++
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/ksplash.po tde-i18n-fr-3.5.10.p/messages/tdebase/ksplash.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/ksplash.po	2005-09-10 13:02:44.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdebase/ksplash.po	2011-12-18 12:12:34.095743233 +0100
+@@ -105,5 +105,5 @@
+ msgstr "Rétablissement de la session"
+ 
+ #: themeengine/objkstheme.cpp:135
+-msgid "TDE is up and running"
+-msgstr "TDE est prêt"
++msgid "Trinity is up and running"
++msgstr "Trinity est prêt"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr-3.5.10.p/messages/tdelibs/tdelibs.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdelibs/tdelibs.po	2008-08-19 20:29:58.000000000 +0200
++++ tde-i18n-fr-3.5.10/messages/tdelibs/tdelibs.po	2011-12-18 12:19:38.552013274 +0100
+@@ -5557,123 +5557,104 @@
+ 
+ #: tdeui/kaboutkde.cpp:34
+ msgid ""
+-"The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a "
+-"world-wide network of software engineers committed to <a "
++"The <b>Trinity Desktop Environment</b> is a fork of the "
++"K Desktop Environment version 3.5, which was originally written by the TDE Team, "
++"a world-wide network of software engineers committed to <a "
+ "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+-"development."
+-"<br>"
+-"<br>No single group, company or organization controls the TDE source code. "
+-"Everyone is welcome to contribute to TDE."
+-"<br>"
+-"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
++"development.<br><br>No single group, company or organization controls the "
++"Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
++"HREF=\"http://www.trinitydesktop.org/\">http://www.trinitydesktop.org</A> for more information "
++"about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
+ "for more information on the TDE project. "
+ msgstr ""
+-"L'<b>Environnement Bureautique TDE</b> est écrit et maintenu par l'équipe de "
+-"TDE, des informaticiens du monde entier travaillant sur Internet au "
+-"développement de <a href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">"
+-"logiciels libres</a>."
+-"<br>"
+-"<br>Aucune société ni organisation ne contrôle le code source de TDE, et chacun "
+-"est invité à y contribuer."
+-"<br>"
+-"<br>Visitez <a href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
++"L'<b>Environnement Bureautique Trinity</b> est un clone de l'environnement "
++"TDE version 3.5, originellement écrit par l'équipe TDE, des informaticiens "
++"du monde entier travaillant sur Internet au développement de <a "
++"href=\"http://www.gnu.org/philosophy/free-sw.fr.html\">logiciels libres</a>."
++"<br><br>Aucune société ni organisation ne contrôle le code source de Trinity, et chacun "
++"est invité à y contribuer.<br><br>Visitez <A HREF=\"http://www.trinitydesktop.org/\">"
++"http://www.trinitydesktop.org</A> pour plus d'informations sur Trinity, et <a "
++"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
+ "pour plus d'informations sur le projet TDE."
+ 
+ #: tdeui/kaboutkde.cpp:43
+ msgid ""
+-"Software can always be improved, and the TDE Team is ready to do so. However, "
+-"you - the user - must tell us when something does not work as expected or could "
+-"be done better."
+-"<br>"
+-"<br>The K Desktop Environment has a bug tracking system. Visit <A "
+-"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> "
+-"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
+-"<br>"
+-"<br>If you have a suggestion for improvement then you are welcome to use the "
+-"bug tracking system to register your wish. Make sure you use the severity "
+-"called \"Wishlist\"."
++"Software can always be improved, and the Trinity Team is ready to "
++"do so. However, you - the user - must tell us when "
++"something does not work as expected or could be done better.<br><br>"
++"The Trinity Desktop Environment has a bug tracking system. Visit "
++"<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
++"use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
++"If you have a suggestion for improvement then you are welcome to use "
++"the bug tracking system to register your wish. Make sure you use the "
++"severity called \"Wishlist\"."
+ msgstr ""
+-"Les logiciels peuvent toujours être améliorés et l'équipe TDE est prête à le "
++"Les logiciels peuvent toujours être améliorés et l'équipe Trinity est prête à le "
+ "faire. Cependant, vous - l'utilisateur(trice) - devez nous signaler ce qui ne "
+-"fonctionne pas correctement ou pourrait être perfectionné."
+-"<br>"
+-"<br>L'Environnement de Bureau TDE possède un système de suivi des bogues. Allez "
+-"sur <A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
+-"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour "
+-"signaler les erreurs."
+-"<br>"
+-"<br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
++"fonctionne pas correctement ou pourrait être perfectionné.<br><br>"
++"L'Environnement de Bureau Trinity possède un système de suivi des bogues. Allez "
++"sur <A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> "
++"ou utilisez la boîte de dialogue « Rapport de bogue » du menu « Aide » pour signaler les "
++"erreurs.<br><br>Si vous voulez suggérer une amélioration, vous êtes invité(e) à utiliser le "
+ "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
+ "d'avoir utilisé l'option « Souhait » (wish)."
+ 
+ #: tdeui/kaboutkde.cpp:54
+ msgid ""
+-"You do not have to be a software developer to be a member of the TDE team. You "
+-"can join the national teams that translate program interfaces. You can provide "
+-"graphics, themes, sounds, and improved documentation. You decide!"
+-"<br>"
+-"<br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
++"You do not have to be a software developer to be a member of the "
++"Trinity team. You can join the national teams that translate "
++"program interfaces. You can provide graphics, themes, sounds, and "
++"improved documentation. You decide!"
++"<br><br>"
++"Visit "
++"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A> "
+ "for information on some projects in which you can participate."
+-"<br>"
+-"<br>If you need more information or documentation, then a visit to <A "
+-"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
++"<br><br>"
++"If you need more information or documentation, then a visit to "
++"<A HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
+ "will provide you with what you need."
+ msgstr ""
+-"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de TDE. "
++"Il n'est pas nécessaire d'être programmeur pour être membre de l'équipe de Trinity. "
+ "Vous pouvez rejoindre les équipes nationales qui traduisent les interfaces des "
+ "programmes. Vous pouvez réaliser des images, des thèmes, des sons et des "
+ "documentations enrichies. C'est vous qui décidez !"
+-"<br>"
+-"<br>Visitez <A HREF=\"http://www.kde.org/fr/jobs.html\">"
+-"http://www.kde.org/fr/jobs.html</A> pour des informations sur certains projets "
+-"auxquels vous pouvez participer."
+-"<br>"
+-"<br>Pour plus d'informations ou de documentations, une visite de <A "
+-"HREF=\"http://developer.kde.org/\">http://developer.kde.org/</A> "
++"<br><br>"
++"Visitez "
++"<A HREF=\"http://www.trinitydesktop.org/jobs/\">http://www.trinitydesktop.org/jobs/</A>"
++"pour des informations sur certains projets auxquels vous pouvez participer."
++"<br><br>"
++"Pour plus d'informations ou de documentations, une visite de <A "
++"HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
+ "devrait vous fournir ce dont vous avez besoin."
+ 
+ #: tdeui/kaboutkde.cpp:67
+ msgid ""
+-"TDE is available free of charge, but making it is not free."
+-"<br>"
+-"<br>Thus, the TDE team formed the TDE e.V., a non-profit organization legally "
+-"founded in Tuebingen, Germany. The TDE e.V. represents the TDE project in legal "
+-"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
+-"http://www.kde-ev.org</a> for information on the TDE e.V."
+-"<br>"
+-"<br>The TDE team does need financial support. Most of the money is used to "
+-"reimburse members and others on expenses they experienced when contributing to "
+-"TDE. You are encouraged to support TDE through a financial donation, using one "
+-"of the ways described at <a href=\"http://www.kde.org/support/\">"
+-"http://www.kde.org/support/</a>."
+-"<br>"
+-"<br>Thank you very much in advance for your support."
+-msgstr ""
+-"TDE est disponible gratuitement, mais sa réalisation a un coût."
+-"<br>"
+-"<br>C'est pourquoi l'équipe de TDE a formé l'association TDE, une association à "
+-"but non lucratif fondée à Tübingen (Allemagne). L'association TDE représente "
+-"les aspects juridiques et financiers du Projet TDE. Consultez <a "
+-"href=\"http://www.kde-ev.org\">http://www.kde-ev.org/</a> "
+-"pour plus d'informations sur l'association TDE."
+-"<br>"
+-"<br>L'équipe de TDE a besoin d'un appui financier. La majeure partie de ses "
++"Trinity is available free of charge, but making it is not free.<br><br>"
++"<br><br>"
++"The Trinity team does need financial support. Most of the money is used to "
++"reimburse members and others on expenses they experienced when "
++"contributing to Trinity. You are encouraged to support Trinity through a financial "
++"donation, using one of the ways described at "
++"<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
++"<br><br>Thank you very much in advance for your support!"
++msgstr ""
++"Trinity est disponible gratuitement, mais sa réalisation a un coût."
++"<br><br>"
++"<br>L'équipe de Trinity a besoin d'un appui financier. La majeure partie de ses "
+ "fonds sert à rembourser les membres et d'autres intervenants des dépenses "
+-"qu'ils ont engagées lors de leur contribution à TDE. Pour apporter votre "
+-"participation financière à TDE, utilisez l'une des possibilités décrites à "
+-"l'adresse <a "
+-"href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
+-"<br>"
+-"<br>Nous vous remercions vivement de votre soutien."
++"qu'ils ont engagées lors de leur contribution à Trinity. Pour apporter votre "
++"participation financière à Trinity, utilisez l'une des possibilités décrites à "
++"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
++"<br><br>Nous vous remercions vivement de votre soutien."
+ 
+ #: tdeui/kaboutkde.cpp:81
+ #, c-format
+-msgid "K Desktop Environment. Release %1"
+-msgstr "Environnement de bureau TDE. Version %1"
++msgid "Trinity Desktop Environment. Release %1"
++msgstr "Environnement de bureau Trinity. Version %1"
+ 
+ #: tdeui/kaboutkde.cpp:83
+ msgid ""
+-"_: About TDE\n"
++"_: About Trinity\n"
+ "&About"
+ msgstr "À &propos"
+ 
+@@ -5682,12 +5663,12 @@
+ msgstr "Rapport de bogues et &souhaits"
+ 
+ #: tdeui/kaboutkde.cpp:85
+-msgid "&Join the TDE Team"
+-msgstr "Re&joignez l'équipe de TDE"
++msgid "&Join the Trinity Team"
++msgstr "Re&joignez l'équipe de Trinity"
+ 
+ #: tdeui/kaboutkde.cpp:86
+-msgid "&Support TDE"
+-msgstr "&Soutenez TDE"
++msgid "&Support Trinity"
++msgstr "&Soutenez Trinity"
+ 
+ #: tdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804
+ msgid "&Yes"
+@@ -6286,6 +6267,10 @@
+ msgid "&Browse..."
+ msgstr "&Parcourir..."
+ 
++#: tdeui/kdialog.cpp:428
++msgid "Please wait..."
++msgstr "Veuillez patienter ..."
++
+ #: tdeui/kdialogbase.cpp:636
+ msgid "&Try"
+ msgstr "&Essayer"
+@@ -6623,8 +6608,8 @@
+ msgstr "À &propos de : %1"
+ 
+ #: tdeui/khelpmenu.cpp:176 tdeui/kstdaction_p.h:114
+-msgid "About &TDE"
+-msgstr "À propos de &TDE"
++msgid "About &Trinity"
++msgstr "À propos de &Trinity"
+ 
+ #: tdeui/kactionclasses.cpp:2072
+ msgid "Exit F&ull Screen Mode"
+diff -Nuar tde-i18n-fr-3.5.10.ORI/messages/tdebase/kcontrol.po tde-i18n-fr-3.5.10/messages/tdebase/kcontrol.po
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/kcontrol.po	2011-12-18 22:34:04.982863520 +0100
++++ tde-i18n-fr-3.5.10/messages/tdebase/kcontrol.po	2011-12-18 22:40:37.574949536 +0100
+@@ -34,8 +34,8 @@
+ msgstr "duranceau@kde.org,caulier.gilles@free.fr,cousin@kde.org,kde@macolu.org"
+ 
+ #: aboutwidget.cpp:43 main.cpp:104
+-msgid "TDE Control Center"
+-msgstr "Centre de configuration de TDE"
++msgid "Trinity Control Center"
++msgstr "Centre de configuration de Trinity"
+ 
+ #: aboutwidget.cpp:45
+ msgid "Configure your desktop environment."
+@@ -43,17 +43,17 @@
+ 
+ #: aboutwidget.cpp:47
+ msgid ""
+-"Welcome to the \"TDE Control Center\", a central place to configure your "
++"Welcome to the \"Trinity Control Center\", a central place to configure your "
+ "desktop environment. Select an item from the index on the left to load a "
+ "configuration module."
+ msgstr ""
+-"Bienvenue dans le « Centre de configuration de TDE », l'endroit où configurer "
++"Bienvenue dans le « Centre de configuration de Trinity », l'endroit où configurer "
+ "votre environnement. Sélectionnez un élément dans l'index à gauche pour charger "
+ "le module de configuration correspondant."
+ 
+ #: aboutwidget.cpp:53 main.cpp:108
+-msgid "TDE Info Center"
+-msgstr "Centre d'informations de TDE"
++msgid "Trinity Info Center"
++msgstr "Centre d'informations de Trinity"
+ 
+ #: aboutwidget.cpp:55
+ msgid "Get system and desktop environment information"
+@@ -61,10 +61,10 @@
+ 
+ #: aboutwidget.cpp:57
+ msgid ""
+-"Welcome to the \"TDE Info Center\", a central place to find information about "
++"Welcome to the \"Trinity Info Center\", a central place to find information about "
+ "your computer system."
+ msgstr ""
+-"Bienvenue dans le « Centre d'informations de TDE », l'endroit où trouver des "
++"Bienvenue dans le « Centre d'informations de Trinity », l'endroit où trouver des "
+ "informations sur votre système."
+ 
+ #: aboutwidget.cpp:61
+@@ -76,8 +76,8 @@
+ "configuration particulière."
+ 
+ #: aboutwidget.cpp:64
+-msgid "TDE version:"
+-msgstr "Version de TDE :"
++msgid "Trinity version:"
++msgstr "Version de Trinity :"
+ 
+ #: aboutwidget.cpp:65
+ msgid "User:"
+@@ -137,13 +137,13 @@
+ 
+ #: helpwidget.cpp:51
+ msgid ""
+-"<h1>TDE Info Center</h1>There is no quick help available for the active info "
++"<h1>Trinity Info Center</h1>There is no quick help available for the active info "
+ "module."
+ "<br>"
+ "<br>Click <a href = \"kinfocenter/index.html\">here</a> "
+ "to read the general Info Center manual."
+ msgstr ""
+-"<h1>Centre d'informations de TDE</h1> Désolé, aucune aide rapide n'est "
++"<h1>Centre d'informations de Trinity</h1> Désolé, aucune aide rapide n'est "
+ "disponible pour le module d'information courant."
+ "<br>"
+ "<br> Cliquez <a href = \"kinfocenter/index.html\">ici</a> "
+@@ -151,13 +151,13 @@
+ 
+ #: helpwidget.cpp:56
+ msgid ""
+-"<h1>TDE Control Center</h1>There is no quick help available for the active "
++"<h1>Trinity Control Center</h1>There is no quick help available for the active "
+ "control module."
+ "<br>"
+ "<br>Click <a href = \"kcontrol/index.html\">here</a> "
+ "to read the general Control Center manual."
+ msgstr ""
+-"<h1>Centre de configuration de TDE</h1> Désolé, aucune aide rapide n'est "
++"<h1>Centre de configuration de Trinity</h1> Désolé, aucune aide rapide n'est "
+ "disponible pour le module de configuration courant."
+ "<br>"
+ "<br> Cliquez <a href = \"kcontrol/index.html\">ici</a> "
+@@ -173,16 +173,16 @@
+ "<br>Cliquez sur le bouton « Mode superutilisateur » ci-dessous."
+ 
+ #: main.cpp:105
+-msgid "The TDE Control Center"
+-msgstr "Le Centre de configuration de TDE"
++msgid "The Trinity Control Center"
++msgstr "Le Centre de configuration de Trinity"
+ 
+ #: main.cpp:106 main.cpp:110
+ msgid "(c) 1998-2004, The TDE Control Center Developers"
+ msgstr "(c) 1998-2004, Les développeurs du Centre de configuration de TDE"
+ 
+ #: main.cpp:109
+-msgid "The TDE Info Center"
+-msgstr "Le Centre d'informations de TDE"
++msgid "The Trinity Info Center"
++msgstr "Le Centre d'informations de Trinity"
+ 
+ #: main.cpp:128 main.cpp:130
+ msgid "Current Maintainer"
+--- tde-i18n-fr-3.5.10.ORI/messages/tdebase/kpersonalizer.po	2011-12-19 21:25:27.471340645 +0100
++++ tde-i18n-fr-3.5.10/messages/tdebase/kpersonalizer.po	2011-12-19 21:29:05.386322708 +0100
+@@ -79,8 +79,8 @@
+ msgstr "Le style Platinium"
+ 
+ #: kcountrypage.cpp:48
+-msgid "<h3>Welcome to TDE %1</h3>"
+-msgstr "<h3>Bienvenue dans TDE %1</h3>"
++msgid "<h3>Welcome to Trinity %1</h3>"
++msgstr "<h3>Bienvenue dans Trinity %1</h3>"
+ 
+ #: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
+ msgid "without name"
+@@ -111,8 +111,8 @@
+ msgstr "L'assistant se redémarre lui-même"
+ 
+ #: main.cpp:32
+-msgid "Personalizer is running before TDE session"
+-msgstr "L'assistant démarre avant la session TDE elle-même"
++msgid "Personalizer is running before Trinity session"
++msgstr "L'assistant démarre avant la session Trinity elle-même"
+ 
+ #: kpersonalizer.cpp:67
+ msgid "Step 1: Introduction"
+@@ -141,13 +141,13 @@
+ #: kpersonalizer.cpp:152
+ msgid ""
+ "<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+-"<p>The Desktop Settings Wizard helps you to configure the TDE desktop to your "
++"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to your "
+ "personal liking.</p>"
+ "<p>Click <b>Cancel</b> to return and finish your setup.</p>"
+ msgstr ""
+ "<p>Voulez-vous vraiment quitter l'assistant de configuration du bureau ?</p> "
+ "<p>L'assistant de configuration du bureau vous aide à configurer le bureau de "
+-"TDE selon vos convenances.</p> "
++"Trinity selon vos convenances.</p> "
+ "<p>Cliquez sur « <b>Annuler</b> » pour retourner et terminer vos réglages.</p>"
+ 
+ #: kpersonalizer.cpp:156
+@@ -171,14 +171,14 @@
+ "<br><b>Titlebar double-click:</b> <i>Shade window</i>"
+ "<br><b>Mouse selection:</b> <i>Single click</i>"
+ "<br><b>Application startup notification:</b> <i>busy cursor</i>"
+-"<br><b>Keyboard scheme:</b> <i>TDE default</i>"
++"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
+ "<br>"
+ msgstr ""
+ "<b>Activation des fenêtres :</b> <i>Cliquer pour avoir le focus</i>"
+ "<br><b>Double-clic sur la barre de titre :</b> <i>Enroule la fenêtre</i>"
+ "<br><b>Sélection par la souris :</b> <i>Simple clic</i>"
+ "<br><b>Notification de démarrage des applications :</b><i> Curseur occupé</i>"
+-"<br><b>Actions du clavier :</b> <i>TDE par défaut</i>"
++"<br><b>Actions du clavier :</b> <i>Trinity par défaut</i>"
+ "<br>"
+ 
+ #: kospage.cpp:364
+@@ -320,34 +320,34 @@
+ #: rc.cpp:6
+ #, no-c-format
+ msgid ""
+-"<p>This Personalizer will help you configure the basic setup of your TDE "
++"<p>This Personalizer will help you configure the basic setup of your Trinity "
+ "desktop in five quick, easy steps. You can set things like your country (for "
+ "date and time formats, etc.), language, desktop behavior and more.</p>\n"
+-"<p>You will be able to change all the settings later using the TDE Control "
++"<p>You will be able to change all the settings later using the Trinity Control "
+ "Center. You may choose to postpone your personalization until later by clicking "
+ "on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
+ "for the country and language settings. However, new users are encouraged to use "
+ "this simple method.</p>\n"
+-"<p>If you already like your TDE configuration and wish to quit the Wizard, "
++"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
+ "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
+ msgstr ""
+ "<p>Cet assistant vous aidera à configurer les réglages de base de votre bureau "
+-"TDE en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
++"Trinity en cinq étapes simples. Vous pouvez régler des paramètres comme votre pays "
+ "(pour les formats de date et d'heure, etc.), votre langue, le comportement du "
+ "bureau et plein d'autres encore.</p>\n"
+ "<p>Vous pourrez changer tous ces réglages ultérieurement en utilisant le Centre "
+-"de configuration de TDE. Vous pouvez choisir de différer votre personnalisation "
++"de configuration de Trinity. Vous pouvez choisir de différer votre personnalisation "
+ "en cliquant sur « <b>Passer l'assistant</b> ». Cependant, il est conseillé pour "
+ "les nouveaux utilisateurs d'utiliser cette méthode.</p>\n"
+-"<p>Si votre configuration de TDE est déjà à votre goût et que vous désirez "
++"<p>Si votre configuration de Trinity est déjà à votre goût et que vous désirez "
+ "quitter l'assistant, cliquez sur « <b>Passer l'assistant</b> » puis sur  « <b>"
+ "Quitter</b> ».</p>"
+ 
+ #. i18n: file kcountrypagedlg.ui line 100
+ #: rc.cpp:11
+ #, no-c-format
+-msgid "<h3>Welcome to TDE %VERSION%!</h3>"
+-msgstr "<h3>Bienvenue dans TDE %VERSION% !</h3>"
++msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
++msgstr "<h3>Bienvenue dans Trinity %VERSION% !</h3>"
+ 
+ #. i18n: file kcountrypagedlg.ui line 148
+ #: rc.cpp:14
+@@ -359,14 +359,14 @@
+ #: rc.cpp:17
+ #, no-c-format
+ msgid ""
+-"<P>TDE offers many visually appealing special effects, such as smoothed fonts, "
++"<P>Trinity offers many visually appealing special effects, such as smoothed fonts, "
+ "previews in the file manager and animated menus. All this beauty, however, "
+ "comes at a small performance cost. </P>\n"
+ "If you have a fast, new processor, you might want to turn them all on, but for "
+ "those of us with slower processors, starting off with less eye candy helps to "
+ "keep your desktop more responsive."
+ msgstr ""
+-"<P>TDE offre de nombreux effets visuels, comme les polices lissées, les aperçus "
++"<P>Trinity offre de nombreux effets visuels, comme les polices lissées, les aperçus "
+ "dans le gestionnaire de fichiers et les menus animés. Toutes ces choses "
+ "superbes ont un coût en termes de performances.</P>\n"
+ "Si vous avez un processeur récent et rapide, vous pouvez toutes les activer, "
+@@ -426,8 +426,8 @@
+ #. i18n: file kospagedlg.ui line 79
+ #: rc.cpp:44
+ #, no-c-format
+-msgid "TDE (TM)"
+-msgstr "TDE ™"
++msgid "Trinity (TM)"
++msgstr "Trinity"
+ 
+ #. i18n: file kospagedlg.ui line 90
+ #: rc.cpp:47
+@@ -454,22 +454,22 @@
+ "<b>System Behavior</b>"
+ "<br>\n"
+ "Graphical User Interfaces behave differently on various Operating Systems.\n"
+-"TDE allows you to customize its behavior according to your needs."
++"Trinity allows you to customize its behavior according to your needs."
+ msgstr ""
+ "<b>Comportement du système</b>"
+ "<br>\n"
+ "Les interfaces utilisateur graphiques se comportent différemment sur les "
+ "différents systèmes d'exploitation.\n"
+-"TDE vous permet de personnaliser son comportement selon vos désirs."
++"Trinity vous permet de personnaliser son comportement selon vos désirs."
+ 
+ #. i18n: file kospagedlg.ui line 168
+ #: rc.cpp:61
+ #, no-c-format
+ msgid ""
+-"For motion impaired users, TDE provides keyboard gestures to activate special "
++"For motion impaired users, Trinity provides keyboard gestures to activate special "
+ "keyboard settings."
+ msgstr ""
+-"Pour les utilisateurs à déplacement réduit, TDE fournit des gestes permettant "
++"Pour les utilisateurs à déplacement réduit, Trinity fournit des gestes permettant "
+ "d'activer des réglages spéciaux du clavier."
+ 
+ #. i18n: file kospagedlg.ui line 179
+@@ -494,26 +494,26 @@
+ #: rc.cpp:71
+ #, no-c-format
+ msgid ""
+-"You can refine the settings you made by starting the TDE Control Center by "
++"You can refine the settings you made by starting the Trinity Control Center by "
+ "choosing the entry <b>Control Center</b> in the TDE menu."
+ msgstr ""
+ "Vous pouvez affiner les réglages que vous avez faits en lançant le <b>"
+-"Centre de configuration de TDE</b> en choisissant l'entrée <b>"
++"Centre de configuration de Trinity</b> en choisissant l'entrée <b>"
+ "Centre de configuration</b> du menu K."
+ 
+ #. i18n: file krefinepagedlg.ui line 133
+ #: rc.cpp:74
+ #, no-c-format
+-msgid "You can also start the TDE Control Center using the button below."
++msgid "You can also start the Trinity Control Center using the button below."
+ msgstr ""
+-"Vous pouvez également démarrer le Centre de configuration de TDE à l'aide du "
++"Vous pouvez également démarrer le Centre de configuration de Trinity à l'aide du "
+ "bouton ci-dessous."
+ 
+ #. i18n: file krefinepagedlg.ui line 203
+ #: rc.cpp:77
+ #, no-c-format
+-msgid "&Launch TDE Control Center"
+-msgstr "&Lancer le Centre de configuration de TDE"
++msgid "&Launch Trinity Control Center"
++msgstr "&Lancer le Centre de configuration de Trinity"
+ 
+ #. i18n: file kstylepagedlg.ui line 32
+ #: rc.cpp:80
+--- tde-i18n-fr-3.5.10/messages/tdebase/konqueror.po.ORI	2011-12-19 21:45:36.416030332 +0100
++++ tde-i18n-fr-3.5.10/messages/tdebase/konqueror.po	2011-12-19 21:51:16.528801717 +0100
+@@ -1203,6 +1203,9 @@
+ msgid "Open in &New Tab"
+ msgstr "Ouvrir dans un &nouvel onglet"
+ 
++msgid "Open in &Background Tab"
++msgstr "Ouvrir dans un onglet en arrière-&plan"
++
+ #: konq_mainwindow.cc:4689
+ msgid "Open the document in a new tab"
+ msgstr "Ouvrir le document dans un nouvel onglet"
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch
new file mode 100644
index 000000000..f107a7814
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-openterminalhere.patch
@@ -0,0 +1,16 @@
+diff -rcb kde-i18n-fr-3.5.10.ori/messages/kdebase/kdesktop.po kde-i18n-fr-3.5.10/messages/kdebase/kdesktop.po
+*** tde-i18n-fr-3.5.10.ori/messages/tdebase/kdesktop.po	2011-07-21 10:02:12.261100210 +0200
+--- tde-i18n-fr-3.5.10/messages/tdebase/kdesktop.po	2011-07-21 10:05:55.365975529 +0200
+***************
+*** 246,251 ****
+--- 246,255 ----
+  msgid "Run Command..."
+  msgstr "Exécuter une commande..."
+  
++ #: krootwm.cc:135 (Trinity Specific)
++ msgid "Open Terminal Here..."
++ msgstr "Ouvrir un Terminal..."
++ 
+  #: krootwm.cc:137
+  msgid "Configure Desktop..."
+  msgstr "Configurer le bureau..."
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
new file mode 100644
index 000000000..4aed514aa
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
@@ -0,0 +1,45 @@
+diff -rcb kde-i18n-fr-3.5.10.ORI/messages/kdebase/kdesu.po kde-i18n-fr-3.5.10/messages/kdebase/kdesu.po
+*** kde-i18n-fr-3.5.10.ORI/messages/tdebase/tdesu.po	2010-12-19 01:32:05.649657741 +0100
+--- kde-i18n-fr-3.5.10/messages/tdebase/tdesu.po	2010-12-19 01:33:50.416539931 +0100
+***************
+*** 132,151 ****
+  #: sudlg.cpp:36
+  msgid ""
+  "The action you requested needs root privileges. Please enter root's password "
+! "below or click Ignore to continue with your current privileges."
+  msgstr ""
+  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
+! "ci-dessous le mot de passe du superutilisateur ou cliquez sur « Ignorer » pour "
+! "continuer avec vos droits actuels."
+  
+  #: sudlg.cpp:40
+  msgid ""
+  "The action you requested needs additional privileges. Please enter the password "
+! "for \"%1\" below or click Ignore to continue with your current privileges."
+  msgstr ""
+  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
+! "ci-dessous le mot de passe de « %1 » ou cliquez sur « Ignorer » pour continuer "
+! "avec vos droits actuels."
+  
+  #: sudlg.cpp:48
+  msgid "&Ignore"
+--- 132,149 ----
+  #: sudlg.cpp:36
+  msgid ""
+  "The action you requested needs root privileges. Please enter root's password "
+! "below."
+  msgstr ""
+  "L'action requise nécessite les droits du superutilisateur. Veuillez saisir "
+! "ci-dessous le mot de passe du superutilisateur."
+  
+  #: sudlg.cpp:40
+  msgid ""
+  "The action you requested needs additional privileges. Please enter the password "
+! "for \"%1\" below."
+  msgstr ""
+  "L'action requise nécessite des droits supplémentaires. Veuillez saisir "
+! "ci-dessous le mot de passe de « %1 »."
+  
+  #: sudlg.cpp:48
+  msgid "&Ignore"
+Seulement dans kde-i18n-fr-3.5.10/messages/kdebase: kdesu.po~
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
new file mode 100644
index 000000000..b3994cec3
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
@@ -0,0 +1,578 @@
+--- tde-i18n-fr/messages/tdelibs/tdelibs.po.ORI	2013-05-11 13:46:34.210204854 +0200
++++ tde-i18n-fr/messages/tdelibs/tdelibs.po	2013-05-11 13:47:23.882174000 +0200
+@@ -5659,8 +5659,36 @@
+ msgstr "À &propos"
+ 
+ #: tdeui/kaboutkde.cpp:84
+-msgid "&Report Bugs or Wishes"
+-msgstr "Rapport de bogues et &souhaits"
++msgid "&Report Bugs/Request Enhancements"
++msgstr "Rapport de bogues / &Améliorations"
++
++msgid "&Report Bug/Request Enhancement..."
++msgstr "&Rapport de bogue/Amélioration..."
++
++msgid ""
++"Reporting bugs and requesting enhancements are maintained using the Bugzilla reporting system.\n"
++"You'll need a login account and password to use the reporting system.\n"
++"To control spam and rogue elements the login requires a valid email address.\n"
++"Consider using any large email service if you want to avoid using your private email address.\n"
++"\n"
++"Selecting the button below opens your web browser to http://bugs.trinitydesktop.org,\n"
++"where you will find the report form.\n"
++"The information displayed above will be transferred to the reporting system.\n"
++"Session cookies must be enabled to use the reporting system.\n"
++"\n"
++"Thank you for helping!"
++msgstr ""
++"Les rapports de bogues et demandes d'améliorations sont traités par le système Bugzilla.\n"
++"Vous devez posséder un identifiant et un mot de passe pour utiliser le système de rapport.\n"
++"Pour éviter le spam et les rapports indésirables, vous devez avoir une adresse email valide.\n"
++"Vous pouvez créer une adresse email spécifique si vous ne voulez pas utiliser votre adresse email privée.\n"
++"\n"
++"Cliquez sur le bouton ci-dessous pour ouvrir votre navigateur à l'adresse http://bugs.trinitydesktop.org,\n"
++"où vous trouverez le formulaire de rapport.\n"
++"Les informations affichés ci-dessus seront transférées au système de rapport.\n"
++"Les cookies de session doivent être activés pour utiliser le système de rapport.\n"
++"\n"
++"Merci pour votre aide!"
+
+ #: tdeui/kaboutkde.cpp:85
+ msgid "&Join the Trinity Team"
+--- tde-i18n-fr/messages/tdebase/tderandr.po.ORI	2013-05-11 13:51:27.100137014 +0200
++++ tde-i18n-fr/messages/tdebase/tderandr.po	2013-05-11 13:57:36.051526232 +0200
+@@ -331,3 +331,24 @@
+ #: configdialog.cpp:49
+ msgid "Global &Shortcuts"
+ msgstr "Raccourcis Globaux"
++
++msgid "Start KRandRTray automatically when you log in?"
++msgstr "Démarrer KRandRTray automatiquement à l'ouverture de session ?"
++
++msgid "Start Automatically"
++msgstr "Démarrer automatiquement"
++
++msgid "Do Not Start"
++msgstr "Ne pas démarrer"
++
++msgid "Output Port"
++msgstr "Sortie Vidéo"
++
++msgid "Next available output"
++msgstr "Sortie Vidéo suivante"
++
++#, c-format
++msgid "%1 (Active)"
++msgstr "%1 (Active)"
++
++
+--- /dev/null	2013-05-11 10:08:04.442569174 +0200
++++ tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po	2013-05-11 14:23:12.893229163 +0200
+@@ -0,0 +1,123 @@
++msgid "<b>The global display configuration is a system wide setting, and requires administrator access</b><br>To alter the system's global display configuration, click on the \"Administrator Mode\" button below."
++msgstr "<b>La configuration d'affichage globale est un réglage système, et nécessite les droits administrateur.</b><br>Pour modifier la configuration système globale, cliquer sur le bouton \"Mode superutilisateur\"."
++
++msgid "Color Profiles"
++msgstr "Profils de couleurs"
++
++msgid "<h1>Monitor & Display Configuration</h1> This module allows you to configure monitors attached to your computer via TDE."
++msgstr "<h1>Configuration de l'affichage</h1>Ce module permet de configurer les moniteurs attachés à votre ordinateur via TDE."
++
++msgid "Global Settings"
++msgstr "Paramètres globaux"
++
++msgid "Global"
++msgstr "Général"
++
++msgid "&Enable global display control"
++msgstr "&Activer le contrôle de l'affichage"
++
++msgid "Resolution and Layout"
++msgstr "Résolution et disposition"
++
++msgid "Monitors"
++msgstr "Moniteurs"
++
++msgid "Drag the monitor icons to match the physical arrangement of your monitors."
++msgstr "Déplacez les icônes pour qu'elles correspondent à la disposition de vos moniteurs."
++
++msgid "Display:"
++msgstr "Sortie Vidéo:"
++
++msgid "&Screen resolution"
++msgstr "&Résolution de l'écran:"
++
++msgid "Less"
++msgstr "Moins"
++
++msgid "More"
++msgstr "Plus"
++
++msgid "unset"
++msgstr "Non définie"
++
++msgid "&Refresh rate"
++msgstr "&Taux de rafraichissement"
++
++msgid "Screen Transformations"
++msgstr "Transformation de l'écran"
++
++msgid "&Mirror screen horizontally"
++msgstr "Miroir &horizonal"
++
++msgid "Mirror screen &vertically"
++msgstr "Miroir &vertical"
++
++msgid "&Use this device as the primary monitor."
++msgstr "Utiliser en tant que moniteur &primaire."
++
++msgid "&Extend my Trinity desktop onto this monitor."
++msgstr "&Etendre mon bureau Trinity sur ce moniteur."
++
++msgid "&Rescan Displays"
++msgstr "&Redétecter les écrans"
++
++msgid "Load &Existing Profile"
++msgstr "Charger un profil &existant."
++
++msgid "&Test Settings"
++msgstr "&Tester les réglages"
++
++msgid "&Identify"
++msgstr "&Identifier"
++
++msgid "Brightness and Gamma"
++msgstr "Luminosité et Gamma"
++
++msgid "Visual Calibration Aid"
++msgstr "Aide visuelle à la calibration"
++
++msgid "Target gamma:"
++msgstr "Gamma cible:"
++
++msgid "Hardware Gamma Control"
++msgstr "Contrôle du Gamma matériel"
++
++msgid "All"
++msgstr "Tous"
++
++msgid "Red"
++msgstr "Rouge"
++
++msgid "Green"
++msgstr "Vert"
++
++msgid "Blue"
++msgstr "Bleu"
++
++msgid "Adjust the gamma sliders to make the squares above fade into their backgrounds as much as possible."
++msgstr "Ajustez les niveaux de gamma jusqu'à ce que les carrés disparaissent dans le fond autant que possible."
++
++msgid "Tip: Most computer software expects a gamma of 2.2.\\nAdditionally, any ICC settings for the selected screen will override the gamma controls available on this tab."
++msgstr "Astuce: La plupart des logiciels attendent un gamma de 2.2.<br>De plus, les réglages ICC spécifiques pour l'écran sélectionné, s'ils existent, seront prioritaires sur ceux-ci."
++
++msgid "Power Management"
++msgstr "Gestion de l'Energie"
++
++msgid "Energy Star (DPMS)"
++msgstr "Energy Star (DPMS)"
++
++msgid "&Enable DPMS power save modes"
++msgstr "&Activer les modes d'économie d'énergie DPMS"
++
++msgid "Enable &standby after"
++msgstr "Interrompre l'écran après"
++
++msgid "Enable &suspend after"
++msgstr "Activer la mise en veille après"
++
++msgid "Enable &power down after"
++msgstr "Activer l'arrêt après"
++
++msgid "minutes."
++msgstr "minutes."
++
+--- tde-i18n-fr/messages/tdebase/kicker.po.ORI	2013-05-11 20:59:51.416285023 +0200
++++ tde-i18n-fr/messages/tdebase/kicker.po	2013-05-11 21:01:03.139885540 +0200
+@@ -889,6 +889,24 @@
+ msgid "My Documents"
+ msgstr "Mes Documents"
+ 
++msgid "My Images"
++msgstr "Mes Images"
++
++msgid "My Music"
++msgstr "Ma Musique"
++
++msgid "My Videos"
++msgstr "Mes Vidéos"
++
++msgid "My Downloads"
++msgstr "Mes Téléchargements"
++
++msgid "Switch to Kickoff Menu Style"
++msgstr "Utiliser le menu Kickoff"
++
++msgid "Switch to Trinity Classic Menu Style"
++msgstr "Utiliser le menu Classique"
++
+ msgid "Network Folders"
+ msgstr "Dossiers Réseau"
+ 
+--- tde-i18n-fr/messages/tdebase/kcmsmserver.po.ORI	2013-05-11 21:07:13.314644518 +0200
++++ tde-i18n-fr/messages/tdebase/kcmsmserver.po	2013-05-11 21:12:44.468153019 +0200
+@@ -63,6 +63,12 @@
+ "Cochez cette option si vous désirez que le gestionnaire de session affiche une "
+ "demande de confirmation avant d'arrêter la session."
+ 
++msgid "Show fancy &logout fadeaway"
++msgstr "Afficher un fondu gris lors de la déconnexion"
++
++msgid "Show logout stat&us dialog"
++msgstr "Afficher la fenêtre d'état de déconnexion"
++
+ #. i18n: file smserverconfigdlg.ui line 62
+ #: rc.cpp:15
+ #, no-c-format
+@@ -177,3 +180,16 @@
+ "Vous pouvez saisir ici une liste (séparée par des virgules) des applications "
+ "qui ne doivent pas être enregistrées, et qui ne seront par conséquent pas "
+ "relancées lorsque la session sera restaurée. Par exemple, « xterm,xconsole »."
++
++msgid "The new window manager will be used when TDE is started the next time."
++msgstr "Le nouveau gestionnaire de fenêtres sera utilisé au prochain démarrage de TDE."
++
++msgid "Window manager change"
++msgstr "Modification du gestionnaire de fenêtres"
++
++msgid "KWin (KDE default)"
++msgstr "TWin (par défaut)"
++
++msgid "Window Manager"
++msgstr "Gestionnaire de fenêtres"
++
+--- tde-i18n-fr/messages/tdebase/kcmtdednssd.po.ORI	2013-05-11 21:14:32.762027927 +0200
++++ tde-i18n-fr/messages/tdebase/kcmtdednssd.po	2013-05-11 21:15:59.767319820 +0200
+@@ -184,3 +184,7 @@
+ 
+ #~ msgid "Alt+I"
+ #~ msgstr "Alt+I"
++
++msgid "Enable &Zeroconf network browsing"
++msgstr "Activer le parcours du réseau avec Zeroconf"
++
+--- tde-i18n-fr/messages/tdebase/kcmenergy.po.ORI	2013-05-11 21:18:10.672748597 +0200
++++ tde-i18n-fr/messages/tdebase/kcmenergy.po	2013-05-11 21:19:44.590902968 +0200
+@@ -102,3 +102,10 @@
+ "Choisissez la période d'inactivité après laquelle l'affichage doit être éteint. "
+ "Ceci est le plus haut niveau d'économie d'énergie qui puisse être utilisé "
+ "lorsque l'écran est physiquement allumé."
++
++msgid "&Enable specific display power management"
++msgstr "&Activer la gestion spécifique de l'énergie"
++
++msgid "Configure KPowersave..."
++msgstr "Configurer KPowersave..."
++
+--- tde-i18n-fr/messages/tdebase/tdeio_media.po.ORI	2013-05-11 21:43:21.810972521 +0200
++++ tde-i18n-fr/messages/tdebase/tdeio_media.po	2013-05-11 21:43:43.080556048 +0200
+@@ -564,3 +564,7 @@
+ #: propsdlgplugin/propsdlgshareplugin.cpp:67
+ msgid "&Mounting"
+ msgstr "&Montage"
++
++msgid "Decrypt"
++msgstr "Décrypter"
++
+--- tde-i18n-fr/messages/tdebase/kcmmedia.po.ORI	2013-05-11 21:52:54.856736846 +0200
++++ tde-i18n-fr/messages/tdebase/kcmmedia.po	2013-05-11 21:53:11.780404569 +0200
+@@ -216,3 +216,10 @@
+ #, no-c-format
+ msgid "Command:"
+ msgstr "Commande :"
++
++msgid "Mount options"
++msgstr "Options de montage par défaut"
++
++msgid "Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br>\nSome of the options are tristate. Leave them \"undefined\" to let KDE choose the best value depending on your media."
++msgstr "Vous pouvez spécifier ici les options de montage par défaut pour les périphériques amovibles. Veuillez noter que certaines options ne sont pas supportées avec certains systèmes de fichiers ou médias. Vous pourrez redéfinir individuellement toutes ces options pour chaque média ultérieurement, en utilisant la boite de dialogue Propriétés sur ce média.<br>\nCertaines options ont 3 états. Laissez-les grisées pour laisser TDE choisir la meilleure valeur pour vous."
++
+--- tde-i18n-fr/messages/tdebase/kcmkonq.po.ORI	2013-05-11 22:03:57.845711507 +0200
++++ tde-i18n-fr/messages/tdebase/kcmkonq.po	2013-05-11 22:07:46.429213872 +0200
+@@ -64,6 +64,17 @@
+ "seule fenêtre. Quand cette option n'est pas cochée, tous les transferts "
+ "apparaissent dans des fenêtres séparées."
+ 
++msgid "Show archived &files as folders"
++msgstr "Afficher les fichiers &archives comme des dossiers"
++
++msgid ""
++"Checking this option will list archived"
++" files as folders when using tree view."
++
++msgstr ""
++"Si vous cochez cette option, tous les fichiers archives (ZIP, TAR ...)"
++" seront affichés comme des dossiers dans l'explorateur de fichiers."
++
+ #: behaviour.cpp:85
+ msgid "Show file &tips"
+ msgstr "Af&ficher les info-bulles des fichiers"
+--- tde-i18n-fr/messages/tdebase/kcmkicker.po.ORI	2013-05-11 23:14:47.566479096 +0200
++++ tde-i18n-fr/messages/tdebase/kcmkicker.po	2013-05-11 23:29:07.733152080 +0200
+@@ -1032,12 +1032,22 @@
+ "y configurer l'aspect et le comportement des poignées d'applets, la teinture de "
+ "la transparence et d'autres choses."
+ 
++
++msgid "Start menu style:"
++msgstr "Style de menu démarrer:"
++
++msgid "Trinity Classic"
++msgstr "Classique"
++
+ #. i18n: file menutab.ui line 27
+ #: rc.cpp:369
+ #, no-c-format
+ msgid "TDE Menu"
+ msgstr "Menu K"
+ 
++msgid "Open menu on mouse hover"
++msgstr "Ouvrir le menu au survol de la souris"
++
+ #. i18n: file menutab.ui line 49
+ #: rc.cpp:372
+ #, no-c-format
+@@ -1122,6 +1126,15 @@
+ msgid "Show side ima&ge"
+ msgstr "Afficher le &bandeau latéral"
+ 
++msgid "Display text in TDE Menu button"
++msgstr "Afficher du texte sur le bouton TDE Menu"
++
++msgid "Text:"
++msgstr "Texte:"
++
++msgid "TDE Menu button icon:"
++msgstr "Icone du bouton TDE Menu:"
++
+ #. i18n: file menutab.ui line 126
+ #: rc.cpp:405
+ #, no-c-format
+@@ -1281,6 +1300,42 @@
+ "Lorsque cette option est sélectionnée, la zone du menu « sous la main » "
+ "contiendra les applications les plus utilisées."
+ 
++msgid "Show T&ooltip"
++msgstr "Afficher les info-bulles"
++
++msgid "<qt>When this option is selected, a tooltip appears when hovering the mouse pointer over Application Launcher Menu items. Enabling this option also requires that tooltips are enabled in the Panels->Appearance configuration dialog."
++msgstr "<qt>Cette option affiche une info-bulle lorsque la souris survole les applications dans le menu de démarrage. Cette option nécessite que les bulles d'aide soient activées dans la rubrique Tableau de bords->Apparence"
++
++msgid "Recent Documents Menu"
++msgstr "Menus des documents récents"
++
++msgid "TDE Menu Search"
++msgstr "Menus de recherche"
++
++msgid "Show search field in TDE Menu"
++msgstr "Afficher le champ de recherche dans le menu K"
++
++msgid "Blur the background when transparency is enabled"
++msgstr "Flouter le fond d'écran lorsque la transparence est activée"
++
++msgid "When checked, the displayed semi-transparent background image will be blurred to reduce eyestrain"
++msgstr "Si vous cochez cette case, le fond d'écran semi-transparent sera flouté pour réduire la fatigue visuelle"
++
++msgid "Show resize handle on panels"
++msgstr "Afficher les poignées de redimensionnement"
++
++msgid "Enabling this option will show a resize handle on the resizable end of each panel."
++msgstr "Activer cette option affichera une poignée de redimensionnement à chaque extremité de chaque panneau."
++
++msgid "Use deep buttons"
++msgstr "Utiliser des textures profonds"
++
++msgid "Enabling this option will yield more highly textured panels."
++msgstr "Activer cette option affichera des panneaux davantage texturés."
++
++msgid "Enable icon activation effects"
++msgstr "Activer les effets d'activation des icones"
++
+ #. i18n: file positiontab.ui line 17
+ #: rc.cpp:464
+ #, no-c-format
+--- tde-i18n-fr/messages/tdebase/ksmserver.po.ORI	2013-05-12 22:22:06.947460769 +0200
++++ tde-i18n-fr/messages/tdebase/ksmserver.po	2013-05-12 22:26:35.822041371 +0200
+@@ -103,3 +103,39 @@
+ msgid "Saving your settings..."
+ msgstr "Enregistrement de vos paramètres ..."
+ 
++msgid "Would you like to turn off your computer?"
++msgstr "Souhaitez-vous éteindre votre ordinateur ?"
++
++msgid ""
++"This computer will turn off automatically\n"
++"after %1 seconds."
++msgstr ""
++"Cet ordinateur s'éteindra automatiquement\n"
++"dans %1 secondes."
++
++msgid "Would you like to reboot your computer?"
++msgstr "Souhaitez-vous redémarrer votre ordinateur ?"
++
++msgid "Would you like to reboot to \"%1\"?"
++msgstr "Voulez-vous redémarrer \"%1\" ?"
++
++msgid ""
++"This computer will reboot automatically\n"
++"after %1 seconds."
++msgstr ""
++"Cet ordinateur redémarrera automatiquement\n"
++"après %1 secondes."
++
++msgid "Would you like to end your current session?"
++msgstr "Souhaitez-vous fermer votre session ?"
++
++msgid ""
++"This session will end\n"
++"after %1 seconds automatically."
++msgstr ""
++"Cette session sera fermée automatiquement\n"
++"après %1 secondes."
++
++msgid "Confirm"
++msgstr "Confirmer"
++
+--- tde-i18n-fr/messages/tdebase/kcmkonqhtml.po.ORI	2013-05-12 22:40:57.371286882 +0200
++++ tde-i18n-fr/messages/tdebase/kcmkonqhtml.po	2013-05-12 22:45:34.458496871 +0200
+@@ -1546,3 +1546,21 @@
+ #, no-c-format
+ msgid "Use a&rtsdsp to pipe plugin sound through aRts"
+ msgstr "Utiliser « a&rtsdsp » pour rediriger le son du module vers aRts"
++
++msgid "Sm&ooth scrolling"
++msgstr "Déflilement fluide"
++
++msgid "Enabled"
++msgstr "Activé"
++
++msgid "Disabled"
++msgstr "Désactivé"
++
++msgid ""
++"Determines whether Konqueror should use smooth steps to scroll HTML pages, or whole steps:<br>"
++"<ul><li><b>Always</b>: Always use smooth steps when scrolling.</li>"
++"<li><b>Never</b>: Never use smooth scrolling, scroll with whole steps instead.</li>"
++msgstr ""
++"Détermine si Konqueror doit utiliser un défilement fluide des pages HTML, ou un défilement par étapes:<br>"
++"<ul><li><b>Toujours</b>: Toujours utiliser le défilement fluide.</li>"
++"<li><b>Jamais</b>: Ne jamais utiliser le défilement fluide, défiler pas par pas.</li>"
+--- tde-i18n-fr/messages/tdebase/kcmkwm.po.ORI	2013-05-12 22:53:03.442689656 +0200
++++ tde-i18n-fr/messages/tdebase/kcmkwm.po	2013-05-12 23:06:59.007771110 +0200
+@@ -1185,3 +1185,22 @@
+ msgstr ""
+ "<qt>La gestion de la transparence est récente et peut causer des problèmes, "
+ "<br> incluant des plantages (du moteur de transparence ou même de X).</qt>"
++
++msgid "Enable the Trinity window composition manager"
++msgstr "Activer le gestionnaire de composition de fenêtres de Trinity"
++
++msgid "Use shadows (standard effects should be disabled in the Styles module if this is checked)"
++msgstr "Utiliser les ombres (l'effet standard d'ombre doit être désactivé dans le menu Styles)"
++
++msgid "Base shadow size:"
++msgstr "Taille de base de l'ombre:"
++
++msgid "Active window shadow size multiplier:"
++msgstr "Multiplier la taille de l'ombre de la fenêtre active:"
++
++msgid "Dock shadow size multiplier:"
++msgstr "Multiplier la taille de l'ombre du dock:"
++
++msgid "Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
++msgstr "Apparition progressive des menus (nécessite que l'apparition progressive soit désactivée dans le menu Styles)"
++
+--- tde-i18n-fr/messages/tdebase/kcmscreensaver.po.ORI	2013-05-14 23:49:35.272995867 +0200
++++ tde-i18n-fr/messages/tdebase/kcmscreensaver.po	2013-05-15 00:00:03.074900231 +0200
+@@ -338,3 +338,33 @@
+ #: scrnsave.cpp:470
+ msgid "Loading..."
+ msgstr "Chargement..."
++
++msgid "&Delay saver start after lock"
++msgstr "Retarder l'économiseur d'écran"
++
++msgid "When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed."
++msgstr "Lors du verrouillage manuel de l'écran, attendre le délai indiqué pour démarrer l'économiseur d'écran."
++
++msgid "&Use Secure Attention Key"
++msgstr "Utiliser les touches de sécurité"
++
++msgid "Require Secure Attention Key prior to displaying the unlock dialog."
++msgstr "Exiger l'appui sur CTRL+ALT+SUPPR avant de demander le mot de passe."
++
++msgid "Use &legacy lock windows"
++msgstr "Utiliser l'ancienne fenêtre de verrouillage"
++
++msgid "Use old-style unmanaged X11 lock windows."
++msgstr "Utiliser l'ancienne fenêtre X11 de verrouillage, non gérée par Trinity."
++
++msgid "&Hide active windows from saver"
++msgstr "&Masquer les fenêtres actives"
++
++msgid "Hide all active windows from the screen saver and use the desktop background as the screen saver input."
++msgstr "Masquer toutes les fenêtres actives et afficher le fond d'écran lorsque l'économiseur d'écran est déclenché."
++
++msgid "&Vibrate unlock dialog box on failure"
++msgstr "&Vibrer en cas d'échec de déverrouillage"
++
++msgid "Makes the unlock dialog box vibrate when entering an incorrect password."
++msgstr "Faire vibrer la fenêtre de déverrouillage lorsqu'un mauvais mot de passe est saisi."
+--- tde-i18n-fr/messages/tdebase/tdmconfig.po.ORI	2013-05-15 00:01:50.557981168 +0200
++++ tde-i18n-fr/messages/tdebase/tdmconfig.po	2013-05-15 00:03:54.685758336 +0200
+@@ -895,3 +895,24 @@
+ "_: EMAIL OF TRANSLATORS\n"
+ "Your emails"
+ msgstr "cousin@kde.org,caulier.gilles@free.fr,kde@macolu.org"
++
++msgid "Secure Attention Key"
++msgstr "Touches de sécurité"
++
++msgid "Enable Secure Attention Key"
++msgstr "Activer les touches de sécurité"
++
++msgid "Secure Attention Key support is not available on your system.  Please check for the presence of evdev and uinput."
++msgstr "Le support des touches de sécurité n'est pas disponible sur votre système. Veuillez vérifier la présence de evdev et uinput."
++
++msgid "Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing measure."
++msgstr "Vous pouvez activer ou désactiver les touches de sécurité, mesure anti-usurpation."
++
++msgid "Restart X-Server with session exit"
++msgstr "Redémarrer le serveur X après la fermeture de la session."
++
++msgid "Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues."
++msgstr "Spécifie si le gestionnaire de connexion doit redémarrer le serveur X local après une fermeture de session au lieu de le réinitialiser. Utilisez cette option si le serveur X a des problèmes de stabilité, d'affichage, ou des fuite mémoire."
++
++msgid "Allow &Root Login"
++msgstr "Autoriser la connexion en tant qu'utilisateur &Root"
+--- tde-i18n-fr/messages/tdebase/kcmbackground.po.ORI	2013-05-15 20:43:56.647074858 +0200
++++ tde-i18n-fr/messages/tdebase/kcmbackground.po	2013-05-15 20:46:02.044250812 +0200
+@@ -920,3 +920,9 @@
+ #, no-c-format
+ msgid "Move &Up"
+ msgstr "Mon&ter"
++
++msgid "Cross-fading background"
++msgstr "Affichage progressif du fond d'écran"
++
++msgid "Enables a smooth fading effect when changing background image."
++msgstr "Activer un effet de fondu lors du changement de fond d'écran."
+--- tde-i18n-fr/messages/tdebase/kminipagerapplet.po.ORI	2013-05-17 21:28:37.998756359 +0200
++++ tde-i18n-fr/messages/tdebase/kminipagerapplet.po	2013-05-17 21:29:50.398145568 +0200
+@@ -193,3 +193,6 @@
+ #, no-c-format
+ msgid "Show window icons in previews?"
+ msgstr "Afficher les icônes des fenêtres dans les aperçus ?"
++
++msgid "&Cycle on Wheel"
++msgstr "&Changer de bureau à la molette"
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
new file mode 100644
index 000000000..e99903cc6
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -0,0 +1,1285 @@
+# Default version for this component
+%define tde_pkg tde-i18n
+%define tde_version 14.0.0
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE specific building variables
+BuildRequires:	autoconf automake libtool m4
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+
+%define tde_tdedocdir %{tde_docdir}/tde
+
+# Builds all supported languages (not unsupported ones)
+%if "%{?TDE_LANGS}" == ""
+%define TDE_LANGS ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW
+%endif
+
+
+Name:			trinity-%{tde_pkg}
+Summary:		Internationalization support for Trinity
+Version:		14.0.0
+Release:		%{?!preversion:1}%{?preversion:_%{preversion}}%{?dist}%{?_variant}
+
+Vendor:			Trinity Project
+Packager:		Francois Andriot <francois.andriot@free.fr>
+URL:			http://www.trinitydesktop.org/
+
+Prefix:			%{tde_prefix}
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+License:		GFDL
+Group:			User Interface/Desktops
+BuildArch:	noarch
+
+# Speed build options
+%define debug_package %{nil}
+%define __spec_install_post %{nil}
+AutoReq: no
+
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+# Translate 'tdesu' message was modified in 'tdebase' package
+Patch0:		tde-i18n-14.0.0-fr-tdesu_no_ignore_button.patch
+
+# Translate 'Open Terminal Here' desktop shortcut
+Patch1:		tde-i18n-14.0.0-fr-openterminalhere.patch
+
+# TDE 3.5.13: French translations for new features
+Patch2:		tde-i18n-14.0.0-fr-add_french_translations.patch
+
+# TDE 3.5.13: Updated translations for zh_TW, thanks to Wei-Lun Chao !
+Patch3:		kde-i18n-zh_TW-3.5.10.patch.gz
+
+# TDE 3.5.13.2: Updated french translations
+Patch4:		tde-i18n-14.0.0-fr-updates.patch
+
+BuildRequires:	findutils
+BuildRequires:	gettext
+BuildRequires:	trinity-arts-devel >= %{tde_version}
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
+
+%description
+%{summary}.
+
+%package Afrikaans
+Summary:		Afrikaans(af) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-af = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Afrikaans < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Afrikaans = %{version}-%{release}
+%description Afrikaans
+%{summary}.
+
+%package Arabic 
+Summary:		Arabic(ar) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ar = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Arabic = %{version}-%{release}
+%description Arabic
+%{summary}.
+
+%package Azerbaijani
+Summary:		Azerbaijani(az) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-az = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Arabic < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Arabic = %{version}-%{release}
+%description Azerbaijani
+%{summary}.
+
+%package Belarusian
+Summary:		Belarusian(be) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-be = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Belarusian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Belarusian = %{version}-%{release}
+%description Belarusian
+%{summary}.
+
+%package Bulgarian
+Summary:		Bulgarian(bg) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-bg = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Bulgarian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Bulgarian = %{version}-%{release}
+%description Bulgarian
+%{summary}.
+
+%package Bengali
+Summary:		Bengali(bn) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-bn = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Bengali < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Bengali = %{version}-%{release}
+%description Bengali
+%{summary}.
+
+%package Tibetan
+Summary:		Tibetan(bo) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-bo = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Tibetan < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Tibetan = %{version}-%{release}
+%description Tibetan
+%{summary}.
+
+%package Breton
+Summary:		Breton(br) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-br = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Breton < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Breton = %{version}-%{release}
+%description Breton
+%{summary}.
+
+%package Bosnian
+Summary:		Bosnian(bs) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-bs = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Bosnian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Bosnian = %{version}-%{release}
+%description Bosnian
+%{summary}.
+
+%package Catalan
+Summary:		Catalan(ca) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ca = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Catalan < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Catalan = %{version}-%{release}
+%description Catalan
+%{summary}.
+
+%package Czech
+Summary:		Czech(cs) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-cs = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Czech < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Czech = %{version}-%{release}
+%description Czech
+%{summary}.
+
+%package Cymraeg
+Summary:		Cymraeg language support for TDE
+Group:			User Interface/Desktops
+Obsoletes:	 trinity-kde-i18n-Cymraeg < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Cymraeg = %{version}-%{release}
+%description Cymraeg
+%{summary}.
+
+%package Welsh
+Summary:		Welsh(cy) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-cy = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Welsh < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Welsh = %{version}-%{release}
+%description Welsh
+%{summary}.
+
+%package Danish
+Summary:		Danish(da) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-da = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Danish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Danish = %{version}-%{release}
+%description Danish
+%{summary}.
+
+%package German
+Summary:		German(de) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-de = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-German < %{version}-%{release}
+Provides:	 trinity-kde-i18n-German = %{version}-%{release}
+%description German
+%{summary}.
+
+%package Greek
+Summary:		Greek(el) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-el = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Greek < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Greek = %{version}-%{release}
+%description Greek
+%{summary}.
+
+%package British
+Summary:		British(en_GB) English support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-en_GB = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-British < %{version}-%{release}
+Provides:	 trinity-kde-i18n-British = %{version}-%{release}
+%description British
+%{summary}.
+
+%package Esperanto
+Summary:		Esperanto(eo) support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-eo = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Esperanto < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Esperanto = %{version}-%{release}
+%description Esperanto
+%{summary}.
+
+%package Spanish
+Summary:		Spanish(es) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-es = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Spanish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Spanish = %{version}-%{release}
+%description Spanish
+%{summary}.
+
+%package Estonian
+Summary:		Estonian(et) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-et = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Estonian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Estonian = %{version}-%{release}
+%description Estonian
+%{summary}.
+
+%package Basque
+Summary:		Basque(eu) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-eu = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Basque < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Basque = %{version}-%{release}
+%description Basque
+%{summary}.
+
+%package Farsi
+Summary:		Farsi(fa) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-fa = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Farsi < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Farsi = %{version}-%{release}
+%description Farsi
+%{summary}.
+
+%package Finnish
+Summary:		Finnish(fi) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-fi = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Finnish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Finnish = %{version}-%{release}
+%description Finnish
+%{summary}.
+
+%package Faroese
+Summary:		Faroese(fo) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-fo = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Faroese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Faroese = %{version}-%{release}
+%description Faroese
+%{summary}.
+
+%package French
+Summary:		French(fr) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-fr = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-French < %{version}-%{release}
+Provides:	 trinity-kde-i18n-French = %{version}-%{release}
+%description French
+%{summary}.
+
+%package Frisian
+Summary:		Frisian(fy) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-fy = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Frisian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Frisian = %{version}-%{release}
+%description Frisian
+%{summary}.
+
+%package Irish
+Summary:		Irish(ga) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ga = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Irish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Irish = %{version}-%{release}
+%description Irish
+%{summary}.
+
+%package Galician
+Summary:		Galician(gl) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-gl = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Galician < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Galician = %{version}-%{release}
+%description Galician
+%{summary}.
+
+%package Hebrew
+Summary:		Hebrew(he) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-he = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Hebrew < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Hebrew = %{version}-%{release}
+%description Hebrew
+%{summary}.
+
+%package Hindi
+Summary:		Hindi(hi) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-hi = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Hindi < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Hindi = %{version}-%{release}
+%description Hindi
+%{summary}.
+
+%package Croatian
+Summary:		Croatian(hr) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-hr = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Croatian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Croatian = %{version}-%{release}
+%description Croatian
+%{summary}.
+
+%package Hungarian
+Summary:		Hungarian(hu) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-hu = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Hungarian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Hungarian = %{version}-%{release}
+%description Hungarian
+%{summary}.
+
+%package Indonesian
+Summary:		Indonesian(id) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-id = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Indonesian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Indonesian = %{version}-%{release}
+%description Indonesian
+%{summary}.
+
+%package Icelandic
+Summary:		Icelandic(is) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-is = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Icelandic < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Icelandic = %{version}-%{release}
+%description Icelandic
+%{summary}.
+
+%package Italian
+Summary:		Italian(it) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-it = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Italian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Italian = %{version}-%{release}
+%description Italian
+%{summary}.
+
+%package Japanese
+Summary:		Japanese(ja) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ja = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Japanese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Japanese = %{version}-%{release}
+%description Japanese
+%{summary}.
+
+%package Korean
+Summary:		Korean(ko) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ko = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Korean < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Korean = %{version}-%{release}
+%description Korean
+%{summary}.
+
+%package Kurdish
+Summary:		Kurdish(ku) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ku = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Kurdish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Kurdish = %{version}-%{release}
+%description Kurdish
+%{summary}.
+
+%package Lao
+Summary:		Lao(lo) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-lo = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Lao < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Lao = %{version}-%{release}
+%description Lao
+%{summary}.
+
+%package Lithuanian
+Summary:		Lithuanian(lt) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-lt = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Lithuanian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Lithuanian = %{version}-%{release}
+%description Lithuanian
+%{summary}.
+
+%package Latvian
+Summary:		Latvian(lv) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-lv = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Latvian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Latvian = %{version}-%{release}
+%description Latvian
+%{summary}.
+
+%package Maori
+Summary:		Maori(mi) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-mi = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Maori < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Maori = %{version}-%{release}
+%description Maori
+%{summary}.
+
+%package Macedonian
+Summary:		Macedonian(mk) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-mk = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Macedonian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Macedonian = %{version}-%{release}
+%description Macedonian
+%{summary}.
+
+%package Maltese
+Summary:		Maltese(mt) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-mt = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Maltese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Maltese = %{version}-%{release}
+%description Maltese
+%{summary}.
+
+%package Dutch
+Summary:		Dutch(nl) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-nl = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Dutch < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Dutch = %{version}-%{release}
+%description Dutch
+%{summary}.
+
+%package Norwegian
+Summary:		Norwegian(no) (Bokmaal) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-no = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Norwegian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Norwegian = %{version}-%{release}
+%description Norwegian
+%{summary}.
+
+%package Norwegian-Nynorsk
+Summary:		Norwegian(nn) (Nynorsk) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-nn = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release}
+%description Norwegian-Nynorsk
+%{summary}.
+
+%package Occitan
+Summary:		Occitan(oc) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-oc = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Occitan < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Occitan = %{version}-%{release}
+%description Occitan
+%{summary}.
+
+%package Polish
+Summary:		Polish(pl) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-pl = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Polish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Polish = %{version}-%{release}
+%description Polish
+%{summary}.
+
+%package Portuguese
+Summary:		Portuguese(pt) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-pt = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Portuguese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Portuguese = %{version}-%{release}
+%description Portuguese
+%{summary}.
+
+%package Punjabi
+Summary:		Punjabi(pa) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-pa = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Punjabi < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Punjabi = %{version}-%{release}
+%description Punjabi
+%{summary}.
+
+%package Brazil
+Summary:		Brazil(pt_BR) Portuguese language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-pt_BR = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Brazil < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Brazil = %{version}-%{release}
+%description Brazil
+%{summary}.
+
+%package Romanian
+Summary:		Romanian(ro) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ro = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Romanian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Romanian = %{version}-%{release}
+%description Romanian
+%{summary}.
+
+%package Russian
+Summary:		Russian(ru) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ru = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Russian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Russian = %{version}-%{release}
+%description Russian
+%{summary}.
+
+%package Slovak
+Summary:		Slovak(sk) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-sk = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Slovak < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Slovak = %{version}-%{release}
+%description Slovak
+%{summary}.
+
+%package Slovenian
+Summary:		Slovenian(sl) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-sl = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Slovenian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Slovenian = %{version}-%{release}
+%description Slovenian
+%{summary}.
+
+%package Serbian
+Summary:		Serbian(sr) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-sr = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Serbian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Serbian = %{version}-%{release}
+%description Serbian
+%{summary}.
+
+%package Swedish
+Summary:		Swedish(sv) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-sv = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Swedish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Swedish = %{version}-%{release}
+%description Swedish
+%{summary}.
+
+%package Tamil
+Summary:		Tamil(ta) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ta = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Tamil < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Tamil = %{version}-%{release}
+%description Tamil
+%{summary}.
+
+%package Tajik
+Summary:		Tajik(tg) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-tg = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Tajik < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Tajik = %{version}-%{release}
+%description Tajik
+%{summary}.
+
+%package Thai
+Summary:		Thai(th) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-th = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Thai < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Thai = %{version}-%{release}
+%description Thai
+%{summary}.
+
+%package Turkish
+Summary:		Turkish(tr) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-tr = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Turkish < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Turkish = %{version}-%{release}
+%description Turkish
+%{summary}.
+
+%package Ukrainian
+Summary:		Ukrainian(uk) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-uk = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Ukrainian < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Ukrainian = %{version}-%{release}
+%description Ukrainian
+%{summary}.
+
+%package Venda
+Summary:		Venda(ven) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-ven = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Venda < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Venda = %{version}-%{release}
+%description Venda
+%{summary}.
+
+%package Vietnamese
+Summary:		Vietnamese(vi) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-vi = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Vietnamese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Vietnamese = %{version}-%{release}
+%description Vietnamese
+%{summary}.
+
+%package Walloon
+Summary:		Walloon(wa) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-wa = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Walloon < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Walloon = %{version}-%{release}
+%description Walloon
+%{summary}.
+
+%package Xhosa
+Summary:		Xhosa(xh) (a Bantu language) support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-xh = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Xhosa < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Xhosa = %{version}-%{release}
+%description Xhosa
+%{summary}.
+
+%package Chinese
+Summary:		Chinese(zh_CN) (Simplified Chinese) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-zh_CN = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Chinese < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Chinese = %{version}-%{release}
+%description Chinese
+%{summary}.
+
+%package Chinese-Big5
+Summary:		Chinese(zh_TW) (Big5) language support for TDE
+Group:			User Interface/Desktops
+Provides: %{name}-tz_TW = %{version}-%{release}
+Obsoletes:	 trinity-kde-i18n-Chinese-Big5 < %{version}-%{release}
+Provides:	 trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
+%description Chinese-Big5
+%{summary}.
+
+
+
+%prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+# Patches for French translations
+pushd tde-i18n-fr
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch4 -p1
+popd
+
+# Patches for Chinese (zh_TW) translations
+pushd tde-i18n-zh_TW
+zcat %{PATCH3} | patch -p1 || :
+popd
+
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+
+
+%build
+unset QTDIR QTINC QTLIB
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export TDEDIR=%{tde_prefix}
+
+export kde_htmldir="%{tde_tdedocdir}/HTML"
+
+for l in %{TDE_LANGS}; do
+  for f in tde-i18n-${l}/; do
+    if [ -d "${f}" ]; then 
+      pushd ${f}
+      (
+      %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g"
+      %__make -f "admin/Makefile.common"
+      %configure \
+        --prefix=%{tde_prefix} \
+        --datadir=%{tde_datadir} \
+        --docdir=%{tde_tdedocdir}
+      %__make %{?_smp_mflags}
+      ) &
+      sleep 3
+      popd
+    fi
+  done
+done
+
+wait
+
+%install
+%__rm -rf %{?buildroot}
+export PATH="%{tde_bindir}:${PATH}"
+
+for l in %{TDE_LANGS}; do
+  for f in tde-i18n-${l}/; do
+    if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then 
+      %__make install DESTDIR="%{?buildroot}" -C "${f}"
+    fi
+  done
+done
+
+# make symlinks relative
+%if "%{tde_prefix}" == "/usr"
+pushd "%{buildroot}%{tde_tdedocdir}/HTML"
+for lang in *; do
+  if [ -d "$lang" ]; then
+    pushd "$lang"
+    for i in */*/*; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../../../docs/common $i
+      fi
+    done
+
+    for i in */*; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../../docs/common $i
+      fi
+    done
+
+    for i in *; do
+      if [ -d $i -a -L $i/common ]; then
+        rm -f $i/common
+        ln -sf ../docs/common $i
+      fi
+    done
+
+    popd
+  fi
+done
+popd   
+%endif
+
+# remove zero-length file
+find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
+
+# See http://fedoraproject.org/wiki/Languages (???)
+%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
+
+# Removes conflict with TDE4
+%if "%{?tde_prefix}" == "/usr"
+%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
+%endif
+
+# remove obsolete TDE 3 application data translations
+%__rm -rf "%{buildroot}%{tde_datadir}/apps"
+
+%clean
+%__rm -rf %{buildroot}
+
+%if "%( grep -w af <<< '%{TDE_LANGS}' )" != ""
+%files Afrikaans
+%defattr(-,root,root,-)
+%lang(af) %{tde_datadir}/locale/af/*
+%lang(af) %{tde_tdedocdir}/HTML/af/
+%endif
+
+%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != ""
+%files Arabic 
+%defattr(-,root,root,-)
+%lang(ar) %{tde_datadir}/locale/ar/*
+%endif
+
+%if "%( grep -w az <<< '%{TDE_LANGS}' )" != ""
+%files Azerbaijani
+%defattr(-,root,root,-)
+%lang(az) %{tde_datadir}/locale/az/*
+%endif
+
+%if "%( grep -w be <<< '%{TDE_LANGS}' )" != ""
+%files Belarusian
+%defattr(-,root,root,-)
+%lang(be) %{tde_datadir}/locale/be/*
+%endif
+
+%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != ""
+%files Bulgarian
+%defattr(-,root,root,-)
+%lang(bg) %{tde_datadir}/locale/bg/*
+%endif
+
+%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != ""
+%files Bengali
+%defattr(-,root,root,-)
+%lang(bn) %{tde_datadir}/locale/bn/*
+%endif
+
+%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != ""
+%files Tibetan
+%defattr(-,root,root,-)
+%lang(bo) %{tde_datadir}/locale/bo/*
+%endif
+
+%if "%( grep -w br <<< '%{TDE_LANGS}' )" != ""
+%files Breton
+%defattr(-,root,root,-)
+%lang(br) %{tde_datadir}/locale/br/*
+%endif
+
+%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != ""
+%files Bosnian
+%defattr(-,root,root,-)
+%lang(bs) %{tde_datadir}/locale/bs/*
+%endif
+
+%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != ""
+%files Catalan
+%defattr(-,root,root,-)
+%lang(ca) %{tde_datadir}/locale/ca/*
+%lang(ca) %{tde_tdedocdir}/HTML/ca/
+%endif
+
+%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != ""
+%files Czech
+%defattr(-,root,root,-)
+%lang(cs) %{tde_datadir}/locale/cs/*
+%lang(cs) %{tde_tdedocdir}/HTML/cs/
+%endif
+
+%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != ""
+%files Welsh
+%defattr(-,root,root,-)
+%lang(cy) %{tde_datadir}/locale/cy/*
+%endif
+
+%if "%( grep -w da <<< '%{TDE_LANGS}' )" != ""
+%files Danish
+%defattr(-,root,root,-)
+%lang(da) %{tde_datadir}/locale/da/*
+%lang(da) %{tde_tdedocdir}/HTML/da/
+%endif
+
+%if "%( grep -w de <<< '%{TDE_LANGS}' )" != ""
+%files German
+%defattr(-,root,root,-)
+%lang(de) %{tde_datadir}/locale/de/*
+%lang(de) %{tde_tdedocdir}/HTML/de/
+%endif
+
+%if "%( grep -w el <<< '%{TDE_LANGS}' )" != ""
+%files Greek
+%defattr(-,root,root,-)
+%lang(el) %{tde_datadir}/locale/el/*
+%endif
+
+%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != ""
+%files British
+%defattr(-,root,root,-)
+%lang(en_GB) %{tde_datadir}/locale/en_GB/*
+%lang(en_GB) %{tde_tdedocdir}/HTML/en_GB/
+%endif
+
+%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != ""
+%files Esperanto
+%defattr(-,root,root,-)
+%lang(eo) %{tde_datadir}/locale/eo/*
+%endif
+
+%if "%( grep -w es <<< '%{TDE_LANGS}' )" != ""
+%files Spanish
+%defattr(-,root,root,-)
+%lang(es) %{tde_datadir}/locale/es/*
+%lang(es) %{tde_tdedocdir}/HTML/es/
+%endif
+
+%if "%( grep -w et <<< '%{TDE_LANGS}' )" != ""
+%files Estonian
+%defattr(-,root,root,-)
+%lang(et) %{tde_datadir}/locale/et/*
+%lang(et) %{tde_tdedocdir}/HTML/et/
+%endif
+
+%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != ""
+%files Basque
+%defattr(-,root,root,-)
+%lang(eu) %{tde_datadir}/locale/eu/*
+%endif
+
+%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != ""
+%files Farsi
+%defattr(-,root,root,-)
+%lang(fa) %{tde_datadir}/locale/fa/*
+%endif
+
+%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != ""
+%files Finnish
+%defattr(-,root,root,-)
+%lang(fi) %{tde_datadir}/locale/fi/*
+%lang(fi) %{tde_tdedocdir}/HTML/fi/
+%endif
+
+%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != ""
+%files Faroese
+%defattr(-,root,root,-)
+%lang(fo) %{tde_datadir}/locale/fo/*
+%endif
+
+%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != ""
+%files French
+%defattr(-,root,root,-)
+%lang(fr) %{tde_datadir}/locale/fr/*
+%lang(fr) %{tde_tdedocdir}/HTML/fr/
+%endif
+
+%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != ""
+%files Frisian
+%defattr(-,root,root,-)
+%lang(fy) %{tde_datadir}/locale/fy/*
+%endif
+
+%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != ""
+%files Irish
+%defattr(-,root,root,-)
+%lang(ga) %{tde_datadir}/locale/ga/*
+%endif
+
+%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != ""
+%files Galician
+%defattr(-,root,root,-)
+%lang(gl) %{tde_datadir}/locale/gl/*
+%endif
+
+%if "%( grep -w he <<< '%{TDE_LANGS}' )" != ""
+%files Hebrew
+%defattr(-,root,root,-)
+%lang(he) %{tde_datadir}/locale/he/*
+%lang(he) %{tde_tdedocdir}/HTML/he/
+%endif
+
+%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != ""
+%files Hindi
+%defattr(-,root,root,-)
+%lang(hi) %{tde_datadir}/locale/hi/*
+%endif
+
+%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != ""
+%files Croatian
+%defattr(-,root,root,-)
+%lang(hr) %{tde_datadir}/locale/hr/*
+%lang(hr) %{tde_tdedocdir}/HTML/hr/
+%endif
+
+%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != ""
+%files Hungarian
+%defattr(-,root,root,-)
+%lang(hu) %{tde_datadir}/locale/hu/*
+%lang(hu) %{tde_tdedocdir}/HTML/hu/
+%endif
+
+%if "%( grep -w id <<< '%{TDE_LANGS}' )" != ""
+%files Indonesian
+%defattr(-,root,root,-)
+%lang(id) %{tde_datadir}/locale/id/*
+%lang(id) %{tde_tdedocdir}/HTML/id/
+%endif
+
+%if "%( grep -w is <<< '%{TDE_LANGS}' )" != ""
+%files Icelandic
+%defattr(-,root,root,-)
+%lang(is) %{tde_datadir}/locale/is/*
+%endif
+
+%if "%( grep -w it <<< '%{TDE_LANGS}' )" != ""
+%files Italian
+%defattr(-,root,root,-)
+%lang(it) %{tde_datadir}/locale/it/*
+%lang(it) %{tde_tdedocdir}/HTML/it/
+%endif
+
+%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != ""
+%files Japanese
+%defattr(-,root,root,-)
+%lang(ja) %{tde_datadir}/locale/ja/*
+%lang(ja) %{tde_tdedocdir}/HTML/ja/
+%endif
+
+%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != ""
+%files Korean
+%defattr(-,root,root,-)
+%lang(ko) %{tde_datadir}/locale/ko/*
+%lang(ko) %{tde_tdedocdir}/HTML/ko/
+%endif
+
+%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != ""
+%files Kurdish
+%defattr(-,root,root,-)
+%lang(ku) %{tde_datadir}/locale/ku/*
+%lang(ku) %{tde_tdedocdir}/HTML/ku/
+%endif
+
+%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != ""
+%files Lao
+%defattr(-,root,root,-)
+%lang(lo) %{tde_datadir}/locale/lo/*
+%lang(lo) %{tde_tdedocdir}/HTML/lo/
+%endif
+
+%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != ""
+%files Lithuanian
+%defattr(-,root,root,-)
+%lang(lt) %{tde_datadir}/locale/lt/*
+%endif
+
+%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
+%files Latvian
+%defattr(-,root,root,-)
+%lang(lv) %{tde_datadir}/locale/lv/*
+%endif
+
+%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != ""
+%files Maori
+%defattr(-,root,root,-)
+%lang(mi) %{tde_datadir}/locale/mi/*
+%endif
+
+%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != ""
+%files Macedonian
+%defattr(-,root,root,-)
+%lang(mk) %{tde_datadir}/locale/mk/*
+%endif
+
+%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != ""
+%files Maltese
+%defattr(-,root,root,-)
+%lang(mt) %{tde_datadir}/locale/mt/*
+%endif
+
+%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != ""
+%files Dutch
+%defattr(-,root,root,-)
+%lang(nl) %{tde_datadir}/locale/nl/*
+%lang(nl) %{tde_tdedocdir}/HTML/nl/
+%endif
+
+%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != ""
+%files Norwegian
+%defattr(-,root,root,-)
+%lang(nb) %{tde_datadir}/locale/nb/*
+#%lang(nb) %{tde_tdedocdir}/HTML/nb/
+%endif
+
+%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != ""
+%files Norwegian-Nynorsk
+%defattr(-,root,root,-)
+%lang(nn) %{tde_datadir}/locale/nn/*
+#%lang(nn) %{tde_tdedocdir}/HTML/nn/
+%endif
+
+%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != ""
+%files Occitan
+%defattr(-,root,root,-)
+%lang(oc) %{tde_datadir}/locale/oc/*
+%endif
+
+%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != ""
+%files Punjabi
+%defattr(-,root,root,-)
+%lang(pa) %{tde_datadir}/locale/pa/*
+%endif
+
+%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != ""
+%files Polish
+%defattr(-,root,root,-)
+%lang(pl) %{tde_datadir}/locale/pl/*
+%lang(pl) %{tde_tdedocdir}/HTML/pl/
+%endif
+
+%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != ""
+%files Portuguese
+%defattr(-,root,root,-)
+%lang(pt) %{tde_datadir}/locale/pt/*
+%lang(pt) %{tde_tdedocdir}/HTML/pt/
+%endif
+
+%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != ""
+%files Brazil
+%defattr(-,root,root,-)
+%lang(pt_BR) %{tde_datadir}/locale/pt_BR/*
+%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/
+%endif
+
+%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != ""
+%files Romanian
+%defattr(-,root,root,-)
+%lang(ro) %{tde_datadir}/locale/ro/*
+%lang(ro) %{tde_tdedocdir}/HTML/ro/
+%endif
+
+%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != ""
+%files Russian
+%defattr(-,root,root,-)
+%lang(ru) %{tde_datadir}/locale/ru/*
+%lang(ru) %{tde_tdedocdir}/HTML/ru/
+%endif
+
+%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != ""
+%files Slovak
+%defattr(-,root,root,-)
+%lang(sk) %{tde_datadir}/locale/sk/*
+%lang(sk) %{tde_tdedocdir}/HTML/sk/
+%endif
+
+%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != ""
+%files Slovenian
+%defattr(-,root,root,-)
+%lang(sl) %{tde_datadir}/locale/sl/*
+%lang(sl) %{tde_tdedocdir}/HTML/sl/
+%endif
+
+%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != ""
+%files Serbian
+%defattr(-,root,root,-)
+%lang(sr) %{tde_datadir}/locale/sr/*
+%lang(sr) %{tde_tdedocdir}/HTML/sr/
+%endif
+
+%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != ""
+%files Swedish
+%defattr(-,root,root,-)
+%lang(sv) %{tde_datadir}/locale/sv/*
+%lang(sv) %{tde_tdedocdir}/HTML/sv/
+%endif
+
+%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != ""
+%files Tamil
+%defattr(-,root,root,-)
+%lang(ta) %{tde_datadir}/locale/ta/*
+%endif
+
+%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != ""
+%files Tajik
+%defattr(-,root,root,-)
+%lang(tg) %{tde_datadir}/locale/tg/*
+%endif
+
+%if "%( grep -w th <<< '%{TDE_LANGS}' )" != ""
+%files Thai
+%defattr(-,root,root,-)
+%lang(th) %{tde_datadir}/locale/th/*
+%endif
+
+%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != ""
+%files Turkish
+%defattr(-,root,root,-)
+%lang(tr) %{tde_datadir}/locale/tr/*
+%lang(tr) %{tde_tdedocdir}/HTML/tr/
+%endif
+
+%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != ""
+%files Ukrainian
+%defattr(-,root,root,-)
+%lang(uk) %{tde_tdedocdir}/HTML/uk/
+%lang(uk) %{tde_datadir}/locale/uk/*
+%endif
+
+%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != ""
+%files Venda
+%defattr(-,root,root,-)
+%lang(ven) %{tde_datadir}/locale/ven/*
+%endif
+
+%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != ""
+%files Vietnamese
+%defattr(-,root,root,-)
+%lang(vi) %{tde_datadir}/locale/vi/*
+%endif
+
+%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != ""
+%files Walloon
+%defattr(-,root,root,-)
+%lang(wa) %{tde_datadir}/locale/wa/*
+%endif
+
+%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != ""
+%files Xhosa
+%defattr(-,root,root,-)
+%lang(xh) %{tde_datadir}/locale/xh/*
+%lang(xh) %{tde_tdedocdir}/HTML/xh/
+%endif
+
+%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != ""
+%files Chinese
+%defattr(-,root,root,-)
+%lang(zh_CN) %{tde_datadir}/locale/zh_CN/*
+%lang(zh_CN) %{tde_tdedocdir}/HTML/zh_CN/
+%endif
+
+%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != ""
+%files Chinese-Big5
+%defattr(-,root,root,-)
+%lang(zh_TW) %{tde_datadir}/locale/zh_TW/*
+%lang(zh_TW) %{tde_tdedocdir}/HTML/zh_TW/
+%endif
+
+%changelog
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+- Initial release for TDE 14.0.0
+
+* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+- Initial release for TDE 3.5.13.2
+
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
+- Initial release for TDE 3.5.13.1
+
+* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
+- Renames to 'trinity-i18n'
+- Updates 'zh_TW' translations
+
+* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Updates French translations (mostly Kickoff Menu related)
+
+* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Removes 'kde-filesystem" dependancy
+
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Fix HTML directory location
+
+* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Re-adds missing files 'entry.desktop'
+- Updates zh_TW translation, thanks to Wei-Lun Chao
+
+* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add missing french translations for TDE 3.5.13
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
+* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
+- Initial version (French language only)
+- Based on RHEL SPEC file 'kde-i18n'
diff --git a/redhat/tde-i18n/i18n-3.5.13.1.spec b/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
index 55a9ffb58..55a9ffb58 100644
--- a/redhat/tde-i18n/i18n-3.5.13.1.spec
+++ b/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/uploaders.mk
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/kdbg/debian/changelog b/ubuntu/maverick/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/ubuntu/maverick/applications/kdbg/debian/compat b/ubuntu/maverick/applications/kdbg/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kdbg/debian/control b/ubuntu/maverick/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/ubuntu/maverick/applications/kdbg/debian/copyright b/ubuntu/maverick/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/ubuntu/maverick/applications/kdbg/debian/doc-base b/ubuntu/maverick/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/ubuntu/maverick/applications/kdbg/debian/docs b/ubuntu/maverick/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/ubuntu/maverick/applications/kdbg/debian/kdbg.1 b/ubuntu/maverick/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/maverick/applications/kdbg/debian/kdbg.xpm b/ubuntu/maverick/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/ubuntu/maverick/applications/kdbg/debian/menu b/ubuntu/maverick/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/ubuntu/maverick/applications/kdbg/debian/rules b/ubuntu/maverick/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/ubuntu/maverick/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/source/format b/ubuntu/maverick/applications/kdbg/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/source/format
+++ b/ubuntu/maverick/applications/kdbg/debian/source/format
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/source/options b/ubuntu/maverick/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/source/options
+++ b/ubuntu/maverick/applications/kdbg/debian/source/options
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/README.source b/ubuntu/maverick/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/README.source
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/README.source
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/buildvars.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/team-members b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/changelog b/ubuntu/maverick/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/changelog
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/changelog
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/compat b/ubuntu/maverick/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/compat
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/compat
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control b/ubuntu/maverick/applications/tdenetworkmanager/debian/control
index f9f6fbf25..f9f6fbf25 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/control
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/control
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in b/ubuntu/maverick/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/control.in
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/control.in
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/copyright b/ubuntu/maverick/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/copyright
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/copyright
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/manpages b/ubuntu/maverick/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/manpages
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/manpages
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/menu b/ubuntu/maverick/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/menu
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/menu
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/network-manager-tde.lintian b/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/network-manager-tde.postinst b/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/patches/series b/ubuntu/maverick/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/patches/series
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/rules b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/rules
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/rules
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/source/format b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/source/format
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/source/options b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/source/options
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/options
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/ubuntu/maverick/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/buildvars.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/buildvars.mk
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/team-members b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/team-members
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/uploaders.mk
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/versions.pl
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/changelog b/ubuntu/maverick/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/squeeze/applications/kpowersave-nohal/debian/changelog
+++ b/ubuntu/maverick/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/compat b/ubuntu/maverick/applications/tdepowersave/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/control
+++ b/ubuntu/maverick/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/copyright b/ubuntu/maverick/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/copyright
+++ b/ubuntu/maverick/applications/tdepowersave/debian/copyright
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/install b/ubuntu/maverick/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/install
+++ b/ubuntu/maverick/applications/tdepowersave/debian/install
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/manpages b/ubuntu/maverick/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/manpages
+++ b/ubuntu/maverick/applications/tdepowersave/debian/manpages
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/menu b/ubuntu/maverick/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/menu
+++ b/ubuntu/maverick/applications/tdepowersave/debian/menu
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/patches/.gitignore b/ubuntu/maverick/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/ubuntu/maverick/applications/tdepowersave/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/postrm b/ubuntu/maverick/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/postrm
+++ b/ubuntu/maverick/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst b/ubuntu/maverick/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/preinst
+++ b/ubuntu/maverick/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/applications/kpowersave-nohal/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/squeeze/applications/kpowersave-nohal/debian/rules
+++ b/ubuntu/maverick/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/source/format b/ubuntu/maverick/applications/tdepowersave/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/source/format
+++ b/ubuntu/maverick/applications/tdepowersave/debian/source/format
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/source/options b/ubuntu/maverick/applications/tdepowersave/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/source/options
+++ b/ubuntu/maverick/applications/tdepowersave/debian/source/options
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/watch b/ubuntu/maverick/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/watch
+++ b/ubuntu/maverick/applications/tdepowersave/debian/watch
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/ubuntu/precise/applications/kdbg/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/kdbg/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/precise/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/precise/applications/kdbg/debian/cdbs/kde.mk b/ubuntu/precise/applications/kdbg/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/precise/applications/kdbg/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/kdbg/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/precise/applications/kdbg/debian/cdbs/versions.pl b/ubuntu/precise/applications/kdbg/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/precise/applications/kdbg/debian/changelog b/ubuntu/precise/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/ubuntu/precise/applications/kdbg/debian/compat b/ubuntu/precise/applications/kdbg/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/precise/applications/kdbg/debian/control b/ubuntu/precise/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/ubuntu/precise/applications/kdbg/debian/copyright b/ubuntu/precise/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/ubuntu/precise/applications/kdbg/debian/doc-base b/ubuntu/precise/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/ubuntu/precise/applications/kdbg/debian/docs b/ubuntu/precise/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/ubuntu/precise/applications/kdbg/debian/kdbg.1 b/ubuntu/precise/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/precise/applications/kdbg/debian/kdbg.xpm b/ubuntu/precise/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/ubuntu/precise/applications/kdbg/debian/menu b/ubuntu/precise/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/ubuntu/precise/applications/kdbg/debian/rules b/ubuntu/precise/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/ubuntu/precise/applications/kdbg/debian/source/format b/ubuntu/precise/applications/kdbg/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/applications/kdbg/debian/source/options b/ubuntu/precise/applications/kdbg/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/applications/kdbg/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/precise/applications/kpowersave-nohal/debian/changelog b/ubuntu/precise/applications/kpowersave-nohal/debian/changelog
deleted file mode 100644
index 506507f65..000000000
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/control b/ubuntu/precise/applications/kpowersave-nohal/debian/control
deleted file mode 100644
index 731afb25f..000000000
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: kpowersave-nohal-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
-Build-Conflicts: autoconf2.13
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-nohal-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
-Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
- management settings and policies of your computer.
- It relies on the TDE hardware library to do the heavy lifting.
- .
- Current feature list:
-  * support for ACPI, APM and PMU
-  * trigger suspend to disk/ram and standby
-  * switch cpu frequency policy (between: performance, dynamic and powersave)
-  * applet icon with information about AC state, battery fill and battery
-    (warning) states
-  * applet tooltip with information about battery fill and remaining battery 
-    time/percentage
-  * autosuspend (to suspend the machine if the user has been inactive for a 
-    defined time)
-  * a global configurable blacklist with programs which prevent autosuspend
-    (e.g. videoplayer and cd burning tools)
-  * trigger lock screen and select the lock method
-  * KNotify support
-  * online help
-  * localisations for many languages
- KPowersave supports schemes with following configurable specific 
- settings for:
-  * screensaver
-  * DPMS
-  * autosuspend
-  * scheme specific blacklist for autosuspend
-  * notification settings
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/postrm b/ubuntu/precise/applications/kpowersave-nohal/debian/postrm
deleted file mode 100644
index 9e8ecc977..000000000
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-nohal-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  remove)
-    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
-    ;;
-  purge)
-    ;;
-  upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/preinst b/ubuntu/precise/applications/kpowersave-nohal/debian/preinst
deleted file mode 100644
index 5b0e73f61..000000000
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/preinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-nohal-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  install)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  upgrade)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    if [ -z "$divert" ]; then
-      dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    fi
-    ;;
-  abort-upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/rules b/ubuntu/precise/applications/kpowersave-nohal/debian/rules
deleted file mode 100755
index 262171bc3..000000000
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/rules
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-  
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.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 := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-		
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f acinclude.m4
-	rm -f aclocal.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/README.source b/ubuntu/precise/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/README.source
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/README.source
diff --git a/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/kde.mk b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/team-members b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdenetworkmanager/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/precise/applications/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/changelog b/ubuntu/precise/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/changelog
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/changelog
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/compat b/ubuntu/precise/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/compat
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/compat
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/control b/ubuntu/precise/applications/tdenetworkmanager/debian/control
index f9f6fbf25..f9f6fbf25 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/control
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/control
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/control.in b/ubuntu/precise/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/control.in
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/control.in
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/copyright b/ubuntu/precise/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/copyright
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/copyright
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/manpages b/ubuntu/precise/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/manpages
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/manpages
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/menu b/ubuntu/precise/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/menu
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/menu
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/network-manager-tde.lintian b/ubuntu/precise/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/network-manager-tde.postinst b/ubuntu/precise/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/patches/series b/ubuntu/precise/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/patches/series
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/precise/applications/knetworkmanager9/debian/rules b/ubuntu/precise/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/ubuntu/precise/applications/knetworkmanager9/debian/rules
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/rules
diff --git a/ubuntu/precise/applications/tdenetworkmanager/debian/source/format b/ubuntu/precise/applications/tdenetworkmanager/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/applications/tdenetworkmanager/debian/source/options b/ubuntu/precise/applications/tdenetworkmanager/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/applications/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/precise/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/ubuntu/precise/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/ubuntu/precise/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/ubuntu/precise/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/buildvars.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/team-members b/ubuntu/precise/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/team-members
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/uploaders.mk b/ubuntu/precise/applications/tdepowersave/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/precise/applications/tdepowersave/debian/cdbs/versions.pl b/ubuntu/precise/applications/tdepowersave/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/precise/applications/tdepowersave/debian/changelog b/ubuntu/precise/applications/tdepowersave/debian/changelog
new file mode 100644
index 000000000..e7773fc6a
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/changelog
@@ -0,0 +1,6 @@
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
diff --git a/ubuntu/precise/applications/tdepowersave/debian/compat b/ubuntu/precise/applications/tdepowersave/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control
new file mode 100644
index 000000000..3c3de5835
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/control
@@ -0,0 +1,42 @@
+Source: tdepowersave-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.8.4
+Homepage: http://sourceforge.net/projects/powersave/
+
+Package: tdepowersave-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
+Description: Power management applet for Trinity
+ KPowersave is a TDE systray applet which allows to control the power 
+ management settings and policies of your computer.
+ It relies on the TDE hardware library to do the heavy lifting.
+ .
+ Current feature list:
+  * support for ACPI, APM and PMU
+  * trigger suspend to disk/ram and standby
+  * switch cpu frequency policy (between: performance, dynamic and powersave)
+  * applet icon with information about AC state, battery fill and battery
+    (warning) states
+  * applet tooltip with information about battery fill and remaining battery 
+    time/percentage
+  * autosuspend (to suspend the machine if the user has been inactive for a 
+    defined time)
+  * a global configurable blacklist with programs which prevent autosuspend
+    (e.g. videoplayer and cd burning tools)
+  * trigger lock screen and select the lock method
+  * KNotify support
+  * online help
+  * localisations for many languages
+ KPowersave supports schemes with following configurable specific 
+ settings for:
+  * screensaver
+  * DPMS
+  * autosuspend
+  * scheme specific blacklist for autosuspend
+  * notification settings
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/copyright b/ubuntu/precise/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/copyright
+++ b/ubuntu/precise/applications/tdepowersave/debian/copyright
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/install b/ubuntu/precise/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/install
+++ b/ubuntu/precise/applications/tdepowersave/debian/install
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave.xpm b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/manpages b/ubuntu/precise/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/manpages
+++ b/ubuntu/precise/applications/tdepowersave/debian/manpages
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/menu b/ubuntu/precise/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/menu
+++ b/ubuntu/precise/applications/tdepowersave/debian/menu
diff --git a/ubuntu/precise/applications/kpowersave-nohal/debian/patches/.gitignore b/ubuntu/precise/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/ubuntu/precise/applications/tdepowersave/debian/patches/.gitignore
diff --git a/ubuntu/precise/applications/tdepowersave/debian/postrm b/ubuntu/precise/applications/tdepowersave/debian/postrm
new file mode 100644
index 000000000..c373aa20d
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/postrm
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdepowersave-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/precise/applications/tdepowersave/debian/preinst b/ubuntu/precise/applications/tdepowersave/debian/preinst
new file mode 100644
index 000000000..fe411fc94
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/preinst
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdepowersave-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+        divert=""
+    fi
+    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    ;;
+  upgrade)
+    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+        divert=""
+    fi
+    if [ -z "$divert" ]; then
+      dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    fi
+    ;;
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/precise/applications/tdepowersave/debian/rules b/ubuntu/precise/applications/tdepowersave/debian/rules
new file mode 100755
index 000000000..97acebf07
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/rules
@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+  
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.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 := AUTHORS NEWS
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+		
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
+
+install/kpowersave::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f acinclude.m4
+	rm -f aclocal.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/precise/applications/tdepowersave/debian/source/format b/ubuntu/precise/applications/tdepowersave/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/precise/applications/tdepowersave/debian/source/options b/ubuntu/precise/applications/tdepowersave/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/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/precise/applications/kpowersave-nohal/debian/watch b/ubuntu/precise/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/ubuntu/precise/applications/kpowersave-nohal/debian/watch
+++ b/ubuntu/precise/applications/tdepowersave/debian/watch
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/ubuntu/raring/applications/kdbg/debian/cdbs/buildvars.mk b/ubuntu/raring/applications/kdbg/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/raring/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kdbg/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..ba002080b
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,109 @@
+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
+
+# 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:
+	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+	touch debian/stamp-cvs-make
+
+include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
+#include debian/cdbs/uploaders.mk
+
+DEB_PATCHDIRS := debian/patches/common debian/patches
+
+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)
+
+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
+
+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 )
+
+clean::
+	rm -rf debian/man/out
+	-rmdir debian/man
+	rm -f debian/stamp-man-pages
+	rm -rf debian/shlibs-check
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	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
+
+clean::
+	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
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/raring/applications/kdbg/debian/cdbs/kde.mk b/ubuntu/raring/applications/kdbg/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/raring/applications/kdbg/debian/cdbs/uploaders.mk b/ubuntu/raring/applications/kdbg/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/raring/applications/kdbg/debian/cdbs/versions.pl b/ubuntu/raring/applications/kdbg/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/raring/applications/kdbg/debian/changelog b/ubuntu/raring/applications/kdbg/debian/changelog
new file mode 100644
index 000000000..85cee798e
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/changelog
@@ -0,0 +1,434 @@
+kdbg-trinity (2.2.2-1) squeeze; urgency=low
+
+  * Initial Release for TDE
+
+ -- Slávek Banko <slavek.banko@axis.cz>  Wed, 03 Jul 2013 01:55:45 +0200
+
+kdbg (2.2.1-2) unstable; urgency=low
+
+  * Redone again relibtoolization making sure it uses latest automake.
+    (Closes: #577679)
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 21 Apr 2010 04:31:55 +0200
+
+kdbg (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Remove patch 03_fix_ftbfs, merged upstream.
+  * Update Standards-Version to 3.8.4, no changes required.
+  * Add ${misc:Depends} to Depends:
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 10 Apr 2010 18:39:35 +0200
+
+kdbg (2.2.0-2) unstable; urgency=low
+
+  * Add patch taken from upstrem to fix FTBFS with newer glibc 2.10 and gcc 4.4.
+   (Closes: #552582)
+  * Minor updates in the copyright file.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 19 Nov 2009 23:06:37 +0100
+
+kdbg (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Redone libtoolization.
+  * Update Standards-Version to 3.8.3, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sun, 20 Sep 2009 20:41:52 +0200
+
+kdbg (2.1.1-1) unstable; urgency=low
+
+  * New upstream release:
+    - Do not crash when clicking on "delete" button if not program is loaded.
+      (Closes: #467243)
+  * Redo patches: 02_libtool_update.diff and buildprep.
+  * Update upstream's email in copyright file.
+  * Update copyright years.
+  * Update Section in doc-base.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Mon, 29 Dec 2008 13:24:32 +0100
+
+kdbg (2.1.0-2) unstable; urgency=low
+
+  * Remove unnecesary build dependency on libqt3-compat-headers. 
+    (Closes: #464057) 
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Thu, 07 Feb 2008 11:10:15 +0100
+
+kdbg (2.1.0-1) unstable; urgency=low
+
+   * New upstream release.
+   * Update Standards-Version to 3.7.3.
+   * Move homepage into control field.
+   * Update menu file to new policy.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 26 Dec 2007 04:52:24 +0100
+
+kdbg (2.0.5-2) unstable; urgency=low
+
+  * Rewrite debian/rules. Now it can be built twice in a row. 
+   (Closes: #424429)
+  * Dangling symlinks are not longer created. (Closes: #186169)
+  * Redone relibtoolization. (Closes: #418563).
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Wed, 30 May 2007 01:13:37 +0100
+
+kdbg (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Tue, 19 Dec 2006 02:15:51 +0100
+
+kdbg (2.0.4-3) unstable; urgency=low
+  
+  * Bumped compat to 5.
+  * Added space to homepage pseudo header.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org>  Sat, 28 Oct 2006 03:57:29 +0200
+
+kdbg (2.0.4-2) unstable; urgency=medium
+
+  * Dropping re-libtoolizing at build time, instead updating libtool
+    with a patch. (Closes: #379811). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat, 29 Jul 2006 14:19:18 +0200
+
+kdbg (2.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped standards-version to 3.7.2, no changes required.
+  * Debugger window comes to the foreground and receives the focus, after a 
+    breakpoint. (Closes: #171845)
+  * Added support for QString in Qt4's debug libraries. (Closes: #354373)
+  * Added copyright of the debian packaging.
+  * Changed kdbg webpage.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Sat,  3 Jun 2006 13:17:46 +0200
+
+kdbg (2.0.3-3) unstable; urgency=low
+
+  * Dropping patches, re-libtoolizing at build time. 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 21 Feb 2006 12:43:49 +0100
+
+kdbg (2.0.3-2) unstable; urgency=low
+
+  * Added patch: 04_am_maintainer_mode.diff, the patch adds AM_MAINTAINER_MODE to 
+    configure.in (Closes: #349988). 
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Thu,  2 Feb 2006 02:08:56 +0100
+
+kdbg (2.0.3-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added patch: 10_update_libtool.diff, now the package doesn't depend from 
+    libfreetype6 and other spurious libraries.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue, 24 Jan 2006 23:12:03 +0100
+
+kdbg (2.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #342096).
+  * New maintainer's email address.
+  * debian/rules: moved debhelper compatibility level setting to
+    'debian/compat'.
+
+ -- Ana Beatriz Guerrero Lopez <ana@ekaia.org>  Tue,  6 Dec 2005 19:07:51 +0100
+
+kdbg (2.0.0-1) unstable; urgency=low
+
+  * Adopted by Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>.
+    (Closes: #315336).
+  * New upstream release.
+  * Bumped standards-version to 3.6.2.
+ 
+ -- Ana Beatriz Guerrero Lopez <anja_isbilia@yahoo.es>  Tue, 30 Aug 2005 19:03:50 +0000
+
+kdbg (1.9.7-2) unstable; urgency=low
+
+  * Updated config.{sub,guess} for compilation on GNU/k*BSD (closes: #305839).
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Apr 2005 08:11:57 +1000
+
+kdbg (1.9.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Suggests kxsldbg, since kdbg can now interact with xsldbg for debugging
+    XSLT scripts.
+  * Patched kdbg/doc/en/Makefile.am to install newer parts of the manual
+    that weren't installed by default.  Using AM_MAINTAINER_MODE to
+    facilitate this.
+
+ -- Ben Burton <bab@debian.org>  Sat, 26 Mar 2005 00:24:40 +1100
+
+kdbg (1.2.10-3) unstable; urgency=low
+
+  * Converted all PO-files to UTF-8 so that all characters are properly
+    displayed (closes: #291317).
+
+ -- Ben Burton <bab@debian.org>  Tue,  8 Feb 2005 18:52:34 +1100
+
+kdbg (1.2.10-2) unstable; urgency=low
+
+  * Updated debian/copyright, including more explicit copyright information
+    and additional author credits.
+  * Minor aesthetic update to short package description.
+
+ -- Ben Burton <bab@debian.org>  Wed, 26 Jan 2005 12:44:28 +1100
+
+kdbg (1.2.10-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Ben Burton <bab@debian.org>  Sun, 20 Jun 2004 19:04:02 +1000
+
+kdbg (1.2.9-3) unstable; urgency=low
+
+  * Patched gdb output parsing so that kdbg loads executables without
+    errors when using newer versions of gdb (closes: #247459).
+  * Quoted more fields in debian/menu.
+
+ -- Ben Burton <bab@debian.org>  Sat,  8 May 2004 13:00:12 +1000
+
+kdbg (1.2.9-2) unstable; urgency=low
+
+  * Built against new libXrender.
+  * Bumped standards-version to 3.6.1.
+
+ -- Ben Burton <bab@debian.org>  Fri,  2 Jan 2004 18:13:07 +1100
+
+kdbg (1.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Tighter fix for the security issue regarding debugger commands previously
+    addressed in kdbg 1.2.8-1 (CAN-2003-0644).  Specifically, kdbg now tests
+    for .kdbgrc file ownership.  Thanks to Matt Zimmerman for his help in this
+    matter.
+
+ -- Ben Burton <bab@debian.org>  Tue,  9 Sep 2003 16:16:07 +1000
+
+kdbg (1.2.8-3) unstable; urgency=low
+
+  * Using high colour pixmap for the debian menu entry.
+
+ -- Ben Burton <bab@debian.org>  Wed, 27 Aug 2003 20:04:25 +1000
+
+kdbg (1.2.8-2) unstable; urgency=low
+
+  * Russian translations changed from kio8-r to UTF-8, thanks to Alexander
+    Kogan for the patch (closes: #137203).
+
+ -- Ben Burton <bab@debian.org>  Tue, 22 Jul 2003 21:34:49 +1000
+
+kdbg (1.2.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Security update.  Fixes the security flaw regarding the program
+    specific debugger command, which can lead to a potential exploit
+    when debugging programs in world-writable directories such as /tmp.
+  * Split menu title into title and longtitle.
+  * Minor man page cleanup.
+  * Bumped standards-version to 3.6.0.
+
+ -- Ben Burton <bab@debian.org>  Sat, 19 Jul 2003 11:32:12 +1000
+
+kdbg (1.2.7-2) unstable; urgency=low
+
+  * Fresh copy of debianrules for new Qt dirs (closes: #185085).
+  * Build-depends on libqt3-compat-headers.
+  * Removed alpha compile flags.
+
+ -- Ben Burton <bab@debian.org>  Mon, 17 Mar 2003 13:38:07 +1100
+
+kdbg (1.2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * First KDE3 upload to debian!
+
+ -- Ben Burton <bab@debian.org>  Sun,  2 Feb 2003 11:19:37 +1100
+
+kdbg (1.2.6-3) unstable; urgency=low
+
+  * New maintainer email address.
+  * Bumped standards-version to 3.5.8.
+
+ -- Ben Burton <bab@debian.org>  Sun,  1 Dec 2002 15:29:49 +1100
+
+kdbg (1.2.6-2) unstable; urgency=low
+
+  * Built with g++-3.2.
+
+ -- Ben Burton <benb@acm.org>  Tue,  5 Nov 2002 20:09:30 +1100
+
+kdbg (1.2.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Mon, 14 Oct 2002 08:06:01 +1000
+
+kdbg (1.2.5-3) unstable; urgency=low
+
+  * Fixed doc-base link.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 17:20:28 +1000
+
+kdbg (1.2.5-2) unstable; urgency=low
+
+  * Rebuilt for KDE3.
+
+ -- Ben Burton <benb@acm.org>  Fri, 30 Aug 2002 08:28:58 +1000
+
+kdbg (1.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Wed, 10 Apr 2002 14:05:38 +1000
+
+kdbg (1.2.4-2) unstable; urgency=low
+
+  * Fixed KCmdLineArgs initialisation (closes: Bug#129681).
+
+ -- Ben Burton <benb@acm.org>  Sun, 17 Feb 2002 19:32:01 +1100
+
+kdbg (1.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Tue, 29 Jan 2002 16:17:45 +1100
+
+kdbg (1.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Thu, 20 Dec 2001 20:59:34 +1000
+
+kdbg (1.2.2-6) unstable; urgency=low
+
+  * Added "Debuggers" hint to debian menu entry (closes: Bug#121011).
+
+ -- Ben Burton <benb@acm.org>  Sat, 24 Nov 2001 19:04:06 -0600
+
+kdbg (1.2.2-5) unstable; urgency=low
+
+  * Changed /usr/share/doc/kdbg/html to link to the english docs instead of
+    the default language docs; this avoids installation breakage on systems
+    with untranslated default languages.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Nov 2001 14:00:49 -0600
+
+kdbg (1.2.2-4) unstable; urgency=low
+
+  * Updated config.sub and config.guess (closes: Bug#120260).
+
+ -- Ben Burton <benb@acm.org>  Tue, 20 Nov 2001 01:15:36 -0600
+
+kdbg (1.2.2-3) unstable; urgency=low
+
+  * No longer uses automake.
+
+ -- Ben Burton <benb@acm.org>  Tue, 23 Oct 2001 10:42:24 -0500
+
+kdbg (1.2.2-2) unstable; urgency=low
+
+  * Updated parameters for alpha build.
+
+ -- Ben Burton <benb@acm.org>  Sun, 23 Sep 2001 23:07:01 -0500
+
+kdbg (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Ben Burton <benb@acm.org>  Sun, 19 Aug 2001 15:16:44 -0500
+
+kdbg (1.2.1-4) unstable; urgency=low
+
+  * Fixed gcc 3.0 compile errors and added libtoolize/aclocal calls
+    to debian/rules (closes: Bug#108121).
+  * Cleaned up debian/rules.
+
+ -- Ben Burton <benb@acm.org>  Thu,  9 Aug 2001 12:00:54 +1000
+
+kdbg (1.2.1-3) unstable; urgency=low
+
+  * Builds on alpha.
+  * Upped standards-version to 3.5.6.
+
+ -- Ben Burton <benb@acm.org>  Sat,  4 Aug 2001 00:32:46 +1000
+
+kdbg (1.2.1-2) unstable; urgency=low
+
+  * Removed redundancies from build-depends.
+  * Cosmetic changes in debian/.
+
+ -- Ben Burton <benb@acm.org>  Mon, 21 May 2001 10:48:13 -0500
+
+kdbg (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fleshed out man page.
+  * Added automake to debian/rules configuration and removed differences
+    from Makefile.in files from the debian sources.
+
+ -- Ben Burton <benb@acm.org>  Tue,  1 May 2001 03:00:06 -0500
+
+kdbg (1.2.0-6) unstable; urgency=low
+
+  * Updated debian/rules to DH_COMPAT=3.
+  * Build-Depends: required version (>> 3.0.0) of debhelper.
+  * Updated Standards-Version to 3.5.2.
+  * Added kderemove="1" to the debian menu item.
+  * Miscellaneous tidying in debian/.
+ 
+ -- Ben Burton <benb@acm.org>  Thu, 26 Apr 2001 12:47:52 -0500
+
+kdbg (1.2.0-5) unstable; urgency=low
+
+  * Fetched a newer config.sub to allow building on ARM systems
+    (closes: Bug#90671).
+
+ -- Ben Burton <benb@acm.org>  Sun, 25 Mar 2001 16:26:40 -0600
+
+kdbg (1.2.0-4) unstable; urgency=low
+
+  * Rebuilt for new libqt2 libraries.
+  * Added KDbg icon to /usr/share/pixmaps and to the Debian menu item.
+
+ -- Ben Burton <benb@acm.org>  Tue,  6 Mar 2001 07:49:40 -0600
+
+kdbg (1.2.0-3) unstable; urgency=low
+
+  * Build-Depends: Replaced kdelibs3-dev with kdelibs-dev.
+
+ -- Ben Burton <benb@acm.org>  Thu, 22 Feb 2001 12:12:25 -0600
+
+kdbg (1.2.0-2) unstable; urgency=low
+
+  * Adopted by Ben Burton <benb@acm.org> (closes: Bug#84529).
+  * Added a (fairly uninformative) man page.
+  * Upgraded to Standards-Version: 3.2.1.
+  * Upgraded debian/rules to DH_COMPAT=2.
+  * Retitled the KDbg menu item to include the name KDbg.
+  * Added a link to the KDbg User's Manual in /usr/share/doc/kdbg.
+  * Miscellaneous cleanups in debian.
+
+ -- Ben Burton <benb@acm.org>  Sat, 17 Feb 2001 11:05:10 -0600
+
+kdbg (1.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Mon, 25 Dec 2000 15:51:26 +0100
+
+kdbg (1.1.7-beta1-1) unstable; urgency=low
+
+  * Initial Release. Closes: #75161
+  * Added kdbg.desktop
+  * Upload sponsored by Bradley Bell <btb@debian.org>
+
+ -- Mariusz Przygodzki <dune@home.pl>  Wed,  6 Dec 2000 22:38:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
diff --git a/ubuntu/raring/applications/kdbg/debian/compat b/ubuntu/raring/applications/kdbg/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/raring/applications/kdbg/debian/control b/ubuntu/raring/applications/kdbg/debian/control
new file mode 100644
index 000000000..c424492a4
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/control
@@ -0,0 +1,36 @@
+Source: kdbg-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs4-trinity-dev, autotools-dev, automake, libtool
+Standards-Version: 3.8.4
+Homepage: http://www.kdbg.org/
+
+Package: kdbg-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: gdb (>= 5.0)
+Suggests: kxsldbg-trinity
+Description: graphical debugger interface [Trinity]
+ KDbg is a graphical user interface to gdb, the GNU debugger.  It provides
+ an intuitive interface for setting breakpoints, inspecting variables,
+ stepping through code and much more.  KDbg requires TDE but you can of
+ course debug any program.
+ .
+ KDbg can also debug XSLT (XML stylesheet translation) scripts by
+ interfacing with xsldbg.  For this the package kxsldbg must be installed.
+ .
+ Features include the following:
+  * Inspection of variable values in a tree structure.
+  * Direct member: For certain compound data types the most important
+    member values are displayed next to the variable name, so that it is
+    not necessary to expand the subtree of that variable in order to see
+    the member value.  KDbg can also display Qt's QString values, which
+    are Unicode strings.
+  * Debugger at your finger tips: The basic debugger functions (step,
+    next, run, finish, until, set/clear/enable/disable breakpoint) are
+    bound to function keys F5 through F10.  Quick and easy.
+  * View source code, search text, set program arguments and environment
+    variables, display arbitrary expressions.
+  * Debugging of core dumps, attaching to running processes is possible.
+  * Conditional breakpoints.
diff --git a/ubuntu/raring/applications/kdbg/debian/copyright b/ubuntu/raring/applications/kdbg/debian/copyright
new file mode 100644
index 000000000..ebf1e447c
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Mariusz Przygodzki <dune@home.pl> on
+Wed,  6 Dec 2000 22:38:22 +0100.
+Maintenance was taken over by Ben Burton <bab@debian.org> on
+Sat, 17 Feb 2001 11:05:10 -0600.
+Maintenance was taken over by Ana Beatriz Guerrero López
+<ana@ekaia.org> on Tue, 30 Aug 2005 19:12:38 +0200
+
+It was downloaded from http://sourceforge.net/projects/kdbg/.
+
+Upstream Author: Johannes Sixt <j6t@kdbg.org>,
+                 with help from many others
+
+Copyright:
+
+  © 1998-2008 Johannes Sixt <j6t@kdbg.org>
+
+  You are free to distribute this software under the terms of
+  the GNU General Public License.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is 
+ © 2000 Mariusz Przygodzki <dune@home.pl> 
+ © 2001-2005 Ben Burton <bab@debian.org>
+ © 2005-2009 Ana Beatriz Guerrero López <ana@ekaia.org>
+and is licensed under the GPL v2, see above.
diff --git a/ubuntu/raring/applications/kdbg/debian/doc-base b/ubuntu/raring/applications/kdbg/debian/doc-base
new file mode 100644
index 000000000..330debeb4
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/doc-base
@@ -0,0 +1,9 @@
+Document: kdbg-trinity
+Title: KDbg - User's Manual [Trinity]
+Author: Johannes Sixt <Johannes.Sixt@telecom.at>
+Abstract:  KDbg is a front-end for gdb, the GNU debugger.
+Section: Programming
+
+Format: HTML
+Index: /opt/trinity/share/doc/tde/HTML/en/kdbg/index.html
+Files: /opt/trinity/share/doc/tde/HTML/en/kdbg/*.html
diff --git a/ubuntu/raring/applications/kdbg/debian/docs b/ubuntu/raring/applications/kdbg/debian/docs
new file mode 100644
index 000000000..2e58c4d34
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/docs
@@ -0,0 +1,2 @@
+BUGS
+TODO
diff --git a/ubuntu/raring/applications/kdbg/debian/kdbg.1 b/ubuntu/raring/applications/kdbg/debian/kdbg.1
new file mode 100644
index 000000000..588ef94db
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/kdbg.1
@@ -0,0 +1,92 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KDBG 1 "March 25, 2005"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+kdbg \- a graphical debugger interface
+.SH SYNOPSIS
+.B kdbg
+[ \fIgeneric-options\fP ]
+[ \fB\-t\fP \fIfile\fP ] [ \fB\-r\fP \fIdevice\fP ]
+[ \fB\-l\fP \fIlanguage\fP ] [ \fB\-p\fP \fIpid\fP ]
+[ \fIprogram\fP ] [ \fIcore\fP ]
+.SH DESCRIPTION
+\fBKDbg\fP is a graphical user interface to \fBgdb\fP, the GNU debugger.  It
+provides an intuitive interface for setting breakpoints, inspecting
+variables, stepping through code and much more.  KDbg requires TDE but
+you can of course debug any program.
+.PP
+KDbg can also debug XSLT (XML stylesheet translation) scripts by
+interfacing with \fBxsldbg\fP.  Debian users must install the \fIkxsldbg\fP
+package to make use of this feature.
+.PP
+You can pass KDbg the path of the executable to debug (\fIprogram\fP) or
+a core dump to debug (\fIcore\fP).
+.PP
+Features of KDbg include:
+.PP
+.RS
+Inspection of variable values in a tree structure.
+.PP
+Direct member: For certain compound data types the most important
+member values are displayed next to the variable name, so that it is
+not necessary to expand the subtree of that variable in order to see
+the member value.  KDbg can also display Qt's QString values, which
+are Unicode strings.
+.PP
+Debugger at your finger tips: The basic debugger functions (step,
+next, run, finish, until, set/clear/enable/disable breakpoint) are
+bound to function keys F5 through F10.  Quick and easy.
+.PP
+View source code, search text, set program arguments and environment
+variables, display arbitrary expressions.
+.PP
+Debugging of core dumps, attaching to running processes is possible.
+.PP
+Conditional breakpoints.
+.RE
+.SH OPTIONS
+Below are the kdbg-specific options.
+For a full summary of options, run \fIkdbg \-\-help\fP.
+.TP
+\fB\-t\fP \fIfile\fP
+Write a transcript of the conversation with the debugger to the given
+file.
+.TP
+\fB\-r\fP \fIdevice\fP
+Use remote debugging via the given device.
+.TP
+\fB\-l\fP \fIlanguage\fP
+Specify the language of the program/script to debug.
+This must be either \fIC\fP (for a C/C++ program) or
+\fIXSL\fP (for an XSLT script).
+If this option is not passed then KDbg will try to deduce the language
+from the given filename.
+.TP
+\fB\-p\fP \fIpid\fP
+Attach to the process with the given process ID.
+.SH SEE ALSO
+.BR gdb (1),
+.BR xsldbg (1).
+.PP
+Full user documentation is available through the TDE Help Centre.
+Alternatively the HTML documentation can be viewed directly from
+\fI/opt/trinity/share/doc/tde/HTML/<lang>/kdbg/\fP.
+.SH AUTHOR
+KDbg was written by Johannes Sixt <Johannes.Sixt@telecom.at>.
+.br
+This manual page was prepared by Ben Burton <bab@debian.org>
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/raring/applications/kdbg/debian/kdbg.xpm b/ubuntu/raring/applications/kdbg/debian/kdbg.xpm
new file mode 100644
index 000000000..8df7ac5f7
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/kdbg.xpm
@@ -0,0 +1,122 @@
+/* XPM */
+static char *kdbg[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 84 1",
+"  c black",
+". c #0C0D16",
+"X c #10111D",
+"o c #11111E",
+"O c #151526",
+"+ c #17182A",
+"@ c #191A26",
+"# c #18182C",
+"$ c #1D1E33",
+"% c #1E1C36",
+"& c #22233D",
+"* c #21243B",
+"= c #23253C",
+"- c #23253D",
+"; c #272A3C",
+": c #313928",
+"> c #333A29",
+", c #262843",
+"< c #2A2B42",
+"1 c #2A2C43",
+"2 c #2A2D47",
+"3 c #292B48",
+"4 c #292B4C",
+"5 c #2B2F4A",
+"6 c #2B2F4B",
+"7 c #2A2C4E",
+"8 c #2C2F4D",
+"9 c #2B2F50",
+"0 c #2D2F57",
+"q c #2E3153",
+"w c #2E3154",
+"e c #2E3254",
+"r c #2E3256",
+"t c #2F3256",
+"y c #2E3059",
+"u c #303359",
+"i c #30345A",
+"p c #31355C",
+"a c #31355D",
+"s c #313761",
+"d c #353464",
+"f c #323864",
+"g c #343A6A",
+"h c #353A6C",
+"j c #363B6F",
+"k c #363C70",
+"l c #383E75",
+"z c #3A3D75",
+"x c #383F7A",
+"c c #393F7C",
+"v c #225025",
+"b c #225425",
+"n c #235926",
+"m c #236828",
+"M c #236F29",
+"N c #247E2A",
+"B c #3A4180",
+"V c #3B4282",
+"C c #3C4181",
+"Z c #3E4181",
+"A c #3C4385",
+"S c #3D4488",
+"D c #3E4589",
+"F c #3E468D",
+"G c #3F4793",
+"H c #404790",
+"J c #404894",
+"K c #434C9E",
+"L c #444DA1",
+"P c #454DA4",
+"I c #454EA6",
+"U c #4751AE",
+"Y c #4954B6",
+"T c #4A55B8",
+"R c #4B56BC",
+"E c #4E5AC6",
+"W c #4F5BCB",
+"Q c #525FD5",
+"! c #5462DD",
+"~ c #5A69EF",
+"^ c #24882B",
+"/ c #25A32E",
+"( c #CE0000",
+") c None",
+/* pixels */
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+"))))))))))))))))))))))))))))))))",
+")))))))))))   ))))   )))))))))))",
+")))()))))) vbv )) vbv ))))))()))",
+"))))()))) nmMmn  nmMmn ))))())))",
+")))))())) mN^NmvvmN^Nm )))()))))",
+"))))))()) M^/((((((/^M ))())))))",
+")))))))() m((O4it,X((m )()))))))",
+"))))))))( (>7kkkgfa*>( ())))))))",
+"))))  )))( ycBBBclhs- ()))  ))))",
+")))     ()(AFG((((xhs()(     )))",
+")   )))(  C(K(PPKG(c(t  ()))   )",
+") )))))()%JL(YTYULJ(lfo)())))) )",
+"))))))())dK(R(WERU(F(g&))())))))",
+"))))))())C(YEQ(QE(PGB(q))())))))",
+"))))  ( )H(TW!~!WTPJB(y) (  ))))",
+")))  )(  H(YEQ!QEYPGB(a  ()  )))",
+"))  ))())F(URE(ER(LFc(t))())  ))",
+")  )))())lH(U(TTUL(A(f3))()))  )",
+") )))))()0DJ(PPPKGD(ga$)())))) )",
+")))))))( #c(F(JJFA(k(q. ()))))))",
+")))))   ()(lcB((((hst()(   )))))",
+"))))  )))(+sgkkhgfaq2.()))  ))))",
+")))) )))()(-iaaaiq81@()())) ))))",
+")))) ))()))((55521;(()))()) ))))",
+")))  )())))) (((((( )))))()  )))",
+"))) )())))))))    ))))))))() )))",
+"))  ())))))))))))))))))))))(  ))",
+")) ())))))))))))))))))))))))( ))",
+"))))))))))))))))))))))))))))))))"
+};
diff --git a/ubuntu/raring/applications/kdbg/debian/menu b/ubuntu/raring/applications/kdbg/debian/menu
new file mode 100644
index 000000000..7a4bb1a99
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/menu
@@ -0,0 +1,8 @@
+?package(kdbg):\
+	needs="x11"\
+	section="Applications/Programming"\
+	hints="TDE,Debuggers"\
+	title="KDbg"\
+	longtitle="KDbg (graphical debugger interface)"\
+	command="/opt/trinity/bin/kdbg"\
+	icon="/opt/trinity/share/pixmaps/kdbg.xpm"
diff --git a/ubuntu/raring/applications/kdbg/debian/rules b/ubuntu/raring/applications/kdbg/debian/rules
new file mode 100755
index 000000000..814462bf3
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#export DH_VERBOSE=1
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
+DEB_CONFIGURE_PREFIX := /opt/trinity
+DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include debian/cdbs/kde.mk
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	dh_testdir
+
+	# Regenerate build system
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+
+	autoreconf --install && automake -f && \
+	$(MAKE) -f admin/Makefile.common && \
+	touch debian/stamp-bootstrap
+
+clean::
+	dh_testdir
+	rm -f debian/stamp-bootstrap
+
+install/kdbg-trinity::
+	dh_testdir
+
+	dh_install debian/kdbg.xpm opt/trinity/share/pixmaps
+
+	dh_installman debian/kdbg.1
+	mkdir -p debian/kdbg-trinity/opt/trinity/share/man
+	mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/
+	rmdir debian/kdbg-trinity/usr/share/man
+
diff --git a/ubuntu/raring/applications/kdbg/debian/source/format b/ubuntu/raring/applications/kdbg/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/raring/applications/kdbg/debian/source/options b/ubuntu/raring/applications/kdbg/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/raring/applications/kdbg/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/raring/applications/kpowersave-nohal/debian/changelog b/ubuntu/raring/applications/kpowersave-nohal/debian/changelog
deleted file mode 100644
index 506507f65..000000000
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
-
-  * Karmic rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
-
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/control b/ubuntu/raring/applications/kpowersave-nohal/debian/control
deleted file mode 100644
index 731afb25f..000000000
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/control
+++ /dev/null
@@ -1,42 +0,0 @@
-Source: kpowersave-nohal-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
-Build-Conflicts: autoconf2.13
-Standards-Version: 3.8.4
-Homepage: http://sourceforge.net/projects/powersave/
-
-Package: kpowersave-nohal-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
-Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
- management settings and policies of your computer.
- It relies on the TDE hardware library to do the heavy lifting.
- .
- Current feature list:
-  * support for ACPI, APM and PMU
-  * trigger suspend to disk/ram and standby
-  * switch cpu frequency policy (between: performance, dynamic and powersave)
-  * applet icon with information about AC state, battery fill and battery
-    (warning) states
-  * applet tooltip with information about battery fill and remaining battery 
-    time/percentage
-  * autosuspend (to suspend the machine if the user has been inactive for a 
-    defined time)
-  * a global configurable blacklist with programs which prevent autosuspend
-    (e.g. videoplayer and cd burning tools)
-  * trigger lock screen and select the lock method
-  * KNotify support
-  * online help
-  * localisations for many languages
- KPowersave supports schemes with following configurable specific 
- settings for:
-  * screensaver
-  * DPMS
-  * autosuspend
-  * scheme specific blacklist for autosuspend
-  * notification settings
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/postrm b/ubuntu/raring/applications/kpowersave-nohal/debian/postrm
deleted file mode 100644
index 9e8ecc977..000000000
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-nohal-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  remove)
-    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
-    ;;
-  purge)
-    ;;
-  upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/preinst b/ubuntu/raring/applications/kpowersave-nohal/debian/preinst
deleted file mode 100644
index 5b0e73f61..000000000
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/preinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-set -e
-
-package_name=kpowersave-nohal-trinity
-
-if [ -z "$package_name" ]; then
-    print >&2 "Internal Error. Please report a bug."
-    exit 1;
-fi
-
-case "$1" in
-  install)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    ;;
-  upgrade)
-    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
-    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
-        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
-        divert=""
-    fi
-    if [ -z "$divert" ]; then
-      dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
-    fi
-    ;;
-  abort-upgrade)
-    ;;
-  *) echo "$0: didn't understand being called with \`$1'" 1>&2
-     exit 0;;
-esac
-
-exit 0
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/rules b/ubuntu/raring/applications/kpowersave-nohal/debian/rules
deleted file mode 100755
index 262171bc3..000000000
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/rules
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-  
-include debian/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.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 := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-		
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f acinclude.m4
-	rm -f aclocal.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/README.source b/ubuntu/raring/applications/tdenetworkmanager/debian/README.source
index 96fb271ab..96fb271ab 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/README.source
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/README.source
diff --git a/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/buildvars.mk b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index 345cc0a61..345cc0a61 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/kde.mk b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..4a098a312 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/kde.mk
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/kde.mk
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/team-members b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/cdbs/team-members
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/team-members
diff --git a/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/uploaders.mk b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdenetworkmanager/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/raring/applications/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/changelog b/ubuntu/raring/applications/tdenetworkmanager/debian/changelog
index b54d300ab..b54d300ab 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/changelog
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/changelog
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/compat b/ubuntu/raring/applications/tdenetworkmanager/debian/compat
index 7f8f011eb..7f8f011eb 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/compat
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/compat
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/control b/ubuntu/raring/applications/tdenetworkmanager/debian/control
index f9f6fbf25..f9f6fbf25 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/control
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/control
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/control.in b/ubuntu/raring/applications/tdenetworkmanager/debian/control.in
index a5cefc2bb..a5cefc2bb 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/control.in
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/control.in
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/copyright b/ubuntu/raring/applications/tdenetworkmanager/debian/copyright
index 2490de254..2490de254 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/copyright
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/copyright
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/manpages b/ubuntu/raring/applications/tdenetworkmanager/debian/manpages
index 0707d198a..0707d198a 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/manpages
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/manpages
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/menu b/ubuntu/raring/applications/tdenetworkmanager/debian/menu
index 7172f7ae8..7172f7ae8 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/menu
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/menu
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/network-manager-tde.lintian b/ubuntu/raring/applications/tdenetworkmanager/debian/network-manager-tde.lintian
index 22bd678da..22bd678da 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/network-manager-tde.lintian
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/network-manager-tde.lintian
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/network-manager-tde.postinst b/ubuntu/raring/applications/tdenetworkmanager/debian/network-manager-tde.postinst
index df7b9dba2..df7b9dba2 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/network-manager-tde.postinst
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/network-manager-tde.postinst
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/patches/series b/ubuntu/raring/applications/tdenetworkmanager/debian/patches/series
index e69de29bb..e69de29bb 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/patches/series
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/patches/series
diff --git a/ubuntu/raring/applications/knetworkmanager9/debian/rules b/ubuntu/raring/applications/tdenetworkmanager/debian/rules
index 00ac9877f..00ac9877f 100755
--- a/ubuntu/raring/applications/knetworkmanager9/debian/rules
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/rules
diff --git a/ubuntu/raring/applications/tdenetworkmanager/debian/source/format b/ubuntu/raring/applications/tdenetworkmanager/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/raring/applications/tdenetworkmanager/debian/source/options b/ubuntu/raring/applications/tdenetworkmanager/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/raring/applications/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/raring/applications/knetworkmanager9/debian/tdenetworkmanager.1 b/ubuntu/raring/applications/tdenetworkmanager/debian/tdenetworkmanager.1
index 0f1abef05..0f1abef05 100644
--- a/ubuntu/raring/applications/knetworkmanager9/debian/tdenetworkmanager.1
+++ b/ubuntu/raring/applications/tdenetworkmanager/debian/tdenetworkmanager.1
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/buildvars.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/buildvars.mk
@@ -0,0 +1,86 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Defines some useful variables, but no rules
+#
+# 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.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildvars
+_cdbs_rules_buildvars = 1
+
+CDBS_VERSION = something
+
+# Common useful variables
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
+
+# Split into arch/indep packages
+ifneq ($(DEB_INDEP_PACKAGES),cdbs)
+DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
+DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
+endif
+# Split into normal and udeb packages
+ifeq ($(DEB_UDEB_PACKAGES),)
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+else
+DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+endif
+# Too much bother for now.  If someone complains we'll fix it.
+#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
+#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
+# A handy list of every package, udeb or not
+DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
+DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
+DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
+
+DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
+
+# Some support for srcdir != builddir builds.
+# These are relative to the root of the package
+DEB_SRCDIR ?= .
+DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
+
+# Miscellaneous bits
+DEB_ARCH = $(shell dpkg --print-architecture)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+
+ifeq ($(words $(DEB_ALL_PACKAGES)),1)
+	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
+else
+	DEB_DESTDIR = $(CURDIR)/debian/tmp/
+endif
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
+
+endif
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index 311dc059d..311dc059d 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk
new file mode 100644
index 000000000..765560c89
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/kde.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Description: A class for KDE packages; sets KDE 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.
+
+_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_kde
+_cdbs_class_kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+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
+
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+
+export kde_cgidir  = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+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
+
+cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+$(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
+
+cleanbuilddir::
+	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+common-build-arch common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	touch $@
+
+common-install-prehook-impl::
+	mkdir -p po
+	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
+	-for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+common-install-arch common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+clean::
+	rm -f debian/stamp-kde-apidox
+	rm -rf po/*.pot
+
+# This is a convenience target for calling manually.  It's not part of
+# the build process.
+buildprep: clean apply-patches
+	$(MAKE) -f admin/Makefile.common dist
+	debian/rules clean
+
+endif
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/team-members b/ubuntu/raring/applications/tdepowersave/debian/cdbs/team-members
index 05761af6e..05761af6e 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/cdbs/team-members
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/team-members
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/uploaders.mk b/ubuntu/raring/applications/tdepowersave/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/cdbs/uploaders.mk
@@ -0,0 +1,29 @@
+
+MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
+
+
+debian/control.tmp:
+	@if [ ! -e debian/control.in ] ; then  \
+		echo "this package is not yet prepared for using automatic update of uploaders"; \
+		echo "Please do so."; \
+		exit 1; \
+	fi
+	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
+
+check-uploaders: debian/control.tmp
+	@if ! diff -q debian/control debian/control.tmp ; then \
+		echo "WARNING:: Control file differs from manually generated one" ; \
+		echo "WARNING:: Please update it manually and check it afterwards" ; \
+		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
+		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
+	fi
+	
+
+clean:: 
+	rm -f debian/control.tmp
+
+update-uploaders: debian/control.tmp
+	@mv -f debian/control.tmp debian/control
+
+makebuilddir:: check-uploaders
diff --git a/ubuntu/raring/applications/tdepowersave/debian/cdbs/versions.pl b/ubuntu/raring/applications/tdepowersave/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/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 "KDE-Version3=$version3\n";
+print "KDE-Version2=$version2\n";
+print "KDE-Next-Version3=$version3_next\n";
+print "KDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/raring/applications/tdepowersave/debian/changelog b/ubuntu/raring/applications/tdepowersave/debian/changelog
new file mode 100644
index 000000000..e7773fc6a
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/changelog
@@ -0,0 +1,6 @@
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
diff --git a/ubuntu/raring/applications/tdepowersave/debian/compat b/ubuntu/raring/applications/tdepowersave/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control
new file mode 100644
index 000000000..3c3de5835
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/control
@@ -0,0 +1,42 @@
+Source: tdepowersave-trinity
+Section: tde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.0), tdelibs4-trinity-dev, libxss-dev, libxtst-dev, libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, automake, autoconf, libtool, libltdl-dev
+Build-Conflicts: autoconf2.13
+Standards-Version: 3.8.4
+Homepage: http://sourceforge.net/projects/powersave/
+
+Package: tdepowersave-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
+Description: Power management applet for Trinity
+ KPowersave is a TDE systray applet which allows to control the power 
+ management settings and policies of your computer.
+ It relies on the TDE hardware library to do the heavy lifting.
+ .
+ Current feature list:
+  * support for ACPI, APM and PMU
+  * trigger suspend to disk/ram and standby
+  * switch cpu frequency policy (between: performance, dynamic and powersave)
+  * applet icon with information about AC state, battery fill and battery
+    (warning) states
+  * applet tooltip with information about battery fill and remaining battery 
+    time/percentage
+  * autosuspend (to suspend the machine if the user has been inactive for a 
+    defined time)
+  * a global configurable blacklist with programs which prevent autosuspend
+    (e.g. videoplayer and cd burning tools)
+  * trigger lock screen and select the lock method
+  * KNotify support
+  * online help
+  * localisations for many languages
+ KPowersave supports schemes with following configurable specific 
+ settings for:
+  * screensaver
+  * DPMS
+  * autosuspend
+  * scheme specific blacklist for autosuspend
+  * notification settings
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/copyright b/ubuntu/raring/applications/tdepowersave/debian/copyright
index a1557e62e..a1557e62e 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/copyright
+++ b/ubuntu/raring/applications/tdepowersave/debian/copyright
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/install b/ubuntu/raring/applications/tdepowersave/debian/install
index 4a1194bd1..4a1194bd1 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/install
+++ b/ubuntu/raring/applications/tdepowersave/debian/install
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
index edff50852..edff50852 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave-nohal-trinity.lintian
+++ b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
index 0ab1d6f90..0ab1d6f90 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave.1
+++ b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
index 99d178492..99d178492 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/kpowersave.xpm
+++ b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/manpages b/ubuntu/raring/applications/tdepowersave/debian/manpages
index c8fa7b85f..c8fa7b85f 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/manpages
+++ b/ubuntu/raring/applications/tdepowersave/debian/manpages
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/menu b/ubuntu/raring/applications/tdepowersave/debian/menu
index 6ae0f9833..6ae0f9833 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/menu
+++ b/ubuntu/raring/applications/tdepowersave/debian/menu
diff --git a/ubuntu/raring/applications/kpowersave-nohal/debian/patches/.gitignore b/ubuntu/raring/applications/tdepowersave/debian/patches/.gitignore
index e69de29bb..e69de29bb 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/patches/.gitignore
+++ b/ubuntu/raring/applications/tdepowersave/debian/patches/.gitignore
diff --git a/ubuntu/raring/applications/tdepowersave/debian/postrm b/ubuntu/raring/applications/tdepowersave/debian/postrm
new file mode 100644
index 000000000..c373aa20d
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/postrm
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdepowersave-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  remove)
+    dpkg-divert --package $package_name --rename --remove /etc/acpi/powerbtn.sh
+    ;;
+  purge)
+    ;;
+  upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/raring/applications/tdepowersave/debian/preinst b/ubuntu/raring/applications/tdepowersave/debian/preinst
new file mode 100644
index 000000000..fe411fc94
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/preinst
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+set -e
+
+package_name=tdepowersave-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+        divert=""
+    fi
+    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    ;;
+  upgrade)
+    divert=`dpkg-divert --listpackage "/etc/acpi/powerbtn.sh"`
+    if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
+        dpkg-divert --remove --local --rename "/etc/acpi/powerbtn.sh"
+        divert=""
+    fi
+    if [ -z "$divert" ]; then
+      dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    fi
+    ;;
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules
new file mode 100755
index 000000000..97acebf07
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/rules
@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+  
+include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.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 := AUTHORS NEWS
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	! [ -f /usr/share/libtool/ltmain.sh ] || \
+	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
+	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+		
+	make -f admin/Makefile.common cvs
+	touch debian/stamp-bootstrap
+
+install/kpowersave::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+
+clean::
+	find . -name Makefile.in | xargs rm -f
+	rm -f acinclude.m4
+	rm -f aclocal.m4
+	rm -f configure
+	rm -f configure.files
+	rm -f configure.in
+	rm -f config.h.in
+	rm -f stamp-h.in
+	rm -f subdirs	
+	rm -f admin/ltmain.sh
+	rm -f admin/libtool.m4.in
+	rm -f debian/stamp-bootstrap
diff --git a/ubuntu/raring/applications/tdepowersave/debian/source/format b/ubuntu/raring/applications/tdepowersave/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/raring/applications/tdepowersave/debian/source/options b/ubuntu/raring/applications/tdepowersave/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/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/raring/applications/kpowersave-nohal/debian/watch b/ubuntu/raring/applications/tdepowersave/debian/watch
index 832285e63..832285e63 100644
--- a/ubuntu/raring/applications/kpowersave-nohal/debian/watch
+++ b/ubuntu/raring/applications/tdepowersave/debian/watch
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/control b/ubuntu/raring/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/control
+++ b/ubuntu/raring/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.