From 9c2b073778acf0038e93f9246e406c31681914b5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 17 Jun 2012 22:33:07 -0500
Subject: [PATCH] Fix tdebase FTBFS on Debian and Ubuntu (cherry picked from
 commit 903a42953992799dc3e6a096dd003f9ef3281600)

---
 .../debian/patches/disable_startkde_wallpaper.diff   | 12 ++++++------
 .../debian/patches/disable_startkde_wallpaper.diff   | 12 ++++++------
 .../debian/patches/disable_startkde_wallpaper.diff   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff
index 838bbec11..c88d50b0b 100644
--- 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
diff --git a/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff b/debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff
index 838bbec11..c88d50b0b 100644
--- 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
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