Branch: master

8f10473b 2014-09-14 09:25:24 Michele Calgaro
Added new TDE default background. Changes required for Debian/Ubuntu distros.
M debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
M debian/lenny/tdebase/debian/tdebase-data-trinity.install
M debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
M debian/squeeze/tdebase/debian/tdebase-data-trinity.install
M ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
M ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 3949f40..598cd70 100644
--- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -7,10 +7,10 @@
 -# Make sure a default wallpaper is set.
 -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
+-  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 -cat >"$tdehome/share/config/kdesktoprc" <<EOF
 -[Desktop0]
--Wallpaper=isadora.png
+-Wallpaper=Trinity-lineart.svg
 -WallpaperMode=Scaled
 -EOF
 -  fi
@@ -18,10 +18,10 @@
 +## Make sure a default wallpaper is set.
 +#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
++#  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 +#cat >"$tdehome/share/config/kdesktoprc" <<EOF
 +#[Desktop0]
-+#Wallpaper=isadora.png
++#Wallpaper=Trinity-lineart.svg
 +#WallpaperMode=Scaled
 +#EOF
 +#  fi
diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index e0e7efb..a6e7cb9 100644
--- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
@@ -1195,6 +1195,8 @@
 debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 3949f40..598cd70 100644
--- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -7,10 +7,10 @@
 -# Make sure a default wallpaper is set.
 -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
+-  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 -cat >"$tdehome/share/config/kdesktoprc" <<EOF
 -[Desktop0]
--Wallpaper=isadora.png
+-Wallpaper=Trinity-lineart.svg
 -WallpaperMode=Scaled
 -EOF
 -  fi
@@ -18,10 +18,10 @@
 +## Make sure a default wallpaper is set.
 +#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
++#  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 +#cat >"$tdehome/share/config/kdesktoprc" <<EOF
 +#[Desktop0]
-+#Wallpaper=isadora.png
++#Wallpaper=Trinity-lineart.svg
 +#WallpaperMode=Scaled
 +#EOF
 +#  fi
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
index e0e7efb..a6e7cb9 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
@@ -1195,6 +1195,8 @@
 debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 3949f40..598cd70 100644
--- a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -7,10 +7,10 @@
 -# Make sure a default wallpaper is set.
 -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
+-  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 -cat >"$tdehome/share/config/kdesktoprc" <<EOF
 -[Desktop0]
--Wallpaper=isadora.png
+-Wallpaper=Trinity-lineart.svg
 -WallpaperMode=Scaled
 -EOF
 -  fi
@@ -18,10 +18,10 @@
 +## Make sure a default wallpaper is set.
 +#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
++#  if [ -r $TDEDIR/share/wallpapers/Trinity-lineart.svg.desktop ]; then
 +#cat >"$tdehome/share/config/kdesktoprc" <<EOF
 +#[Desktop0]
-+#Wallpaper=isadora.png
++#Wallpaper=Trinity-lineart.svg
 +#WallpaperMode=Scaled
 +#EOF
 +#  fi
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index e0e7efb..a6e7cb9 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -1195,6 +1195,8 @@
 debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
 debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
+debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz