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

33 files changed, 91 insertions, 91 deletions

diff --git a/ubuntu/raring/tdegames/debian/atlantik-trinity.menu b/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
 ?package(atlantik):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Monopoly"\
+	hints="TDE,Monopoly"\
 	title="Atlantik"\
-	icon32x32="/usr/share/pixmaps/atlantik.xpm"\
-	icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
 	command="/opt/trinity/games/atlantik"
 
diff --git a/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk
@@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
 	if test -e debian/$(cdbs_curpkg).lintian; then \
 		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
+			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
 	fi
 	if test -e debian/$(cdbs_curpkg).presubj; then \
 		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
+			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
 	fi
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
diff --git a/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu b/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KAsteroids"\
-	icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
-	icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
 	command="/opt/trinity/games/kasteroids"
 
diff --git a/ubuntu/raring/tdegames/debian/katomic-trinity.menu b/ubuntu/raring/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/ubuntu/raring/tdegames/debian/katomic-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Puzzles"\
 	hints="TDE"\
-	title="KDE Atomic Entertainment"\
-	icon32x32="/usr/share/pixmaps/katomic.xpm"\
-	icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+	title="TDE Atomic Entertainment"\
+	icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
 	command="/opt/trinity/games/katomic"
 
diff --git a/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu b/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Backgammon"\
-	icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
-	icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+	title="TDE Backgammon"\
+	icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
 	command="/opt/trinity/games/kbackgammon"
 
diff --git a/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu b/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
         section="Games/Board"\
         hints="TDE"\
         title="KBattleship"\
-	icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
-	icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
         command="/opt/trinity/games/kbattleship"
diff --git a/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu b/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kblackbox):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,BlackBox"\
+	hints="TDE,BlackBox"\
 	title="KBlackBox"\
-	icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
-	icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
 	command="/opt/trinity/games/kblackbox"
 
diff --git a/ubuntu/raring/tdegames/debian/kbounce-trinity.menu b/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Bounce Ball Game"\
-	icon32x32="/usr/share/pixmaps/kbounce.xpm"\
-	icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+	title="TDE Bounce Ball Game"\
+	icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
 	command="/opt/trinity/games/kbounce"
 
diff --git a/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu b/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KEnolaba"\
-	icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
-	icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
 	command="/opt/trinity/games/kenolaba"
diff --git a/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu b/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
         needs="x11"\
         section="Games/Tetris-like"\
 	hints="TDE"\
-        title="KDE Foul Eggs"\
-	icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
-	icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+        title="TDE Foul Eggs"\
+	icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
         command="/opt/trinity/games/kfouleggs"
 
diff --git a/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu b/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KGoldrunner"\
-	icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
-	icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
 	command="/opt/trinity/games/kgoldrunner"
 
diff --git a/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu b/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="KJumpingCube"\
-	icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
-	icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
 	command="/opt/trinity/games/kjumpingcube"
 
diff --git a/ubuntu/raring/tdegames/debian/klickety-trinity.menu b/ubuntu/raring/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/ubuntu/raring/tdegames/debian/klickety-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Puzzles"\
 	hints="TDE"\
 	title="Klickety"\
-	icon32x32="/usr/share/pixmaps/klickety.xpm"\
-	icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
 	command="/opt/trinity/games/klickety"
 
diff --git a/ubuntu/raring/tdegames/debian/klines-trinity.menu b/ubuntu/raring/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/ubuntu/raring/tdegames/debian/klines-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KLines"\
-	icon32x32="/usr/share/pixmaps/klines.xpm"\
-	icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
 	command="/opt/trinity/games/klines"
diff --git a/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu b/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmahjongg):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Mahjongg"\
+	hints="TDE,Mahjongg"\
 	title="KMahjongg"\
-	icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
-	icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
 	command="/opt/trinity/games/kmahjongg"
 
diff --git a/ubuntu/raring/tdegames/debian/kmines-trinity.menu b/ubuntu/raring/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/ubuntu/raring/tdegames/debian/kmines-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmines):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="Kmines"\
-	icon32x32="/usr/share/pixmaps/kmines.xpm"\
-	icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
 	command="/opt/trinity/games/kmines"
 
diff --git a/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu b/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
 ?package(knetwalk):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="KNetwalk"\
-	icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
-	icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
 	command="/opt/trinity/games/knetwalk"
 
diff --git a/ubuntu/raring/tdegames/debian/kolf-trinity.menu b/ubuntu/raring/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/ubuntu/raring/tdegames/debian/kolf-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Miniature Golf"\
-	icon32x32="/usr/share/pixmaps/kolf.xpm"\
-	icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+	title="TDE Miniature Golf"\
+	icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
 	command="/opt/trinity/games/kolf"
 
