diff --git a/debian/lenny/applications/kpowersave/debian/install b/debian/lenny/applications/kpowersave/debian/install index 4a1194bd1..7b00dd534 100644 --- a/debian/lenny/applications/kpowersave/debian/install +++ b/debian/lenny/applications/kpowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda index 4d9818595..652f468f2 100644 --- a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda +++ b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.linda @@ -1,4 +1,4 @@ Tag: lib-not-in-shlibs Tag: no-shlib-file -Data: /usr/trinity/lib/libkdeinit_*.so +Data: /opt/trinity/lib/libkdeinit_*.so diff --git a/debian/lenny/applications/kpowersave/debian/menu b/debian/lenny/applications/kpowersave/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/debian/lenny/applications/kpowersave/debian/menu +++ b/debian/lenny/applications/kpowersave/debian/menu @@ -3,5 +3,5 @@ section="Applications/System/Monitoring"\ title="KPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ + icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\ command="/opt/trinity/bin/kpowersave" diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules index 2c4fb87d0..51e6498b9 100755 --- a/debian/lenny/applications/kpowersave/debian/rules +++ b/debian/lenny/applications/kpowersave/debian/rules @@ -26,10 +26,13 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: +install/kpowersave-trinity:: install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +binary-install/kpowersave-trinity:: + mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/ + clean:: find . -name Makefile.in | xargs rm -f rm -f acinclude.m4 diff --git a/debian/squeeze/applications/kpowersave/debian/install b/debian/squeeze/applications/kpowersave/debian/install index 4a1194bd1..7b00dd534 100644 --- a/debian/squeeze/applications/kpowersave/debian/install +++ b/debian/squeeze/applications/kpowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda index 4d9818595..652f468f2 100644 --- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda +++ b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.linda @@ -1,4 +1,4 @@ Tag: lib-not-in-shlibs Tag: no-shlib-file -Data: /usr/trinity/lib/libkdeinit_*.so +Data: /opt/trinity/lib/libkdeinit_*.so diff --git a/debian/squeeze/applications/kpowersave/debian/menu b/debian/squeeze/applications/kpowersave/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/debian/squeeze/applications/kpowersave/debian/menu +++ b/debian/squeeze/applications/kpowersave/debian/menu @@ -3,5 +3,5 @@ section="Applications/System/Monitoring"\ title="KPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ + icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\ command="/opt/trinity/bin/kpowersave" diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules index a02e93aaa..913dd64f1 100755 --- a/debian/squeeze/applications/kpowersave/debian/rules +++ b/debian/squeeze/applications/kpowersave/debian/rules @@ -26,10 +26,13 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: +install/kpowersave-trinity:: install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +binary-install/kpowersave-trinity:: + mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/ + clean:: find . -name Makefile.in | xargs rm -f rm -f acinclude.m4 diff --git a/ubuntu/maverick/applications/kpowersave/debian/install b/ubuntu/maverick/applications/kpowersave/debian/install index 4a1194bd1..7b00dd534 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/install +++ b/ubuntu/maverick/applications/kpowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda index 4d9818595..652f468f2 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda +++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.linda @@ -1,4 +1,4 @@ Tag: lib-not-in-shlibs Tag: no-shlib-file -Data: /usr/trinity/lib/libkdeinit_*.so +Data: /opt/trinity/lib/libkdeinit_*.so diff --git a/ubuntu/maverick/applications/kpowersave/debian/menu b/ubuntu/maverick/applications/kpowersave/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/menu +++ b/ubuntu/maverick/applications/kpowersave/debian/menu @@ -3,5 +3,5 @@ section="Applications/System/Monitoring"\ title="KPowersave"\ longtitle="Battery monitor and general power management"\ - icon="/usr/share/pixmaps/kpowersave.xpm"\ + icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\ command="/opt/trinity/bin/kpowersave" diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules index a02e93aaa..913dd64f1 100755 --- a/ubuntu/maverick/applications/kpowersave/debian/rules +++ b/ubuntu/maverick/applications/kpowersave/debian/rules @@ -26,10 +26,13 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kpowersave:: +install/kpowersave-trinity:: install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave +binary-install/kpowersave-trinity:: + mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/ + clean:: find . -name Makefile.in | xargs rm -f rm -f acinclude.m4