From 21544772c772f6ab17769c37d7dfce48a903688d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Thu, 18 Jul 2013 19:49:20 +0200
Subject: Second part of renaming kpowersave-nohal on Debian and Ubuntu

---
 .../lenny/applications/tdepowersave/debian/control |   4 +-
 .../lenny/applications/tdepowersave/debian/install |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 debian/lenny/applications/tdepowersave/debian/menu |   8 +-
 .../lenny/applications/tdepowersave/debian/rules   |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../lenny/applications/tdepowersave/debian/watch   |   2 -
 .../applications/tdepowersave/debian/control       |   4 +-
 .../applications/tdepowersave/debian/install       |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 .../squeeze/applications/tdepowersave/debian/menu  |   8 +-
 .../squeeze/applications/tdepowersave/debian/rules |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../squeeze/applications/tdepowersave/debian/watch |   2 -
 .../applications/tdepowersave/debian/control       |   4 +-
 .../applications/tdepowersave/debian/install       |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 .../wheezy/applications/tdepowersave/debian/menu   |   8 +-
 .../wheezy/applications/tdepowersave/debian/rules  |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../wheezy/applications/tdepowersave/debian/watch  |   2 -
 .../applications/tdepowersave/debian/control       |   4 +-
 .../applications/tdepowersave/debian/install       |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 .../maverick/applications/tdepowersave/debian/menu |   8 +-
 .../applications/tdepowersave/debian/rules         |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../applications/tdepowersave/debian/watch         |   2 -
 .../applications/tdepowersave/debian/control       |   4 +-
 .../applications/tdepowersave/debian/install       |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 .../precise/applications/tdepowersave/debian/menu  |   8 +-
 .../precise/applications/tdepowersave/debian/rules |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../precise/applications/tdepowersave/debian/watch |   2 -
 .../applications/tdepowersave/debian/control       |   4 +-
 .../applications/tdepowersave/debian/install       |   2 +-
 .../debian/kpowersave-nohal-trinity.linda          |   4 -
 .../debian/kpowersave-nohal-trinity.lintian        |   5 -
 .../applications/tdepowersave/debian/kpowersave.1  | 148 -----
 .../tdepowersave/debian/kpowersave.xpm             | 628 ---------------------
 .../applications/tdepowersave/debian/manpages      |   2 +-
 .../raring/applications/tdepowersave/debian/menu   |   8 +-
 .../raring/applications/tdepowersave/debian/rules  |   6 +-
 .../tdepowersave/debian/tdepowersave-trinity.linda |   4 +
 .../debian/tdepowersave-trinity.lintian            |   5 +
 .../tdepowersave/debian/tdepowersave.1             | 148 +++++
 .../tdepowersave/debian/tdepowersave.xpm           | 628 +++++++++++++++++++++
 .../raring/applications/tdepowersave/debian/watch  |   2 -
 84 files changed, 4776 insertions(+), 4788 deletions(-)
 delete mode 100644 debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 debian/lenny/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 debian/lenny/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 debian/lenny/applications/tdepowersave/debian/watch
 delete mode 100644 debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 debian/squeeze/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 debian/squeeze/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 debian/squeeze/applications/tdepowersave/debian/watch
 delete mode 100644 debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 debian/wheezy/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 debian/wheezy/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 debian/wheezy/applications/tdepowersave/debian/watch
 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 ubuntu/maverick/applications/tdepowersave/debian/watch
 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 ubuntu/precise/applications/tdepowersave/debian/watch
 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
 create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda
 create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian
 create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1
 create mode 100644 ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm
 delete mode 100644 ubuntu/raring/applications/tdepowersave/debian/watch

diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/lenny/applications/tdepowersave/debian/control
+++ b/debian/lenny/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/debian/lenny/applications/tdepowersave/debian/install b/debian/lenny/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/lenny/applications/tdepowersave/debian/install
+++ b/debian/lenny/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 b/debian/lenny/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm b/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/debian/lenny/applications/tdepowersave/debian/manpages b/debian/lenny/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/lenny/applications/tdepowersave/debian/manpages
+++ b/debian/lenny/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/lenny/applications/tdepowersave/debian/menu b/debian/lenny/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/lenny/applications/tdepowersave/debian/menu
+++ b/debian/lenny/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/lenny/applications/tdepowersave/debian/rules
+++ b/debian/lenny/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave.1 b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/debian/lenny/applications/tdepowersave/debian/watch b/debian/lenny/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/lenny/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/debian/squeeze/applications/tdepowersave/debian/control b/debian/squeeze/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/squeeze/applications/tdepowersave/debian/control
+++ b/debian/squeeze/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/debian/squeeze/applications/tdepowersave/debian/install b/debian/squeeze/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/squeeze/applications/tdepowersave/debian/install
+++ b/debian/squeeze/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1 b/debian/squeeze/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm b/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/debian/squeeze/applications/tdepowersave/debian/manpages b/debian/squeeze/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/squeeze/applications/tdepowersave/debian/manpages
+++ b/debian/squeeze/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/squeeze/applications/tdepowersave/debian/menu b/debian/squeeze/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/squeeze/applications/tdepowersave/debian/menu
+++ b/debian/squeeze/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/squeeze/applications/tdepowersave/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/squeeze/applications/tdepowersave/debian/rules
+++ b/debian/squeeze/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1 b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/debian/squeeze/applications/tdepowersave/debian/watch b/debian/squeeze/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/wheezy/applications/tdepowersave/debian/control
+++ b/debian/wheezy/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/debian/wheezy/applications/tdepowersave/debian/install b/debian/wheezy/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/wheezy/applications/tdepowersave/debian/install
+++ b/debian/wheezy/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1 b/debian/wheezy/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm b/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/debian/wheezy/applications/tdepowersave/debian/manpages b/debian/wheezy/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/wheezy/applications/tdepowersave/debian/manpages
+++ b/debian/wheezy/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/wheezy/applications/tdepowersave/debian/menu b/debian/wheezy/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/wheezy/applications/tdepowersave/debian/menu
+++ b/debian/wheezy/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/wheezy/applications/tdepowersave/debian/rules
+++ b/debian/wheezy/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1 b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/debian/wheezy/applications/tdepowersave/debian/watch b/debian/wheezy/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/control
+++ b/ubuntu/maverick/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/install b/ubuntu/maverick/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/install
+++ b/ubuntu/maverick/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/tdepowersave/debian/kpowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/tdepowersave/debian/manpages b/ubuntu/maverick/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/manpages
+++ b/ubuntu/maverick/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/menu b/ubuntu/maverick/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/menu
+++ b/ubuntu/maverick/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/maverick/applications/tdepowersave/debian/rules
+++ b/ubuntu/maverick/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+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/tdepowersave/debian/tdepowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/tdepowersave/debian/watch b/ubuntu/maverick/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/control
+++ b/ubuntu/precise/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/ubuntu/precise/applications/tdepowersave/debian/install b/ubuntu/precise/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/install
+++ b/ubuntu/precise/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/precise/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/precise/applications/tdepowersave/debian/manpages b/ubuntu/precise/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/manpages
+++ b/ubuntu/precise/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/precise/applications/tdepowersave/debian/menu b/ubuntu/precise/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/menu
+++ b/ubuntu/precise/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/precise/applications/tdepowersave/debian/rules b/ubuntu/precise/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/precise/applications/tdepowersave/debian/rules
+++ b/ubuntu/precise/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/precise/applications/tdepowersave/debian/watch b/ubuntu/precise/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/control
+++ b/ubuntu/raring/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power 
+ TDEPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
  It relies on the TDE hardware library to do the heavy lifting.
  .
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
   * KNotify support
   * online help
   * localisations for many languages
- KPowersave supports schemes with following configurable specific 
+ TDEPowersave supports schemes with following configurable specific 
  settings for:
   * screensaver
   * DPMS
diff --git a/ubuntu/raring/applications/tdepowersave/debian/install b/ubuntu/raring/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/install
+++ b/ubuntu/raring/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
deleted file mode 100644
index ff5153632..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ /dev/null
@@ -1,4 +0,0 @@
-Tag: lib-not-in-shlibs
-
-Tag: no-shlib-file
-Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" 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/raring/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* 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/raring/applications/tdepowersave/debian/manpages b/ubuntu/raring/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/manpages
+++ b/ubuntu/raring/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/raring/applications/tdepowersave/debian/menu b/ubuntu/raring/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/menu
+++ b/ubuntu/raring/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
   needs="X11"\
   section="Applications/System/Monitoring"\
-  title="KPowersave"\
+  title="TDEPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
-  command="/opt/trinity/bin/kpowersave"
+  icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+  command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/raring/applications/tdepowersave/debian/rules
+++ b/ubuntu/raring/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/kpowersave::
-	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda
new file mode 100644
index 000000000..ff5153632
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda
@@ -0,0 +1,4 @@
+Tag: lib-not-in-shlibs
+
+Tag: no-shlib-file
+Data: /usr/trinity/lib/libtdeinit_*.so
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options] 
+.SH DESCRIPTION
+A TDE 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\-tde  
+Show TDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS TDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B  \-\-nofork  
+Don't run in the background.
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_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/raring/applications/tdepowersave/debian/watch b/ubuntu/raring/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
-- 
cgit v1.2.3