Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

63 files changed, 1138 insertions, 8 deletions

diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/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/kpowersave-nohal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
index 765560c89..765560c89 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdbg/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/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/kpowersave-nohal/debian/compat b/ubuntu/maverick/applications/kdbg/debian/compat
index 7ed6ff82d..7ed6ff82d 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/compat
+++ b/ubuntu/maverick/applications/kdbg/debian/compat
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/maverick/applications/knetworkmanager9/debian/source/format b/ubuntu/maverick/applications/kdbg/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/debian/source/format
+++ b/ubuntu/maverick/applications/kdbg/debian/source/format
diff --git a/ubuntu/maverick/applications/knetworkmanager9/debian/source/options b/ubuntu/maverick/applications/kdbg/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/knetworkmanager9/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/maverick/applications/kpowersave-nohal/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/buildvars.mk
index 23d4709dc..23d4709dc 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/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/maverick/applications/kpowersave-nohal/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
index 31adfe31e..31adfe31e 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/uploaders.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/versions.pl
index 75c9add4b..75c9add4b 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/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/maverick/applications/kpowersave-nohal/debian/source/format b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format
index 89ae9db8f..89ae9db8f 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/format
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/format
diff --git a/ubuntu/maverick/applications/kpowersave-nohal/debian/source/options b/ubuntu/maverick/applications/tdenetworkmanager/debian/source/options
index 72f1f5450..72f1f5450 100644
--- a/ubuntu/maverick/applications/kpowersave-nohal/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/maverick/applications/tdepowersave/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/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/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/maverick/applications/tdepowersave/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/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/maverick/applications/tdepowersave/debian/cdbs/versions.pl b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/versions.pl
new file mode 100644
index 000000000..75c9add4b
--- /dev/null
+++ b/ubuntu/maverick/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/maverick/applications/kpowersave-nohal/debian/changelog b/ubuntu/maverick/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/ubuntu/maverick/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/ubuntu/maverick/applications/kpowersave-nohal/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/ubuntu/maverick/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/maverick/applications/tdepowersave/debian/source/format b/ubuntu/maverick/applications/tdepowersave/debian/source/format
new file mode 100644
index 000000000..89ae9db8f
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/source/options b/ubuntu/maverick/applications/tdepowersave/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/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/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.