Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

7 files changed, 20 insertions, 38 deletions

diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff b/ubuntu/maverick/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 3949f4040..598cd7092 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/plasma-desktop.autodetect b/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect
deleted file mode 100755
index b083cb277..000000000
--- a/ubuntu/maverick/tdebase/debian/plasma-desktop.autodetect
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-DESKTOP_SESSION="$DESKTOP_SESSION"
-echo "You are running $DESKTOP_SESSION"
-
-if [[ "$DESKTOP_SESSION" == "trinity" ]]
-then
-	# Do nothing, this is Trinity
-	echo "I detected Trinity"
-else
-	# This is KDE4, start plasma-desktop
-	echo "I detected KDE4"
-	/usr/bin/plasma-desktop.kde4
-fi
diff --git a/ubuntu/maverick/tdebase/debian/plasma.autodetect b/ubuntu/maverick/tdebase/debian/plasma.autodetect
deleted file mode 100755
index c23f68909..000000000
--- a/ubuntu/maverick/tdebase/debian/plasma.autodetect
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-DESKTOP_SESSION="$DESKTOP_SESSION"
-echo "You are running $DESKTOP_SESSION"
-
-if [[ "$DESKTOP_SESSION" == "trinity" ]]
-then
-	# Do nothing, this is Trinity
-	echo "I detected Trinity"
-else
-	# This is KDE4, start plasma
-	echo "I detected KDE4"
-	/usr/bin/plasma.kde4
-fi
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 1d062ca42..1192433cb 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -291,5 +291,3 @@ binary-install/tdebase-trinity-bin::
 
 binary-install/ksmserver-trinity::
 	install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop
-	install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma
-	install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 0ae53f571..740f0b2ce 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -1165,14 +1165,18 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
 debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
 debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
+debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
+debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
+debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
+debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
 debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
 debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
+debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
+debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
 debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
 debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
@@ -1195,14 +1199,14 @@ debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
 debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
 debian/tmp/opt/trinity/share/wallpapers/isadora.png
 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/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/moon.svgz
 debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
+debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
+debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
 debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
@@ -1219,6 +1223,10 @@ debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
 debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
 debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.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/triplegears.jpg
 debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
 debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg
diff --git a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
index 43a7beeaa..a951e7daf 100644
--- a/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdepasswd-trinity.install
@@ -33,3 +33,6 @@ debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png
 debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png
 debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg
 debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdepasswd/index.docbook
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
index 04241c097..afcf37d7b 100644
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install
@@ -44,6 +44,7 @@ debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop
 debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png
 debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png
 debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png
+debian/tmp/opt/trinity/share/apps/tdm/themes/minimalist
 debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdm/index.cache.bz2