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

20 files changed, 46 insertions, 46 deletions

diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Ark"\
-	icon32x32="/usr/share/pixmaps/ark.xpm"\
-	icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
 	command="/opt/trinity/bin/ark"
 
 # Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index d0556e97b..599a692dd 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
 Architecture: all
 Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
 Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
 Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
 Description: general purpose utilities from the official Trinity release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
 Architecture: any
 Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
 Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
 Description: development files for the Trinity utilities module
  This package contains development files needed to compile tdeutils
  applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
  This package is part of Trinity, as a component of the KDE utilities module.
  See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
 
-Package: kdelirc-trinity
+Package: tdelirc-trinity
 Section: utils
 Architecture: any
 Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
 Package: tdessh-trinity
 Section: tde
 Architecture: any
-Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
 Depends: ${shlibs:Depends}, openssh-client | ssh-client
 Description: ssh frontend for Trinity
  This package contains KDE's frontend for ssh.
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcalc):\
 	needs="X11"\
 	section="Apps/Math"\
-	hints="KDE,Calculators"\
+	hints="TDE,Calculators"\
 	title="KCalc"\
-	icon32x32="/usr/share/pixmaps/kcalc.xpm"\
-	icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
 	command="/opt/trinity/bin/kcalc"
 
 # Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcharselect):\
 	needs="X11"\
 	section="Apps/Tools"\
-	hints="KDE,Characters"\
+	hints="TDE,Characters"\
 	title="KCharSelect"\
-	icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
-	icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
 	command="/opt/trinity/bin/kcharselect"
 
 # Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KDiskFree"\
-	icon32x32="/usr/share/pixmaps/kdf.xpm"\
-	icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
 	command="/opt/trinity/bin/kdf"
 
 ?package(kdf):\
@@ -12,8 +12,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="kwikdisk"\
-	icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
-	icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
 	command="/opt/trinity/bin/kwikdisk"
 
 # Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kedit):\
 	needs="X11"\
 	section="Apps/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KEdit"\
-	icon32x32="/usr/share/pixmaps/kedit.xpm"\
-	icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
 	command="/opt/trinity/bin/kedit"
 
 # Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KFloppy"\
-	icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
-	icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
 	command="/opt/trinity/bin/kfloppy"
 
 # Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kgpg"\
-	icon32x32="/usr/share/pixmaps/kgpg.xpm"\
-	icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
 	command="/opt/trinity/bin/kgpg"
 
 # Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KHexEdit"\
-	icon32x32="/usr/share/pixmaps/khexedit.xpm"\
-	icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
 	command="/opt/trinity/bin/khexedit"
 
 # Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KJots"\
-	icon32x32="/usr/share/pixmaps/kjots.xpm"\
-	icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
 	command="/opt/trinity/bin/kjots"
 
 # Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kregexpeditor"\
-	icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
-	icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
 	command="/opt/trinity/bin/kregexpeditor"
 
 # Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KTimer"\
-	icon32x32="/usr/share/pixmaps/ktimer.xpm"\
-	icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
 	command="/opt/trinity/bin/ktimer"
 
 # Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Superkaramba"\
-	icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
-	icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
 	command="/opt/trinity/bin/superkaramba"
 
 # Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install