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

18 files changed, 33 insertions, 32 deletions

diff --git a/ubuntu/raring/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/raring/applications/tde-guidance/debian/tde-guidance-trinity.install
index ee5988874..67e6d8496 100644
--- a/ubuntu/raring/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/raring/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -31,12 +31,12 @@ opt/trinity/share/apps/guidance/pics/hi32-group.png
 opt/trinity/share/apps/guidance/pics/hi32-identity.png
 opt/trinity/share/apps/guidance/pics/hi32-password.png
 opt/trinity/share/apps/guidance/pics/kcmpartitions.png
-opt/trinity/share/apps/guidance/pics/kde1.png
-opt/trinity/share/apps/guidance/pics/kde2.png
-opt/trinity/share/apps/guidance/pics/trinity.png
-opt/trinity/share/apps/guidance/pics/kde4.png
-opt/trinity/share/apps/guidance/pics/kde5.png
-opt/trinity/share/apps/guidance/pics/kde6.png
+opt/trinity/share/apps/guidance/pics/trinity1.png
+opt/trinity/share/apps/guidance/pics/trinity2.png
+opt/trinity/share/apps/guidance/pics/trinity3.png
+opt/trinity/share/apps/guidance/pics/trinity4.png
+opt/trinity/share/apps/guidance/pics/trinity5.png
+opt/trinity/share/apps/guidance/pics/trinity6.png
 opt/trinity/share/apps/guidance/pics/hi32-samba.png
 opt/trinity/share/apps/guidance/pics/hi16-hdd.png
 opt/trinity/share/apps/guidance/pics/hi16-cdrom.png
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile
index ea9d69b19..c32c879c6 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile
@@ -108,10 +108,10 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

+	install -m644 artwork/throbber/16x16/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

+	install -m644 artwork/throbber/22x22/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

+	install -m644 artwork/throbber/32x32/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

+	install -m644 artwork/throbber/48x48/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

 

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"

 	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"

diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kde.png b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/kde.png
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kde.png b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/kde.png
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kde.png b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/kde.png
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kde.png b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/kde.png
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile
index 6c213aa2c..5d2ecb190 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile
@@ -248,10 +248,10 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

+	install -m644 artwork/throbber/16x16/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

+	install -m644 artwork/throbber/22x22/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

+	install -m644 artwork/throbber/32x32/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

+	install -m644 artwork/throbber/48x48/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

 

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"

 	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"

diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile b/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile
index 40306f9ae..6ebe4b03f 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile
@@ -247,10 +247,10 @@ install:
 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

+	install -m644 artwork/throbber/16x16/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"

+	install -m644 artwork/throbber/22x22/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"

+	install -m644 artwork/throbber/32x32/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"

+	install -m644 artwork/throbber/48x48/trinity.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"

 

 	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"

 	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"

diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png
index 5f4f1a9fb..5f4f1a9fb 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/16x16/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/16x16/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png
index e6f1e0bf6..e6f1e0bf6 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/22x22/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/22x22/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png
index f763d6bbb..f763d6bbb 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/32x32/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/32x32/trinity.png
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kde.png b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png
index d441f58bf..d441f58bf 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/48x48/kde.png
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/artwork/throbber/48x48/trinity.png
diff --git a/ubuntu/raring/tdebase/debian/konqueror-trinity.install b/ubuntu/raring/tdebase/debian/konqueror-trinity.install
index 562eec1f3..29d9b7991 100644
--- a/ubuntu/raring/tdebase/debian/konqueror-trinity.install
+++ b/ubuntu/raring/tdebase/debian/konqueror-trinity.install
@@ -119,12 +119,12 @@ debian/tmp/opt/trinity/share/apps/konqueror/about/plugins_rtl.html
 debian/tmp/opt/trinity/share/apps/konqueror/about/specs.html
 debian/tmp/opt/trinity/share/apps/konqueror/about/tips.html
 debian/tmp/opt/trinity/share/apps/konqueror/about/top-right-konqueror.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png
-debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity1.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity2.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity3.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity4.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity5.png
+debian/tmp/opt/trinity/share/apps/konqueror/icons/crystalsvg/16x16/actions/trinity6.png
 debian/tmp/opt/trinity/share/apps/konqueror/konq-simplebrowser.rc
 debian/tmp/opt/trinity/share/apps/konqueror/konqueror.rc
 debian/tmp/opt/trinity/share/apps/konqueror/pics/indicator_connect.png
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
index a5bb8114a..cdbc0eb68 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
@@ -2089,12 +2089,13 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/identity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/info.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/inline_image.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/inline_table.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde1.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity1.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity2.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity3.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity4.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity5.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity6.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/trinity.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde4.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde5.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde6.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/kde.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/key_enter.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/knewstuff.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/launch.png
@@ -2554,7 +2555,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/idea.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/identity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/inline_image.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/inline_table.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/kde.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/trinity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/key_enter.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/launch.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/leftjust.png
@@ -2920,7 +2921,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/halfencrypted.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/help.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/identity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/indent.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/kde.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/trinity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/tdevelop_down.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/knewstuff.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/launch.png
@@ -3287,7 +3288,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/gear.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/gohome.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/identity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/indent.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/kde.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/trinity.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/launch.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/lock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/mail_new.png