From dc4c8f694814aa1f03f1ca2709228f2f07642101 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 12 Aug 2015 14:56:26 -0500 Subject: [PATCH] Fix tdescreensaver installation directory on Debian and Ubuntu (cherry picked from commit 985f6b9c8c1db710b424018f8c5cfd2c2b1a1653) --- debian/lenny/tdeartwork/debian/rules | 2 +- .../debian/tdescreensaver-xsavers-extra-trinity.install | 2 +- .../debian/tdescreensaver-xsavers-webcollage-trinity.install | 2 +- debian/squeeze/tdeartwork/debian/rules | 2 +- .../debian/tdescreensaver-xsavers-extra-trinity.install | 2 +- .../debian/tdescreensaver-xsavers-webcollage-trinity.install | 2 +- ubuntu/maverick/tdeartwork/debian/rules | 2 +- .../debian/tdescreensaver-xsavers-extra-trinity.install | 2 +- .../debian/tdescreensaver-xsavers-webcollage-trinity.install | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules index 062bd4f29..272ae85ec 100755 --- a/debian/lenny/tdeartwork/debian/rules +++ b/debian/lenny/tdeartwork/debian/rules @@ -37,4 +37,4 @@ clean:: cd tdescreensaver/kxsconfig/ && ./update_hacks.sh binary-install/tdescreensaver-xsavers-extra-trinity:: - rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop + rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install index 65da0bfe4..3f7f191ef 100644 --- a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/ diff --git a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install index 74d362927..e6b5fb014 100644 --- a/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install +++ b/debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop opt/trinity/share/applnk/System/ScreenSavers/ diff --git a/debian/squeeze/tdeartwork/debian/rules b/debian/squeeze/tdeartwork/debian/rules index da0f05cb7..b5271b975 100755 --- a/debian/squeeze/tdeartwork/debian/rules +++ b/debian/squeeze/tdeartwork/debian/rules @@ -37,4 +37,4 @@ clean:: cd tdescreensaver/kxsconfig/ && ./update_hacks.sh binary-install/tdescreensaver-xsavers-extra-trinity:: - rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop + rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install index 65da0bfe4..3f7f191ef 100644 --- a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/ diff --git a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install index 74d362927..e6b5fb014 100644 --- a/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install +++ b/debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop opt/trinity/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules index da0f05cb7..b5271b975 100755 --- a/ubuntu/maverick/tdeartwork/debian/rules +++ b/ubuntu/maverick/tdeartwork/debian/rules @@ -37,4 +37,4 @@ clean:: cd tdescreensaver/kxsconfig/ && ./update_hacks.sh binary-install/tdescreensaver-xsavers-extra-trinity:: - rm -f debian/tdescreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop + rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/webcollage.desktop diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install index 65da0bfe4..3f7f191ef 100644 --- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/ diff --git a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install index 74d362927..e6b5fb014 100644 --- a/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install +++ b/ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install @@ -1 +1 @@ -tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop usr/share/applnk/System/ScreenSavers/ +tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop opt/trinity/share/applnk/System/ScreenSavers/