From 779143e082761c8ea8107af38f2c4765f17e68bb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 16:58:55 -0500 Subject: Add krootbacking binary to Ubuntu and Debian kdeartwork --- ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install | 1 + 1 file changed, 1 insertion(+) (limited to 'ubuntu/maverick/kdeartwork/debian') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install index d65c099dc..8711152ba 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install @@ -1,3 +1,4 @@ +debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kslideshow.kss debian/tmp/opt/trinity/bin/kpolygon.kss debian/tmp/opt/trinity/bin/krotation.kss -- cgit v1.2.1 From 53fd04138ca27a9534d4696dbf983a24f589495e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 17:32:43 -0500 Subject: Fix up kdeartwork under Debian and Ubuntu --- ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install | 1 - ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ubuntu/maverick/kdeartwork/debian') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install index 8711152ba..d65c099dc 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-trinity.install @@ -1,4 +1,3 @@ -debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kslideshow.kss debian/tmp/opt/trinity/bin/kpolygon.kss debian/tmp/opt/trinity/bin/krotation.kss diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install index af1bbc133..10fb6b475 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/usr/local/bin/xscreensaver-getimage-file +debian/tmp/usr/local/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 -- cgit v1.2.1 From 46b13ffe74ee67ad1a5d39cebb2cff0151c5ddad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 20:33:58 -0500 Subject: Fix kdeartwork FTBFS --- .../maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/kdeartwork/debian') diff --git a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install index 10fb6b475..9d8130e98 100644 --- a/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install +++ b/ubuntu/maverick/kdeartwork/debian/kscreensaver-xsavers-trinity.install @@ -1,5 +1,5 @@ -debian/tmp/usr/local/bin/xscreensaver-getimage-file -debian/tmp/usr/local/bin/xscreensaver-getimage +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 -- cgit v1.2.1 From 8bd1c5a1e6cce647afb0ee99a7d937fc8bca5342 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 19 Aug 2011 20:35:51 -0500 Subject: Second part of prior commit for Debian and Ubuntu --- .../debian/patches/debianize-xscreensaver-root-hack.diff | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ubuntu/maverick/kdeartwork/debian/patches/debianize-xscreensaver-root-hack.diff (limited to 'ubuntu/maverick/kdeartwork/debian') 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 -- cgit v1.2.1