summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase/debian
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-15 02:03:20 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-15 02:03:20 +0100
commit11bfc1adba5c32d7299cca4d4f9141e889033cd6 (patch)
treeb1b0a42e8ae5b51dfe93352f9247b4056be0c027 /ubuntu/maverick/tdebase/debian
parent9eaa7eb86bd627d3636f0d1988c7e867e2f7eebf (diff)
parent14dfc7ec02c0f331342d8becac217b781b5feadf (diff)
downloadtde-packaging-11bfc1adba5c32d7299cca4d4f9141e889033cd6.tar.gz
tde-packaging-11bfc1adba5c32d7299cca4d4f9141e889033cd6.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
-rw-r--r--ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff6
1 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 21011fbd5..00cc8ca37 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,12 +1,12 @@
--- starttde
+++ starttde
-@@ -184,17 +184,17 @@
+@@ -228,17 +228,17 @@
. $tdehome/share/config/startupconfig
fi
-# Make sure a default wallpaper is set.
-if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
+- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$tdehome/share/config/kdesktoprc <<EOF
-[Desktop0]
@@ -17,7 +17,7 @@
-fi
+## Make sure a default wallpaper is set.
+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
++# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$tdehome/share/config/kdesktoprc <<EOF
+#[Desktop0]