Fix lintian overrides on Debian and Ubuntu

(cherry picked from commit 09baa28aa4748c02ca157089cac90ed45c767dfd)

8 files changed, 26 insertions, 26 deletions

diff --git a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian b/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian
index d7a490dae..0037f433c 100644
--- a/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
 # kconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/kconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/kconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/kconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/kconf_update/move_repositories.pl
 
 # This is from kdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libkdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libkdeinit-cervisia
diff --git a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/ubuntu/maverick/kdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/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/maverick/kdesdk/debian/kbabel-trinity.lintian b/ubuntu/maverick/kdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/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/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian b/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian
index 97dd13989..91f6885f3 100644
--- a/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/debian/kdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
 # The syntax error is just perlpod docs appearing after the script exits.
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-kdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+kdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+kdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/kdesdk/debian/kompare-trinity.lintian b/ubuntu/maverick/kdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/ubuntu/maverick/kdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/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/maverick/kdesdk/debian/kspy-trinity.lintian b/ubuntu/maverick/kdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/ubuntu/maverick/kdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/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/maverick/kdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..015a481a0 100644
--- a/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
 # This is from kdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libkdeinit_cvsaskpass.so opt/trinity/lib/libkdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libkdeinit_cvsservice.so opt/trinity/lib/libkdeinit_cvsservice.so
diff --git a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.lintian b/ubuntu/maverick/kdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/ubuntu/maverick/kdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/maverick/kdesdk/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