summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-07-20 04:24:36 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-07-20 04:25:28 +0200
commit09baa28aa4748c02ca157089cac90ed45c767dfd (patch)
treea9be754fb2369ae0f9f8d3be663be95d1d4c2b86
parent21544772c772f6ab17769c37d7dfce48a903688d (diff)
downloadtde-packaging-09baa28aa4748c02ca157089cac90ed45c767dfd.tar.gz
tde-packaging-09baa28aa4748c02ca157089cac90ed45c767dfd.zip
Fix lintian overrides on Debian and Ubuntu
-rwxr-xr-xdebian/lenny/applications/amarok/debian/rules2
-rw-r--r--debian/lenny/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xdebian/lenny/applications/gwenview/debian/rules6
-rwxr-xr-xdebian/lenny/applications/kaffeine/debian/rules22
-rw-r--r--debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--debian/lenny/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--debian/lenny/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/lenny/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/lenny/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--debian/lenny/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--debian/lenny/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--debian/lenny/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--debian/lenny/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--debian/lenny/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--debian/lenny/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/lenny/applications/kpowersave.cmake/debian/rules6
-rw-r--r--debian/lenny/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/lenny/applications/kpowersave/debian/rules4
-rwxr-xr-xdebian/lenny/applications/krusader/debian/rules2
-rw-r--r--debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/lenny/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/lenny/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--debian/lenny/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--debian/lenny/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--debian/lenny/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--debian/lenny/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--debian/lenny/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--debian/lenny/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--debian/lenny/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--debian/lenny/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--debian/lenny/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--debian/lenny/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--debian/lenny/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--debian/lenny/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--debian/lenny/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/lenny/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--debian/lenny/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--debian/lenny/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--debian/lenny/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/lenny/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--debian/lenny/tdewebdev/debian/quanta-trinity.lintian4
-rwxr-xr-xdebian/squeeze/applications/amarok/debian/rules2
-rw-r--r--debian/squeeze/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xdebian/squeeze/applications/gwenview/debian/rules6
-rwxr-xr-xdebian/squeeze/applications/kaffeine/debian/rules22
-rw-r--r--debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--debian/squeeze/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--debian/squeeze/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/squeeze/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/squeeze/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--debian/squeeze/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--debian/squeeze/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--debian/squeeze/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--debian/squeeze/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--debian/squeeze/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--debian/squeeze/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/squeeze/applications/kpowersave.cmake/debian/rules6
-rw-r--r--debian/squeeze/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/squeeze/applications/kpowersave/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/krusader/debian/rules2
-rw-r--r--debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--debian/squeeze/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--debian/squeeze/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/squeeze/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/squeeze/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--debian/squeeze/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--debian/squeeze/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--debian/squeeze/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--debian/squeeze/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/squeeze/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--debian/squeeze/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--debian/squeeze/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--debian/squeeze/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--debian/squeeze/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--debian/squeeze/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--debian/squeeze/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--debian/squeeze/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--debian/squeeze/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/squeeze/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/squeeze/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--debian/squeeze/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--debian/squeeze/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--debian/squeeze/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/squeeze/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/squeeze/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--debian/squeeze/tdewebdev/debian/quanta-trinity.lintian4
-rwxr-xr-xdebian/wheezy/applications/amarok/debian/rules2
-rw-r--r--debian/wheezy/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xdebian/wheezy/applications/gwenview/debian/rules6
-rwxr-xr-xdebian/wheezy/applications/kaffeine/debian/rules22
-rw-r--r--debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--debian/wheezy/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--debian/wheezy/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/wheezy/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/wheezy/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--debian/wheezy/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--debian/wheezy/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--debian/wheezy/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--debian/wheezy/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--debian/wheezy/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/wheezy/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--debian/wheezy/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--debian/wheezy/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/wheezy/applications/kpowersave.cmake/debian/rules6
-rw-r--r--debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xdebian/wheezy/applications/kpowersave/debian/rules4
-rwxr-xr-xdebian/wheezy/applications/krusader/debian/rules2
-rw-r--r--debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--debian/wheezy/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--debian/wheezy/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/wheezy/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/wheezy/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--debian/wheezy/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--debian/wheezy/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--debian/wheezy/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--debian/wheezy/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--debian/wheezy/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--debian/wheezy/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/wheezy/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--debian/wheezy/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--debian/wheezy/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--debian/wheezy/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--debian/wheezy/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--debian/wheezy/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--debian/wheezy/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--debian/wheezy/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--debian/wheezy/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--debian/wheezy/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--debian/wheezy/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--debian/wheezy/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--debian/wheezy/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--debian/wheezy/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/wheezy/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/wheezy/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--debian/wheezy/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--debian/wheezy/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--debian/wheezy/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--debian/wheezy/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/wheezy/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--debian/wheezy/tdewebdev/debian/quanta-trinity.lintian4
-rwxr-xr-xubuntu/maverick/applications/amarok/debian/rules2
-rw-r--r--ubuntu/maverick/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xubuntu/maverick/applications/gwenview/debian/rules6
-rwxr-xr-xubuntu/maverick/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/maverick/applications/kpowersave.cmake/debian/rules6
-rw-r--r--ubuntu/maverick/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/maverick/applications/kpowersave/debian/rules4
-rwxr-xr-xubuntu/maverick/applications/krusader/debian/rules2
-rw-r--r--ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian4
-rwxr-xr-xubuntu/precise/applications/amarok/debian/rules2
-rw-r--r--ubuntu/precise/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xubuntu/precise/applications/gwenview/debian/rules6
-rwxr-xr-xubuntu/precise/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/precise/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--ubuntu/precise/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/precise/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/precise/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--ubuntu/precise/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--ubuntu/precise/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--ubuntu/precise/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--ubuntu/precise/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/precise/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--ubuntu/precise/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/precise/applications/kpowersave.cmake/debian/rules6
-rw-r--r--ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/precise/applications/kpowersave/debian/rules4
-rwxr-xr-xubuntu/precise/applications/krusader/debian/rules2
-rw-r--r--ubuntu/precise/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--ubuntu/precise/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/precise/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--ubuntu/precise/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--ubuntu/precise/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--ubuntu/precise/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--ubuntu/precise/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--ubuntu/precise/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--ubuntu/precise/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/precise/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--ubuntu/precise/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--ubuntu/precise/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--ubuntu/precise/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--ubuntu/precise/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--ubuntu/precise/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--ubuntu/precise/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--ubuntu/precise/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--ubuntu/precise/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--ubuntu/precise/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--ubuntu/precise/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--ubuntu/precise/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--ubuntu/precise/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--ubuntu/precise/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--ubuntu/precise/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--ubuntu/precise/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--ubuntu/precise/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/precise/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian4
-rwxr-xr-xubuntu/raring/applications/amarok/debian/rules2
-rw-r--r--ubuntu/raring/applications/gwenview/debian/gwenview.lintian6
-rwxr-xr-xubuntu/raring/applications/gwenview/debian/rules6
-rwxr-xr-xubuntu/raring/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian34
-rw-r--r--ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian6
-rw-r--r--ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian28
-rw-r--r--ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian6
-rw-r--r--ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian2
-rw-r--r--ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kword-trinity.lintian6
-rw-r--r--ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/raring/applications/kpowersave.cmake/debian/rules6
-rw-r--r--ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian8
-rwxr-xr-xubuntu/raring/applications/kpowersave/debian/rules4
-rwxr-xr-xubuntu/raring/applications/krusader/debian/rules2
-rw-r--r--ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdeaddons/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdeaddons/debian/kate-plugins-trinity.lintian2
-rw-r--r--ubuntu/raring/tdeaddons/debian/kicker-applets-trinity.lintian4
-rw-r--r--ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/raring/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian2
-rw-r--r--ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/kicker-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/klipper-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian8
-rw-r--r--ubuntu/raring/tdebase/debian/konqueror-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/konsole-trinity.lintian6
-rw-r--r--ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian4
-rw-r--r--ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian12
-rw-r--r--ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian8
-rw-r--r--ubuntu/raring/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/raring/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegraphics/debian/kfaxview-trinity.lintian8
-rw-r--r--ubuntu/raring/tdegraphics/debian/kghostview-trinity.lintian2
-rw-r--r--ubuntu/raring/tdegraphics/debian/kmrml-trinity.lintian8
-rw-r--r--ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.lintian2
-rw-r--r--ubuntu/raring/tdegraphics/debian/ksvg-trinity.lintian2
-rw-r--r--ubuntu/raring/tdegraphics/debian/kuickshow-trinity.lintian8
-rw-r--r--ubuntu/raring/tdegraphics/debian/kview-trinity.lintian6
-rw-r--r--ubuntu/raring/tdegraphics/debian/kviewshell-trinity.lintian4
-rw-r--r--ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian30
-rw-r--r--ubuntu/raring/tdemultimedia/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdemultimedia/debian/kmix-trinity.lintian8
-rw-r--r--ubuntu/raring/tdemultimedia/debian/krec-trinity.lintian6
-rw-r--r--ubuntu/raring/tdemultimedia/debian/libarts1-xine-trinity.lintian2
-rw-r--r--ubuntu/raring/tdemultimedia/debian/noatun-trinity.lintian8
-rw-r--r--ubuntu/raring/tdenetwork/debian/knewsticker-trinity.lintian2
-rw-r--r--ubuntu/raring/tdenetwork/debian/kppp-trinity.lintian6
-rw-r--r--ubuntu/raring/tdenetwork/debian/ksirc-trinity.lintian6
-rw-r--r--ubuntu/raring/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/raring/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/raring/tdesdk/debian/kapptemplate-trinity.lintian20
-rw-r--r--ubuntu/raring/tdesdk/debian/kbabel-trinity.lintian2
-rw-r--r--ubuntu/raring/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/tdesdk-scripts-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/umbrello-trinity.lintian2
-rw-r--r--ubuntu/raring/tdetoys/debian/kweather-trinity.lintian4
-rw-r--r--ubuntu/raring/tdeutils/debian/ark-trinity-trinity.lintian6
-rw-r--r--ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/raring/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/raring/tdewebdev/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdewebdev/debian/quanta-data-trinity.lintian6
-rw-r--r--ubuntu/raring/tdewebdev/debian/quanta-trinity.lintian4
522 files changed, 1704 insertions, 1704 deletions
diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules
index 77b0e3159..bb6288758 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 6fdaead63..0e247a6ab 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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index d6423c512..2fca00e50 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 9021f8fb0..2f9fed447 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/tde/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/tde/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 tdelibs
- 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 820cf112f..7500cb18d 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/tde/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/tde/chalk.desktop chalk
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.lintian b/debian/lenny/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 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 libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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 9733b0a93..b08ff3b43 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 libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.lintian b/debian/lenny/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/debian/lenny/applications/koffice/debian/kexi-trinity.lintian b/debian/lenny/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 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 libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-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 1062b39db..25a8c006f 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/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 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/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.lintian b/debian/lenny/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 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 libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-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 45d130a4e..c77411ba2 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/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/lenny/applications/koffice/debian/kplato-trinity.lintian b/debian/lenny/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 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/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 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/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian b/debian/lenny/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.lintian b/debian/lenny/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 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 libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/lenny/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 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/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/debian/lenny/applications/koffice/debian/kugar-trinity.lintian b/debian/lenny/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 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 libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-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 6fa3d857b..09c395552 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/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.lintian b/debian/lenny/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 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 libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 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 5a95e522d..4b297b1ae 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/tdeio_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/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdeaccessibility/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/tdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdeaddons/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/tdeaddons/debian/kate-plugins-trinity.lintian b/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/debian/lenny/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/lenny/tdeaddons/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/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/debian/lenny/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/lenny/tdeaddons/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/tdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdeadmin/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/tdeadmin/debian/lilo-config-trinity.lintian b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/debian/lenny/tdebase/debian/kate-trinity.lintian b/debian/lenny/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/debian/lenny/tdebase/debian/kicker-trinity.lintian b/debian/lenny/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/debian/lenny/tdebase/debian/kicker-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/debian/lenny/tdebase/debian/klipper-trinity.lintian b/debian/lenny/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/debian/lenny/tdebase/debian/klipper-trinity.lintian
+++ b/debian/lenny/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/lenny/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.lintian b/debian/lenny/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.lintian
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/debian/lenny/tdebase/debian/konsole-trinity.lintian b/debian/lenny/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/debian/lenny/tdebase/debian/konsole-trinity.lintian
+++ b/debian/lenny/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/lenny/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.lintian b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/debian/lenny/tdebase/debian/twin-trinity.lintian b/debian/lenny/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/debian/lenny/tdebase/debian/twin-trinity.lintian
+++ b/debian/lenny/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdeedu/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/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdegames/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/tdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdegraphics/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/tdegraphics/debian/kfaxview-trinity.lintian b/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/debian/lenny/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/lenny/tdegraphics/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/tdegraphics/debian/kghostview-trinity.lintian b/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/debian/lenny/tdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/lenny/tdegraphics/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/tdegraphics/debian/kmrml-trinity.lintian b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/lenny/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/lenny/tdegraphics/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/tdegraphics/debian/ksvg-trinity.lintian b/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/debian/lenny/tdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/lenny/tdegraphics/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/tdegraphics/debian/kuickshow-trinity.lintian b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/lenny/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.lintian b/debian/lenny/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.lintian
+++ b/debian/lenny/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian b/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/debian/lenny/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/lenny/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdemultimedia/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/tdemultimedia/debian/kmix-trinity.lintian b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/lenny/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/lenny/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/debian/lenny/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/lenny/tdemultimedia/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/tdemultimedia/debian/noatun-trinity.lintian b/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/debian/lenny/tdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/lenny/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian b/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/debian/lenny/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/lenny/tdenetwork/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/tdenetwork/debian/kppp-trinity.lintian b/debian/lenny/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/debian/lenny/tdenetwork/debian/kppp-trinity.lintian
+++ b/debian/lenny/tdenetwork/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/tdenetwork/debian/ksirc-trinity.lintian b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/lenny/tdenetwork/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/tdesdk/debian/cervisia-trinity.lintian b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian b/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.lintian b/debian/lenny/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.lintian b/debian/lenny/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/debian/lenny/tdesdk/debian/kompare-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/debian/lenny/tdesdk/debian/kspy-trinity.lintian b/debian/lenny/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/debian/lenny/tdesdk/debian/kspy-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian b/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.lintian b/debian/lenny/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/debian/lenny/tdesdk/debian/umbrello-trinity.lintian
+++ b/debian/lenny/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/debian/lenny/tdetoys/debian/kweather-trinity.lintian b/debian/lenny/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/debian/lenny/tdetoys/debian/kweather-trinity.lintian
+++ b/debian/lenny/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.lintian b/debian/lenny/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/lenny/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/tdewebdev/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/tdewebdev/debian/quanta-data-trinity.lintian b/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/debian/lenny/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/lenny/tdewebdev/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/tdewebdev/debian/quanta-trinity.lintian b/debian/lenny/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/debian/lenny/tdewebdev/debian/quanta-trinity.lintian
+++ b/debian/lenny/tdewebdev/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 277aff4ec..1b6f7c5fe 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 6fdaead63..0e247a6ab 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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules
index d6423c512..2fca00e50 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 9021f8fb0..2f9fed447 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/tde/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/tde/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 tdelibs
- 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 820cf112f..7500cb18d 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/tde/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/tde/chalk.desktop chalk
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian b/debian/squeeze/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 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 libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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 9733b0a93..b08ff3b43 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 libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian b/debian/squeeze/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian b/debian/squeeze/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 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 libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-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 1062b39db..25a8c006f 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/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 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/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian b/debian/squeeze/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 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 libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-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 45d130a4e..c77411ba2 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/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian b/debian/squeeze/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 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/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 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/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian b/debian/squeeze/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 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 libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/squeeze/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 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/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian b/debian/squeeze/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 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 libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-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 6fa3d857b..09c395552 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/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.lintian b/debian/squeeze/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 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 libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 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 5a95e522d..4b297b1ae 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/tdeio_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/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdeaccessibility/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/tdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdeaddons/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/tdeaddons/debian/kate-plugins-trinity.lintian b/debian/squeeze/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/debian/squeeze/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/squeeze/tdeaddons/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/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/squeeze/tdeaddons/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/tdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdeadmin/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/tdeadmin/debian/lilo-config-trinity.lintian b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/debian/squeeze/tdebase/debian/kate-trinity.lintian b/debian/squeeze/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/debian/squeeze/tdebase/debian/kate-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian b/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian b/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/debian/squeeze/tdebase/debian/kicker-trinity.lintian b/debian/squeeze/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/debian/squeeze/tdebase/debian/kicker-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/debian/squeeze/tdebase/debian/klipper-trinity.lintian b/debian/squeeze/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/debian/squeeze/tdebase/debian/klipper-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian b/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.lintian b/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/debian/squeeze/tdebase/debian/konsole-trinity.lintian b/debian/squeeze/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/debian/squeeze/tdebase/debian/konsole-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian b/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian b/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/debian/squeeze/tdebase/debian/twin-trinity.lintian b/debian/squeeze/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/debian/squeeze/tdebase/debian/twin-trinity.lintian
+++ b/debian/squeeze/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/debian/squeeze/tdeedu/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdeedu/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/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdegames/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/tdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/debian/squeeze/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdegraphics/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/tdegraphics/debian/kfaxview-trinity.lintian b/debian/squeeze/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/debian/squeeze/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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/tdegraphics/debian/kghostview-trinity.lintian b/debian/squeeze/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/debian/squeeze/tdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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/tdegraphics/debian/kmrml-trinity.lintian b/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/squeeze/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.lintian b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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/tdegraphics/debian/ksvg-trinity.lintian b/debian/squeeze/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/debian/squeeze/tdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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/tdegraphics/debian/kuickshow-trinity.lintian b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/squeeze/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/squeeze/tdegraphics/debian/kview-trinity.lintian b/debian/squeeze/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian b/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/debian/squeeze/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/squeeze/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdemultimedia/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/tdemultimedia/debian/kmix-trinity.lintian b/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian b/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/squeeze/tdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/squeeze/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/debian/squeeze/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/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/tdemultimedia/debian/noatun-trinity.lintian b/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/debian/squeeze/tdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/squeeze/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/debian/squeeze/tdenetwork/debian/knewsticker-trinity.lintian b/debian/squeeze/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/debian/squeeze/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/squeeze/tdenetwork/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/tdenetwork/debian/kppp-trinity.lintian b/debian/squeeze/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/debian/squeeze/tdenetwork/debian/kppp-trinity.lintian
+++ b/debian/squeeze/tdenetwork/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/tdenetwork/debian/ksirc-trinity.lintian b/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/squeeze/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/squeeze/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/squeeze/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/debian/squeeze/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/squeeze/tdenetwork/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/tdesdk/debian/cervisia-trinity.lintian b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/squeeze/tdesdk/debian/kapptemplate-trinity.lintian b/debian/squeeze/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/debian/squeeze/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/debian/squeeze/tdesdk/debian/kbabel-trinity.lintian b/debian/squeeze/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/debian/squeeze/tdesdk/debian/kompare-trinity.lintian b/debian/squeeze/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/debian/squeeze/tdesdk/debian/kompare-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/debian/squeeze/tdesdk/debian/kspy-trinity.lintian b/debian/squeeze/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/debian/squeeze/tdesdk/debian/kspy-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-scripts-trinity.lintian b/debian/squeeze/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/debian/squeeze/tdesdk/debian/umbrello-trinity.lintian b/debian/squeeze/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/debian/squeeze/tdesdk/debian/umbrello-trinity.lintian
+++ b/debian/squeeze/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/debian/squeeze/tdetoys/debian/kweather-trinity.lintian b/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
+++ b/debian/squeeze/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian b/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/squeeze/tdeutils/debian/kedit-trinity.lintian b/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/squeeze/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian b/debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/debian/squeeze/tdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/squeeze/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/tdewebdev/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/tdewebdev/debian/quanta-data-trinity.lintian b/debian/squeeze/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/debian/squeeze/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/squeeze/tdewebdev/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/tdewebdev/debian/quanta-trinity.lintian b/debian/squeeze/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/debian/squeeze/tdewebdev/debian/quanta-trinity.lintian
+++ b/debian/squeeze/tdewebdev/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/wheezy/applications/amarok/debian/rules b/debian/wheezy/applications/amarok/debian/rules
index 277aff4ec..1b6f7c5fe 100755
--- a/debian/wheezy/applications/amarok/debian/rules
+++ b/debian/wheezy/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/wheezy/applications/gwenview/debian/gwenview.lintian b/debian/wheezy/applications/gwenview/debian/gwenview.lintian
index 6fdaead63..0e247a6ab 100644
--- a/debian/wheezy/applications/gwenview/debian/gwenview.lintian
+++ b/debian/wheezy/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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/debian/wheezy/applications/gwenview/debian/rules b/debian/wheezy/applications/gwenview/debian/rules
index d6423c512..2fca00e50 100755
--- a/debian/wheezy/applications/gwenview/debian/rules
+++ b/debian/wheezy/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/wheezy/applications/kaffeine/debian/rules b/debian/wheezy/applications/kaffeine/debian/rules
index 9021f8fb0..2f9fed447 100755
--- a/debian/wheezy/applications/kaffeine/debian/rules
+++ b/debian/wheezy/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/tde/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/tde/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 tdelibs
- 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/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/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/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/wheezy/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/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/wheezy/applications/koffice/debian/chalk-data-trinity.lintian b/debian/wheezy/applications/koffice/debian/chalk-data-trinity.lintian
index 820cf112f..7500cb18d 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/debian/wheezy/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/tde/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/tde/chalk.desktop chalk
diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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/wheezy/applications/koffice/debian/karbon-trinity.lintian b/debian/wheezy/applications/koffice/debian/karbon-trinity.lintian
index 9733b0a93..b08ff3b43 100644
--- a/debian/wheezy/applications/koffice/debian/karbon-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/debian/wheezy/applications/koffice/debian/kchart-trinity.lintian b/debian/wheezy/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 100644
--- a/debian/wheezy/applications/koffice/debian/kchart-trinity.lintian
+++ b/debian/wheezy/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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/debian/wheezy/applications/koffice/debian/kexi-trinity.lintian b/debian/wheezy/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 100644
--- a/debian/wheezy/applications/koffice/debian/kexi-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/debian/wheezy/applications/koffice/debian/kformula-trinity.lintian b/debian/wheezy/applications/koffice/debian/kformula-trinity.lintian
index 1062b39db..25a8c006f 100644
--- a/debian/wheezy/applications/koffice/debian/kformula-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/debian/wheezy/applications/koffice/debian/kivio-data-trinity.lintian b/debian/wheezy/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 100644
--- a/debian/wheezy/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/debian/wheezy/applications/koffice/debian/kivio-trinity.lintian b/debian/wheezy/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 100644
--- a/debian/wheezy/applications/koffice/debian/kivio-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
diff --git a/debian/wheezy/applications/koffice/debian/koffice-libs-trinity.lintian b/debian/wheezy/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/debian/wheezy/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/debian/wheezy/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/wheezy/applications/koffice/debian/koshell-trinity.lintian b/debian/wheezy/applications/koffice/debian/koshell-trinity.lintian
index 45d130a4e..c77411ba2 100644
--- a/debian/wheezy/applications/koffice/debian/koshell-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/debian/wheezy/applications/koffice/debian/kplato-trinity.lintian b/debian/wheezy/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 100644
--- a/debian/wheezy/applications/koffice/debian/kplato-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/debian/wheezy/applications/koffice/debian/kpresenter-data-trinity.lintian b/debian/wheezy/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 100644
--- a/debian/wheezy/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/debian/wheezy/applications/koffice/debian/kpresenter-trinity.lintian b/debian/wheezy/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 100644
--- a/debian/wheezy/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/debian/wheezy/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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/debian/wheezy/applications/koffice/debian/kspread-trinity.lintian b/debian/wheezy/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 100644
--- a/debian/wheezy/applications/koffice/debian/kspread-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/debian/wheezy/applications/koffice/debian/kthesaurus-trinity.lintian b/debian/wheezy/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 100644
--- a/debian/wheezy/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/debian/wheezy/applications/koffice/debian/kugar-trinity.lintian b/debian/wheezy/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 100644
--- a/debian/wheezy/applications/koffice/debian/kugar-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/debian/wheezy/applications/koffice/debian/kword-data-trinity.lintian b/debian/wheezy/applications/koffice/debian/kword-data-trinity.lintian
index 6fa3d857b..09c395552 100644
--- a/debian/wheezy/applications/koffice/debian/kword-data-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/debian/wheezy/applications/koffice/debian/kword-trinity.lintian b/debian/wheezy/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 100644
--- a/debian/wheezy/applications/koffice/debian/kword-trinity.lintian
+++ b/debian/wheezy/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/rules b/debian/wheezy/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/debian/wheezy/applications/kpowersave.cmake/debian/rules
+++ b/debian/wheezy/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/wheezy/applications/kpowersave/debian/kpowersave-trinity.lintian b/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/debian/wheezy/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/debian/wheezy/applications/kpowersave/debian/rules b/debian/wheezy/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 100755
--- a/debian/wheezy/applications/kpowersave/debian/rules
+++ b/debian/wheezy/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/wheezy/applications/krusader/debian/rules b/debian/wheezy/applications/krusader/debian/rules
index 5a95e522d..4b297b1ae 100755
--- a/debian/wheezy/applications/krusader/debian/rules
+++ b/debian/wheezy/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_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/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/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/wheezy/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdeaccessibility/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/wheezy/tdeaddons/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdeaddons/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/wheezy/tdeaddons/debian/kate-plugins-trinity.lintian b/debian/wheezy/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/debian/wheezy/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/debian/wheezy/tdeaddons/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/wheezy/tdeaddons/debian/kicker-applets-trinity.lintian b/debian/wheezy/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/debian/wheezy/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/debian/wheezy/tdeaddons/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/wheezy/tdeadmin/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdeadmin/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/wheezy/tdeadmin/debian/lilo-config-trinity.lintian b/debian/wheezy/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/debian/wheezy/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/debian/wheezy/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/debian/wheezy/tdebase/debian/kate-trinity.lintian b/debian/wheezy/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/debian/wheezy/tdebase/debian/kate-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian b/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/debian/wheezy/tdebase/debian/kdesktop-trinity.lintian b/debian/wheezy/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/debian/wheezy/tdebase/debian/kdesktop-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/debian/wheezy/tdebase/debian/khelpcenter-trinity.lintian b/debian/wheezy/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/debian/wheezy/tdebase/debian/khelpcenter-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/debian/wheezy/tdebase/debian/kicker-trinity.lintian b/debian/wheezy/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/debian/wheezy/tdebase/debian/kicker-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/debian/wheezy/tdebase/debian/klipper-trinity.lintian b/debian/wheezy/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/debian/wheezy/tdebase/debian/klipper-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/debian/wheezy/tdebase/debian/kmenuedit-trinity.lintian b/debian/wheezy/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/debian/wheezy/tdebase/debian/kmenuedit-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/debian/wheezy/tdebase/debian/konqueror-trinity.lintian b/debian/wheezy/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/debian/wheezy/tdebase/debian/konqueror-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/debian/wheezy/tdebase/debian/konsole-trinity.lintian b/debian/wheezy/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/debian/wheezy/tdebase/debian/konsole-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/debian/wheezy/tdebase/debian/ksmserver-trinity.lintian b/debian/wheezy/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/debian/wheezy/tdebase/debian/ksmserver-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.lintian b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/debian/wheezy/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/debian/wheezy/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/debian/wheezy/tdebase/debian/tdeprint-trinity.lintian b/debian/wheezy/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/debian/wheezy/tdebase/debian/tdeprint-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/debian/wheezy/tdebase/debian/twin-trinity.lintian b/debian/wheezy/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/debian/wheezy/tdebase/debian/twin-trinity.lintian
+++ b/debian/wheezy/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/debian/wheezy/tdeedu/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdeedu/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/wheezy/tdegames/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdegames/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/wheezy/tdegraphics/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/debian/wheezy/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdegraphics/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/wheezy/tdegraphics/debian/kfaxview-trinity.lintian b/debian/wheezy/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/debian/wheezy/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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/wheezy/tdegraphics/debian/kghostview-trinity.lintian b/debian/wheezy/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/debian/wheezy/tdegraphics/debian/kghostview-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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/wheezy/tdegraphics/debian/kmrml-trinity.lintian b/debian/wheezy/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/debian/wheezy/tdegraphics/debian/kmrml-trinity.lintian
+++ b/debian/wheezy/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.lintian b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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/wheezy/tdegraphics/debian/ksvg-trinity.lintian b/debian/wheezy/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/debian/wheezy/tdegraphics/debian/ksvg-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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/wheezy/tdegraphics/debian/kuickshow-trinity.lintian b/debian/wheezy/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/debian/wheezy/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/debian/wheezy/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/debian/wheezy/tdegraphics/debian/kview-trinity.lintian b/debian/wheezy/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/debian/wheezy/tdegraphics/debian/kview-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian b/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/debian/wheezy/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/debian/wheezy/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.lintian b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/debian/wheezy/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdemultimedia/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/wheezy/tdemultimedia/debian/kmix-trinity.lintian b/debian/wheezy/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/debian/wheezy/tdemultimedia/debian/kmix-trinity.lintian
+++ b/debian/wheezy/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/debian/wheezy/tdemultimedia/debian/krec-trinity.lintian b/debian/wheezy/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/debian/wheezy/tdemultimedia/debian/krec-trinity.lintian
+++ b/debian/wheezy/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/debian/wheezy/tdemultimedia/debian/libarts1-xine-trinity.lintian b/debian/wheezy/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/debian/wheezy/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/debian/wheezy/tdemultimedia/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/wheezy/tdemultimedia/debian/noatun-trinity.lintian b/debian/wheezy/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/debian/wheezy/tdemultimedia/debian/noatun-trinity.lintian
+++ b/debian/wheezy/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/debian/wheezy/tdenetwork/debian/knewsticker-trinity.lintian b/debian/wheezy/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/debian/wheezy/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/debian/wheezy/tdenetwork/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/wheezy/tdenetwork/debian/kppp-trinity.lintian b/debian/wheezy/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/debian/wheezy/tdenetwork/debian/kppp-trinity.lintian
+++ b/debian/wheezy/tdenetwork/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/wheezy/tdenetwork/debian/ksirc-trinity.lintian b/debian/wheezy/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/debian/wheezy/tdenetwork/debian/ksirc-trinity.lintian
+++ b/debian/wheezy/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/debian/wheezy/tdenetwork/debian/kwifimanager-trinity.lintian b/debian/wheezy/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/debian/wheezy/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/debian/wheezy/tdenetwork/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/wheezy/tdesdk/debian/cervisia-trinity.lintian b/debian/wheezy/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/debian/wheezy/tdesdk/debian/cervisia-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/debian/wheezy/tdesdk/debian/kapptemplate-trinity.lintian b/debian/wheezy/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/debian/wheezy/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/debian/wheezy/tdesdk/debian/kbabel-trinity.lintian b/debian/wheezy/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/debian/wheezy/tdesdk/debian/kbabel-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/debian/wheezy/tdesdk/debian/kompare-trinity.lintian b/debian/wheezy/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/debian/wheezy/tdesdk/debian/kompare-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/debian/wheezy/tdesdk/debian/kspy-trinity.lintian b/debian/wheezy/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/debian/wheezy/tdesdk/debian/kspy-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian b/debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/debian/wheezy/tdesdk/debian/tdesdk-scripts-trinity.lintian b/debian/wheezy/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/debian/wheezy/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/debian/wheezy/tdesdk/debian/umbrello-trinity.lintian b/debian/wheezy/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/debian/wheezy/tdesdk/debian/umbrello-trinity.lintian
+++ b/debian/wheezy/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/debian/wheezy/tdetoys/debian/kweather-trinity.lintian b/debian/wheezy/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/debian/wheezy/tdetoys/debian/kweather-trinity.lintian
+++ b/debian/wheezy/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/debian/wheezy/tdeutils/debian/ark-trinity-trinity.lintian b/debian/wheezy/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/debian/wheezy/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/debian/wheezy/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian b/debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/debian/wheezy/tdeutils/debian/kedit-trinity.lintian b/debian/wheezy/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/debian/wheezy/tdeutils/debian/kedit-trinity.lintian
+++ b/debian/wheezy/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian b/debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/debian/wheezy/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/debian/wheezy/tdewebdev/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/wheezy/tdewebdev/debian/quanta-data-trinity.lintian b/debian/wheezy/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/debian/wheezy/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/debian/wheezy/tdewebdev/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/wheezy/tdewebdev/debian/quanta-trinity.lintian b/debian/wheezy/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/debian/wheezy/tdewebdev/debian/quanta-trinity.lintian
+++ b/debian/wheezy/tdewebdev/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 277aff4ec..1b6f7c5fe 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 6fdaead63..0e247a6ab 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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index d6423c512..2fca00e50 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 9021f8fb0..2f9fed447 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/tde/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/tde/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 tdelibs
- 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 820cf112f..7500cb18d 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/tde/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/tde/chalk.desktop chalk
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 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 libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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 9733b0a93..b08ff3b43 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 libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 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 libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-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 1062b39db..25a8c006f 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/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 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/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 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 libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-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 45d130a4e..c77411ba2 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/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 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/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 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/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 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 libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 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/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 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 libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-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 6fa3d857b..09c395552 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/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian b/ubuntu/maverick/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 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 libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_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 edff50852..8f6135226 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/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 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 5a95e522d..4b297b1ae 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/tdeio_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/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/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/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaccessibility/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/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/ubuntu/maverick/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/maverick/tdeaddons/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/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeadmin/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/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.lintian b/ubuntu/maverick/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/ubuntu/maverick/tdebase/debian/twin-trinity.lintian
+++ b/ubuntu/maverick/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeedu/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/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegames/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/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/ubuntu/maverick/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/kghostview-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/ksvg-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/ubuntu/maverick/tdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/ubuntu/maverick/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/maverick/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdemultimedia/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/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/ubuntu/maverick/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/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/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/ubuntu/maverick/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/maverick/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/ubuntu/maverick/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/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/tdenetwork/debian/kppp-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/ubuntu/maverick/tdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/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/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/maverick/tdenetwork/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/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian b/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian b/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/maverick/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdewebdev/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/tdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/maverick/tdewebdev/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/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/ubuntu/maverick/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/maverick/tdewebdev/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/precise/applications/amarok/debian/rules b/ubuntu/precise/applications/amarok/debian/rules
index 277aff4ec..1b6f7c5fe 100755
--- a/ubuntu/precise/applications/amarok/debian/rules
+++ b/ubuntu/precise/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/precise/applications/gwenview/debian/gwenview.lintian b/ubuntu/precise/applications/gwenview/debian/gwenview.lintian
index 6fdaead63..0e247a6ab 100644
--- a/ubuntu/precise/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/precise/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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/precise/applications/gwenview/debian/rules b/ubuntu/precise/applications/gwenview/debian/rules
index d6423c512..2fca00e50 100755
--- a/ubuntu/precise/applications/gwenview/debian/rules
+++ b/ubuntu/precise/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/precise/applications/kaffeine/debian/rules b/ubuntu/precise/applications/kaffeine/debian/rules
index 9021f8fb0..2f9fed447 100755
--- a/ubuntu/precise/applications/kaffeine/debian/rules
+++ b/ubuntu/precise/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/tde/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/tde/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 tdelibs
- 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/precise/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/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/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/precise/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/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/precise/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.lintian
index 820cf112f..7500cb18d 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/ubuntu/precise/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/tde/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/tde/chalk.desktop chalk
diff --git a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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/precise/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/precise/applications/koffice/debian/karbon-trinity.lintian
index 9733b0a93..b08ff3b43 100644
--- a/ubuntu/precise/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/ubuntu/precise/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 100644
--- a/ubuntu/precise/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/precise/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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/ubuntu/precise/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 100644
--- a/ubuntu/precise/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/ubuntu/precise/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kformula-trinity.lintian
index 1062b39db..25a8c006f 100644
--- a/ubuntu/precise/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/precise/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 100644
--- a/ubuntu/precise/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/ubuntu/precise/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 100644
--- a/ubuntu/precise/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
diff --git a/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/ubuntu/precise/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/ubuntu/precise/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/precise/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/precise/applications/koffice/debian/koshell-trinity.lintian
index 45d130a4e..c77411ba2 100644
--- a/ubuntu/precise/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/precise/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 100644
--- a/ubuntu/precise/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/precise/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 100644
--- a/ubuntu/precise/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 100644
--- a/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/precise/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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 100644
--- a/ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/ubuntu/precise/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 100644
--- a/ubuntu/precise/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/ubuntu/precise/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 100644
--- a/ubuntu/precise/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/ubuntu/precise/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kword-data-trinity.lintian
index 6fa3d857b..09c395552 100644
--- a/ubuntu/precise/applications/koffice/debian/kword-data-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/ubuntu/precise/applications/koffice/debian/kword-trinity.lintian b/ubuntu/precise/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 100644
--- a/ubuntu/precise/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/precise/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
diff --git a/ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/ubuntu/precise/applications/kpowersave.cmake/debian/rules b/ubuntu/precise/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/ubuntu/precise/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/precise/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/precise/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/precise/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/ubuntu/precise/applications/kpowersave/debian/rules b/ubuntu/precise/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 100755
--- a/ubuntu/precise/applications/kpowersave/debian/rules
+++ b/ubuntu/precise/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/precise/applications/krusader/debian/rules b/ubuntu/precise/applications/krusader/debian/rules
index 5a95e522d..4b297b1ae 100755
--- a/ubuntu/precise/applications/krusader/debian/rules
+++ b/ubuntu/precise/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_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/precise/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/precise/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/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/precise/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/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/precise/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/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/precise/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdeaccessibility/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/precise/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdeaddons/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/precise/tdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/precise/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/ubuntu/precise/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/precise/tdeaddons/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/precise/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/precise/tdeaddons/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/precise/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdeadmin/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/precise/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/precise/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/ubuntu/precise/tdebase/debian/kate-trinity.lintian b/ubuntu/precise/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/ubuntu/precise/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/ubuntu/precise/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/precise/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/ubuntu/precise/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/precise/tdebase/debian/kicker-trinity.lintian b/ubuntu/precise/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/ubuntu/precise/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/ubuntu/precise/tdebase/debian/klipper-trinity.lintian b/ubuntu/precise/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/ubuntu/precise/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/ubuntu/precise/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/precise/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/ubuntu/precise/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/precise/tdebase/debian/konqueror-trinity.lintian b/ubuntu/precise/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/ubuntu/precise/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/ubuntu/precise/tdebase/debian/konsole-trinity.lintian b/ubuntu/precise/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/ubuntu/precise/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/ubuntu/precise/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/precise/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/ubuntu/precise/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/precise/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/precise/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/precise/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/ubuntu/precise/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/precise/tdebase/debian/twin-trinity.lintian b/ubuntu/precise/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/ubuntu/precise/tdebase/debian/twin-trinity.lintian
+++ b/ubuntu/precise/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/ubuntu/precise/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdeedu/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/precise/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdegames/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/precise/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/precise/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdegraphics/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/precise/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/ubuntu/precise/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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/precise/tdegraphics/debian/kghostview-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/ubuntu/precise/tdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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/precise/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/ubuntu/precise/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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/precise/tdegraphics/debian/ksvg-trinity.lintian b/ubuntu/precise/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/ubuntu/precise/tdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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/precise/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/ubuntu/precise/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/precise/tdegraphics/debian/kview-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/ubuntu/precise/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/ubuntu/precise/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/precise/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/precise/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdemultimedia/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/precise/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/precise/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/ubuntu/precise/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/precise/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/precise/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/precise/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/ubuntu/precise/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/precise/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/precise/tdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/precise/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/ubuntu/precise/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/precise/tdemultimedia/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/precise/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/precise/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/ubuntu/precise/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/precise/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/ubuntu/precise/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/precise/tdenetwork/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/precise/tdenetwork/debian/kppp-trinity.lintian b/ubuntu/precise/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/ubuntu/precise/tdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/precise/tdenetwork/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/precise/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/precise/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/ubuntu/precise/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/precise/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/precise/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/precise/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/ubuntu/precise/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/precise/tdenetwork/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/precise/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian b/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian b/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian b/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian b/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/precise/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/ubuntu/precise/tdetoys/debian/kweather-trinity.lintian b/ubuntu/precise/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/ubuntu/precise/tdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/precise/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/ubuntu/precise/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/precise/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/ubuntu/precise/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/precise/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/precise/tdeutils/debian/kedit-trinity.lintian b/ubuntu/precise/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/ubuntu/precise/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/precise/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/precise/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/precise/tdewebdev/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/precise/tdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/ubuntu/precise/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/precise/tdewebdev/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/precise/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/ubuntu/precise/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/precise/tdewebdev/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/raring/applications/amarok/debian/rules b/ubuntu/raring/applications/amarok/debian/rules
index 277aff4ec..1b6f7c5fe 100755
--- a/ubuntu/raring/applications/amarok/debian/rules
+++ b/ubuntu/raring/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/raring/applications/gwenview/debian/gwenview.lintian b/ubuntu/raring/applications/gwenview/debian/gwenview.lintian
index 6fdaead63..0e247a6ab 100644
--- a/ubuntu/raring/applications/gwenview/debian/gwenview.lintian
+++ b/ubuntu/raring/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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
-gwenview binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-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 libtdeinit_gwenview.so for opt/trinity/lib/libtdeinit_gwenview.so
+gwenview-trinity binary: package-name-doesnt-match-sonames libgwenviewcore1 libtdeinit-gwenview
diff --git a/ubuntu/raring/applications/gwenview/debian/rules b/ubuntu/raring/applications/gwenview/debian/rules
index d6423c512..2fca00e50 100755
--- a/ubuntu/raring/applications/gwenview/debian/rules
+++ b/ubuntu/raring/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/raring/applications/kaffeine/debian/rules b/ubuntu/raring/applications/kaffeine/debian/rules
index 9021f8fb0..2f9fed447 100755
--- a/ubuntu/raring/applications/kaffeine/debian/rules
+++ b/ubuntu/raring/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/tde/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/tde/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 tdelibs
- 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/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/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/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/raring/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/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/raring/applications/koffice/debian/chalk-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian
index 820cf112f..7500cb18d 100644
--- a/ubuntu/raring/applications/koffice/debian/chalk-data-trinity.lintian
+++ b/ubuntu/raring/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/tde/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/tde/chalk.desktop chalk
diff --git a/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian b/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian
index 08adc5291..1d75d150d 100644
--- a/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/chalk-trinity.lintian
@@ -1,4 +1,4 @@
-chalk: shlib-missing-in-control-file libtdeinit_chalk.so for usr/lib/libtdeinit_chalk.so
-chalk: menu-icon-missing /usr/share/pixmaps/chalk.xpm
-chalk: package-name-doesnt-match-sonames libtdeinit-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 libtdeinit_chalk.so for opt/trinity/lib/libtdeinit_chalk.so
+chalk-trinity: menu-icon-missing /opt/trinity/share/pixmaps/chalk.xpm
+chalk-trinity: package-name-doesnt-match-sonames libtdeinit-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/raring/applications/koffice/debian/karbon-trinity.lintian b/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian
index 9733b0a93..b08ff3b43 100644
--- a/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian
@@ -1,2 +1,2 @@
-karbon: shlib-missing-in-control-file libtdeinit_karbon.so for usr/lib/libtdeinit_karbon.so
-karbon: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
+karbon-trinity: shlib-missing-in-control-file libtdeinit_karbon.so for opt/trinity/lib/libtdeinit_karbon.so
+karbon-trinity: package-name-doesnt-match-sonames libkarboncommon0 libtdeinit-karbon
diff --git a/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian
index 4a9df9c9e..b548f2d00 100644
--- a/ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian
+++ b/ubuntu/raring/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 libtdeinit_kchart.so for usr/lib/libtdeinit_kchart.so
-kchart: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-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 libtdeinit_kchart.so for opt/trinity/lib/libtdeinit_kchart.so
+kchart-trinity: package-name-doesnt-match-sonames libkchartcommon2 libkchartimageexport4 libkdchart0 libtdeinit-kchart
diff --git a/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian
index 5288fb87d..c89fb0678 100644
--- a/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kexi-trinity.lintian
@@ -1,14 +1,14 @@
-kexi: shlib-missing-in-control-file libtdeinit_kexi.so for usr/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
+kexi-trinity: shlib-missing-in-control-file libtdeinit_kexi.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kexi libkexicore2 libkexidatatable2 libkexidb2 libkexidbparser2 libkexiextendedwidgets2 libkexiformutils2 libkexiguiutils2 libkeximain2 libkeximigrate2 libkexirelationsview2 libkexisql2-2 libkexisql3-3 libkexiutils2 libkformdesigner2
diff --git a/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian
index 1062b39db..25a8c006f 100644
--- a/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,4 @@
-kformula: no-shlibs-control-file usr/lib/libtdeinit_kformula.so
-kformula: postinst-must-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: postrm-should-call-ldconfig usr/lib/libtdeinit_kformula.so
-kformula: package-name-doesnt-match-sonames libtdeinit-kformula
+kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
+kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian
index d77987c69..66e15fdb7 100644
--- a/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kivio-data-trinity.lintian
@@ -1,2 +1,2 @@
-kivio-data: desktop-command-not-in-package /usr/share/applications/tde/kivio.desktop kivio
+kivio-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kivio.desktop kivio
diff --git a/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian
index 02a07173b..1ff9e3f76 100644
--- a/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kivio-trinity.lintian
@@ -1,4 +1,4 @@
-kivio: shlib-missing-in-control-file libtdeinit_kivio.so for usr/lib/libtdeinit_kivio.so
-kivio: menu-icon-missing /usr/share/pixmaps/kivio.xpm
-kivio: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
+kivio-trinity: shlib-missing-in-control-file libtdeinit_kivio.so for opt/trinity/lib/libtdeinit_kivio.so
+kivio-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kivio.xpm
+kivio-trinity: package-name-doesnt-match-sonames libtdeinit-kivio libkiviocommon0
diff --git a/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian b/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian
index bdf6f40e1..1137a9b12 100644
--- a/ubuntu/raring/applications/koffice/debian/koffice-libs-trinity.lintian
+++ b/ubuntu/raring/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/raring/applications/koffice/debian/koshell-trinity.lintian b/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian
index 45d130a4e..c77411ba2 100644
--- a/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,4 @@
-koshell: no-shlibs-control-file usr/lib/libtdeinit_koshell.so
-koshell: postinst-must-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: postrm-should-call-ldconfig usr/lib/libtdeinit_koshell.so
-koshell: package-name-doesnt-match-sonames libtdeinit-koshell
+koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
+koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian
index f08eafe73..74f77679d 100644
--- a/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,4 @@
-kplato: no-shlibs-control-file usr/lib/libtdeinit_kplato.so
-kplato: postinst-must-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: postrm-should-call-ldconfig usr/lib/libtdeinit_kplato.so
-kplato: package-name-doesnt-match-sonames libtdeinit-kplato
+kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
+kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian
index 68e69e640..8a7a4f113 100644
--- a/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kpresenter-data-trinity.lintian
@@ -1,2 +1,2 @@
-kpresenter-data: desktop-command-not-in-package /usr/share/applications/tde/kpresenter.desktop kpresenter
+kpresenter-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kpresenter.desktop kpresenter
diff --git a/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian
index 6e7af5591..dc55d0006 100644
--- a/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.lintian
+++ b/ubuntu/raring/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 libtdeinit_kpresenter.so for usr/lib/libtdeinit_kpresenter.so
-kpresenter: menu-icon-missing /usr/share/pixmaps/kpresenter.xpm
-kpresenter: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
+kpresenter-trinity: script-with-language-extension opt/trinity/bin/kprconverter.pl
+kpresenter-trinity: shlib-missing-in-control-file libtdeinit_kpresenter.so for opt/trinity/lib/libtdeinit_kpresenter.so
+kpresenter-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kpresenter.xpm
+kpresenter-trinity: package-name-doesnt-match-sonames libtdeinit-kpresenter libkpresenterimageexport4 libkpresenterprivate4
diff --git a/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian
index b47c3a364..44cb7cb45 100644
--- a/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian
@@ -1,7 +1,7 @@
-kspread: shlib-missing-in-control-file libtdeinit_kspread.so for usr/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
+kspread-trinity: shlib-missing-in-control-file libtdeinit_kspread.so for opt/trinity/lib/libtdeinit_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 libtdeinit-kspread libkspreadcommon0
diff --git a/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian
index 7d7018a77..252102b05 100644
--- a/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,5 @@
-kthesaurus: no-shlibs-control-file usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postinst-must-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: postrm-should-call-ldconfig usr/lib/libtdeinit_kthesaurus.so
-kthesaurus: package-name-doesnt-match-sonames libtdeinit-kthesaurus
+kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
+kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian
index 5b8ec0d77..8504ff61f 100644
--- a/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kugar-trinity.lintian
@@ -1,4 +1,4 @@
-kugar: shlib-missing-in-control-file libtdeinit_kudesigner.so for usr/lib/libtdeinit_kudesigner.so
-kugar: shlib-missing-in-control-file libtdeinit_kugar.so for usr/lib/libtdeinit_kugar.so
-kugar: shlib-missing-in-control-file libkudesignercore.so for usr/lib/libkudesignercore.so
-kugar: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kudesigner.so for opt/trinity/lib/libtdeinit_kudesigner.so
+kugar-trinity: shlib-missing-in-control-file libtdeinit_kugar.so for opt/trinity/lib/libtdeinit_kugar.so
+kugar-trinity: shlib-missing-in-control-file libkudesignercore.so for opt/trinity/lib/libkudesignercore.so
+kugar-trinity: package-name-doesnt-match-sonames libtdeinit-kudesigner libtdeinit-kugar libkudesignercore libkugarlib1
diff --git a/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian
index 6fa3d857b..09c395552 100644
--- a/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kword-data-trinity.lintian
@@ -1,2 +1,2 @@
-kword-data: desktop-command-not-in-package /usr/share/applications/tde/kword.desktop kword
+kword-data-trinity: desktop-command-not-in-package /opt/trinity/share/applications/tde/kword.desktop kword
diff --git a/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian b/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian
index 5d08d84ca..2c396f259 100644
--- a/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian
+++ b/ubuntu/raring/applications/koffice/debian/kword-trinity.lintian
@@ -1,4 +1,4 @@
-kword: shlib-missing-in-control-file libtdeinit_kword.so for usr/lib/libtdeinit_kword.so
-kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
+kword-trinity: shlib-missing-in-control-file libtdeinit_kword.so for opt/trinity/lib/libtdeinit_kword.so
+kword-trinity: menu-icon-missing /opt/trinity/share/pixmaps/kword.xpm
+kword-trinity: package-name-doesnt-match-sonames libtdeinit-kword libkwordprivate4
diff --git a/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian b/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
+++ b/ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/ubuntu/raring/applications/kpowersave.cmake/debian/rules b/ubuntu/raring/applications/kpowersave.cmake/debian/rules
index 7f153b395..0d2383bae 100755
--- a/ubuntu/raring/applications/kpowersave.cmake/debian/rules
+++ b/ubuntu/raring/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/raring/applications/kpowersave/debian/kpowersave-trinity.lintian b/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian
index edff50852..8f6135226 100644
--- a/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian
+++ b/ubuntu/raring/applications/kpowersave/debian/kpowersave-trinity.lintian
@@ -1,5 +1,5 @@
-kpowersave: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: package-name-doesnt-match-sonames libtdeinit-kpowersave
-kpowersave: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
-kpowersave: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: package-name-doesnt-match-sonames libtdeinit-kpowersave
+kpowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
+kpowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kpowersave.so
diff --git a/ubuntu/raring/applications/kpowersave/debian/rules b/ubuntu/raring/applications/kpowersave/debian/rules
index 961465395..0cf9afbec 100755
--- a/ubuntu/raring/applications/kpowersave/debian/rules
+++ b/ubuntu/raring/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/raring/applications/krusader/debian/rules b/ubuntu/raring/applications/krusader/debian/rules
index 5a95e522d..4b297b1ae 100755
--- a/ubuntu/raring/applications/krusader/debian/rules
+++ b/ubuntu/raring/applications/krusader/debian/rules
@@ -48,7 +48,7 @@ install/krusader-trinity::
$(DEB_DESTDIR)/opt/trinity/share/config/tdeio_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/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index 53c516a66..b93e7c154 100644
--- a/ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/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/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/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/raring/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/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/raring/tdeaccessibility/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdeaccessibility/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdeaccessibility/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/raring/tdeaddons/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeaddons/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdeaddons/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdeaddons/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/raring/tdeaddons/debian/kate-plugins-trinity.lintian b/ubuntu/raring/tdeaddons/debian/kate-plugins-trinity.lintian
index d4625a389..27eca0292 100644
--- a/ubuntu/raring/tdeaddons/debian/kate-plugins-trinity.lintian
+++ b/ubuntu/raring/tdeaddons/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/raring/tdeaddons/debian/kicker-applets-trinity.lintian b/ubuntu/raring/tdeaddons/debian/kicker-applets-trinity.lintian
index 3007e3556..705d74139 100644
--- a/ubuntu/raring/tdeaddons/debian/kicker-applets-trinity.lintian
+++ b/ubuntu/raring/tdeaddons/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/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdeadmin/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/raring/tdeadmin/debian/lilo-config-trinity.lintian b/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian
index dc8ec46fb..f268b6b2a 100644
--- a/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian
+++ b/ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian
@@ -1 +1 @@
-lilo-config: menu-command-not-in-package /usr/share/menu/lilo-config:6 /opt/trinity/bin/tdesu
+lilo-config-trinity: menu-command-not-in-package /usr/share/menu/lilo-config-trinity:6 /opt/trinity/bin/tdesu
diff --git a/ubuntu/raring/tdebase/debian/kate-trinity.lintian b/ubuntu/raring/tdebase/debian/kate-trinity.lintian
index 0ad1f24b6..d6a673d2f 100644
--- a/ubuntu/raring/tdebase/debian/kate-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/kate-trinity.lintian
@@ -1,2 +1,2 @@
-kate: shlib-missing-in-control-file libtdeinit_kwrite.so usr/lib/libtdeinit_kwrite.so
-kate: shlib-missing-in-control-file libtdeinit_kate.so usr/lib/libtdeinit_kate.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kwrite.so opt/trinity/lib/libtdeinit_kwrite.so
+kate-trinity: shlib-missing-in-control-file libtdeinit_kate.so opt/trinity/lib/libtdeinit_kate.so
diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian b/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian
index a1120501f..95c1d8196 100644
--- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.lintian
@@ -1,3 +1,3 @@
-kcontrol: shlib-missing-in-control-file libtdeinit_kaccess.so usr/lib/libtdeinit_kaccess.so
-kcontrol: shlib-missing-in-control-file libtdeinit_kcontrol.so usr/lib/libtdeinit_kcontrol.so
-kcontrol: shlib-missing-in-control-file libtdeinit_tderandrinithack.so usr/lib/libtdeinit_tderandrinithack.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kaccess.so opt/trinity/lib/libtdeinit_kaccess.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_kcontrol.so opt/trinity/lib/libtdeinit_kcontrol.so
+kcontrol-trinity: shlib-missing-in-control-file libtdeinit_tderandrinithack.so opt/trinity/lib/libtdeinit_tderandrinithack.so
diff --git a/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian b/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian
index 478f4fbc8..caf101636 100644
--- a/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/kdesktop-trinity.lintian
@@ -1 +1 @@
-kdesktop: no-shlibs-control-file usr/lib/libtdeinit_kdesktop.so
+kdesktop-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kdesktop.so
diff --git a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian
index 44eb5fc11..3a278bff7 100644
--- a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.lintian
@@ -1,3 +1,3 @@
-khelpcenter: no-shlibs-control-file usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postinst-must-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
-khelpcenter: postrm-should-call-ldconfig usr/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
+khelpcenter-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khelpcenter.so
diff --git a/ubuntu/raring/tdebase/debian/kicker-trinity.lintian b/ubuntu/raring/tdebase/debian/kicker-trinity.lintian
index f600f5d82..9f6cb2e4d 100644
--- a/ubuntu/raring/tdebase/debian/kicker-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/kicker-trinity.lintian
@@ -1,3 +1,3 @@
-kicker: shlib-missing-in-control-file libtdeinit_extensionproxy.so usr/lib/libtdeinit_extensionproxy.so
-kicker: shlib-missing-in-control-file libtdeinit_kicker.so usr/lib/libtdeinit_kicker.so
-kicker: shlib-missing-in-control-file libtdeinit_appletproxy.so usr/lib/libtdeinit_appletproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_extensionproxy.so opt/trinity/lib/libtdeinit_extensionproxy.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_kicker.so opt/trinity/lib/libtdeinit_kicker.so
+kicker-trinity: shlib-missing-in-control-file libtdeinit_appletproxy.so opt/trinity/lib/libtdeinit_appletproxy.so
diff --git a/ubuntu/raring/tdebase/debian/klipper-trinity.lintian b/ubuntu/raring/tdebase/debian/klipper-trinity.lintian
index f7bcf9946..bee8b8020 100644
--- a/ubuntu/raring/tdebase/debian/klipper-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/klipper-trinity.lintian
@@ -1,3 +1,3 @@
-klipper: no-shlibs-control-file usr/lib/libtdeinit_klipper.so
-klipper: postinst-must-call-ldconfig usr/lib/libtdeinit_klipper.so
-klipper: postrm-should-call-ldconfig usr/lib/libtdeinit_klipper.so
+klipper-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
+klipper-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_klipper.so
diff --git a/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian b/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian
index 154077ad9..c36dd0445 100644
--- a/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/kmenuedit-trinity.lintian
@@ -1,4 +1,4 @@
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: no-shlibs-control-file usr/lib/libtdeinit_kmenuedit.so
-kmenuedit: postinst-must-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
-kmenuedit: postrm-should-call-ldconfig usr/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmenuedit.so
+kmenuedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
+kmenuedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcontroledit.so
diff --git a/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian b/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian
index 243cafb9f..670ed2c27 100644
--- a/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/konqueror-trinity.lintian
@@ -1,3 +1,3 @@
-konqueror: shlib-missing-in-control-file libtdeinit_keditbookmarks.so usr/lib/libtdeinit_keditbookmarks.so
-konqueror: shlib-missing-in-control-file libtdeinit_kfmclient.so usr/lib/libtdeinit_kfmclient.so
-konqueror: shlib-missing-in-control-file libtdeinit_konqueror.so usr/lib/libtdeinit_konqueror.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_keditbookmarks.so opt/trinity/lib/libtdeinit_keditbookmarks.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_kfmclient.so opt/trinity/lib/libtdeinit_kfmclient.so
+konqueror-trinity: shlib-missing-in-control-file libtdeinit_konqueror.so opt/trinity/lib/libtdeinit_konqueror.so
diff --git a/ubuntu/raring/tdebase/debian/konsole-trinity.lintian b/ubuntu/raring/tdebase/debian/konsole-trinity.lintian
index 765754c3e..7006dfe10 100644
--- a/ubuntu/raring/tdebase/debian/konsole-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/konsole-trinity.lintian
@@ -1,3 +1,3 @@
-konsole: no-shlibs-control-file usr/lib/libtdeinit_konsole.so
-konsole: postinst-must-call-ldconfig usr/lib/libtdeinit_konsole.so
-konsole: postrm-should-call-ldconfig usr/lib/libtdeinit_konsole.so
+konsole-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
+konsole-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_konsole.so
diff --git a/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian b/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian
index 20f94f8ee..2c7c61596 100644
--- a/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/ksmserver-trinity.lintian
@@ -1,2 +1,2 @@
-ksmserver: no-shlibs-control-file usr/lib/libtdeinit_ksmserver.so
-ksmserver: postinst-must-call-ldconfig usr/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksmserver.so
+ksmserver-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksmserver.so
diff --git a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian
index 3f56c6d4a..07cf159e7 100644
--- a/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian
+++ b/ubuntu/raring/tdebase/debian/tdebase-trinity-bin.lintian
@@ -1,6 +1,6 @@
-tdebase-bin: setgid-binary usr/bin/tdesud 2755 root/nogroup
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kcminit.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: no-shlibs-control-file usr/lib/libtdeinit_kxkb.so
-tdebase-bin: postinst-must-call-ldconfig usr/lib/libtdeinit_khotkeys.so
-tdebase-bin: postrm-should-call-ldconfig usr/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: setgid-binary opt/trinity/bin/tdesud 2755 root/nogroup
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcminit.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kxkb.so
+tdebase-bin-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
+tdebase-bin-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_khotkeys.so
diff --git a/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian b/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian
index 9da8261d7..52cd10d88 100644
--- a/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/tdeprint-trinity.lintian
@@ -1,4 +1,4 @@
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kjobviewer.so
-tdeprint: no-shlibs-control-file usr/lib/libtdeinit_kprinter.so
-tdeprint: postinst-must-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
-tdeprint: postrm-should-call-ldconfig usr/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kprinter.so
+tdeprint-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
+tdeprint-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kjobviewer.so
diff --git a/ubuntu/raring/tdebase/debian/twin-trinity.lintian b/ubuntu/raring/tdebase/debian/twin-trinity.lintian
index b6272e484..d0cfc8eb8 100644
--- a/ubuntu/raring/tdebase/debian/twin-trinity.lintian
+++ b/ubuntu/raring/tdebase/debian/twin-trinity.lintian
@@ -1,2 +1,2 @@
-twin: shlib-missing-in-control-file libtdeinit_twin.so usr/lib/libtdeinit_twin.so
-twin: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so usr/lib/libtdeinit_twin_rules_dialog.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin.so opt/trinity/lib/libtdeinit_twin.so
+twin-trinity: shlib-missing-in-control-file libtdeinit_twin_rules_dialog.so opt/trinity/lib/libtdeinit_twin_rules_dialog.so
diff --git a/ubuntu/raring/tdeedu/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdeedu/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdeedu/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdeedu/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/raring/tdegames/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdegames/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/raring/tdegraphics/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdegraphics/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/raring/tdegraphics/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdegraphics/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/raring/tdegraphics/debian/kfaxview-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kfaxview-trinity.lintian
index 7d86c17d3..77a1b0e8e 100644
--- a/ubuntu/raring/tdegraphics/debian/kfaxview-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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/raring/tdegraphics/debian/kghostview-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kghostview-trinity.lintian
index 5bf0bd75c..00a976862 100644
--- a/ubuntu/raring/tdegraphics/debian/kghostview-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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/raring/tdegraphics/debian/kmrml-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kmrml-trinity.lintian
index e3a5ddb8a..0193c9699 100644
--- a/ubuntu/raring/tdegraphics/debian/kmrml-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/debian/kmrml-trinity.lintian
@@ -1,4 +1,4 @@
-kmrml: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
-kmrml: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
+kmrml-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_mrmlsearch.so
+kmrml-trinity: package-name-doesnt-match-sonames libtdeinit-mrmlsearch
diff --git a/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.lintian
index 18443a699..354b0da93 100644
--- a/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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/raring/tdegraphics/debian/ksvg-trinity.lintian b/ubuntu/raring/tdegraphics/debian/ksvg-trinity.lintian
index 9f56c22ee..64f139273 100644
--- a/ubuntu/raring/tdegraphics/debian/ksvg-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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/raring/tdegraphics/debian/kuickshow-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kuickshow-trinity.lintian
index 4551b5f0c..89f453cea 100644
--- a/ubuntu/raring/tdegraphics/debian/kuickshow-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/debian/kuickshow-trinity.lintian
@@ -1,4 +1,4 @@
-kuickshow: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
-kuickshow: package-name-doesnt-match-sonames libtdeinit-kuickshow
+kuickshow-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kuickshow.so
+kuickshow-trinity: package-name-doesnt-match-sonames libtdeinit-kuickshow
diff --git a/ubuntu/raring/tdegraphics/debian/kview-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kview-trinity.lintian
index b81a18ccc..fc787acd7 100644
--- a/ubuntu/raring/tdegraphics/debian/kview-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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 libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
-kview: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
+kview-trinity: shlib-missing-in-control-file libphotobook.so opt/trinity/lib/libphotobook.so
+kview-trinity: shlib-missing-in-control-file libtdeinit_kview.so opt/trinity/lib/libtdeinit_kview.so
+kview-trinity: package-name-doesnt-match-sonames libtdeinit-kview libkimageviewer0
diff --git a/ubuntu/raring/tdegraphics/debian/kviewshell-trinity.lintian b/ubuntu/raring/tdegraphics/debian/kviewshell-trinity.lintian
index 6ed9b4a4e..1a2ace9c6 100644
--- a/ubuntu/raring/tdegraphics/debian/kviewshell-trinity.lintian
+++ b/ubuntu/raring/tdegraphics/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 libtdemultipage0 libdjvu
+kviewshell-trinity: shlib-missing-in-control-file libdjvu.so opt/trinity/lib/libdjvu.so
+kviewshell-trinity: package-name-doesnt-match-sonames libtdemultipage0 libdjvu
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian b/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian
index 98b98d0e1..4a5ad60ed 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian
+++ b/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.lintian
@@ -1,15 +1,15 @@
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
-tdelibs4c2a binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
-tdelibs4c2a binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kaddprinterwizard.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_cupsdconf.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_dcopserver.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdecmshell.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_http_cache_cleaner.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdebuildsycoca.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kded.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcookiejar.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdelauncher.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeconf_update.so
+tdelibs4c2a-trinity binary: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdeio_uiserver.so
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/fileshareset 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kgrantpty 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/kpac_dhcp_helper 4755 root/root
+tdelibs4c2a-trinity binary: setuid-binary opt/trinity/bin/start_tdeinit 4755 root/root
diff --git a/ubuntu/raring/tdemultimedia/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdemultimedia/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdemultimedia/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdemultimedia/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/raring/tdemultimedia/debian/kmix-trinity.lintian b/ubuntu/raring/tdemultimedia/debian/kmix-trinity.lintian
index a2a96f9ee..c802a5b07 100644
--- a/ubuntu/raring/tdemultimedia/debian/kmix-trinity.lintian
+++ b/ubuntu/raring/tdemultimedia/debian/kmix-trinity.lintian
@@ -1,4 +1,4 @@
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
-kmix: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
-kmix: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kmix.so
+kmix-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
+kmix-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kmixctrl.so
diff --git a/ubuntu/raring/tdemultimedia/debian/krec-trinity.lintian b/ubuntu/raring/tdemultimedia/debian/krec-trinity.lintian
index b09b553d8..9cba1f36a 100644
--- a/ubuntu/raring/tdemultimedia/debian/krec-trinity.lintian
+++ b/ubuntu/raring/tdemultimedia/debian/krec-trinity.lintian
@@ -1,3 +1,3 @@
-krec: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
-krec: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
-krec: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
+krec-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_krec.so
diff --git a/ubuntu/raring/tdemultimedia/debian/libarts1-xine-trinity.lintian b/ubuntu/raring/tdemultimedia/debian/libarts1-xine-trinity.lintian
index bfbcf2995..ef72447cf 100644
--- a/ubuntu/raring/tdemultimedia/debian/libarts1-xine-trinity.lintian
+++ b/ubuntu/raring/tdemultimedia/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/raring/tdemultimedia/debian/noatun-trinity.lintian b/ubuntu/raring/tdemultimedia/debian/noatun-trinity.lintian
index 89faa71aa..834dbc664 100644
--- a/ubuntu/raring/tdemultimedia/debian/noatun-trinity.lintian
+++ b/ubuntu/raring/tdemultimedia/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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_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 libtdeinit_noatun.so opt/trinity/lib/libtdeinit_noatun.so
diff --git a/ubuntu/raring/tdenetwork/debian/knewsticker-trinity.lintian b/ubuntu/raring/tdenetwork/debian/knewsticker-trinity.lintian
index c7c412887..566329697 100644
--- a/ubuntu/raring/tdenetwork/debian/knewsticker-trinity.lintian
+++ b/ubuntu/raring/tdenetwork/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/raring/tdenetwork/debian/kppp-trinity.lintian b/ubuntu/raring/tdenetwork/debian/kppp-trinity.lintian
index 58308748b..5a3a22357 100644
--- a/ubuntu/raring/tdenetwork/debian/kppp-trinity.lintian
+++ b/ubuntu/raring/tdenetwork/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/raring/tdenetwork/debian/ksirc-trinity.lintian b/ubuntu/raring/tdenetwork/debian/ksirc-trinity.lintian
index 265515419..f219b1176 100644
--- a/ubuntu/raring/tdenetwork/debian/ksirc-trinity.lintian
+++ b/ubuntu/raring/tdenetwork/debian/ksirc-trinity.lintian
@@ -1,3 +1,3 @@
-ksirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
-ksirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
+ksirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ksirc.so
diff --git a/ubuntu/raring/tdenetwork/debian/kwifimanager-trinity.lintian b/ubuntu/raring/tdenetwork/debian/kwifimanager-trinity.lintian
index c953beb6c..1586f0f0a 100644
--- a/ubuntu/raring/tdenetwork/debian/kwifimanager-trinity.lintian
+++ b/ubuntu/raring/tdenetwork/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/raring/tdesdk/debian/cervisia-trinity.lintian b/ubuntu/raring/tdesdk/debian/cervisia-trinity.lintian
index a7760d061..6759ea297 100644
--- a/ubuntu/raring/tdesdk/debian/cervisia-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/cervisia-trinity.lintian
@@ -1,9 +1,9 @@
# tdeconf_update scripts don't need to be executable.
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/change_colors.pl
-cervisia: script-not-executable ./usr/share/apps/tdeconf_update/move_repositories.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/change_colors.pl
+cervisia-trinity: script-not-executable ./opt/trinity/share/apps/tdeconf_update/move_repositories.pl
# This is from tdeinit black magic.
-cervisia: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
-cervisia: package-name-doesnt-match-sonames libtdeinit-cervisia
+cervisia-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_cervisia.so
+cervisia-trinity: package-name-doesnt-match-sonames libtdeinit-cervisia
diff --git a/ubuntu/raring/tdesdk/debian/kapptemplate-trinity.lintian b/ubuntu/raring/tdesdk/debian/kapptemplate-trinity.lintian
index 81e5ffeaf..803257d10 100644
--- a/ubuntu/raring/tdesdk/debian/kapptemplate-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/kapptemplate-trinity.lintian
@@ -1,11 +1,11 @@
# These are files to provide for new applications.
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/no-exe/COPYING
-kapptemplate: extra-license-file usr/share/apps/kapptemplate/appframework/COPYING
-kapptemplate: executable-not-elf-or-script ./usr/share/apps/kapptemplate/admin/Doxyfile.global
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/config.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/cvs.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/doxygen.sh
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/bcheck.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/conf.change.pl
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/admin/am_edit
-kapptemplate: script-not-executable ./usr/share/apps/kapptemplate/include/kapptemplate.common
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/no-exe/COPYING
+kapptemplate-trinity: extra-license-file opt/trinity/share/apps/kapptemplate/appframework/COPYING
+kapptemplate-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/kapptemplate/admin/Doxyfile.global
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/config.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/cvs.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/doxygen.sh
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/bcheck.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/conf.change.pl
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/admin/am_edit
+kapptemplate-trinity: script-not-executable ./opt/trinity/share/apps/kapptemplate/include/kapptemplate.common
diff --git a/ubuntu/raring/tdesdk/debian/kbabel-trinity.lintian b/ubuntu/raring/tdesdk/debian/kbabel-trinity.lintian
index 96e416558..d2f345fca 100644
--- a/ubuntu/raring/tdesdk/debian/kbabel-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/kbabel-trinity.lintian
@@ -1,2 +1,2 @@
# This does not include a separate library package.
-kbabel: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
+kbabel-trinity: package-name-doesnt-match-sonames libkbabelcommon3 libkbabeldictplugin1
diff --git a/ubuntu/raring/tdesdk/debian/kompare-trinity.lintian b/ubuntu/raring/tdesdk/debian/kompare-trinity.lintian
index 857a388be..70173c488 100644
--- a/ubuntu/raring/tdesdk/debian/kompare-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/kompare-trinity.lintian
@@ -1,3 +1,3 @@
# This does not include a separate library package.
-kompare: package-name-doesnt-match-sonames libkompareinterface0
-kompare: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
+kompare-trinity: package-name-doesnt-match-sonames libkompareinterface0
+kompare-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkompareinterface.so.0.0.0 opt/trinity/lib/libkompareinterface.so
diff --git a/ubuntu/raring/tdesdk/debian/kspy-trinity.lintian b/ubuntu/raring/tdesdk/debian/kspy-trinity.lintian
index 85c1a0252..84d9c917f 100644
--- a/ubuntu/raring/tdesdk/debian/kspy-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/kspy-trinity.lintian
@@ -1,5 +1,5 @@
# There is no -dev package.
-kspy: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
+kspy-trinity: non-dev-pkg-with-shlib-symlink opt/trinity/lib/libkspy.so.1.2.0 opt/trinity/lib/libkspy.so
# This does not come with a separate library package.
-kspy: package-name-doesnt-match-sonames libkspy1
+kspy-trinity: package-name-doesnt-match-sonames libkspy1
diff --git a/ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian b/ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian
index f3a4e3325..ed7e5eea1 100644
--- a/ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian
@@ -1,3 +1,3 @@
# This is from tdeinit black magic.
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
-libcvsservice0: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsaskpass.so opt/trinity/lib/libtdeinit_cvsaskpass.so
+libcvsservice0-trinity: shlib-missing-in-control-file libtdeinit_cvsservice.so opt/trinity/lib/libtdeinit_cvsservice.so
diff --git a/ubuntu/raring/tdesdk/debian/tdesdk-scripts-trinity.lintian b/ubuntu/raring/tdesdk/debian/tdesdk-scripts-trinity.lintian
index e3136bc9c..cecda9973 100644
--- a/ubuntu/raring/tdesdk/debian/tdesdk-scripts-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/tdesdk-scripts-trinity.lintian
@@ -1,3 +1,3 @@
# The syntax error is just perlpod docs appearing after the script exits.
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
-tdesdk-scripts: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/cvsversion
+tdesdk-scripts-trinity: shell-script-fails-syntax-check ./opt/trinity/bin/kde-build
diff --git a/ubuntu/raring/tdesdk/debian/umbrello-trinity.lintian b/ubuntu/raring/tdesdk/debian/umbrello-trinity.lintian
index 5ebb37a57..17c9ba52c 100644
--- a/ubuntu/raring/tdesdk/debian/umbrello-trinity.lintian
+++ b/ubuntu/raring/tdesdk/debian/umbrello-trinity.lintian
@@ -1,2 +1,2 @@
# this is not a script but a template, so it should not be executable
-umbrello: script-not-executable ./usr/share/apps/umbrello/headings/heading.py
+umbrello-trinity: script-not-executable ./opt/trinity/share/apps/umbrello/headings/heading.py
diff --git a/ubuntu/raring/tdetoys/debian/kweather-trinity.lintian b/ubuntu/raring/tdetoys/debian/kweather-trinity.lintian
index b6c7e13d9..2a4387162 100644
--- a/ubuntu/raring/tdetoys/debian/kweather-trinity.lintian
+++ b/ubuntu/raring/tdetoys/debian/kweather-trinity.lintian
@@ -1,2 +1,2 @@
-kweather: no-shlibs-control-file usr/lib/trinity/libtdeinit_kweatherreport.so
-kweather: package-name-doesnt-match-sonames libtdeinit-kweatherreport
+kweather-trinity: no-shlibs-control-file opt/trinity/lib/trinity/libtdeinit_kweatherreport.so
+kweather-trinity: package-name-doesnt-match-sonames libtdeinit-kweatherreport
diff --git a/ubuntu/raring/tdeutils/debian/ark-trinity-trinity.lintian b/ubuntu/raring/tdeutils/debian/ark-trinity-trinity.lintian
index 2b8d3a553..47861fafc 100644
--- a/ubuntu/raring/tdeutils/debian/ark-trinity-trinity.lintian
+++ b/ubuntu/raring/tdeutils/debian/ark-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-ark: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
-ark: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
-ark: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
+ark-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_ark.so
diff --git a/ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian b/ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian
index 075ce6c50..0b36154e5 100644
--- a/ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian
+++ b/ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian
@@ -1,3 +1,3 @@
-kcalc: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
-kcalc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
+kcalc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kcalc.so
diff --git a/ubuntu/raring/tdeutils/debian/kedit-trinity.lintian b/ubuntu/raring/tdeutils/debian/kedit-trinity.lintian
index a2a63b3ba..fdde7bd3b 100644
--- a/ubuntu/raring/tdeutils/debian/kedit-trinity.lintian
+++ b/ubuntu/raring/tdeutils/debian/kedit-trinity.lintian
@@ -1,3 +1,3 @@
-kedit: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
-kedit: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
-kedit: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
+kedit-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kedit.so
diff --git a/ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian b/ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian
index a0041fc4c..91e79108d 100644
--- a/ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian
+++ b/ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian
@@ -1,11 +1,11 @@
# These files are provided to create new applications.
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/COPYING.LIB
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.QPL
-tdevelop-data: extra-license-file usr/share/apps/kdevappwizard/template-common/LICENSE.BSD
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/COPYING.LIB
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.QPL
+tdevelop-data-trinity: extra-license-file opt/trinity/share/apps/kdevappwizard/template-common/LICENSE.BSD
# This file is a template, not a script.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevfilecreate/file-templates/pl
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevfilecreate/file-templates/pl
# This file is used internally by tdeio_pydoc.la and invoked explicitly with python.
-tdevelop-data: script-not-executable ./usr/share/apps/tdeio_pydoc/kde_pydoc.py
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/tdeio_pydoc/kde_pydoc.py
# This file is used internally by libkdevcvsservice.la and invoked explicitly with sh.
-tdevelop-data: script-not-executable ./usr/share/apps/kdevcvsservice/buildcvs.sh
+tdevelop-data-trinity: script-not-executable ./opt/trinity/share/apps/kdevcvsservice/buildcvs.sh
diff --git a/ubuntu/raring/tdewebdev/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdewebdev/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/raring/tdewebdev/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/raring/tdewebdev/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/raring/tdewebdev/debian/quanta-data-trinity.lintian b/ubuntu/raring/tdewebdev/debian/quanta-data-trinity.lintian
index d8906a5be..1b1814f88 100644
--- a/ubuntu/raring/tdewebdev/debian/quanta-data-trinity.lintian
+++ b/ubuntu/raring/tdewebdev/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/raring/tdewebdev/debian/quanta-trinity.lintian b/ubuntu/raring/tdewebdev/debian/quanta-trinity.lintian
index 09ae4739d..f46ec301f 100644
--- a/ubuntu/raring/tdewebdev/debian/quanta-trinity.lintian
+++ b/ubuntu/raring/tdewebdev/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