diff --git a/ubuntu/raring/tdegames/debian/konquest-trinity.menu b/ubuntu/raring/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/ubuntu/raring/tdegames/debian/konquest-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="Konquest"\
-	icon32x32="/usr/share/pixmaps/konquest.xpm"\
-	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
 	command="/opt/trinity/games/konquest"
 
diff --git a/ubuntu/raring/tdegames/debian/kpat-trinity.menu b/ubuntu/raring/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/ubuntu/raring/tdegames/debian/kpat-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Patience"\
-	icon32x32="/usr/share/pixmaps/kpat.xpm"\
-	icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+	title="TDE Patience"\
+	icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
 	command="/opt/trinity/games/kpat"
 
diff --git a/ubuntu/raring/tdegames/debian/kpoker-trinity.menu b/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Poker"\
-	icon32x32="/usr/share/pixmaps/kpoker.xpm"\
-	icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+	title="TDE Poker"\
+	icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
 	command="/opt/trinity/games/kpoker"
 
diff --git a/ubuntu/raring/tdegames/debian/kreversi-trinity.menu b/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Reversi"\
-	icon32x32="/usr/share/pixmaps/kreversi.xpm"\
-	icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+	title="TDE Reversi"\
+	icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
 	command="/opt/trinity/games/kreversi"
 
diff --git a/ubuntu/raring/tdegames/debian/ksame-trinity.menu b/ubuntu/raring/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/ubuntu/raring/tdegames/debian/ksame-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksame):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,SameGame"\
-	title="KDE SameGame"\
-	icon32x32="/usr/share/pixmaps/ksame.xpm"\
-	icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+	hints="TDE,SameGame"\
+	title="TDE SameGame"\
+	icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
 	command="/opt/trinity/games/ksame"
 
diff --git a/ubuntu/raring/tdegames/debian/kshisen-trinity.menu b/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Shisen-Sho"\
-	icon32x32="/usr/share/pixmaps/kshisen.xpm"\
-	icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+	title="TDE Shisen-Sho"\
+	icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
 	command="/opt/trinity/games/kshisen"
 
diff --git a/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu b/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Sirtet"\
-	icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
-	icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+	title="TDE Sirtet"\
+	icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
 	command="/opt/trinity/games/ksirtet"
 
diff --git a/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu b/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Smiletris"\
-	icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
-	icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+	title="TDE Smiletris"\
+	icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
 	command="/opt/trinity/games/ksmiletris"
 
diff --git a/ubuntu/raring/tdegames/debian/ksnake-trinity.menu b/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Snake Race"\
-	icon32x32="/usr/share/pixmaps/ksnake.xpm"\
-	icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+	title="TDE Snake Race"\
+	icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
 	command="/opt/trinity/games/ksnake"
 
diff --git a/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu b/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksokoban):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Sokoban"\
-	title="KDE Sokoban"\
-	icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
-	icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+	hints="TDE,Sokoban"\
+	title="TDE Sokoban"\
+	icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
 	command="/opt/trinity/games/ksokoban"
 
diff --git a/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu b/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE SpaceDuel"\
-	icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
-	icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+	title="TDE SpaceDuel"\
+	icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
 	command="/opt/trinity/games/kspaceduel"
 
diff --git a/ubuntu/raring/tdegames/debian/ktron-trinity.menu b/ubuntu/raring/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/ubuntu/raring/tdegames/debian/ktron-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Tron"\
-	icon32x32="/usr/share/pixmaps/ktron.xpm"\
-	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+	title="TDE Tron"\
+	icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
 	command="/opt/trinity/games/ktron"
 
diff --git a/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu b/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
-	title="KDE Potato Guy"\
-	icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
-	icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+	title="TDE Potato Guy"\
+	icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
 	command="/opt/trinity/games/ktuberling"
 
diff --git a/ubuntu/raring/tdegames/debian/kwin4-trinity.menu b/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KWin4"\
-	icon32x32="/usr/share/pixmaps/twin4.xpm"\
-	icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
 
diff --git a/ubuntu/raring/tdegames/debian/lskat-trinity.menu b/ubuntu/raring/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/ubuntu/raring/tdegames/debian/lskat-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Lieutnant Skat"\
-	icon32x32="/usr/share/pixmaps/lskat.xpm"\
-	icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+	title="TDE Lieutnant Skat"\
+	icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
 	command="/opt/trinity/games/lskat"