From 4b357920dc023b08253a710ed94082909098e7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 14 Sep 2012 16:04:51 +0200 Subject: [PATCH] Fix install directories for kpowersave on Debian and Ubuntu --- debian/lenny/applications/kpowersave/debian/install | 2 +- .../applications/kpowersave/debian/kpowersave-trinity.linda | 2 +- debian/lenny/applications/kpowersave/debian/menu | 2 +- debian/lenny/applications/kpowersave/debian/rules | 5 ++++- debian/squeeze/applications/kpowersave/debian/install | 2 +- .../applications/kpowersave/debian/kpowersave-trinity.linda | 2 +- debian/squeeze/applications/kpowersave/debian/menu | 2 +- debian/squeeze/applications/kpowersave/debian/rules | 5 ++++- debian/wheezy/applications/kpowersave/debian/install | 2 +- .../applications/kpowersave/debian/kpowersave-trinity.linda | 2 +- debian/wheezy/applications/kpowersave/debian/menu | 2 +- debian/wheezy/applications/kpowersave/debian/rules | 5 ++++- ubuntu/maverick/applications/kpowersave/debian/install | 2 +- .../applications/kpowersave/debian/kpowersave-trinity.linda | 2 +- ubuntu/maverick/applications/kpowersave/debian/menu | 2 +- ubuntu/maverick/applications/kpowersave/debian/rules | 5 ++++- ubuntu/precise/applications/kpowersave/debian/install | 2 +- .../applications/kpowersave/debian/kpowersave-trinity.linda | 2 +- ubuntu/precise/applications/kpowersave/debian/menu | 2 +- ubuntu/precise/applications/kpowersave/debian/rules | 5 ++++- 20 files changed, 35 insertions(+), 20 deletions(-) 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 ff5153632..35bdc35cd 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/libtdeinit_*.so +Data: /opt/trinity/lib/libtdeinit_*.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 49718160e..991d42479 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 ff5153632..35bdc35cd 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/libtdeinit_*.so +Data: /opt/trinity/lib/libtdeinit_*.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 49718160e..991d42479 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/debian/wheezy/applications/kpowersave/debian/install b/debian/wheezy/applications/kpowersave/debian/install index 4a1194bd1..7b00dd534 100644 --- a/debian/wheezy/applications/kpowersave/debian/install +++ b/debian/wheezy/applications/kpowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.linda b/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.linda index ff5153632..35bdc35cd 100644 --- a/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.linda +++ b/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.linda @@ -1,4 +1,4 @@ Tag: lib-not-in-shlibs Tag: no-shlib-file -Data: /usr/trinity/lib/libtdeinit_*.so +Data: /opt/trinity/lib/libtdeinit_*.so diff --git a/debian/wheezy/applications/kpowersave/debian/menu b/debian/wheezy/applications/kpowersave/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/debian/wheezy/applications/kpowersave/debian/menu +++ b/debian/wheezy/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/wheezy/applications/kpowersave/debian/rules b/debian/wheezy/applications/kpowersave/debian/rules index 49718160e..991d42479 100755 --- a/debian/wheezy/applications/kpowersave/debian/rules +++ b/debian/wheezy/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 ff5153632..35bdc35cd 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/libtdeinit_*.so +Data: /opt/trinity/lib/libtdeinit_*.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 49718160e..991d42479 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 diff --git a/ubuntu/precise/applications/kpowersave/debian/install b/ubuntu/precise/applications/kpowersave/debian/install index 4a1194bd1..7b00dd534 100644 --- a/ubuntu/precise/applications/kpowersave/debian/install +++ b/ubuntu/precise/applications/kpowersave/debian/install @@ -1 +1 @@ -debian/kpowersave.xpm usr/share/pixmaps +debian/kpowersave.xpm opt/trinity/share/pixmaps diff --git a/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.linda b/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.linda index ff5153632..35bdc35cd 100644 --- a/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.linda +++ b/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.linda @@ -1,4 +1,4 @@ Tag: lib-not-in-shlibs Tag: no-shlib-file -Data: /usr/trinity/lib/libtdeinit_*.so +Data: /opt/trinity/lib/libtdeinit_*.so diff --git a/ubuntu/precise/applications/kpowersave/debian/menu b/ubuntu/precise/applications/kpowersave/debian/menu index 6ae0f9833..0dbd62cc4 100644 --- a/ubuntu/precise/applications/kpowersave/debian/menu +++ b/ubuntu/precise/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/precise/applications/kpowersave/debian/rules b/ubuntu/precise/applications/kpowersave/debian/rules index 49718160e..991d42479 100755 --- a/ubuntu/precise/applications/kpowersave/debian/rules +++ b/ubuntu/precise/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