Fix lintian overrides on Debian and Ubuntu

(cherry picked from commit 09baa28aa4748c02ca157089cac90ed45c767dfd)

9 files changed, 22 insertions, 22 deletions

diff --git a/debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/debian/lenny/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdegraphics/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/debian/lenny/kdegraphics/debian/kfaxview-trinity.lintian b/debian/lenny/kdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/debian/lenny/kdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kfaxview-trinity.lintian
@@ -1,4 +1,4 @@
-kfaxview: no-shlibs-control-file opt/trinity/lib/libkfaximage.so
-kfaxview: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so
-kfaxview: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so
-kfaxview: package-name-doesnt-match-sonames libkfaximage
+kfaxview-trinity: no-shlibs-control-file opt/trinity/lib/libkfaximage.so
+kfaxview-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkfaximage.so
+kfaxview-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkfaximage.so
+kfaxview-trinity: package-name-doesnt-match-sonames libkfaximage
diff --git a/debian/lenny/kdegraphics/debian/kghostview-trinity.lintian b/debian/lenny/kdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/debian/lenny/kdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kghostview-trinity.lintian
@@ -1 +1 @@
-kghostview: package-name-doesnt-match-sonames libkghostviewlib0
+kghostview-trinity: package-name-doesnt-match-sonames libkghostviewlib0
diff --git a/debian/lenny/kdegraphics/debian/kmrml-trinity.lintian b/debian/lenny/kdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..1e1c0f081 100644
--- a/debian/lenny/kdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libkdeinit-mrmlsearch
diff --git a/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.lintian b/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kpovmodeler-trinity.lintian
@@ -1 +1 @@
-kpovmodeler: package-name-doesnt-match-sonames libkpovmodeler0
+kpovmodeler-trinity: package-name-doesnt-match-sonames libkpovmodeler0
diff --git a/debian/lenny/kdegraphics/debian/ksvg-trinity.lintian b/debian/lenny/kdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/debian/lenny/kdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/ksvg-trinity.lintian
@@ -1 +1 @@
-ksvg: package-name-doesnt-match-sonames libtext2path0 libksvg0
+ksvg-trinity: package-name-doesnt-match-sonames libtext2path0 libksvg0
diff --git a/debian/lenny/kdegraphics/debian/kuickshow-trinity.lintian b/debian/lenny/kdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..dd274dba5 100644
--- a/debian/lenny/kdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libkdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libkdeinit-kuickshow
diff --git a/debian/lenny/kdegraphics/debian/kview-trinity.lintian b/debian/lenny/kdegraphics/debian/kview-trinity.lintian
index 8314a8155..7459b4b82 100644
--- a/debian/lenny/kdegraphics/debian/kview-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kview-trinity.lintian
@@ -1,3 +1,3 @@
-kview: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
-kview: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
-kview: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libkdeinit_kview.so opt/trinity/lib/libkdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libkdeinit-kview libkimageviewer0
diff --git a/debian/lenny/kdegraphics/debian/kviewshell-trinity.lintian b/debian/lenny/kdegraphics/debian/kviewshell-trinity.lintian
index 4a0571207..5e80c0a55 100644
--- a/debian/lenny/kdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/lenny/kdegraphics/debian/kviewshell-trinity.lintian
@@ -1,2 +1,2 @@
-kviewshell: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
-kviewshell: package-name-doesnt-match-sonames libkmultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libkmultipage0 libdjvu