Rename kpowersave-nohal package in Debian and Ubuntu

18 files changed, 42 insertions, 24 deletions

diff --git a/debian/lenny/applications/tdepowersave/debian/changelog b/debian/lenny/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/lenny/applications/tdepowersave/debian/changelog
+++ b/debian/lenny/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/lenny/applications/tdepowersave/debian/control
+++ b/debian/lenny/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/lenny/applications/tdepowersave/debian/postrm b/debian/lenny/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/lenny/applications/tdepowersave/debian/postrm
+++ b/debian/lenny/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/lenny/applications/tdepowersave/debian/preinst b/debian/lenny/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/lenny/applications/tdepowersave/debian/preinst
+++ b/debian/lenny/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/lenny/applications/tdepowersave/debian/rules
+++ b/debian/lenny/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/lenny/metapackages/rename-meta/debian/control
+++ b/debian/lenny/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/debian/squeeze/applications/tdepowersave/debian/changelog b/debian/squeeze/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/squeeze/applications/tdepowersave/debian/changelog
+++ b/debian/squeeze/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/debian/squeeze/applications/tdepowersave/debian/control b/debian/squeeze/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/squeeze/applications/tdepowersave/debian/control
+++ b/debian/squeeze/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/squeeze/applications/tdepowersave/debian/postrm b/debian/squeeze/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/squeeze/applications/tdepowersave/debian/postrm
+++ b/debian/squeeze/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/applications/tdepowersave/debian/preinst b/debian/squeeze/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/squeeze/applications/tdepowersave/debian/preinst
+++ b/debian/squeeze/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/squeeze/applications/tdepowersave/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/squeeze/applications/tdepowersave/debian/rules
+++ b/debian/squeeze/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
diff --git a/debian/wheezy/applications/tdepowersave/debian/changelog b/debian/wheezy/applications/tdepowersave/debian/changelog
index 506507f65..e7773fc6a 100644
--- a/debian/wheezy/applications/tdepowersave/debian/changelog
+++ b/debian/wheezy/applications/tdepowersave/debian/changelog
@@ -1,4 +1,4 @@
-kpowersave-nohal-trinity (0.7.3-0ubuntu3) karmic; urgency=low
+tdepowersave-trinity (0.7.3-0ubuntu3) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control
index 731afb25f..3c3de5835 100644
--- a/debian/wheezy/applications/tdepowersave/debian/control
+++ b/debian/wheezy/applications/tdepowersave/debian/control
@@ -1,4 +1,4 @@
-Source: kpowersave-nohal-trinity
+Source: tdepowersave-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -8,10 +8,10 @@ Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/powersave/
 
-Package: kpowersave-nohal-trinity
+Package: tdepowersave-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kpowersave-trinity
+Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
 Description: Power management applet for Trinity
  KPowersave is a TDE systray applet which allows to control the power 
  management settings and policies of your computer.
diff --git a/debian/wheezy/applications/tdepowersave/debian/postrm b/debian/wheezy/applications/tdepowersave/debian/postrm
index 9e8ecc977..c373aa20d 100644
--- a/debian/wheezy/applications/tdepowersave/debian/postrm
+++ b/debian/wheezy/applications/tdepowersave/debian/postrm
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/wheezy/applications/tdepowersave/debian/preinst b/debian/wheezy/applications/tdepowersave/debian/preinst
index 5b0e73f61..fe411fc94 100644
--- a/debian/wheezy/applications/tdepowersave/debian/preinst
+++ b/debian/wheezy/applications/tdepowersave/debian/preinst
@@ -2,7 +2,7 @@
 
 set -e
 
-package_name=kpowersave-nohal-trinity
+package_name=tdepowersave-trinity
 
 if [ -z "$package_name" ]; then
     print >&2 "Internal Error. Please report a bug."
diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules
index 262171bc3..97acebf07 100755
--- a/debian/wheezy/applications/tdepowersave/debian/rules
+++ b/debian/wheezy/applications/tdepowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave::
-	install -p -D -m644 debian/kpowersave-nohal-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-nohal-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
+	install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
 
 clean::
 	find . -name Makefile.in | xargs rm -f
diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control
index 2fc02fcf2..0647d30f3 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/control
+++ b/debian/wheezy/metapackages/rename-meta/debian/control
@@ -1187,3 +1187,9 @@ Architecture: all
 Depends: tde-guidance-powermanager-trinity
 Conflicts: kde-guidance-powermanager-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
+
+Package: kpowersave-nohal-trinity
+Architecture: all
+Depends: tdepowersave-trinity
+Conflicts: kpowersave-nohal-trinity (< 4:13.9.9)
+Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.