Fix lintian overrides on Debian and Ubuntu

(cherry picked from commit 09baa28aa4748c02ca157089cac90ed45c767dfd)

13 files changed, 39 insertions, 39 deletions

diff --git a/debian/lenny/kdebase/debian/kate-trinity.lintian b/debian/lenny/kdebase/debian/kate-trinity.lintian
index fcc9b79aa..80d27b09a 100644
--- a/debian/lenny/kdebase/debian/kate-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libkdeinit_kwrite.so usr/lib/libkdeinit_kwrite.so
-kate: shlib-missing-in-control-file libkdeinit_kate.so usr/lib/libkdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libkdeinit_kwrite.so opt/trinity/lib/libkdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libkdeinit_kate.so opt/trinity/lib/libkdeinit_kate.so
diff --git a/debian/lenny/kdebase/debian/kcontrol-trinity.lintian b/debian/lenny/kdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..2a4306011 100644
--- a/debian/lenny/kdebase/debian/kcontrol-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libkdeinit_kaccess.so usr/lib/libkdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libkdeinit_kcontrol.so usr/lib/libkdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libkdeinit_krandrinithack.so usr/lib/libkdeinit_krandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libkdeinit_kaccess.so opt/trinity/lib/libkdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libkdeinit_kcontrol.so opt/trinity/lib/libkdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libkdeinit_krandrinithack.so opt/trinity/lib/libkdeinit_krandrinithack.so
diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-bin.lintian b/debian/lenny/kdebase/debian/kdebase-trinity-bin.lintian
index 82e1b9846..9f78d69c8 100644
--- a/debian/lenny/kdebase/debian/kdebase-trinity-bin.lintian
+++ b/debian/lenny/kdebase/debian/kdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-kdebase-bin: setgid-binary usr/bin/kdesud 2755 root/nogroup
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kcminit.so
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_khotkeys.so
-kdebase-bin: no-shlibs-control-file usr/lib/libkdeinit_kxkb.so
-kdebase-bin: postinst-must-call-ldconfig usr/lib/libkdeinit_khotkeys.so
-kdebase-bin: postrm-should-call-ldconfig usr/lib/libkdeinit_khotkeys.so
+kdebase-bin-trinity: setgid-binary opt/trinity/bin/kdesud 2755 root/nogroup
+kdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcminit.so
+kdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_khotkeys.so
+kdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kxkb.so
+kdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_khotkeys.so
+kdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_khotkeys.so
diff --git a/debian/lenny/kdebase/debian/kdeprint-trinity.lintian b/debian/lenny/kdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..156e04dc0 100644
--- a/debian/lenny/kdebase/debian/kdeprint-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kjobviewer.so
-kdeprint: no-shlibs-control-file usr/lib/libkdeinit_kprinter.so
-kdeprint: postinst-must-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
-kdeprint: postrm-should-call-ldconfig usr/lib/libkdeinit_kjobviewer.so
+kdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kjobviewer.so
+kdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kprinter.so
+kdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kjobviewer.so
+kdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kjobviewer.so
diff --git a/debian/lenny/kdebase/debian/kdesktop-trinity.lintian b/debian/lenny/kdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..c270fd6ae 100644
--- a/debian/lenny/kdebase/debian/kdesktop-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libkdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kdesktop.so
diff --git a/debian/lenny/kdebase/debian/khelpcenter-trinity.lintian b/debian/lenny/kdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..181e28c79 100644
--- a/debian/lenny/kdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/lenny/kdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libkdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_khelpcenter.so
diff --git a/debian/lenny/kdebase/debian/kicker-trinity.lintian b/debian/lenny/kdebase/debian/kicker-trinity.lintian
index 41de1be8e..58291ed21 100644
--- a/debian/lenny/kdebase/debian/kicker-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libkdeinit_extensionproxy.so usr/lib/libkdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libkdeinit_kicker.so usr/lib/libkdeinit_kicker.so
-kicker: shlib-missing-in-control-file libkdeinit_appletproxy.so usr/lib/libkdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libkdeinit_extensionproxy.so opt/trinity/lib/libkdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libkdeinit_kicker.so opt/trinity/lib/libkdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libkdeinit_appletproxy.so opt/trinity/lib/libkdeinit_appletproxy.so
diff --git a/debian/lenny/kdebase/debian/klipper-trinity.lintian b/debian/lenny/kdebase/debian/klipper-trinity.lintian
index 710a50459..320ae2d31 100644
--- a/debian/lenny/kdebase/debian/klipper-trinity.lintian
+++ b/debian/lenny/kdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libkdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libkdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libkdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_klipper.so
diff --git a/debian/lenny/kdebase/debian/kmenuedit-trinity.lintian b/debian/lenny/kdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..845065f6f 100644
--- a/debian/lenny/kdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libkdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libkdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcontroledit.so
diff --git a/debian/lenny/kdebase/debian/konqueror-trinity.lintian b/debian/lenny/kdebase/debian/konqueror-trinity.lintian
index 27e528d84..2bbd4c186 100644
--- a/debian/lenny/kdebase/debian/konqueror-trinity.lintian
+++ b/debian/lenny/kdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libkdeinit_keditbookmarks.so usr/lib/libkdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libkdeinit_kfmclient.so usr/lib/libkdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libkdeinit_konqueror.so usr/lib/libkdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libkdeinit_keditbookmarks.so opt/trinity/lib/libkdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libkdeinit_kfmclient.so opt/trinity/lib/libkdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libkdeinit_konqueror.so opt/trinity/lib/libkdeinit_konqueror.so
diff --git a/debian/lenny/kdebase/debian/konsole-trinity.lintian b/debian/lenny/kdebase/debian/konsole-trinity.lintian
index 95c2d012e..c050f8ca0 100644
--- a/debian/lenny/kdebase/debian/konsole-trinity.lintian
+++ b/debian/lenny/kdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libkdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libkdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libkdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_konsole.so
diff --git a/debian/lenny/kdebase/debian/ksmserver-trinity.lintian b/debian/lenny/kdebase/debian/ksmserver-trinity.lintian
index 669919e49..b246da092 100644
--- a/debian/lenny/kdebase/debian/ksmserver-trinity.lintian
+++ b/debian/lenny/kdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libkdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libkdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksmserver.so
diff --git a/debian/lenny/kdebase/debian/kwin-trinity.lintian b/debian/lenny/kdebase/debian/kwin-trinity.lintian
index 1bf281c8a..12758aa76 100644
--- a/debian/lenny/kdebase/debian/kwin-trinity.lintian
+++ b/debian/lenny/kdebase/debian/kwin-trinity.lintian
@@ -1,2 +1,2 @@
-kwin: shlib-missing-in-control-file libkdeinit_kwin.so usr/lib/libkdeinit_kwin.so
-kwin: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so usr/lib/libkdeinit_kwin_rules_dialog.so
+kwin-trinity: shlib-missing-in-control-file libkdeinit_kwin.so opt/trinity/lib/libkdeinit_kwin.so
+kwin-trinity: shlib-missing-in-control-file libkdeinit_kwin_rules_dialog.so opt/trinity/lib/libkdeinit_kwin_rules_dialog.so