Use Autotools to build kpowersave under ubuntu

27 files changed, 1708 insertions, 20 deletions

diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/buildvars.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/buildvars.mk
new file mode 100644
index 000000000..23d4709dc
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/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.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
new file mode 100644
index 000000000..888f4be38
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
@@ -0,0 +1,98 @@
+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:
+	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/kde/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/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/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/kde/HTML/en/$$pkg; \
+	done
+
+clean::
+	rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
new file mode 100644
index 000000000..9dbcfbafd
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/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/kde/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/"
+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.cmake/debian/cdbs/team-members b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/team-members
new file mode 100644
index 000000000..05761af6e
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/team-members
@@ -0,0 +1,16 @@
+Sune Vuorela <debian@pusling.com>
+Ana Beatriz Guerrero Lopez <ana@debian.org>
+Fathi Boudra <fboudra@free.fr>
+Modestas Vainius <geromanas@mailas.com>
+Josh Metzler <joshdeb@metzlers.org>
+Isaac Clerencia <isaac@debian.org>
+Adeodato Simó <dato@net.com.org.es>
+Adeodato Simo <dato@net.com.org.es>
+Christopher Martin <chrsmrtn@debian.org>
+Daniel Schepler <schepler@debian.org>
+Sarah Hobbs <hobbsee@ubuntu.com>
+Nacho Barrientos Arias <nacho@debian.org>
+Ricardo Javier Cardenes Medina <rcardenes@debian.org>
+Ricardo Cardenes <rcardenes@debian.org>
+Armin Berres <trigger+debian@space-based.de>
+Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/uploaders.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/uploaders.mk
new file mode 100644
index 000000000..31adfe31e
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/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/kpowersave.cmake/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/versions.pl
new file mode 100644
index 000000000..9ce11d8a3
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/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/-[^-]+$//;
+($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.cmake/debian/changelog b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
new file mode 100644
index 000000000..206f5ef59
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/changelog
@@ -0,0 +1,372 @@
+kpowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 02 July 2009 16:08:00 -0600
+
+kpowersave-trinity (0.7.3-0ubuntu2) intrepid; urgency=low
+
+  * Moved KDE3 to /opt/trinity
+  * Integrated properly with KDE4.2+
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Thu, 05 March 2009 29:52:00 -0600
+
+kpowersave-trinity (0.7.3-0ubuntu1) intrepid; urgency=low
+
+  * Added -trinity suffix
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 14 Dec 2008 15:12:00 -0600
+
+kpowersave (0.7.3-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/patches/kubuntu_02_messages_target.diff
+    - Modified maintainer field per specification
+
+ -- Harald Sitter <apachelogger@ubuntu.com>  Fri, 25 Jan 2008 09:54:46 +0000
+
+kpowersave (0.7.3-2) unstable; urgency=low
+
+  * debian/control
+    - Bump Standards-Version to 3.7.3. No further changes required.
+    - Drop Recommends: pm-utils | powersaved | hibernate | acpi-support.
+      Let the hal package depend on the correct suspend framework.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 06:02:09 +0100
+
+kpowersave (0.7.3-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable.
+  * Dropped debian/patches/kubuntu_01_kdepot.patch - in KDE CDBS class.
+  * Remaining Ubuntu changes:
+    - debian/patches/kubuntu_02_messages_target.diff
+
+ -- Jonathan Patrick Davies <jpatrick@kubuntu.org>  Wed, 24 Oct 2007 20:41:44 +0200
+
+kpowersave (0.7.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes a crash in HardwareInfo::checkCurrentCPUFreqPolicy ().
+      Closes: #422057
+  * debian/control
+    - Use the new "Homepage:" field to specify the upstream URL.
+    - Add a Build-Conflicts against autoconf2.13.
+  * debian/menu
+    - Update to the new menu spec.
+  * debian/patches/10-kpowersave-crash-on-getenv.patch
+    - Removed, fixed upstream.
+  * debian/patches/06-handle_failed_suspend.patch
+    - Removed, merged upstream.
+  * debian/patches/05-restore_window.patch
+    - Removed, merged upstream.
+  * debian/patches/04-default_config.patch
+    - Updated, wodim is now already in the application blacklist that is
+      provided by upstream.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 04 Oct 2007 12:48:39 +0200
+
+kpowersave (0.7.2-3ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable. 
+  * Remaining Ubuntu changes:
+    * debian/control: change Maintainer field
+    * debian/patches/kubuntu_01_kdepot.patch
+    * debian/patches/kubuntu_02_messages_target.diff
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 13:22:26 +1000
+
+kpowersave (0.7.2-3) unstable; urgency=low
+
+  * debian/patches/10-kpowersave-crash-on-getenv.patch
+    - Fixes a crash when the environment variable DESKTOP_SESSION is not set.
+      Patch by Pierre Habouzit, thanks!  Closes: #422420
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 21:07:05 +0200
+
+kpowersave (0.7.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/patches/05-restore_window.patch
+    - Pull from svn. Properly restore minimized configuration dialog.
+      Closes: #413638
+  * debian/patches/06-handle_failed_suspend.patch
+    - Pull from svn. Check the return code of the Suspend() method and display
+      a message box if it failed. Closes: #413811
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Apr 2007 20:40:41 +0200
+
+kpowersave (0.7.2-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian experimental
+  * Dropped Ubuntu changes:
+    * debian/control: drop Conflics/Replaces/Provides klaptopdaemon - does not
+      conflict anymore
+    * debian/rules: remove dh_iconcache - done by cdbs
+  * Remaining Ubuntu changes:
+    * debian/control: change Maintainer field
+    * debian/patches/kubuntu_01_kdepot.patch
+    * debian/patches/kubuntu_02_messages_target.diff
+
+ -- Luka Renko <lure@ubuntu.com>  Mon, 19 Mar 2007 22:30:13 +0100
+
+kpowersave (0.7.2-1) experimental; urgency=low
+
+  * New upstream release. Closes: #412647
+  * debian/patches/01-autoconf_2.6.patch,
+    debian/patches/02-close_dialog_on_destroy.patch
+    - Removed, merged upstream.
+  * debian/patches/04-default_config.patch
+    - Add wodim to application blacklist.
+    - Do not unmount external media on suspend.
+      kded/mediamanager in Debian is missing a patch which would allow that. 
+  * Beginning with this version, the dependency on powersaved as backend has
+    been dropped. All the heavy lifting is done via HAL now.
+    Update debian/control accordingly:
+    - Remove build dependency on libpowersave-dev.
+    - Remove dependency on powersaved, add a versioned dependency on 
+      hal (>= 0.5.8.1) instead (needed for cpu frequency scaling support).
+    - For proper suspend/resume support, hal should use one of the existing 
+      suspend frameworks. Add Recommends on these packages. 
+    - Update the package description.
+
+ -- Michael Biebl <biebl@debian.org>  Mon,  5 Mar 2007 07:24:09 +0100
+
+kpowersave (0.7.2-0ubuntu1) feisty; urgency=low
+
+  * New upstream release: uses HAL directly (no powersave dependency)
+  * Changes:
+    * drop 01-autoconf_2.6.patch: included upstream
+    * drop 02-close_dialog_on_destroy.patch: included upstream
+    * drop 03-reset_blankonly_to_default.patch: fixed upstream
+    * update kubuntu_01_kdepot.patch to apply
+    * drop Build-Depends on libpowersave-dev: now uses HAL 
+    * drop Depends on powersaved: now uses HAL
+    * update Maintainer field
+  * UVF exception approved by MOTU https://launchpad.net/bugs/88793
+
+ -- Luka Renko <lure@ubuntu.com>  Wed, 28 Feb 2007 22:35:46 +0100
+
+kpowersave (0.6.2-5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Added dh_iconcache
+    - Add kubuntu_02_messages_target.diff fix messages 
+      target for .pot generation
+    - Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
+    - Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce 
+      its removal. 
+
+ -- ville palo <vi64pa@gmail.com>  Sun, 21 Jan 2007 09:21:00 +0000
+
+kpowersave (0.6.2-5) unstable; urgency=low
+
+  * Prepend a sequence number to all patches.
+  * debian/patches/03-reset_blankonly_to_default.patch
+    - Added. Reset kscreensaver settings to correct default values on scheme 
+      changes and on application shutdown.
+      Patch by Modestas Vainius, thanks! Closes: #399473
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 20 Jan 2007 19:49:40 +0100
+
+kpowersave (0.6.2-4) unstable; urgency=low
+
+  * debian/patches/close_dialog_on_destroy.patch
+    - Added. Correctly close the information dialog when activated over dcop.
+      Closes: #398201
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 13 Nov 2006 06:05:56 +0100
+
+kpowersave (0.6.2-3) unstable; urgency=low
+
+  * Update maintainer email address to biebl@debian.org.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 20 Oct 2006 00:04:12 +0200
+
+kpowersave (0.6.2-2ubuntu2) edgy; urgency=low
+
+  * Rebuild against dbus 0.90
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Wed, 30 Aug 2006 22:04:58 +0200
+
+kpowersave (0.6.2-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Luka Renko <lure@ubuntu.com>  Sat, 12 Aug 2006 17:17:17 +0200
+
+kpowersave (0.6.2-2) unstable; urgency=medium
+
+  * Updated admin/cvs.sh to support autoconf-2.6. Closes: #379824
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 25 Jul 2006 23:10:10 +0200
+
+kpowersave (0.6.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Display correct warning message if user lacks permissions to connect to
+      powersaved over dbus. Closes: #356609
+  * Requires powersave 0.12.8 or newer.
+
+ -- Michael Biebl <biebl@teco.edu>  Sat, 24 Jun 2006 19:16:02 +0200
+
+kpowersave (0.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Corrected typo in package description. Closes: #364191
+  * Removed kpowersave-fix-utf8_in_eventrc.diff, fixed upstream.
+  * Bumped Standards-Version to 3.7.2, no further changes required.
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 15 May 2006 02:28:48 +0200
+
+kpowersave (0.6.0-1ubuntu4) dapper; urgency=low
+
+  * Added dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 13 May 2006 20:16:04 +1000
+
+kpowersave (0.6.0-1ubuntu3) dapper; urgency=low
+
+  * Add kubuntu_02_messages_target.diff fix messages 
+    target for .pot generation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Apr 2006 15:03:01 +0000
+
+kpowersave (0.6.0-1ubuntu2) dapper; urgency=low
+
+  * Added kubuntu_01_kdepot.diff for pot file extraction to rosetta
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu, 13 Apr 2006 00:40:57 +0200
+
+kpowersave (0.6.0-1ubuntu1) dapper; urgency=low
+
+  * Added kpowersave-fix-utf8_in_eventrc.diff
+
+ -- Luka Renko <lure.net@gmail.com>  Wed, 12 Apr 2006 19:39:57 +0200
+
+kpowersave (0.6.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Requires powersave 0.12.7 or newer.
+  * Added build dependency on libxtst-dev.
+  * Added kpowersave-fix-utf8_in_eventrc.diff. 
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 17 Apr 2006 18:21:14 +0200
+
+kpowersave (0.5.11-1ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Luka Renko <lure.net@gmail.com>  Sun, 26 Mar 2006 18:59:38 +0200
+
+kpowersave (0.5.11-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu>  Thu, 23 Mar 2006 09:45:35 +0100
+
+kpowersave (0.5.10-1ubuntu1) dapper; urgency=low
+
+  * Added a Conflicts/Replaces/Provides: klaptopdaemon to enforce its removal. 
+
+ -- Michael Biebl <biebl@teco.edu>  Thu,  9 Mar 2006 23:05:33 +0100
+
+kpowersave (0.5.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * Requires powersave 0.12.2 or newer.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Mar 2006 23:45:01 +0100
+
+kpowersave (0.5.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Requires powersave 0.12.1 or newer.
+
+ -- Michael Biebl <biebl@teco.edu>  Thu,  2 Mar 2006 18:43:24 +0100
+
+kpowersave (0.5.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped debhelper compatibility to 5.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 21 Feb 2006 10:51:35 +0100
+
+kpowersave (0.5.7-1) unstable; urgency=low
+
+  * New upstream release.
+    - kpowersave now shows correct instructions how to start the powersaved
+      daemon. Closes: #352218
+    - Layout problem in the information dialog has been fixed. Closes: #352684 
+  * Corrected formatting of the homepage url in the long description.
+  
+ -- Michael Biebl <biebl@teco.edu>  Tue, 14 Feb 2006 23:27:37 +0100
+
+kpowersave (0.5.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue,  7 Feb 2006 02:51:39 +0100
+
+kpowersave (0.5.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed build dependency on libcpufreq-dev as it is now correctly handled
+    by libpowersave-dev.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 31 Jan 2006 01:32:36 +0100
+
+kpowersave (0.5.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 23 Jan 2006 23:14:39 +0100
+
+kpowersave (0.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Requires powersave 0.11.5 or newer.
+
+ -- Michael Biebl <biebl@teco.edu>  Wed, 18 Jan 2006 05:10:26 +0100
+
+kpowersave (0.5.2-1ubuntu1) dapper; urgency=low
+
+  * Add kubuntu_01_desktop_autostart.patch to prevent kpowersave from starting
+    automatically in GNOME (Closes: Malone #32340).
+
+ -- Raphaël Pinson <raphink@ubuntu.com>  Sat,  4 Mar 2006 17:22:09 +0100
+
+kpowersave (0.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed patches absolute_build_path_fix.diff and sound_files_path.diff,
+    fixed upstream.
+  * Tightened dependencies on powersave, version 0.11.2 or newer is required.
+  * Use Debian libtool and regenerate the autotools files.
+    + Added build dependencies to automake1.9, autoconf and libtool.
+  * hal and dbus are now mandatory. Added the corresponding build
+    dependencies.
+  * Removed the build dependency on libqt3-compat-headers. Package has been
+    fixed upstream to compile cleanly without it. 
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 16 Jan 2006 02:02:45 +0100
+
+kpowersave (0.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * This release was not uploaded to unstable.
+
+ -- Michael Biebl <biebl@teco.edu>  Tue, 10 Jan 2006 02:25:11 +0100
+
+kpowersave (0.4.5-2) unstable; urgency=low
+
+  * Depend on powersaved (<< 0.10). kpowersave-0.4.x does not work properly with
+    powersaved (>= 0.10). 
+
+ -- Michael Biebl <biebl@teco.edu>  Sun,  8 Jan 2006 18:00:08 +0100
+
+kpowersave (0.4.5-1) unstable; urgency=low
+
+  * Initial release. Closes: #329922
+
+ -- Michael Biebl <biebl@teco.edu>  Wed,  9 Nov 2005 00:53:24 +0100
+
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/compat b/ubuntu/maverick/applications/kpowersave.cmake/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/control b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
new file mode 100644
index 000000000..430ad6cb1
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control
@@ -0,0 +1,40 @@
+Source: kpowersave-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Standards-Version: 3.8.4
+Homepage: http://sourceforge.net/projects/powersave/
+
+Package: kpowersave-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
+Description: HAL based 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 HAL 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/maverick/applications/kpowersave/debian/control.in b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
index 8fb5ca51f..8fb5ca51f 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control.in
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/control.in
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/copyright b/ubuntu/maverick/applications/kpowersave.cmake/debian/copyright
new file mode 100644
index 000000000..a1557e62e
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by Michael Biebl <biebl@teco.edu> on
+Sun, 25 Sep 2005 01:12:21 +0200.
+
+It was downloaded from http://sourceforge.net/projects/powersave/
+
+Copyright Holders: 
+  Danny Kukawka <dkukawka@suse.de>
+  Thomas Renninger <trenn@suse.de>
+
+License:
+
+  This package is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/install b/ubuntu/maverick/applications/kpowersave.cmake/debian/install
new file mode 100644
index 000000000..4a1194bd1
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/install
@@ -0,0 +1 @@
+debian/kpowersave.xpm usr/share/pixmaps
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
new file mode 100644
index 000000000..4d9818595
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libkdeinit_*.so
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
new file mode 100644
index 000000000..1f650ceb8
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -0,0 +1,5 @@
+kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.1 b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.1
new file mode 100644
index 000000000..0ab1d6f90
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.SH NAME
+kpowersave
+\- A KDE KPart Application
+.SH SYNOPSIS
+kpowersave [Qt\-options] [KDE\-options] 
+.SH DESCRIPTION
+A KDE KPart Application
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/kpowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/kpowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.xpm b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.xpm
new file mode 100644
index 000000000..99d178492
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * kpowersave_xpm[] = {
+"32 32 593 2",
+"  	c None",
+". 	c #6D2121",
+"+ 	c #783738",
+"@ 	c #743E40",
+"# 	c #5D2F30",
+"$ 	c #3E1618",
+"% 	c #8A0200",
+"& 	c #982306",
+"* 	c #A75C4B",
+"= 	c #D3B8BC",
+"- 	c #E9E0E1",
+"; 	c #E7E7ED",
+"> 	c #DDDFE7",
+", 	c #CCCBD7",
+"' 	c #B3ADBB",
+") 	c #827583",
+"! 	c #6A3227",
+"~ 	c #410B00",
+"{ 	c #080000",
+"] 	c #AE381A",
+"^ 	c #C79676",
+"/ 	c #D8C9B7",
+"( 	c #B3B7C2",
+"_ 	c #F2F8FF",
+": 	c #EBEDF4",
+"< 	c #D8D9E3",
+"[ 	c #CBCBD8",
+"} 	c #BEC0CF",
+"| 	c #B4B5C9",
+"1 	c #A0A4BD",
+"2 	c #9B90A1",
+"3 	c #B08583",
+"4 	c #8F493D",
+"5 	c #340B02",
+"6 	c #A71F09",
+"7 	c #D5BEA2",
+"8 	c #F1FFFF",
+"9 	c #EEF2F6",
+"0 	c #999AAD",
+"a 	c #C8C8D7",
+"b 	c #CFCFDB",
+"c 	c #C2C2D0",
+"d 	c #B6B6C6",
+"e 	c #A8A8BC",
+"f 	c #9B9BB1",
+"g 	c #8685A0",
+"h 	c #8D8EA6",
+"i 	c #AFB8CD",
+"j 	c #ABAFC6",
+"k 	c #9F534D",
+"l 	c #1C0000",
+"m 	c #B63F26",
+"n 	c #DAC1A4",
+"o 	c #DCD9DF",
+"p 	c #EEF3F6",
+"q 	c #B0B6C4",
+"r 	c #AEB0C4",
+"s 	c #BDBECF",
+"t 	c #B2B3C6",
+"u 	c #A6A7BB",
+"v 	c #9A9BB1",
+"w 	c #8C8EA5",
+"x 	c #797D94",
+"y 	c #98A0B4",
+"z 	c #B3BCD0",
+"A 	c #A99EAF",
+"B 	c #C46347",
+"C 	c #2B0C00",
+"D 	c #B63C1A",
+"E 	c #FED76A",
+"F 	c #E2BE8D",
+"G 	c #DCB4A6",
+"H 	c #D6BCBA",
+"I 	c #B3ABB9",
+"J 	c #A9A7B9",
+"K 	c #A4A5B7",
+"L 	c #9EA1B1",
+"M 	c #9798A9",
+"N 	c #9392A1",
+"O 	c #A2969F",
+"P 	c #C29994",
+"Q 	c #CD866F",
+"R 	c #DC6A3D",
+"S 	c #B42A0E",
+"T 	c #160101",
+"U 	c #B53817",
+"V 	c #FFDA34",
+"W 	c #FFF727",
+"X 	c #FCE43C",
+"Y 	c #F5B84C",
+"Z 	c #EDA45F",
+"` 	c #E79B6C",
+" .	c #E39872",
+"..	c #E2926F",
+"+.	c #E08764",
+"@.	c #E07853",
+"#.	c #DF623C",
+"$.	c #DA4925",
+"%.	c #C83415",
+"&.	c #B10E04",
+"*.	c #900000",
+"=.	c #180000",
+"-.	c #B53918",
+";.	c #FFD83B",
+">.	c #FFF30F",
+",.	c #FBED00",
+"'.	c #F2BD00",
+").	c #EB8F02",
+"!.	c #E4650D",
+"~.	c #DE3B14",
+"{.	c #D71E15",
+"].	c #CF180F",
+"^.	c #C60D07",
+"/.	c #BA0100",
+"(.	c #B10000",
+"_.	c #AA0000",
+":.	c #AB0000",
+"<.	c #980000",
+"[.	c #170000",
+"}.	c #FFF312",
+"|.	c #FBEC00",
+"1.	c #F2BA00",
+"2.	c #EA8B00",
+"3.	c #E45A00",
+"4.	c #DE2200",
+"5.	c #D40000",
+"6.	c #CC0000",
+"7.	c #C00000",
+"8.	c #A20103",
+"9.	c #8D0811",
+"0.	c #7F1825",
+"a.	c #6D293B",
+"b.	c #474158",
+"c.	c #60637E",
+"d.	c #7D7D99",
+"e.	c #9292AB",
+"f.	c #77779C",
+"g.	c #FDEE00",
+"h.	c #F9BF00",
+"i.	c #E68600",
+"j.	c #CC5100",
+"k.	c #AB260B",
+"l.	c #95161A",
+"m.	c #83232C",
+"n.	c #803D48",
+"o.	c #875E6B",
+"p.	c #8D7C8A",
+"q.	c #9698A7",
+"r.	c #A5ABB8",
+"s.	c #B7BCC6",
+"t.	c #CBC7CD",
+"u.	c #D0CBCF",
+"v.	c #C7C4CC",
+"w.	c #CAC9CF",
+"x.	c #9F9FB8",
+"y.	c #262641",
+"z.	c #B63915",
+"A.	c #FFD838",
+"B.	c #FFF413",
+"C.	c #F9EA00",
+"D.	c #99822F",
+"E.	c #8D7B67",
+"F.	c #958B89",
+"G.	c #A2A5A9",
+"H.	c #B4BABD",
+"I.	c #C6CDCE",
+"J.	c #D2DADA",
+"K.	c #D5DCE2",
+"L.	c #CDD5DF",
+"M.	c #BCC5D7",
+"N.	c #A0B5D8",
+"O.	c #83A5D9",
+"P.	c #6B98DB",
+"Q.	c #5A8FDE",
+"R.	c #3C80E3",
+"S.	c #5E8AD2",
+"T.	c #B4B0BE",
+"U.	c #3F3F61",
+"V.	c #AA372A",
+"W.	c #F9D742",
+"X.	c #FFFC02",
+"Y.	c #B1AB13",
+"Z.	c #6F7184",
+"`.	c #EDF1F8",
+" +	c #EAECEF",
+".+	c #CBD4E0",
+"++	c #B2C6E0",
+"@+	c #97B7E0",
+"#+	c #84ADE2",
+"$+	c #79A8E5",
+"%+	c #6DA2E9",
+"&+	c #5E9CED",
+"*+	c #5299F8",
+"=+	c #509AFD",
+"-+	c #529BFE",
+";+	c #509CFF",
+">+	c #4094FF",
+",+	c #3D7EE0",
+"'+	c #B4B3C0",
+")+	c #5D5C7F",
+"!+	c #9D363D",
+"~+	c #D1D0B4",
+"{+	c #FFF856",
+"]+	c #A29E28",
+"^+	c #72727F",
+"/+	c #E5E2E1",
+"(+	c #94B7DB",
+"_+	c #97C2EF",
+":+	c #A3CBF7",
+"<+	c #A6CEFC",
+"[+	c #AAD0FF",
+"}+	c #ABD1FF",
+"|+	c #A1CAFF",
+"1+	c #94C4FF",
+"2+	c #8ABDFF",
+"3+	c #7EB6FF",
+"4+	c #6DACFF",
+"5+	c #559EFF",
+"6+	c #4195FF",
+"7+	c #2877EB",
+"8+	c #9DA6C2",
+"9+	c #767292",
+"0+	c #0E0E1C",
+"a+	c #9F3636",
+"b+	c #C7CED6",
+"c+	c #EBEDF5",
+"d+	c #BEBCAD",
+"e+	c #606061",
+"f+	c #D3CECE",
+"g+	c #9ABEE5",
+"h+	c #D5EBFF",
+"i+	c #EEF4FF",
+"j+	c #D2E5FF",
+"k+	c #BFDAFF",
+"l+	c #ACD0FF",
+"m+	c #9BC7FF",
+"n+	c #8FBFFF",
+"o+	c #7FB6FF",
+"p+	c #4F9BFF",
+"q+	c #2B84FD",
+"r+	c #1875F6",
+"s+	c #0E6AF1",
+"t+	c #075DE3",
+"u+	c #8498C5",
+"v+	c #8E89A3",
+"w+	c #161629",
+"x+	c #C8CFCE",
+"y+	c #E8EAEB",
+"z+	c #D1D1D7",
+"A+	c #5C5C5D",
+"B+	c #BBB7B7",
+"C+	c #A6C0DF",
+"D+	c #AAD1FD",
+"E+	c #DEECFF",
+"F+	c #C4DDFF",
+"G+	c #B4D4FF",
+"H+	c #A4CAFF",
+"I+	c #9AC5FF",
+"J+	c #76B1FF",
+"K+	c #2C89FF",
+"L+	c #016BFE",
+"M+	c #0064F8",
+"N+	c #005FEE",
+"O+	c #005AE5",
+"P+	c #0050DD",
+"Q+	c #6588C7",
+"R+	c #A09AB0",
+"S+	c #2A2A44",
+"T+	c #C9CFCF",
+"U+	c #E5E7E7",
+"V+	c #E0E0E0",
+"W+	c #676767",
+"X+	c #A3A1A1",
+"Y+	c #B8C4D9",
+"Z+	c #93BFF0",
+"`+	c #D6E9FF",
+" @	c #BDD9FF",
+".@	c #ACCFFF",
+"+@	c #A3CAFF",
+"@@	c #7BB5FF",
+"#@	c #2386FF",
+"$@	c #0472FF",
+"%@	c #006AFC",
+"&@	c #0065F4",
+"*@	c #005FEA",
+"=@	c #005AE3",
+"-@	c #004FDB",
+";@	c #4B78C9",
+">@	c #A5A0B1",
+",@	c #454569",
+"'@	c #E4E6E6",
+")@	c #E7E7E7",
+"!@	c #7D7D7E",
+"~@	c #898788",
+"{@	c #C7CAD5",
+"]@	c #89B6EA",
+"^@	c #C7E1FF",
+"/@	c #B6D5FF",
+"(@	c #ABCEFF",
+"_@	c #86BBFF",
+":@	c #2F8EFF",
+"<@	c #117BFF",
+"[@	c #0570FF",
+"}@	c #0068F8",
+"|@	c #0063F0",
+"1@	c #005DE7",
+"2@	c #0059DF",
+"3@	c #004CD6",
+"4@	c #3369CD",
+"5@	c #A3A2B4",
+"6@	c #585880",
+"7@	c #909090",
+"8@	c #717072",
+"9@	c #C6C4CB",
+"0@	c #84AFE7",
+"a@	c #B5D7FF",
+"b@	c #B5D4FF",
+"c@	c #96C4FF",
+"d@	c #3A96FF",
+"e@	c #1C82FF",
+"f@	c #0D77FF",
+"g@	c #006BFD",
+"h@	c #0066F4",
+"i@	c #0061EC",
+"j@	c #005BE4",
+"k@	c #0055DB",
+"l@	c #004ED3",
+"m@	c #0D51CB",
+"n@	c #9298B7",
+"o@	c #6B6A90",
+"p@	c #0B0B17",
+"q@	c #E5E6E6",
+"r@	c #E6E6E6",
+"s@	c #9F9F9F",
+"t@	c #636265",
+"u@	c #BFBABC",
+"v@	c #80AAE1",
+"w@	c #9FC9FF",
+"x@	c #A8CEFF",
+"y@	c #4EA1FF",
+"z@	c #2489FF",
+"A@	c #187EFF",
+"B@	c #0069FA",
+"C@	c #005EE8",
+"D@	c #0058DF",
+"E@	c #0052D7",
+"F@	c #004DCE",
+"G@	c #0047C8",
+"H@	c #7B8CBA",
+"I@	c #7E7B9B",
+"J@	c #1D1D34",
+"K@	c #E5E5E5",
+"L@	c #AAAAAB",
+"M@	c #5E5E60",
+"N@	c #B3ADAC",
+"O@	c #90ADDA",
+"P@	c #78B4FC",
+"Q@	c #61ADFF",
+"R@	c #2D90FF",
+"S@	c #2185FF",
+"T@	c #0E78FF",
+"U@	c #016CFE",
+"V@	c #0066F5",
+"W@	c #005CE4",
+"X@	c #0055DC",
+"Y@	c #0050D3",
+"Z@	c #004ACB",
+"`@	c #003AC2",
+" #	c #617CC1",
+".#	c #8C89A2",
+"+#	c #2D2D4C",
+"@#	c #E4E4E4",
+"##	c #B5B5B5",
+"$#	c #606062",
+"%#	c #9D9A9B",
+"&#	c #ABB6CF",
+"*#	c #3D94F7",
+"=#	c #3C9CFF",
+"-#	c #2C8DFF",
+";#	c #1A80FF",
+">#	c #0772FF",
+",#	c #0068FB",
+"'#	c #0062F2",
+")#	c #005BEA",
+"!#	c #0053E2",
+"~#	c #004FD9",
+"{#	c #024BCF",
+"]#	c #094DC7",
+"^#	c #1950C0",
+"/#	c #6681C0",
+"(#	c #8987A0",
+"_#	c #41416E",
+":#	c #E3E3E3",
+"<#	c #BCBCBC",
+"[#	c #69696B",
+"}#	c #858488",
+"|#	c #BDBAC5",
+"1#	c #3E8DEF",
+"2#	c #3094FF",
+"3#	c #1C84FF",
+"4#	c #0473FF",
+"5#	c #0069FD",
+"6#	c #0364F2",
+"7#	c #1464E5",
+"8#	c #296AD7",
+"9#	c #4A7ACB",
+"0#	c #6281BF",
+"a#	c #7B8CB9",
+"b#	c #9098B4",
+"c#	c #ABAAB7",
+"d#	c #B4B2B9",
+"e#	c #B8B7BD",
+"f#	c #AAAAB9",
+"g#	c #8080A3",
+"h#	c #5B5B8F",
+"i#	c #A03838",
+"j#	c #E2E2E2",
+"k#	c #727274",
+"l#	c #727276",
+"m#	c #BDB6BB",
+"n#	c #508DE5",
+"o#	c #1579F9",
+"p#	c #347FE8",
+"q#	c #5287D9",
+"r#	c #6B8DCB",
+"s#	c #8699C1",
+"t#	c #9BA4BC",
+"u#	c #BAB8C0",
+"v#	c #CCC6C4",
+"w#	c #D1CCC9",
+"x#	c #D3D0CE",
+"y#	c #D3D0D6",
+"z#	c #D1D2E3",
+"A#	c #D4D6EE",
+"B#	c #DADBF6",
+"C#	c #DCDEE9",
+"D#	c #D4D4D4",
+"E#	c #BFBFC4",
+"F#	c #A6A6B9",
+"G#	c #8686AD",
+"H#	c #56568C",
+"I#	c #3E3E79",
+"J#	c #A13434",
+"K#	c #CAD4D4",
+"L#	c #7C7C7D",
+"M#	c #67676A",
+"N#	c #ACABB4",
+"O#	c #AAB1CA",
+"P#	c #AAB1C9",
+"Q#	c #C5C2C7",
+"R#	c #D3CCCA",
+"S#	c #D7D1D0",
+"T#	c #DAD7D8",
+"U#	c #DEDCE0",
+"V#	c #D8D9EA",
+"W#	c #CCCFF1",
+"X#	c #C5C8F6",
+"Y#	c #C5C9FA",
+"Z#	c #CACDFF",
+"`#	c #D0D3FF",
+" $	c #D7DAFF",
+".$	c #E1E3FF",
+"+$	c #EAECFF",
+"@$	c #EDEEFD",
+"#$	c #E2E3E7",
+"$$	c #CBCBC7",
+"%$	c #C8C8C4",
+"&$	c #BDBDC0",
+"*$	c #9E9EAF",
+"=$	c #6A6A9D",
+"-$	c #840808",
+";$	c #C18B8B",
+">$	c #EBF3F3",
+",$	c #E8F0F0",
+"'$	c #BDC2C2",
+")$	c #878A8A",
+"!$	c #616367",
+"~$	c #B1B1B4",
+"{$	c #D0CECC",
+"]$	c #DEDBD8",
+"^$	c #E4E4E2",
+"/$	c #E6E6E5",
+"($	c #E7E8EA",
+"_$	c #D2D4F9",
+":$	c #B9BEFD",
+"<$	c #B0B5FF",
+"[$	c #B4B9FF",
+"}$	c #BFC3FF",
+"|$	c #C9CEFF",
+"1$	c #D5D8FF",
+"2$	c #DDDFFF",
+"3$	c #E4E7FC",
+"4$	c #E3E4EF",
+"5$	c #DADBDF",
+"6$	c #D1D1D2",
+"7$	c #C5C5C5",
+"8$	c #B1B1B1",
+"9$	c #959595",
+"0$	c #717170",
+"a$	c #606056",
+"b$	c #676782",
+"c$	c #17172F",
+"d$	c #5C0303",
+"e$	c #9E4545",
+"f$	c #C08787",
+"g$	c #B59F9F",
+"h$	c #8F8787",
+"i$	c #5D5C5F",
+"j$	c #777A7E",
+"k$	c #9DA0A4",
+"l$	c #B1B2B2",
+"m$	c #BCBBBB",
+"n$	c #C5C5C3",
+"o$	c #D3D3D3",
+"p$	c #E1E1E1",
+"q$	c #DDDDEA",
+"r$	c #D4D6F5",
+"s$	c #CED1FD",
+"t$	c #D4D6FD",
+"u$	c #DDDEF5",
+"v$	c #DBDCE7",
+"w$	c #D8D8DB",
+"x$	c #D0CFCF",
+"y$	c #C0C1BF",
+"z$	c #ACACAB",
+"A$	c #959594",
+"B$	c #82827F",
+"C$	c #737370",
+"D$	c #64646D",
+"E$	c #595973",
+"F$	c #565680",
+"G$	c #48487B",
+"H$	c #0D0D1B",
+"I$	c #2C0000",
+"J$	c #4B0E0E",
+"K$	c #541717",
+"L$	c #521516",
+"M$	c #430E10",
+"N$	c #442329",
+"O$	c #59535C",
+"P$	c #777882",
+"Q$	c #97979B",
+"R$	c #A7A7A8",
+"S$	c #AFAFAE",
+"T$	c #BABAB6",
+"U$	c #CBCAC6",
+"V$	c #D7D8D8",
+"W$	c #D9D9DB",
+"X$	c #D2D1CF",
+"Y$	c #C4C3C1",
+"Z$	c #B0AFAD",
+"`$	c #9B9B99",
+" %	c #8B8B88",
+".%	c #7E7E7D",
+"+%	c #74747B",
+"@%	c #66667E",
+"#%	c #5A5A82",
+"$%	c #44446F",
+"%%	c #29294B",
+"&%	c #131329",
+"*%	c #06060E",
+"=%	c #131319",
+"-%	c #2C2C37",
+";%	c #545463",
+">%	c #757584",
+",%	c #8D8D94",
+"'%	c #989897",
+")%	c #A1A19E",
+"!%	c #A9A9A7",
+"~%	c #A2A29F",
+"{%	c #91918E",
+"]%	c #848484",
+"^%	c #7A7A85",
+"/%	c #696983",
+"(%	c #535376",
+"_%	c #363659",
+":%	c #1F1F3C",
+"<%	c #0D0D1A",
+"[%	c #12121C",
+"}%	c #333345",
+"|%	c #5A5A6F",
+"1%	c #737385",
+"2%	c #88888E",
+"3%	c #7E7E89",
+"4%	c #686882",
+"5%	c #50506E",
+"6%	c #30304C",
+"7%	c #16162A",
+"8%	c #080811",
+"9%	c #1A1A29",
+"0%	c #2E2E44",
+"a%	c #26263C",
+"b%	c #11111F",
+"                                                                ",
+"            . + @ # $                                           ",
+"    % & * = - ; > , ' ) ! ~ {                                   ",
+"  ] ^ / ( _ : < [ } | 1 2 3 4 5                                 ",
+"6 7 8 9 0 a b c d e f g h i j k l                               ",
+"m n o p q r s t u v w x y z A B C                               ",
+"D E F G H I J K L M N O P Q R S T                               ",
+"U V W X Y Z `  ...+.@.#.$.%.&.*.=.                              ",
+"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.                              ",
+"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f.                      ",
+"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.                    ",
+"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.                    ",
+"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+                    ",
+"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+                  ",
+"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+                  ",
+"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+                  ",
+"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@                  ",
+"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@                  ",
+"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@                ",
+"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@                ",
+"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+#                ",
+"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#                ",
+"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#            ",
+"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#    ",
+"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$  ",
+"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
+"  d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
+"      I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%  ",
+"                    =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%          ",
+"                          [%}%|%1%2%3%4%5%6%7%8%                ",
+"                                9%0%a%b%                        ",
+"                                                                "};
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/manpages b/ubuntu/maverick/applications/kpowersave.cmake/debian/manpages
new file mode 100644
index 000000000..c8fa7b85f
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/manpages
@@ -0,0 +1 @@
+debian/kpowersave.1
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/menu b/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
new file mode 100644
index 000000000..6ae0f9833
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
@@ -0,0 +1,7 @@
+?package(kpowersave):\
+  needs="X11"\
+  section="Applications/System/Monitoring"\
+  title="KPowersave"\
+  longtitle="Battery monitor and general power management"\
+  icon="/usr/share/pixmaps/kpowersave.xpm"\
+  command="/opt/trinity/bin/kpowersave"
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/postrm b/ubuntu/maverick/applications/kpowersave.cmake/debian/postrm
new file mode 100644
index 000000000..4e8eda799
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/postrm
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+set -e
+
+package_name=kpowersave-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/maverick/applications/kpowersave.cmake/debian/preinst b/ubuntu/maverick/applications/kpowersave.cmake/debian/preinst
new file mode 100644
index 000000000..b007ccf90
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/preinst
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+set -e
+
+package_name=kpowersave-trinity
+
+if [ -z "$package_name" ]; then
+    print >&2 "Internal Error. Please report a bug."
+    exit 1;
+fi
+
+case "$1" in
+  install)
+    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    ;;
+  upgrade)
+    dpkg-divert --package $package_name --divert /etc/acpi/powerbtn.sh.distrib --rename /etc/acpi/powerbtn.sh
+    ;;
+  abort-upgrade)
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+     exit 0;;
+esac
+
+exit 0
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
new file mode 100755
index 000000000..7f153b395
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+  
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/debian-qt-kde.mk
+
+DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
+
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+
+install/kpowersave::
+	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/watch b/ubuntu/maverick/applications/kpowersave.cmake/debian/watch
new file mode 100644
index 000000000..832285e63
--- /dev/null
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 888f4be38..47e83ef4a 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,9 @@ _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)
@@ -93,6 +96,14 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	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/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
index 9dbcfbafd..5b6508f8c 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
@@ -35,7 +35,7 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
-# include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +59,7 @@ 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/"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
@@ -70,7 +70,7 @@ cleanbuilddir::
 
 common-build-arch common-build-indep:: debian/stamp-kde-apidox
 debian/stamp-kde-apidox:
-#	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
 common-install-prehook-impl::
@@ -82,7 +82,7 @@ common-install-prehook-impl::
 
 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))
+	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
diff --git a/ubuntu/maverick/applications/kpowersave/debian/control b/ubuntu/maverick/applications/kpowersave/debian/control
index 430ad6cb1..87738b5f0 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/control
+++ b/ubuntu/maverick/applications/kpowersave/debian/control
@@ -3,15 +3,16 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.6), libdbus-tqt-1-dev, libtool, libltdl-dev, cmake
+Build-Depends: cdbs, debhelper (>= 5.0.0), kdelibs4-trinity-dev, libxss-dev, libxtst-dev, libhal-dev (>= 0.5.6), 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-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.8.1)
-Description: HAL based power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+Description: HAL based power management applet for KDE3
+ KPowersave is a KDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on HAL to do the heavy lifting.
  .
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules
index 7f153b395..2c4fb87d0 100755
--- a/ubuntu/maverick/applications/kpowersave/debian/rules
+++ b/ubuntu/maverick/applications/kpowersave/debian/rules
@@ -1,24 +1,45 @@
 #!/usr/bin/make -f
   
-# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
-# Also include the main Trinity path
-ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
-else
-LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
-endif
-export LD_LIBRARY_PATH
-
+include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/debian-qt-kde.mk
+
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+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/kde
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+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-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
 	install -p -D -m644 debian/kpowersave-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