From 912d7b24ba768ed5937f0b4da82a69fbdec3afd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 20 Jul 2013 04:24:36 +0200
Subject: [PATCH] Fix lintian overrides on Debian and Ubuntu (cherry picked
 from commit 09baa28aa4748c02ca157089cac90ed45c767dfd)

---
 debian/lenny/applications/amarok/debian/rules |  2 +-
 .../gwenview/debian/gwenview.lintian          |  6 ++--
 .../lenny/applications/gwenview/debian/rules  |  6 ++--
 .../lenny/applications/kaffeine/debian/rules  | 22 ++++++------
 .../kerry/debian/cdbs/debian-qt-kde.mk        |  4 +--
 .../koffice/debian/cdbs/debian-qt-kde.mk      |  4 +--
 .../koffice/debian/chalk-data-trinity.lintian | 34 +++++++++----------
 .../koffice/debian/chalk-trinity.lintian      |  6 ++--
 .../koffice/debian/karbon-trinity.lintian     |  4 +--
 .../koffice/debian/kchart-trinity.lintian     |  6 ++--
 .../koffice/debian/kexi-trinity.lintian       | 28 +++++++--------
 .../koffice/debian/kformula-trinity.lintian   |  8 ++---
 .../koffice/debian/kivio-data-trinity.lintian |  2 +-
 .../koffice/debian/kivio-trinity.lintian      |  6 ++--
 .../debian/koffice-libs-trinity.lintian       |  2 +-
 .../koffice/debian/koshell-trinity.lintian    |  8 ++---
 .../koffice/debian/kplato-trinity.lintian     |  8 ++---
 .../debian/kpresenter-data-trinity.lintian    |  2 +-
 .../koffice/debian/kpresenter-trinity.lintian |  8 ++---
 .../koffice/debian/kspread-trinity.lintian    | 12 +++----
 .../koffice/debian/kthesaurus-trinity.lintian |  8 ++---
 .../koffice/debian/kugar-trinity.lintian      |  8 ++---
 .../koffice/debian/kword-data-trinity.lintian |  2 +-
 .../koffice/debian/kword-trinity.lintian      |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../kpowersave.cmake/debian/rules             |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../applications/kpowersave/debian/rules      |  4 +--
 .../lenny/applications/krusader/debian/rules  |  2 +-
 .../ktorrent/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdeaddons/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/kate-plugins-trinity.lintian       |  2 +-
 .../debian/kicker-applets-trinity.lintian     |  4 +--
 .../kdeadmin/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/lilo-config-trinity.lintian        |  2 +-
 .../lenny/kdebase/debian/kate-trinity.lintian |  4 +--
 .../kdebase/debian/kcontrol-trinity.lintian   |  6 ++--
 .../debian/kdebase-trinity-bin.lintian        | 12 +++----
 .../kdebase/debian/kdeprint-trinity.lintian   |  8 ++---
 .../kdebase/debian/kdesktop-trinity.lintian   |  2 +-
 .../debian/khelpcenter-trinity.lintian        |  6 ++--
 .../kdebase/debian/kicker-trinity.lintian     |  6 ++--
 .../kdebase/debian/klipper-trinity.lintian    |  6 ++--
 .../kdebase/debian/kmenuedit-trinity.lintian  |  8 ++---
 .../kdebase/debian/konqueror-trinity.lintian  |  6 ++--
 .../kdebase/debian/konsole-trinity.lintian    |  6 ++--
 .../kdebase/debian/ksmserver-trinity.lintian  |  4 +--
 .../lenny/kdebase/debian/kwin-trinity.lintian |  4 +--
 .../lenny/kdeedu/debian/cdbs/debian-qt-kde.mk |  4 +--
 .../kdegames/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../kdegraphics/debian/cdbs/debian-qt-kde.mk  |  4 +--
 .../debian/kfaxview-trinity.lintian           |  8 ++---
 .../debian/kghostview-trinity.lintian         |  2 +-
 .../kdegraphics/debian/kmrml-trinity.lintian  |  8 ++---
 .../debian/kpovmodeler-trinity.lintian        |  2 +-
 .../kdegraphics/debian/ksvg-trinity.lintian   |  2 +-
 .../debian/kuickshow-trinity.lintian          |  8 ++---
 .../kdegraphics/debian/kview-trinity.lintian  |  6 ++--
 .../debian/kviewshell-trinity.lintian         |  4 +--
 .../debian/kdelibs4c2a-trinity.lintian        | 30 ++++++++--------
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdemultimedia/debian/kmix-trinity.lintian |  8 ++---
 .../kdemultimedia/debian/krec-trinity.lintian |  6 ++--
 .../debian/libarts1-xine-trinity.lintian      |  2 +-
 .../debian/noatun-trinity.lintian             |  8 ++---
 .../debian/knewsticker-trinity.lintian        |  2 +-
 .../kdenetwork/debian/kppp-trinity.lintian    |  6 ++--
 .../kdenetwork/debian/ksirc-trinity.lintian   |  6 ++--
 .../debian/kwifimanager-trinity.lintian       |  6 ++--
 .../kdesdk/debian/cervisia-trinity.lintian    | 12 +++----
 .../debian/kapptemplate-trinity.lintian       | 20 +++++------
 .../kdesdk/debian/kbabel-trinity.lintian      |  2 +-
 .../debian/kdesdk-scripts-trinity.lintian     |  4 +--
 .../kdesdk/debian/kompare-trinity.lintian     |  4 +--
 .../lenny/kdesdk/debian/kspy-trinity.lintian  |  4 +--
 .../debian/libcvsservice0-trinity.lintian     |  4 +--
 .../kdesdk/debian/umbrello-trinity.lintian    |  2 +-
 .../kdetoys/debian/kweather-trinity.lintian   |  4 +--
 .../debian/ark-trinity-trinity.lintian        |  6 ++--
 .../debian/kcalc-trinity-trinity.lintian      |  6 ++--
 .../kdeutils/debian/kedit-trinity.lintian     |  6 ++--
 .../debian/kdevelop-data-trinity.lintian      | 14 ++++----
 .../kdewebdev/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/quanta-data-trinity.lintian        |  6 ++--
 .../kdewebdev/debian/quanta-trinity.lintian   |  4 +--
 .../squeeze/applications/amarok/debian/rules  |  2 +-
 .../gwenview/debian/gwenview.lintian          |  6 ++--
 .../applications/gwenview/debian/rules        |  6 ++--
 .../applications/kaffeine/debian/rules        | 22 ++++++------
 .../kerry/debian/cdbs/debian-qt-kde.mk        |  4 +--
 .../koffice/debian/cdbs/debian-qt-kde.mk      |  4 +--
 .../koffice/debian/chalk-data-trinity.lintian | 34 +++++++++----------
 .../koffice/debian/chalk-trinity.lintian      |  6 ++--
 .../koffice/debian/karbon-trinity.lintian     |  4 +--
 .../koffice/debian/kchart-trinity.lintian     |  6 ++--
 .../koffice/debian/kexi-trinity.lintian       | 28 +++++++--------
 .../koffice/debian/kformula-trinity.lintian   |  8 ++---
 .../koffice/debian/kivio-data-trinity.lintian |  2 +-
 .../koffice/debian/kivio-trinity.lintian      |  6 ++--
 .../debian/koffice-libs-trinity.lintian       |  2 +-
 .../koffice/debian/koshell-trinity.lintian    |  8 ++---
 .../koffice/debian/kplato-trinity.lintian     |  8 ++---
 .../debian/kpresenter-data-trinity.lintian    |  2 +-
 .../koffice/debian/kpresenter-trinity.lintian |  8 ++---
 .../koffice/debian/kspread-trinity.lintian    | 12 +++----
 .../koffice/debian/kthesaurus-trinity.lintian |  8 ++---
 .../koffice/debian/kugar-trinity.lintian      |  8 ++---
 .../koffice/debian/kword-data-trinity.lintian |  2 +-
 .../koffice/debian/kword-trinity.lintian      |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../kpowersave.cmake/debian/rules             |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../applications/kpowersave/debian/rules      |  4 +--
 .../applications/krusader/debian/rules        |  2 +-
 .../ktorrent/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdeaddons/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/kate-plugins-trinity.lintian       |  2 +-
 .../debian/kicker-applets-trinity.lintian     |  4 +--
 .../kdeadmin/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/lilo-config-trinity.lintian        |  2 +-
 .../kdebase/debian/kate-trinity.lintian       |  4 +--
 .../kdebase/debian/kcontrol-trinity.lintian   |  6 ++--
 .../debian/kdebase-trinity-bin.lintian        | 12 +++----
 .../kdebase/debian/kdeprint-trinity.lintian   |  8 ++---
 .../kdebase/debian/kdesktop-trinity.lintian   |  2 +-
 .../debian/khelpcenter-trinity.lintian        |  6 ++--
 .../kdebase/debian/kicker-trinity.lintian     |  6 ++--
 .../kdebase/debian/klipper-trinity.lintian    |  6 ++--
 .../kdebase/debian/kmenuedit-trinity.lintian  |  8 ++---
 .../kdebase/debian/konqueror-trinity.lintian  |  6 ++--
 .../kdebase/debian/konsole-trinity.lintian    |  6 ++--
 .../kdebase/debian/ksmserver-trinity.lintian  |  4 +--
 .../kdebase/debian/kwin-trinity.lintian       |  4 +--
 .../kdeedu/debian/cdbs/debian-qt-kde.mk       |  4 +--
 .../kdegames/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../kdegraphics/debian/cdbs/debian-qt-kde.mk  |  4 +--
 .../debian/kfaxview-trinity.lintian           |  8 ++---
 .../debian/kghostview-trinity.lintian         |  2 +-
 .../kdegraphics/debian/kmrml-trinity.lintian  |  8 ++---
 .../debian/kpovmodeler-trinity.lintian        |  2 +-
 .../kdegraphics/debian/ksvg-trinity.lintian   |  2 +-
 .../debian/kuickshow-trinity.lintian          |  8 ++---
 .../kdegraphics/debian/kview-trinity.lintian  |  6 ++--
 .../debian/kviewshell-trinity.lintian         |  4 +--
 .../debian/kdelibs4c2a-trinity.lintian        | 30 ++++++++--------
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdemultimedia/debian/kmix-trinity.lintian |  8 ++---
 .../kdemultimedia/debian/krec-trinity.lintian |  6 ++--
 .../debian/libarts1-xine-trinity.lintian      |  2 +-
 .../debian/noatun-trinity.lintian             |  8 ++---
 .../debian/knewsticker-trinity.lintian        |  2 +-
 .../kdenetwork/debian/kppp-trinity.lintian    |  6 ++--
 .../kdenetwork/debian/ksirc-trinity.lintian   |  6 ++--
 .../debian/kwifimanager-trinity.lintian       |  6 ++--
 .../kdesdk/debian/cervisia-trinity.lintian    | 12 +++----
 .../debian/kapptemplate-trinity.lintian       | 20 +++++------
 .../kdesdk/debian/kbabel-trinity.lintian      |  2 +-
 .../debian/kdesdk-scripts-trinity.lintian     |  4 +--
 .../kdesdk/debian/kompare-trinity.lintian     |  4 +--
 .../kdesdk/debian/kspy-trinity.lintian        |  4 +--
 .../debian/libcvsservice0-trinity.lintian     |  4 +--
 .../kdesdk/debian/umbrello-trinity.lintian    |  2 +-
 .../kdetoys/debian/kweather-trinity.lintian   |  4 +--
 .../debian/ark-trinity-trinity.lintian        |  6 ++--
 .../debian/kcalc-trinity-trinity.lintian      |  6 ++--
 .../kdeutils/debian/kedit-trinity.lintian     |  6 ++--
 .../debian/kdevelop-data-trinity.lintian      | 14 ++++----
 .../kdewebdev/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/quanta-data-trinity.lintian        |  6 ++--
 .../kdewebdev/debian/quanta-trinity.lintian   |  4 +--
 .../maverick/applications/amarok/debian/rules |  2 +-
 .../gwenview/debian/gwenview.lintian          |  6 ++--
 .../applications/gwenview/debian/rules        |  6 ++--
 .../applications/kaffeine/debian/rules        | 22 ++++++------
 .../kerry/debian/cdbs/debian-qt-kde.mk        |  4 +--
 .../koffice/debian/cdbs/debian-qt-kde.mk      |  4 +--
 .../koffice/debian/chalk-data-trinity.lintian | 34 +++++++++----------
 .../koffice/debian/chalk-trinity.lintian      |  6 ++--
 .../koffice/debian/karbon-trinity.lintian     |  4 +--
 .../koffice/debian/kchart-trinity.lintian     |  6 ++--
 .../koffice/debian/kexi-trinity.lintian       | 28 +++++++--------
 .../koffice/debian/kformula-trinity.lintian   |  8 ++---
 .../koffice/debian/kivio-data-trinity.lintian |  2 +-
 .../koffice/debian/kivio-trinity.lintian      |  6 ++--
 .../debian/koffice-libs-trinity.lintian       |  2 +-
 .../koffice/debian/koshell-trinity.lintian    |  8 ++---
 .../koffice/debian/kplato-trinity.lintian     |  8 ++---
 .../debian/kpresenter-data-trinity.lintian    |  2 +-
 .../koffice/debian/kpresenter-trinity.lintian |  8 ++---
 .../koffice/debian/kspread-trinity.lintian    | 12 +++----
 .../koffice/debian/kthesaurus-trinity.lintian |  8 ++---
 .../koffice/debian/kugar-trinity.lintian      |  8 ++---
 .../koffice/debian/kword-data-trinity.lintian |  2 +-
 .../koffice/debian/kword-trinity.lintian      |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../kpowersave.cmake/debian/rules             |  6 ++--
 .../debian/kpowersave-trinity.lintian         |  8 ++---
 .../applications/kpowersave/debian/rules      |  4 +--
 .../applications/krusader/debian/rules        |  2 +-
 .../ktorrent/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdeaddons/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/kate-plugins-trinity.lintian       |  2 +-
 .../debian/kicker-applets-trinity.lintian     |  4 +--
 .../kdeadmin/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/lilo-config-trinity.lintian        |  2 +-
 .../kdebase/debian/kate-trinity.lintian       |  4 +--
 .../kdebase/debian/kcontrol-trinity.lintian   |  6 ++--
 .../debian/kdebase-trinity-bin.lintian        | 12 +++----
 .../kdebase/debian/kdeprint-trinity.lintian   |  8 ++---
 .../kdebase/debian/kdesktop-trinity.lintian   |  2 +-
 .../debian/khelpcenter-trinity.lintian        |  6 ++--
 .../kdebase/debian/kicker-trinity.lintian     |  6 ++--
 .../kdebase/debian/klipper-trinity.lintian    |  6 ++--
 .../kdebase/debian/kmenuedit-trinity.lintian  |  8 ++---
 .../kdebase/debian/konqueror-trinity.lintian  |  6 ++--
 .../kdebase/debian/konsole-trinity.lintian    |  6 ++--
 .../kdebase/debian/ksmserver-trinity.lintian  |  4 +--
 .../kdebase/debian/kwin-trinity.lintian       |  4 +--
 .../kdeedu/debian/cdbs/debian-qt-kde.mk       |  4 +--
 .../kdegames/debian/cdbs/debian-qt-kde.mk     |  4 +--
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdegraphics/debian/cdbs/debian-qt-kde.mk  |  4 +--
 .../debian/kfaxview-trinity.lintian           |  8 ++---
 .../debian/kghostview-trinity.lintian         |  2 +-
 .../kdegraphics/debian/kmrml-trinity.lintian  |  8 ++---
 .../debian/kpovmodeler-trinity.lintian        |  2 +-
 .../kdegraphics/debian/ksvg-trinity.lintian   |  2 +-
 .../debian/kuickshow-trinity.lintian          |  8 ++---
 .../kdegraphics/debian/kview-trinity.lintian  |  6 ++--
 .../debian/kviewshell-trinity.lintian         |  4 +--
 .../debian/kdelibs4c2a-trinity.lintian        | 30 ++++++++--------
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../kdemultimedia/debian/kmix-trinity.lintian |  8 ++---
 .../kdemultimedia/debian/krec-trinity.lintian |  6 ++--
 .../debian/libarts1-xine-trinity.lintian      |  2 +-
 .../debian/noatun-trinity.lintian             |  8 ++---
 .../debian/knewsticker-trinity.lintian        |  2 +-
 .../kdenetwork/debian/kppp-trinity.lintian    |  6 ++--
 .../kdenetwork/debian/ksirc-trinity.lintian   |  6 ++--
 .../debian/kwifimanager-trinity.lintian       |  6 ++--
 .../kdesdk/debian/cervisia-trinity.lintian    | 12 +++----
 .../debian/kapptemplate-trinity.lintian       | 20 +++++------
 .../kdesdk/debian/kbabel-trinity.lintian      |  2 +-
 .../debian/kdesdk-scripts-trinity.lintian     |  4 +--
 .../kdesdk/debian/kompare-trinity.lintian     |  4 +--
 .../kdesdk/debian/kspy-trinity.lintian        |  4 +--
 .../debian/libcvsservice0-trinity.lintian     |  4 +--
 .../kdesdk/debian/umbrello-trinity.lintian    |  2 +-
 .../kdetoys/debian/kweather-trinity.lintian   |  4 +--
 .../debian/ark-trinity-trinity.lintian        |  6 ++--
 .../debian/kcalc-trinity-trinity.lintian      |  6 ++--
 .../kdeutils/debian/kedit-trinity.lintian     |  6 ++--
 .../debian/cdbs/debian-qt-kde.mk              |  4 +--
 .../debian/kdevelop-data-trinity.lintian      | 14 ++++----
 .../kdewebdev/debian/cdbs/debian-qt-kde.mk    |  4 +--
 .../debian/quanta-data-trinity.lintian        |  6 ++--
 .../kdewebdev/debian/quanta-trinity.lintian   |  4 +--
 260 files changed, 850 insertions(+), 850 deletions(-)

diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules
index 77c35d14f..3d134416a 100755
--- a/debian/lenny/applications/amarok/debian/rules
+++ b/debian/lenny/applications/amarok/debian/rules
@@ -71,7 +71,7 @@ debian/stamp-automake:
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 	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
 
 clean::
diff --git a/debian/lenny/applications/gwenview/debian/gwenview.lintian b/debian/lenny/applications/gwenview/debian/gwenview.lintian
index 91d566d75..e8c71a351 100644
--- a/debian/lenny/applications/gwenview/debian/gwenview.lintian
+++ b/debian/lenny/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
-gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
+gwenview-trinity binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index 3bc3592a0..9e06b4ce6 100755
--- a/debian/lenny/applications/gwenview/debian/rules
+++ b/debian/lenny/applications/gwenview/debian/rules
@@ -37,8 +37,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/gwenview-trinity::
-	install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm
-	install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview
+	install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm
+	install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 	
-	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \
+	cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \
 	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index 5984a3b6f..48d70c5a4 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/applications/kaffeine/debian/rules
@@ -33,24 +33,24 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kaffeine-trinity::
-	install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/opt/trinity/share/pixmaps/kaffeine.xpm
-	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/kaffeine/opt/trinity/share/lintian/overrides/kaffeine
-	install -D -p -m0755 debian/install-css.sh debian/kaffeine/opt/trinity/share/doc/kaffeine/install-css.sh
-	install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/kde/kaffeine-iso.desktop
+	install -D -p -m0644 debian/kaffeine.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/kaffeine.xpm
+	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -D -p -m0755 debian/install-css.sh debian/$(cdbs_curpkg)/opt/trinity/share/doc/kaffeine/install-css.sh
+	install -D -p -m0644 debian/kaffeine-iso.desktop debian/$(cdbs_curpkg)/opt/trinity/share/applications/kde/kaffeine-iso.desktop
 
 	#Debian additions
