TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix tdebase FTBFS on Debian and Ubuntu

Browse Source 
(cherry picked from commit 903a429539)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 3aa05d61df
commit 9c2b073778
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

12
debian/lenny/kdebase/debian/patches/disable_startkde_wallpaper.diff vendored
Unescape View File

@ -1,14 +1,14 @@
--- startkde --- startkde
+++ startkde +++ startkde
@@ -184,17 +184,17 @@ @@ -288,17 +288,17 @@
. $kdehome/share/config/startupconfig . "$kdehome/share/config/startupconfig"
fi fi
-# Make sure a default wallpaper is set. -# 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. - # With Trinity KDE this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$kdehome/share/config/kdesktoprc <<EOF -cat >"$kdehome/share/config/kdesktoprc" <<EOF
-[Desktop0] -[Desktop0]
-Wallpaper=isadora.png -Wallpaper=isadora.png
-WallpaperMode=Scaled -WallpaperMode=Scaled
@ -16,10 +16,10 @@
- fi - fi
-fi -fi
+## Make sure a default wallpaper is set. +## 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. +# # With Trinity KDE this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$kdehome/share/config/kdesktoprc <<EOF +#cat >"$kdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0] +#[Desktop0]
+#Wallpaper=isadora.png +#Wallpaper=isadora.png
+#WallpaperMode=Scaled +#WallpaperMode=Scaled

12
debian/squeeze/kdebase/debian/patches/disable_startkde_wallpaper.diff vendored
Unescape View File

@ -1,14 +1,14 @@
--- startkde --- startkde
+++ startkde +++ startkde
@@ -184,17 +184,17 @@ @@ -288,17 +288,17 @@
. $kdehome/share/config/startupconfig . "$kdehome/share/config/startupconfig"
fi fi
-# Make sure a default wallpaper is set. -# 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. - # With Trinity KDE this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$kdehome/share/config/kdesktoprc <<EOF -cat >"$kdehome/share/config/kdesktoprc" <<EOF
-[Desktop0] -[Desktop0]
-Wallpaper=isadora.png -Wallpaper=isadora.png
-WallpaperMode=Scaled -WallpaperMode=Scaled
@ -16,10 +16,10 @@
- fi - fi
-fi -fi
+## Make sure a default wallpaper is set. +## 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. +# # With Trinity KDE this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$kdehome/share/config/kdesktoprc <<EOF +#cat >"$kdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0] +#[Desktop0]
+#Wallpaper=isadora.png +#Wallpaper=isadora.png
+#WallpaperMode=Scaled +#WallpaperMode=Scaled

12
ubuntu/maverick/kdebase/debian/patches/disable_startkde_wallpaper.diff
Unescape View File

@ -1,14 +1,14 @@
--- startkde --- startkde
+++ startkde +++ startkde
@@ -184,17 +184,17 @@ @@ -288,17 +288,17 @@
. $kdehome/share/config/startupconfig . "$kdehome/share/config/startupconfig"
fi fi
-# Make sure a default wallpaper is set. -# 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. - # With Trinity KDE this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then - if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$kdehome/share/config/kdesktoprc <<EOF -cat >"$kdehome/share/config/kdesktoprc" <<EOF
-[Desktop0] -[Desktop0]
-Wallpaper=isadora.png -Wallpaper=isadora.png
-WallpaperMode=Scaled -WallpaperMode=Scaled
@ -16,10 +16,10 @@
- fi - fi
-fi -fi
+## Make sure a default wallpaper is set. +## 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. +# # With Trinity KDE this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then +# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$kdehome/share/config/kdesktoprc <<EOF +#cat >"$kdehome/share/config/kdesktoprc" <<EOF
+#[Desktop0] +#[Desktop0]
+#Wallpaper=isadora.png +#Wallpaper=isadora.png
+#WallpaperMode=Scaled +#WallpaperMode=Scaled

Write Preview
Loading…
Cancel
Save