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

11 files changed, 28 insertions, 30 deletions

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.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/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/kpowersave-nohal-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
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/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
index 0ab1d6f90..d79cfd21d 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
@@ -1,12 +1,12 @@
 .\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
 .SH NAME
-kpowersave
-\- A KDE KPart Application
+tdepowersave
+\- A TDE KPart Application
 .SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options] 
+tdepowersave [Qt\-options] [TDE\-options] 
 .SH DESCRIPTION
-A KDE KPart Application
+A TDE KPart Application
 .SH OPTIONS
 .SS Generic options:
 .TP
@@ -16,8 +16,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -34,7 +34,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -133,10 +133,10 @@ 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/
+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:/kpowersave/'"
+.BR "`khelpcenter help:/tdepowersave/'"
 from the command-line.
 .br
 .SH AUTHORS
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
index 99d178492..a7b0f2e7c 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kpowersave_xpm[] = {
+static char * tdepowersave_xpm[] = {
 "32 32 593 2",
 "  	c None",
 ". 	c #6D2121",
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