-	install -D -p -m0755 debian/install-codecs debian/kaffeine/opt/trinity/lib/kaffeine/install-codecs
-	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
-	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
-	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/kaffeine/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
+	install -D -p -m0755 debian/install-codecs debian/$(cdbs_curpkg)/opt/trinity/lib/kaffeine/install-codecs
+	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
+	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
+	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/$(cdbs_curpkg)/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
 
 	# file shipped by kdelibs
-	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
-	rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
 
 binary-install/kaffeine-trinity::
-	mv debian/kaffeine-trinity/usr/share/man debian/kaffeine-trinity/opt/trinity/share/
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 get-orig-source:
 	 @@dh_testdir
diff --git a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kerry/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/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/koffice/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/applications/koffice/debian/chalk-data-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
index bf1a99e00..909a9062a 100644
--- a/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian
@@ -1,17 +1,17 @@
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invert.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invertpython.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invertruby.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invert.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rc
-chalk-data: desktop-command-not-in-package /usr/share/applications/kde/chalk.desktop chalk
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invert.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invertpython.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invertruby.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invert.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rc
+chalk-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/chalk.desktop chalk
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..ef467a3e1 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk-trinity: shlib-missing-in-control-file libkdeinit_chalk.so for opt/trinity/lib/libkdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..f399de402 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libkdeinit_karbon.so for opt/trinity/lib/libkdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..f81d8d6f7 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
-kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkdchart.so.0.0.0 opt/trinity/lib/libkdchart.so
+kchart-trinity: shlib-missing-in-control-file libkdeinit_kchart.so for opt/trinity/lib/libkdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
 
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..07d1301aa 100644
--- a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libkdeinit_kexi.so for opt/trinity/lib/libkdeinit_kexi.so
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/readme.html
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/kross/python/kexiapp/__init__.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.py
+kexi-trinity: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..ec8c2f644 100644
--- a/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libkdeinit-kformula
diff --git a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
index a5c25f78c..4eb29a57e 100644
--- a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/kde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kivio.desktop kivio
 
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..00d1d2875 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libkdeinit_kivio.so for opt/trinity/lib/libkdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
 
diff --git a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian
@@ -1 +1 @@
-koffice-libs: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
+koffice-libs-trinity: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
diff --git a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..073ee53ab 100644
--- a/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libkdeinit-koshell
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..5237efd72 100644
--- a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libkdeinit-kplato
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
index af719fd2f..0756d2647 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/kde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kpresenter.desktop kpresenter
 
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..2445c57ce 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
-kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libkdeinit_kpresenter.so for opt/trinity/lib/libkdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..370d6a7f9 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libkdeinit_kspread.so for opt/trinity/lib/libkdeinit_kspread.so
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.py
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
+kspread-trinity: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
 
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..ba2ff8197 100644
--- a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libkdeinit-kthesaurus
 
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
index e06755739..a0cd38a78 100644
--- a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kudesigner.so for opt/trinity/lib/libkdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kugar.so for opt/trinity/lib/libkdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
diff --git a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
index 2bc903eb9..34a1f7f57 100644
--- a/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/kde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kword.desktop kword
 
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..a187698f4 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libkdeinit_kword.so for opt/trinity/lib/libkdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
 
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/rules b/debian/lenny/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/debian/lenny/applications/kpowersave.cmake/debian/rules
+++ b/debian/lenny/applications/kpowersave.cmake/debian/rules
@@ -19,6 +19,6 @@ DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
-install/kpowersave::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/kpowersave-trinity::
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg)
diff --git a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules
index 120ec29f9..484f52352 100755
--- a/debian/lenny/applications/kpowersave/debian/rules
+++ b/debian/lenny/applications/kpowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave-trinity::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
 
 binary-install/kpowersave-trinity::
 	mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/
diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules
index 967b15604..f413f4d3a 100755
--- a/debian/lenny/applications/krusader/debian/rules
+++ b/debian/lenny/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/config/kio_isorc
 	# install lintian override
 	install -D -p -m0644 debian/krusader.lintian-overrides \
