Fix tdebase FTBFS on Debian and Ubuntu

(cherry picked from commit 903a429539)
13 years ago · 9c2b073778
parent 3aa05d61df
commit 9c2b073778
3 changed files with 18 additions and 18 deletions
--- a/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/lenny/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
--- a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff
+++ b/debian/squeeze/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
--- 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