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

3 files changed, 33 insertions, 15 deletions

diff --git a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install b/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
index f00d50a90..bb548da13 100644
--- a/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/ksplash-trinity.install
@@ -20,11 +20,6 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_bottom.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_inactive_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_top.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/Theme.rc
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_active_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_bottom.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_inactive_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_top.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_active_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
@@ -40,6 +35,17 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Preview.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Theme.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.docbook
diff --git a/ubuntu/precise/tdebase/debian/ksplash-trinity.install b/ubuntu/precise/tdebase/debian/ksplash-trinity.install
index f00d50a90..bb548da13 100644
--- a/ubuntu/precise/tdebase/debian/ksplash-trinity.install
+++ b/ubuntu/precise/tdebase/debian/ksplash-trinity.install
@@ -20,11 +20,6 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_bottom.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_inactive_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_top.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/Theme.rc
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_active_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_bottom.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_inactive_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_top.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_active_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
@@ -40,6 +35,17 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Preview.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Theme.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.docbook
diff --git a/ubuntu/raring/tdebase/debian/ksplash-trinity.install b/ubuntu/raring/tdebase/debian/ksplash-trinity.install
index f00d50a90..bb548da13 100644
--- a/ubuntu/raring/tdebase/debian/ksplash-trinity.install
+++ b/ubuntu/raring/tdebase/debian/ksplash-trinity.install
@@ -20,11 +20,6 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_bottom.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_inactive_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/splash_top.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/blue-bend/Theme.rc
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_active_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_bottom.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_inactive_bar.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/splash_top.png
-debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/locolor/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_active_bar.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Default/splash_bottom.png
@@ -40,6 +35,17 @@ debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Simple/Theme.rc
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Preview.png
 debian/tmp/opt/trinity/share/apps/ksplash/Themes/Standard/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/locolor/Theme.rc
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Preview.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_active_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_bottom.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_inactive_bar.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/splash_top.png
+debian/tmp/opt/trinity/share/apps/ksplash/Themes/TDE-Classic/Theme.rc
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/ksplashml/index.docbook