summaryrefslogtreecommitdiffstats
path: root/debian/lenny/tdebase
diff options
context:
space:
mode:
authorFrancois Andriot <[email protected]>2012-06-23 10:26:33 +0200
committerFrancois Andriot <[email protected]>2012-06-23 10:26:33 +0200
commit55105d15adb9e935e1d7a88b41367017753ace9f (patch)
treec726f529c11ef486acf2a63c8464e6cc7ff59457 /debian/lenny/tdebase
parentc9be07821c8511cb8fe2649392fbd3942d756f72 (diff)
parent2415145b9c835be7ff154da29dc76a19aa6a18db (diff)
downloadtde-packaging-55105d15adb9e935e1d7a88b41367017753ace9f.tar.gz
tde-packaging-55105d15adb9e935e1d7a88b41367017753ace9f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/lenny/tdebase')
-rw-r--r--debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 00cc8ca37..a45290729 100644
--- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,14 +1,14 @@
--- starttde
+++ starttde
-@@ -228,17 +228,17 @@
- . $tdehome/share/config/startupconfig
+@@ -288,17 +288,17 @@
+ . "$tdehome/share/config/startupconfig"
fi
-# Make sure a default wallpaper is set.
--if [ ! -e $tdehome/share/config/kdesktoprc ]; then
+-if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
--cat >$tdehome/share/config/kdesktoprc <<EOF
+-cat >"$tdehome/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 $tdehome/share/config/kdesktoprc ]; then
++#if [ ! -e "$tdehome/share/config/kdesktoprc" ]; then
+# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-+#cat >$tdehome/share/config/kdesktoprc <<EOF
++#cat >"$tdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0]
+#Wallpaper=isadora.png
+#WallpaperMode=Scaled