diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 22:33:07 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-17 22:33:07 -0500 |
| commit | 903a42953992799dc3e6a096dd003f9ef3281600 (patch) | |
| tree | 04f8524fb40792d31c97884ceb3fae1fb04ea192 | |
| parent | 143d7c6059d64220483a0d9473969a36a620a194 (diff) | |
| download | tde-packaging-903a42953992799dc3e6a096dd003f9ef3281600.tar.gz tde-packaging-903a42953992799dc3e6a096dd003f9ef3281600.zip | |
Fix tdebase FTBFS on Debian and Ubuntu
3 files changed, 18 insertions, 18 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 diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff index 00cc8ca37..a45290729 100644 --- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/squeeze/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 diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff index 00cc8ca37..a45290729 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/ubuntu/maverick/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 |