summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-17 22:33:07 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-07-23 23:17:58 +0200
commit9c2b073778acf0038e93f9246e406c31681914b5 (patch)
tree756f356b58ca8ded39ba2edf728ed55e586f44c2 /ubuntu
parent3aa05d61df50474091636c2f933a18bf0a606f55 (diff)
downloadtde-packaging-9c2b073778acf0038e93f9246e406c31681914b5.tar.gz
tde-packaging-9c2b073778acf0038e93f9246e406c31681914b5.zip
Fix tdebase FTBFS on Debian and Ubuntu
(cherry picked from commit 903a42953992799dc3e6a096dd003f9ef3281600)
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff12
1 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff
index 838bbec11..c88d50b0b 100644
--- a/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff
@@ -1,14 +1,14 @@
--- startkde
+++ startkde
-@@ -184,17 +184,17 @@
- . $kdehome/share/config/startupconfig
+@@ -288,17 +288,17 @@
+ . "$kdehome/share/config/startupconfig"
fi
-# Make sure a default wallpaper is set.
--if [ ! -e $kdehome/share/config/kdesktoprc ]; then
+-if [ ! -e "$kdehome/share/config/kdesktoprc" ]; then
- # With Trinity KDE this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
--cat >$kdehome/share/config/kdesktoprc <<EOF
+-cat >"$kdehome/share/config/kdesktoprc" <<EOF
-[Desktop0]
-Wallpaper=isadora.png
-WallpaperMode=Scaled
@@ -16,10 +16,10 @@
- fi
-fi
+## Make sure a default wallpaper is set.
-+#if [ ! -e $kdehome/share/config/kdesktoprc ]; then
++#if [ ! -e "$kdehome/share/config/kdesktoprc" ]; then
+# # With Trinity KDE this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-+#cat >$kdehome/share/config/kdesktoprc <<EOF
++#cat >"$kdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0]
+#Wallpaper=isadora.png
+#WallpaperMode=Scaled