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

15 files changed, 40 insertions, 40 deletions

diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
 # tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
 
 # This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu b/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
 ?package(cervisia):\
   needs="x11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
+  hints="TDE,Version control"\
   title="Cervisia"\
   longtitle="Cervisia (CVS Frontend)"\
-  icon="/usr/share/pixmaps/cervisia.xpm"\
+  icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
   command="/opt/trinity/bin/cervisia"
 
diff --git a/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
 # These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian b/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
 # This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu b/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel"\
         longtitle="KBabel (Translation Tool)"\
-        icon="/usr/share/pixmaps/kbabel.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
         command="/opt/trinity/bin/kbabel"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Dictionary"\
         longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
-        icon="/usr/share/pixmaps/kbabeldict.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
         command="/opt/trinity/bin/kbabeldict"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Catalog Manager"\
         longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
-        icon="/usr/share/pixmaps/catalogmanager.xpm"\
+        icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
         command="/opt/trinity/bin/catalogmanager"
 
diff --git a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
         section="Applications/Project Management"\
         hints="TDE"\
         title="KBugBuster"\
-        longtitle="KBugBuster (KDE Bug Management)"\
-        icon="/usr/share/pixmaps/kbugbuster.xpm"\
+        longtitle="KBugBuster (TDE Bug Management)"\
+        icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
         command="/opt/trinity/bin/kbugbuster"
diff --git a/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian b/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
 # This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/ubuntu/precise/tdesdk/debian/kompare-trinity.menu b/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
         hints="TDE"\
         title="Kompare"\
         longtitle="Kompare (Diff/Patch Frontend)"\
-        icon="/usr/share/pixmaps/kompare.xpm"\
+        icon="/opt/trinity/share/pixmaps/kompare.xpm"\
         command="/opt/trinity/bin/kompare"
 
diff --git a/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian b/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
 
 # This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu b/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KUIViewer"\
   longtitle="KUIViewer (Qt Designer UI File Viewer)"\
-  icon="/usr/share/pixmaps/kuiviewer.xpm"\
+  icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
   command="/opt/trinity/bin/kuiviewer"
 
diff --git a/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
 # This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu b/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
   command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
 # The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian b/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
 # this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu b/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="Umbrello"\
   longtitle="Umbrello (UML Modeller)"\
-  icon="/usr/share/pixmaps/umbrello.xpm"\
+  icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
   command="/opt/trinity/bin/umbrello"