summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/kdeartwork
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-20 19:02:33 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-20 19:02:33 -0400
commit6507e11446a26cf7882ecc8658e505b6adce8e61 (patch)
tree6fddf797d72efd2218a9251d88cd78421d29cf11 /ubuntu/maverick/kdeartwork
parent15f0f9d002ddecf5cc794a7a5bdd78a971b31ee6 (diff)
parentff90ca42326263cc8f50263efb91a4592c89e84c (diff)
downloadtde-packaging-6507e11446a26cf7882ecc8658e505b6adce8e61.tar.gz
tde-packaging-6507e11446a26cf7882ecc8658e505b6adce8e61.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/kdeartwork')
-rw-r--r--ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install3
-rw-r--r--ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff10
2 files changed, 13 insertions, 0 deletions
diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
index af1bbc133..9d8130e98 100644
--- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
+++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install
@@ -1,3 +1,6 @@
+debian/tmp/opt/trinity/bin/xscreensaver-getimage-file
+debian/tmp/opt/trinity/bin/xscreensaver-getimage
+debian/tmp/opt/trinity/bin/krootbacking
debian/tmp/opt/trinity/bin/kxsconfig
debian/tmp/opt/trinity/bin/kxsrun
debian/tmp/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop
diff --git a/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
new file mode 100644
index 000000000..b8a55ad56
--- /dev/null
+++ b/ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff
@@ -0,0 +1,10 @@
+diff -urN kscreensaver/krootbacking/Makefile.am kscreensaver/krootbacking/Makefile.am
+--- kscreensaver/krootbacking/Makefile.am 2011-08-19 19:27:09.000000000 -0500
++++ kscreensaver/krootbacking/Makefile.am 2011-08-19 20:06:36.000000000 -0500
+@@ -9,5 +9,5 @@
+
+ noinst_HEADERS = krootbacking.h
+
+-hackdir = /usr/local/bin/
++hackdir = /opt/trinity/bin/
+ hack_DATA = xscreensaver-getimage xscreensaver-getimage-file