Branch: master

985f6b9c 2015-08-12 14:56:26 Timothy Pearson
Fix tdescreensaver installation directory on Debian and Ubuntu
M debian/lenny/tdeartwork/debian/rules
M debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
M debian/lenny/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
M debian/squeeze/tdeartwork/debian/rules
M debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
M debian/squeeze/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
M ubuntu/maverick/tdeartwork/debian/rules
M ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
M ubuntu/maverick/tdeartwork/debian/tdescreensaver-xsavers-webcollage-trinity.install
diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules
index 062bd4f..272ae85 100755
--- a/debian/lenny/tdeartwork/debian/rules
+++ b/debian/lenny/tdeartwork/debian/rules
@@ -37,4 +37,4 @@
 	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 65da0bf..3f7f191 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 74d3629..e6b5fb0 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 da0f05c..b5271b9 100755
--- a/debian/squeeze/tdeartwork/debian/rules
+++ b/debian/squeeze/tdeartwork/debian/rules
@@ -37,4 +37,4 @@
 	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 65da0bf..3f7f191 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 74d3629..e6b5fb0 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 da0f05c..b5271b9 100755
--- a/ubuntu/maverick/tdeartwork/debian/rules
+++ b/ubuntu/maverick/tdeartwork/debian/rules
@@ -37,4 +37,4 @@
 	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 65da0bf..3f7f191 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 74d3629..e6b5fb0 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/