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

13 files changed, 26 insertions, 26 deletions

diff --git a/debian/wheezy/tdepim/debian/akregator-trinity.menu b/debian/wheezy/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/wheezy/tdepim/debian/akregator-trinity.menu
+++ b/debian/wheezy/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="aKregator"\
-	icon32x32="/usr/share/pixmaps/akregator.xpm"\
-	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
 	command="/opt/trinity/bin/akregator"
diff --git a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAddressbook"\
-	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
-	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
 	command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/wheezy/tdepim/debian/kalarm-trinity.menu b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/wheezy/tdepim/debian/kalarm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAlarm"\
-	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
-	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
 	command="/opt/trinity/bin/kalarm"
diff --git a/debian/wheezy/tdepim/debian/karm-trinity.menu b/debian/wheezy/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/wheezy/tdepim/debian/karm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Project Management"\
 	hints="TDE"\
 	title="KArm"\
-	icon32x32="/usr/share/pixmaps/karm.xpm"\
-	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
 	command="/opt/trinity/bin/karm"
diff --git a/debian/wheezy/tdepim/debian/kmail-trinity.menu b/debian/wheezy/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/wheezy/tdepim/debian/kmail-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
 ?package(kmail):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail"\
-	icon32x32="/usr/share/pixmaps/kmail.xpm"\
-	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
 	command="/opt/trinity/bin/kmail"
diff --git a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
 ?package(kmailcvt):\
 	needs="X11"\
 	section="Applications/Data Management"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail/KAB Import Tool"\
 	command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/wheezy/tdepim/debian/knode-trinity.menu b/debian/wheezy/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/wheezy/tdepim/debian/knode-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
 ?package(knode):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,News"\
+	hints="TDE,News"\
 	title="KNode"\
-	icon32x32="/usr/share/pixmaps/knode.xpm"\
-	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
 	command="/opt/trinity/bin/knode"
diff --git a/debian/wheezy/tdepim/debian/knotes-trinity.menu b/debian/wheezy/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/wheezy/tdepim/debian/knotes-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KNotes"\
-	icon32x32="/usr/share/pixmaps/knotes.xpm"\
-	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
 	command="/opt/trinity/bin/knotes"
diff --git a/debian/wheezy/tdepim/debian/kontact-trinity.menu b/debian/wheezy/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/wheezy/tdepim/debian/kontact-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="Kontact"\
-	icon32x32="/usr/share/pixmaps/kontact.xpm"\
-	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
 	command="/opt/trinity/bin/kontact"
diff --git a/debian/wheezy/tdepim/debian/korganizer-trinity.menu b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/wheezy/tdepim/debian/korganizer-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KOrganizer"\
-	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
-	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
 	command="/opt/trinity/bin/korganizer"
diff --git a/debian/wheezy/tdepim/debian/korn-trinity.menu b/debian/wheezy/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/wheezy/tdepim/debian/korn-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="KOrn"\
-	icon32x32="/usr/share/pixmaps/korn.xpm"\
-	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
 	command="/opt/trinity/bin/korn"
diff --git a/debian/wheezy/tdepim/debian/ktnef-trinity.menu b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/wheezy/tdepim/debian/ktnef-trinity.menu
+++ b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KTnef"\
-	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
-	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
 	command="/opt/trinity/bin/ktnef"
diff --git a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
-	title="KDE Groupware Wizard"\
+	title="TDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
 ?package(tdepim-wizards):\