-		$(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader
+		$(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
 binary-post-install/krusader-trinity::
 	rm -rf debian/krusader-trinity/etc/trinity/
diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ktorrent/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/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdeaccessibility/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/kdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdeaddons/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/kdeaddons/debian/kate-plugins-trinity.lintian b/debian/lenny/kdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/debian/lenny/kdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/lenny/kdeaddons/debian/kate-plugins-trinity.lintian
@@ -1,2 +1,2 @@
 # Doesn't need to be executable - only run from within kate.
-kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh
+kate-plugins-trinity: script-not-executable ./opt/trinity/share/apps/kate/scripts/html-tidy.sh
diff --git a/debian/lenny/kdeaddons/debian/kicker-applets-trinity.lintian b/debian/lenny/kdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/debian/lenny/kdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/lenny/kdeaddons/debian/kicker-applets-trinity.lintian
@@ -1,3 +1,3 @@
 # Call is inserted by debhelper and is correct.
-kicker-applets: postinst-has-useless-call-to-ldconfig
-kicker-applets: postrm-has-useless-call-to-ldconfig
+kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
+kicker-applets-trinity: postrm-has-useless-call-to-ldconfig
diff --git a/debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdeadmin/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/kdeadmin/debian/lilo-config-trinity.lintian b/debian/lenny/kdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..e37a33b77 100644
--- a/debian/lenny/kdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/lenny/kdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/kdesu
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
diff --git a/debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdeedu/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/kdegames/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdegames/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/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
diff --git a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.lintian b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.lintian
index 2e0ebfa6c..7918aa780 100644
--- a/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.lintian
+++ b/debian/lenny/kdelibs/debian/kdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
diff --git a/debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdemultimedia/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/kdemultimedia/debian/kmix-trinity.lintian b/debian/lenny/kdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..8f1fe3f4e 100644
--- a/debian/lenny/kdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/lenny/kdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
diff --git a/debian/lenny/kdemultimedia/debian/krec-trinity.lintian b/debian/lenny/kdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b59ed3df8 100644
--- a/debian/lenny/kdemultimedia/debian/krec-trinity.lintian
+++ b/debian/lenny/kdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
diff --git a/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/lenny/kdemultimedia/debian/libarts1-xine-trinity.lintian
@@ -1 +1 @@
-libarts1-xine: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
+libarts1-xine-trinity: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
diff --git a/debian/lenny/kdemultimedia/debian/noatun-trinity.lintian b/debian/lenny/kdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..27214f531 100644
--- a/debian/lenny/kdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/lenny/kdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
-noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
-noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
-noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun-trinity: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
+noatun-trinity: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
+noatun-trinity: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
+noatun-trinity: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
diff --git a/debian/lenny/kdenetwork/debian/knewsticker-trinity.lintian b/debian/lenny/kdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/debian/lenny/kdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/lenny/kdenetwork/debian/knewsticker-trinity.lintian
@@ -1 +1 @@
-knewsticker: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
+knewsticker-trinity: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
diff --git a/debian/lenny/kdenetwork/debian/kppp-trinity.lintian b/debian/lenny/kdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/debian/lenny/kdenetwork/debian/kppp-trinity.lintian
+++ b/debian/lenny/kdenetwork/debian/kppp-trinity.lintian
@@ -1,3 +1,3 @@
-kppp: setuid-binary opt/trinity/bin/kppp 4754 root/dip
-kppp: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
-kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
+kppp-trinity: setuid-binary opt/trinity/bin/kppp 4754 root/dip
+kppp-trinity: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
+kppp-trinity: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
diff --git a/debian/lenny/kdenetwork/debian/ksirc-trinity.lintian b/debian/lenny/kdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..6256da4ce 100644
--- a/debian/lenny/kdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/lenny/kdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
diff --git a/debian/lenny/kdenetwork/debian/kwifimanager-trinity.lintian b/debian/lenny/kdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/debian/lenny/kdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/lenny/kdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1,3 @@
-kwifimanager: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
diff --git a/debian/lenny/kdesdk/debian/cervisia-trinity.lintian b/debian/lenny/kdesdk/debian/cervisia-trinity.lintian
index d7a490dae..0037f433c 100644
--- a/debian/lenny/kdesdk/debian/cervisia-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/kapptemplate-trinity.lintian b/debian/lenny/kdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/debian/lenny/kdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/kbabel-trinity.lintian b/debian/lenny/kdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/debian/lenny/kdesdk/debian/kbabel-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/kdesdk-scripts-trinity.lintian b/debian/lenny/kdesdk/debian/kdesdk-scripts-trinity.lintian
index 97dd13989..91f6885f3 100644
--- a/debian/lenny/kdesdk/debian/kdesdk-scripts-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/kompare-trinity.lintian b/debian/lenny/kdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/debian/lenny/kdesdk/debian/kompare-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/kspy-trinity.lintian b/debian/lenny/kdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/debian/lenny/kdesdk/debian/kspy-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/libcvsservice0-trinity.lintian b/debian/lenny/kdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..015a481a0 100644
--- a/debian/lenny/kdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/lenny/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/debian/lenny/kdesdk/debian/umbrello-trinity.lintian b/debian/lenny/kdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/debian/lenny/kdesdk/debian/umbrello-trinity.lintian
+++ b/debian/lenny/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
diff --git a/debian/lenny/kdetoys/debian/kweather-trinity.lintian b/debian/lenny/kdetoys/debian/kweather-trinity.lintian
index e6fb3080a..adb549884 100644
--- a/debian/lenny/kdetoys/debian/kweather-trinity.lintian
+++ b/debian/lenny/kdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libkdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libkdeinit-kweatherreport
diff --git a/debian/lenny/kdeutils/debian/ark-trinity-trinity.lintian b/debian/lenny/kdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..c4771fe04 100644
--- a/debian/lenny/kdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/lenny/kdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
diff --git a/debian/lenny/kdeutils/debian/kcalc-trinity-trinity.lintian b/debian/lenny/kdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..4e3ff01ab 100644
--- a/debian/lenny/kdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/lenny/kdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
diff --git a/debian/lenny/kdeutils/debian/kedit-trinity.lintian b/debian/lenny/kdeutils/debian/kedit-trinity.lintian
index 864682bca..232253503 100644
--- a/debian/lenny/kdeutils/debian/kedit-trinity.lintian
+++ b/debian/lenny/kdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
diff --git a/debian/lenny/kdevelop/debian/kdevelop-data-trinity.lintian b/debian/lenny/kdevelop/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..a78623689 100644
--- a/debian/lenny/kdevelop/debian/kdevelop-data-trinity.lintian
+++ b/debian/lenny/kdevelop/debian/kdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
 # These files are provided to create new applications.
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
 # This file is a template, not a script.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
 # This file is used internally by kio_pydoc.la and invoked explicitly with python.
-kdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/kdewebdev/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/kdewebdev/debian/quanta-data-trinity.lintian b/debian/lenny/kdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/debian/lenny/kdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/lenny/kdewebdev/debian/quanta-data-trinity.lintian
@@ -1,6 +1,6 @@
 # These are shipped with quanta's kommander scripts and do not need to be
 # executable.
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/dwt.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/TemplateMagic.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/externalpreview.sh
 
diff --git a/debian/lenny/kdewebdev/debian/quanta-trinity.lintian b/debian/lenny/kdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/debian/lenny/kdewebdev/debian/quanta-trinity.lintian
+++ b/debian/lenny/kdewebdev/debian/quanta-trinity.lintian
@@ -1,4 +1,4 @@
 # This tag is required for apps already in the KDE menu.
-quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
+quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
 # This is part of the docbook docs.
-quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
+quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
diff --git a/debian/squeeze/applications/amarok/debian/rules b/debian/squeeze/applications/amarok/debian/rules
index 648919ef2..bea194004 100755
--- a/debian/squeeze/applications/amarok/debian/rules
+++ b/debian/squeeze/applications/amarok/debian/rules
@@ -72,7 +72,7 @@ debian/stamp-automake:
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 	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
 
 clean::
diff --git a/debian/squeeze/applications/gwenview/debian/gwenview.lintian b/debian/squeeze/applications/gwenview/debian/gwenview.lintian
index 91d566d75..e8c71a351 100644
--- a/debian/squeeze/applications/gwenview/debian/gwenview.lintian
+++ b/debian/squeeze/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
-gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
+gwenview-trinity binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules
index 3332a5d74..b6b642662 100755
--- a/debian/squeeze/applications/gwenview/debian/rules
+++ b/debian/squeeze/applications/gwenview/debian/rules
@@ -37,8 +37,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/gwenview-trinity::
-	install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm
-	install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview
+	install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm
+	install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 	
-	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \
+	cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \
 	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules
index cc3f7d5da..d4b0bca77 100755
--- a/debian/squeeze/applications/kaffeine/debian/rules
+++ b/debian/squeeze/applications/kaffeine/debian/rules
@@ -33,24 +33,24 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kaffeine-trinity::
-	install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/opt/trinity/share/pixmaps/kaffeine.xpm
-	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/kaffeine/opt/trinity/share/lintian/overrides/kaffeine
-	install -D -p -m0755 debian/install-css.sh debian/kaffeine/opt/trinity/share/doc/kaffeine/install-css.sh
-	install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/kde/kaffeine-iso.desktop
+	install -D -p -m0644 debian/kaffeine.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/kaffeine.xpm
+	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -D -p -m0755 debian/install-css.sh debian/$(cdbs_curpkg)/opt/trinity/share/doc/kaffeine/install-css.sh
+	install -D -p -m0644 debian/kaffeine-iso.desktop debian/$(cdbs_curpkg)/opt/trinity/share/applications/kde/kaffeine-iso.desktop
 
 	#Debian additions
-	install -D -p -m0755 debian/install-codecs debian/kaffeine/opt/trinity/lib/kaffeine/install-codecs
-	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
-	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
-	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/kaffeine/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
+	install -D -p -m0755 debian/install-codecs debian/$(cdbs_curpkg)/opt/trinity/lib/kaffeine/install-codecs
+	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
+	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
+	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/$(cdbs_curpkg)/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
 
 	# file shipped by kdelibs
-	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
-	rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
 
 binary-install/kaffeine-trinity::
-	mv debian/kaffeine-trinity/usr/share/man debian/kaffeine-trinity/opt/trinity/share/
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 get-orig-source:
 	 @@dh_testdir
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kerry/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/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/koffice/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/squeeze/applications/koffice/debian/chalk-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
index bf1a99e00..909a9062a 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian
@@ -1,17 +1,17 @@
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invert.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invertpython.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invertruby.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invert.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rc
-chalk-data: desktop-command-not-in-package /usr/share/applications/kde/chalk.desktop chalk
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invert.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invertpython.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invertruby.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invert.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rc
+chalk-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/chalk.desktop chalk
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..ef467a3e1 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk-trinity: shlib-missing-in-control-file libkdeinit_chalk.so for opt/trinity/lib/libkdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian b/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..f399de402 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libkdeinit_karbon.so for opt/trinity/lib/libkdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian b/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..f81d8d6f7 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
-kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkdchart.so.0.0.0 opt/trinity/lib/libkdchart.so
+kchart-trinity: shlib-missing-in-control-file libkdeinit_kchart.so for opt/trinity/lib/libkdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
 
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian b/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..07d1301aa 100644
--- a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libkdeinit_kexi.so for opt/trinity/lib/libkdeinit_kexi.so
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/readme.html
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/kross/python/kexiapp/__init__.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.py
+kexi-trinity: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian b/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..ec8c2f644 100644
--- a/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libkdeinit-kformula
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
index a5c25f78c..4eb29a57e 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/kde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kivio.desktop kivio
 
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..00d1d2875 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libkdeinit_kivio.so for opt/trinity/lib/libkdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
 
diff --git a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian
@@ -1 +1 @@
-koffice-libs: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
+koffice-libs-trinity: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
diff --git a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian b/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..073ee53ab 100644
--- a/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libkdeinit-koshell
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian b/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..5237efd72 100644
--- a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libkdeinit-kplato
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
index af719fd2f..0756d2647 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/kde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kpresenter.desktop kpresenter
 
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..2445c57ce 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
-kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libkdeinit_kpresenter.so for opt/trinity/lib/libkdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian b/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..370d6a7f9 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libkdeinit_kspread.so for opt/trinity/lib/libkdeinit_kspread.so
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.py
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
+kspread-trinity: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
 
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..ba2ff8197 100644
--- a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libkdeinit-kthesaurus
 
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian b/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
index e06755739..a0cd38a78 100644
--- a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kudesigner.so for opt/trinity/lib/libkdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kugar.so for opt/trinity/lib/libkdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
diff --git a/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
index 2bc903eb9..34a1f7f57 100644
--- a/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/kde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kword.desktop kword
 
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian b/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..a187698f4 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libkdeinit_kword.so for opt/trinity/lib/libkdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
 
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/rules b/debian/squeeze/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/debian/squeeze/applications/kpowersave.cmake/debian/rules
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/rules
@@ -19,6 +19,6 @@ DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
-install/kpowersave::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/kpowersave-trinity::
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg)
diff --git a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules
index bbe86c8d9..16dc75082 100755
--- a/debian/squeeze/applications/kpowersave/debian/rules
+++ b/debian/squeeze/applications/kpowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave-trinity::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
 
 binary-install/kpowersave-trinity::
 	mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/
diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules
index 0b16abed9..3095cca3c 100755
--- a/debian/squeeze/applications/krusader/debian/rules
+++ b/debian/squeeze/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/config/kio_isorc
 	# install lintian override
 	install -D -p -m0644 debian/krusader.lintian-overrides \
-		$(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader
+		$(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
 binary-post-install/krusader-trinity::
 	rm -rf debian/krusader-trinity/etc/trinity/
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ktorrent/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/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeaccessibility/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/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeaddons/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/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian b/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/squeeze/kdeaddons/debian/kate-plugins-trinity.lintian
@@ -1,2 +1,2 @@
 # Doesn't need to be executable - only run from within kate.
-kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh
+kate-plugins-trinity: script-not-executable ./opt/trinity/share/apps/kate/scripts/html-tidy.sh
diff --git a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian b/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/squeeze/kdeaddons/debian/kicker-applets-trinity.lintian
@@ -1,3 +1,3 @@
 # Call is inserted by debhelper and is correct.
-kicker-applets: postinst-has-useless-call-to-ldconfig
-kicker-applets: postrm-has-useless-call-to-ldconfig
+kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
+kicker-applets-trinity: postrm-has-useless-call-to-ldconfig
diff --git a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeadmin/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/squeeze/kdeadmin/debian/lilo-config-trinity.lintian b/debian/squeeze/kdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..e37a33b77 100644
--- a/debian/squeeze/kdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/squeeze/kdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/kdesu
diff --git a/debian/squeeze/kdebase/debian/kate-trinity.lintian b/debian/squeeze/kdebase/debian/kate-trinity.lintian
index fcc9b79aa..80d27b09a 100644
--- a/debian/squeeze/kdebase/debian/kate-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kcontrol-trinity.lintian b/debian/squeeze/kdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..2a4306011 100644
--- a/debian/squeeze/kdebase/debian/kcontrol-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kdebase-trinity-bin.lintian b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.lintian
index 82e1b9846..9f78d69c8 100644
--- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kdeprint-trinity.lintian b/debian/squeeze/kdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..156e04dc0 100644
--- a/debian/squeeze/kdebase/debian/kdeprint-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kdesktop-trinity.lintian b/debian/squeeze/kdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..c270fd6ae 100644
--- a/debian/squeeze/kdebase/debian/kdesktop-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/khelpcenter-trinity.lintian b/debian/squeeze/kdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..181e28c79 100644
--- a/debian/squeeze/kdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kicker-trinity.lintian b/debian/squeeze/kdebase/debian/kicker-trinity.lintian
index 41de1be8e..58291ed21 100644
--- a/debian/squeeze/kdebase/debian/kicker-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/klipper-trinity.lintian b/debian/squeeze/kdebase/debian/klipper-trinity.lintian
index 710a50459..320ae2d31 100644
--- a/debian/squeeze/kdebase/debian/klipper-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kmenuedit-trinity.lintian b/debian/squeeze/kdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..845065f6f 100644
--- a/debian/squeeze/kdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/konqueror-trinity.lintian b/debian/squeeze/kdebase/debian/konqueror-trinity.lintian
index 27e528d84..2bbd4c186 100644
--- a/debian/squeeze/kdebase/debian/konqueror-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/konsole-trinity.lintian b/debian/squeeze/kdebase/debian/konsole-trinity.lintian
index 95c2d012e..c050f8ca0 100644
--- a/debian/squeeze/kdebase/debian/konsole-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/ksmserver-trinity.lintian b/debian/squeeze/kdebase/debian/ksmserver-trinity.lintian
index 669919e49..b246da092 100644
--- a/debian/squeeze/kdebase/debian/ksmserver-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdebase/debian/kwin-trinity.lintian b/debian/squeeze/kdebase/debian/kwin-trinity.lintian
index 1bf281c8a..12758aa76 100644
--- a/debian/squeeze/kdebase/debian/kwin-trinity.lintian
+++ b/debian/squeeze/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
diff --git a/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdeedu/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/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdegames/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/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/debian/squeeze/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kfaxview-trinity.lintian b/debian/squeeze/kdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/debian/squeeze/kdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kghostview-trinity.lintian b/debian/squeeze/kdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/debian/squeeze/kdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kmrml-trinity.lintian b/debian/squeeze/kdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..1e1c0f081 100644
--- a/debian/squeeze/kdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kpovmodeler-trinity.lintian b/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/debian/squeeze/kdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/ksvg-trinity.lintian b/debian/squeeze/kdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/debian/squeeze/kdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kuickshow-trinity.lintian b/debian/squeeze/kdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..dd274dba5 100644
--- a/debian/squeeze/kdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kview-trinity.lintian b/debian/squeeze/kdegraphics/debian/kview-trinity.lintian
index 8314a8155..7459b4b82 100644
--- a/debian/squeeze/kdegraphics/debian/kview-trinity.lintian
+++ b/debian/squeeze/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/squeeze/kdegraphics/debian/kviewshell-trinity.lintian b/debian/squeeze/kdegraphics/debian/kviewshell-trinity.lintian
index 4a0571207..5e80c0a55 100644
--- a/debian/squeeze/kdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/squeeze/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
diff --git a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian
index 2e0ebfa6c..7918aa780 100644
--- a/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian
+++ b/debian/squeeze/kdelibs/debian/kdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
diff --git a/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdemultimedia/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/squeeze/kdemultimedia/debian/kmix-trinity.lintian b/debian/squeeze/kdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..8f1fe3f4e 100644
--- a/debian/squeeze/kdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/squeeze/kdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
diff --git a/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian b/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b59ed3df8 100644
--- a/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian
+++ b/debian/squeeze/kdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
diff --git a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/squeeze/kdemultimedia/debian/libarts1-xine-trinity.lintian
@@ -1 +1 @@
-libarts1-xine: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
+libarts1-xine-trinity: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
diff --git a/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian b/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..27214f531 100644
--- a/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/squeeze/kdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
-noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
-noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
-noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun-trinity: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
+noatun-trinity: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
+noatun-trinity: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
+noatun-trinity: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
diff --git a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian b/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/squeeze/kdenetwork/debian/knewsticker-trinity.lintian
@@ -1 +1 @@
-knewsticker: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
+knewsticker-trinity: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
diff --git a/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian b/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian
+++ b/debian/squeeze/kdenetwork/debian/kppp-trinity.lintian
@@ -1,3 +1,3 @@
-kppp: setuid-binary opt/trinity/bin/kppp 4754 root/dip
-kppp: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
-kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
+kppp-trinity: setuid-binary opt/trinity/bin/kppp 4754 root/dip
+kppp-trinity: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
+kppp-trinity: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
diff --git a/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian b/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..6256da4ce 100644
--- a/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/squeeze/kdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
diff --git a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian b/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/squeeze/kdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1,3 @@
-kwifimanager: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
diff --git a/debian/squeeze/kdesdk/debian/cervisia-trinity.lintian b/debian/squeeze/kdesdk/debian/cervisia-trinity.lintian
index d7a490dae..0037f433c 100644
--- a/debian/squeeze/kdesdk/debian/cervisia-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/kapptemplate-trinity.lintian b/debian/squeeze/kdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/debian/squeeze/kdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/kbabel-trinity.lintian b/debian/squeeze/kdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/debian/squeeze/kdesdk/debian/kbabel-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.lintian b/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.lintian
index 97dd13989..91f6885f3 100644
--- a/debian/squeeze/kdesdk/debian/kdesdk-scripts-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/kompare-trinity.lintian b/debian/squeeze/kdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/debian/squeeze/kdesdk/debian/kompare-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/kspy-trinity.lintian b/debian/squeeze/kdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/debian/squeeze/kdesdk/debian/kspy-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.lintian b/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.lintian
index 1430a5540..015a481a0 100644
--- a/debian/squeeze/kdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/squeeze/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/debian/squeeze/kdesdk/debian/umbrello-trinity.lintian b/debian/squeeze/kdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/debian/squeeze/kdesdk/debian/umbrello-trinity.lintian
+++ b/debian/squeeze/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
diff --git a/debian/squeeze/kdetoys/debian/kweather-trinity.lintian b/debian/squeeze/kdetoys/debian/kweather-trinity.lintian
index e6fb3080a..adb549884 100644
--- a/debian/squeeze/kdetoys/debian/kweather-trinity.lintian
+++ b/debian/squeeze/kdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libkdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libkdeinit-kweatherreport
diff --git a/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian b/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..c4771fe04 100644
--- a/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/squeeze/kdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
diff --git a/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian b/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..4e3ff01ab 100644
--- a/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/squeeze/kdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
diff --git a/debian/squeeze/kdeutils/debian/kedit-trinity.lintian b/debian/squeeze/kdeutils/debian/kedit-trinity.lintian
index 864682bca..232253503 100644
--- a/debian/squeeze/kdeutils/debian/kedit-trinity.lintian
+++ b/debian/squeeze/kdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
diff --git a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian b/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..a78623689 100644
--- a/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian
+++ b/debian/squeeze/kdevelop/debian/kdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
 # These files are provided to create new applications.
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
 # This file is a template, not a script.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
 # This file is used internally by kio_pydoc.la and invoked explicitly with python.
-kdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/kdewebdev/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/squeeze/kdewebdev/debian/quanta-data-trinity.lintian b/debian/squeeze/kdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/squeeze/kdewebdev/debian/quanta-data-trinity.lintian
@@ -1,6 +1,6 @@
 # These are shipped with quanta's kommander scripts and do not need to be
 # executable.
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/dwt.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/TemplateMagic.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/externalpreview.sh
 
diff --git a/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian b/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian
+++ b/debian/squeeze/kdewebdev/debian/quanta-trinity.lintian
@@ -1,4 +1,4 @@
 # This tag is required for apps already in the KDE menu.
-quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
+quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
 # This is part of the docbook docs.
-quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
+quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules
index 648919ef2..bea194004 100755
--- a/ubuntu/maverick/applications/amarok/debian/rules
+++ b/ubuntu/maverick/applications/amarok/debian/rules
@@ -72,7 +72,7 @@ debian/stamp-automake:
 $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 	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
 
 clean::
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
index 91d566d75..e8c71a351 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/maverick/applications/gwenview/debian/gwenview.lintian
@@ -1,3 +1,3 @@
-gwenview binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
-gwenview binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
+gwenview-trinity binary: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libgwenviewcore.so.1.0.0 opt/trinity/lib/libgwenviewcore.so
+gwenview-trinity binary: shlib-missing-in-control-file libkdeinit_gwenview.so for opt/trinity/lib/libkdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libkdeinit-gwenview
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index 3332a5d74..b6b642662 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/maverick/applications/gwenview/debian/rules
@@ -37,8 +37,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/gwenview-trinity::
-	install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm
-	install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview
+	install -p -D -m644 debian/gwenview.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/gwenview.xpm
+	install -p -D -m644 debian/gwenview.lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 	
-	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \
+	cd $(CURDIR)/debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/gwenview; \
 	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index cc3f7d5da..d4b0bca77 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/applications/kaffeine/debian/rules
@@ -33,24 +33,24 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kaffeine-trinity::
-	install -D -p -m0644 debian/kaffeine.xpm debian/kaffeine/opt/trinity/share/pixmaps/kaffeine.xpm
-	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/kaffeine/opt/trinity/share/lintian/overrides/kaffeine
-	install -D -p -m0755 debian/install-css.sh debian/kaffeine/opt/trinity/share/doc/kaffeine/install-css.sh
-	install -D -p -m0644 debian/kaffeine-iso.desktop debian/kaffeine/opt/trinity/share/applications/kde/kaffeine-iso.desktop
+	install -D -p -m0644 debian/kaffeine.xpm debian/$(cdbs_curpkg)/opt/trinity/share/pixmaps/kaffeine.xpm
+	install -D -p -m0644 debian/kaffeine-trinity.lintian-overrides debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -D -p -m0755 debian/install-css.sh debian/$(cdbs_curpkg)/opt/trinity/share/doc/kaffeine/install-css.sh
+	install -D -p -m0644 debian/kaffeine-iso.desktop debian/$(cdbs_curpkg)/opt/trinity/share/applications/kde/kaffeine-iso.desktop
 
 	#Debian additions
-	install -D -p -m0755 debian/install-codecs debian/kaffeine/opt/trinity/lib/kaffeine/install-codecs
-	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
-	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/kaffeine/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
-	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/kaffeine/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
+	install -D -p -m0755 debian/install-codecs debian/$(cdbs_curpkg)/opt/trinity/lib/kaffeine/install-codecs
+	install -D -p -m0644 debian/kaffeine_xine-install-dvdcss.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-dvdcss.desktop
+	install -D -p -m0644 debian/kaffeine_xine-install-ffmpeg.desktop debian/$(cdbs_curpkg)/opt/trinity/share/services/kaffeine_xine-install-ffmpeg.desktop
+	install -D -p -m0644 debian/kaffeine_codecinstall.desktop debian/$(cdbs_curpkg)/opt/trinity/share/servicetypes/kaffeine_codecinstall.desktop
 
 	# file shipped by kdelibs
-	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
-	rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
+	rm -f debian/$(cdbs_curpkg)/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
 
 binary-install/kaffeine-trinity::
-	mv debian/kaffeine-trinity/usr/share/man debian/kaffeine-trinity/opt/trinity/share/
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
 
 get-orig-source:
 	 @@dh_testdir
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kerry/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/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/koffice/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/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian
index bf1a99e00..909a9062a 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian
@@ -1,17 +1,17 @@
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invert.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertpython/invertpython.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invertruby.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/filterstest/filterstest.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturepainting/torture-painting.rc
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/torturefilters/torture-filters.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/changecs/changecs.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/invertruby/invert.rb
-chalk-data: executable-not-elf-or-script ./usr/share/apps/chalk/scripts/randompaint/randompaint.rc
-chalk-data: desktop-command-not-in-package /usr/share/applications/kde/chalk.desktop chalk
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invert.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertpython/invertpython.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/reshapehisto/reshapehisto.py
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invertruby.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/filterstest/filterstest.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturepainting/torture-painting.rc
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/torturefilters/torture-filters.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/changecs/changecs.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/invertruby/invert.rb
+chalk-data-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/chalk/scripts/randompaint/randompaint.rc
+chalk-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/chalk.desktop chalk
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index 40bb7a6ee..ef467a3e1 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libkdeinit_chalk.so for usr/lib/libkdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
+chalk-trinity: shlib-missing-in-control-file libkdeinit_chalk.so for opt/trinity/lib/libkdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libkdeinit-chalk libchalk-cmyk-u16-0 libchalk-gray-u16-0 libchalk-lms-f32-0 libchalk-rgb-f16half0 libchalk-rgb-f32-0 libchalk-rgb-u16-0 libchalk-ycbcr-u16-0 libchalk-ycbcr-u8-0 libchalkcolor1 libchalkcommon1 libchalkgrayscale0 libchalkimage1 libchalkrgb0 libchalkscripting0 libchalkui1
 
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
index e8e11eff0..f399de402 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libkdeinit_karbon.so for usr/lib/libkdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libkdeinit_karbon.so for opt/trinity/lib/libkdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libkdeinit-karbon
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
index 1c399d1f3..f81d8d6f7 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
@@ -1,5 +1,5 @@
 # There is no -dev package.
-kchart: non-dev-pkg-with-shlib-symlink usr/lib/libkdchart.so.0.0.0 usr/lib/libkdchart.so
-kchart: shlib-missing-in-control-file libkdeinit_kchart.so for usr/lib/libkdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
+kchart-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkdchart.so.0.0.0 opt/trinity/lib/libkdchart.so
+kchart-trinity: shlib-missing-in-control-file libkdeinit_kchart.so for opt/trinity/lib/libkdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libkdeinit-kchart
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
index d1dfd14c2..07d1301aa 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libkdeinit_kexi.so for usr/lib/libkdeinit_kexi.so
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/readme.html
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/kross/python/kexiapp/__init__.py
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
-kexi: executable-not-elf-or-script ./usr/share/apps/kexi/scripts/copycenter/CopyCenter.py
-kexi: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libkdeinit_kexi.so for opt/trinity/lib/libkdeinit_kexi.so
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/readme.html
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginKexiDB.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenterPluginQtSQL.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/kross/python/kexiapp/__init__.py
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/exportxhtml/ExportXHTML.rc
+kexi-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kexi/scripts/copycenter/CopyCenter.py
+kexi-trinity: package-name-doesnt-match-sonames libkdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
index 1224a3094..ec8c2f644 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libkdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libkdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libkdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libkdeinit-kformula
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian
index a5c25f78c..4eb29a57e 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/kde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kivio.desktop kivio
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
index 2d8cfc583..00d1d2875 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libkdeinit_kivio.so for usr/lib/libkdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libkdeinit_kivio.so for opt/trinity/lib/libkdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libkdeinit-kivio libkiviocommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian
@@ -1 +1 @@
-koffice-libs: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
+koffice-libs-trinity: package-name-doesnt-match-sonames libkformulalib4 libkochart1 libkofficecore3 libkofficeui3 libkopainter2 libkopalette1 libkoproperty2 libkotext3 libkowmf2 libkrossapi1 libkrossmain1 libkstore3 libkwmailmerge-interface4 libkwmf3 libkwordexportfilters1
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
index e410a8d00..073ee53ab 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libkdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libkdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libkdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libkdeinit-koshell
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
index 62e4d82ea..5237efd72 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libkdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libkdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libkdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libkdeinit-kplato
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian
index af719fd2f..0756d2647 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/kde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kpresenter.desktop kpresenter
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
index d038ca914..2445c57ce 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
@@ -1,4 +1,4 @@
-kpresenter: script-with-language-extension usr/bin/kprconverter.pl
-kpresenter: shlib-missing-in-control-file libkdeinit_kpresenter.so for usr/lib/libkdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libkdeinit_kpresenter.so for opt/trinity/lib/libkdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libkdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
index 6c23d706d..370d6a7f9 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libkdeinit_kspread.so for usr/lib/libkdeinit_kspread.so
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/exporthtml/ExportHtml.py
-kspread: executable-not-elf-or-script ./usr/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
-kspread: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libkdeinit_kspread.so for opt/trinity/lib/libkdeinit_kspread.so
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.rc
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/exporthtml/ExportHtml.py
+kspread-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kspread/scripts/scripteditor/ScriptEditor.py
+kspread-trinity: package-name-doesnt-match-sonames libkdeinit-kspread libkspreadcommon0
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
index b32d255df..ba2ff8197 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libkdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libkdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libkdeinit-kthesaurus
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
index e06755739..a0cd38a78 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libkdeinit_kudesigner.so for usr/lib/libkdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libkdeinit_kugar.so for usr/lib/libkdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kudesigner.so for opt/trinity/lib/libkdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libkdeinit_kugar.so for opt/trinity/lib/libkdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libkdeinit-kudesigner libkdeinit-kugar libkudesignercore libkugarlib1
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian
index 2bc903eb9..34a1f7f57 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/kde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/kde/kword.desktop kword
 
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
index e18dbe8b2..a187698f4 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libkdeinit_kword.so for usr/lib/libkdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libkdeinit_kword.so for opt/trinity/lib/libkdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libkdeinit-kword libkwordprivate4
 
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/rules
@@ -19,6 +19,6 @@ DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
 
 DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
-install/kpowersave::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/kpowersave-trinity::
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/$(cdbs_curpkg)/usr/share/linda/overrides/$(cdbs_curpkg)
diff --git a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
index 1f650ceb8..b0c32f61e 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libkdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libkdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kpowersave.so
 
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules
index bbe86c8d9..16dc75082 100755
--- a/ubuntu/maverick/applications/kpowersave/debian/rules
+++ b/ubuntu/maverick/applications/kpowersave/debian/rules
@@ -30,8 +30,8 @@ debian/stamp-bootstrap:
 	touch debian/stamp-bootstrap
 
 install/kpowersave-trinity::
-	install -p -D -m644 debian/kpowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
-	install -p -D -m644 debian/kpowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+	install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
+	install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
 
 binary-install/kpowersave-trinity::
 	mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/
diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules
index 0b16abed9..3095cca3c 100755
--- a/ubuntu/maverick/applications/krusader/debian/rules
+++ b/ubuntu/maverick/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
 		$(DEB_DESTDIR)/opt/trinity/share/config/kio_isorc
 	# install lintian override
 	install -D -p -m0644 debian/krusader.lintian-overrides \
-		$(DEB_DESTDIR)/opt/trinity/share/lintian/overrides/krusader
+		$(DEB_DESTDIR)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
 binary-post-install/krusader-trinity::
 	rm -rf debian/krusader-trinity/etc/trinity/
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/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/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdeaccessibility/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/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdeaddons/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/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/maverick/kdeaddons/debian/kate-plugins-trinity.lintian
@@ -1,2 +1,2 @@
 # Doesn't need to be executable - only run from within kate.
-kate-plugins: script-not-executable ./usr/share/apps/kate/scripts/html-tidy.sh
+kate-plugins-trinity: script-not-executable ./opt/trinity/share/apps/kate/scripts/html-tidy.sh
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.lintian
@@ -1,3 +1,3 @@
 # Call is inserted by debhelper and is correct.
-kicker-applets: postinst-has-useless-call-to-ldconfig
-kicker-applets: postrm-has-useless-call-to-ldconfig
+kicker-applets-trinity: postinst-has-useless-call-to-ldconfig
+kicker-applets-trinity: postrm-has-useless-call-to-ldconfig
diff --git a/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdeadmin/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/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian
index 96c770df9..e37a33b77 100644
--- a/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/maverick/kdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/kdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/kdesu
diff --git a/ubuntu/maverick/kdebase/debian/kate-trinity.lintian b/ubuntu/maverick/kdebase/debian/kate-trinity.lintian
index fcc9b79aa..80d27b09a 100644
--- a/ubuntu/maverick/kdebase/debian/kate-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/kdebase/debian/kcontrol-trinity.lintian
index 3c7f407c6..2a4306011 100644
--- a/ubuntu/maverick/kdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.lintian b/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.lintian
index 82e1b9846..9f78d69c8 100644
--- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kdeprint-trinity.lintian b/ubuntu/maverick/kdebase/debian/kdeprint-trinity.lintian
index 6cac09d35..156e04dc0 100644
--- a/ubuntu/maverick/kdebase/debian/kdeprint-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kdesktop-trinity.lintian b/ubuntu/maverick/kdebase/debian/kdesktop-trinity.lintian
index b652ef1a3..c270fd6ae 100644
--- a/ubuntu/maverick/kdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.lintian b/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.lintian
index db8286ac4..181e28c79 100644
--- a/ubuntu/maverick/kdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kicker-trinity.lintian b/ubuntu/maverick/kdebase/debian/kicker-trinity.lintian
index 41de1be8e..58291ed21 100644
--- a/ubuntu/maverick/kdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/klipper-trinity.lintian b/ubuntu/maverick/kdebase/debian/klipper-trinity.lintian
index 710a50459..320ae2d31 100644
--- a/ubuntu/maverick/kdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.lintian b/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.lintian
index 075ffc823..845065f6f 100644
--- a/ubuntu/maverick/kdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/konqueror-trinity.lintian b/ubuntu/maverick/kdebase/debian/konqueror-trinity.lintian
index 27e528d84..2bbd4c186 100644
--- a/ubuntu/maverick/kdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/konsole-trinity.lintian b/ubuntu/maverick/kdebase/debian/konsole-trinity.lintian
index 95c2d012e..c050f8ca0 100644
--- a/ubuntu/maverick/kdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/ksmserver-trinity.lintian b/ubuntu/maverick/kdebase/debian/ksmserver-trinity.lintian
index 669919e49..b246da092 100644
--- a/ubuntu/maverick/kdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdebase/debian/kwin-trinity.lintian b/ubuntu/maverick/kdebase/debian/kwin-trinity.lintian
index 1bf281c8a..12758aa76 100644
--- a/ubuntu/maverick/kdebase/debian/kwin-trinity.lintian
+++ b/ubuntu/maverick/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
diff --git a/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdeedu/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/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegames/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/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/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/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/maverick/kdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/ubuntu/maverick/kdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/ubuntu/maverick/kdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.lintian
index 5c83f447b..1e1c0f081 100644
--- a/ubuntu/maverick/kdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/ubuntu/maverick/kdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/ubuntu/maverick/kdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.lintian
index 61cb450ac..dd274dba5 100644
--- a/ubuntu/maverick/kdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kview-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kview-trinity.lintian
index 8314a8155..7459b4b82 100644
--- a/ubuntu/maverick/kdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/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/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.lintian
index 4a0571207..5e80c0a55 100644
--- a/ubuntu/maverick/kdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/maverick/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
diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian
index 2e0ebfa6c..7918aa780 100644
--- a/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian
+++ b/ubuntu/maverick/kdelibs/debian/kdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
-kdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-kdelibs4c2a binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kaddprinterwizard.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_cupsdconf.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_dcopserver.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcmshell.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_http_cache_cleaner.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kbuildsycoca.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kded.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcookiejar.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_klauncher.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kconf_update.so
+kdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libkdeinit_kio_uiserver.so
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+kdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_kdeinit 4755 root/root
diff --git a/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdemultimedia/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/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian
index 6f97d1c92..8f1fe3f4e 100644
--- a/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/maverick/kdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kmixctrl.so
diff --git a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian b/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian
index 4b6b929a1..b59ed3df8 100644
--- a/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/maverick/kdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_krec.so
diff --git a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/maverick/kdemultimedia/debian/libarts1-xine-trinity.lintian
@@ -1 +1 @@
-libarts1-xine: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
+libarts1-xine-trinity: no-shlibs-control-file opt/trinity/lib/libarts_xine.so
diff --git a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian b/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian
index 2dba45ea5..27214f531 100644
--- a/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/maverick/kdemultimedia/debian/noatun-trinity.lintian
@@ -1,4 +1,4 @@
-noatun: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
-noatun: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
-noatun: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
-noatun: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
+noatun-trinity: shlib-missing-in-control-file libwinskinvis.so opt/trinity/lib/libwinskinvis.so
+noatun-trinity: shlib-missing-in-control-file libartseffects.so opt/trinity/lib/libartseffects.so
+noatun-trinity: shlib-missing-in-control-file libnoatunarts.so opt/trinity/lib/libnoatunarts.so
+noatun-trinity: shlib-missing-in-control-file libkdeinit_noatun.so opt/trinity/lib/libkdeinit_noatun.so
diff --git a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/maverick/kdenetwork/debian/knewsticker-trinity.lintian
@@ -1 +1 @@
-knewsticker: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
+knewsticker-trinity: menu-command-not-in-package /opt/trinity/lib/menu/knewsticker:8 /opt/trinity/bin/appletproxy
diff --git a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian b/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/maverick/kdenetwork/debian/kppp-trinity.lintian
@@ -1,3 +1,3 @@
-kppp: setuid-binary opt/trinity/bin/kppp 4754 root/dip
-kppp: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
-kppp: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
+kppp-trinity: setuid-binary opt/trinity/bin/kppp 4754 root/dip
+kppp-trinity: non-standard-executable-perm opt/trinity/bin/kppplogview 0754 != 0755
+kppp-trinity: non-standard-file-perm etc/ppp/peers/kppp-options 0640 != 0644
diff --git a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian b/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian
index d4f2f589a..6256da4ce 100644
--- a/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/maverick/kdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ksirc.so
diff --git a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/maverick/kdenetwork/debian/kwifimanager-trinity.lintian
@@ -1,3 +1,3 @@
-kwifimanager: no-shlibs-control-file opt/trinity/lib/libkwireless.so
-kwifimanager: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
-kwifimanager: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: no-shlibs-control-file opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkwireless.so
+kwifimanager-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkwireless.so
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
diff --git a/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian b/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian
index e6fb3080a..adb549884 100644
--- a/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/maverick/kdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libkdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libkdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libkdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libkdeinit-kweatherreport
diff --git a/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian
index 7c958e5e4..c4771fe04 100644
--- a/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/maverick/kdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_ark.so
diff --git a/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian
index d05acaa86..4e3ff01ab 100644
--- a/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/maverick/kdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kcalc.so
diff --git a/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian b/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian
index 864682bca..232253503 100644
--- a/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/maverick/kdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libkdeinit_kedit.so
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/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/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian b/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian
index 7fae2cfa6..a78623689 100644
--- a/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian
+++ b/ubuntu/maverick/kdevelop/debian/kdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
 # These files are provided to create new applications.
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-kdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+kdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
 # This file is a template, not a script.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
 # This file is used internally by kio_pydoc.la and invoked explicitly with python.
-kdevelop-data: script-not-executable ./usr/share/apps/kio_pydoc/kde_pydoc.py
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kio_pydoc/kde_pydoc.py
 # This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-kdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+kdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdewebdev/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/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/maverick/kdewebdev/debian/quanta-data-trinity.lintian
@@ -1,6 +1,6 @@
 # These are shipped with quanta's kommander scripts and do not need to be
 # executable.
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/dwt.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/TemplateMagic.pl
-quanta-data: script-not-executable ./usr/share/apps/quanta/scripts/externalpreview.sh
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/dwt.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/TemplateMagic.pl
+quanta-data-trinity: script-not-executable ./opt/trinity/share/apps/quanta/scripts/externalpreview.sh
 
diff --git a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian b/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/maverick/kdewebdev/debian/quanta-trinity.lintian
@@ -1,4 +1,4 @@
 # This tag is required for apps already in the KDE menu.
-quanta: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
+quanta-trinity: menu-item-contains-unknown-tag kderemove /opt/trinity/lib/menu/quanta:9
 # This is part of the docbook docs.
-quanta: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook
+quanta-trinity: extra-license-file opt/trinity/share/doc/tde/HTML/en/quanta/credits-license.docbook