summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/lenny/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--debian/lenny/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xdebian/lenny/applications/amarok/debian/rules2
-rw-r--r--debian/lenny/applications/bibletime/debian/menu2
-rw-r--r--debian/lenny/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--debian/lenny/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--debian/lenny/applications/filelight/debian/menu2
-rw-r--r--debian/lenny/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--debian/lenny/applications/gwenview/debian/menu4
-rwxr-xr-xdebian/lenny/applications/gwenview/debian/rules6
-rw-r--r--debian/lenny/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--debian/lenny/applications/k3b/debian/k3b.menu4
-rw-r--r--debian/lenny/applications/k9copy/debian/control2
-rw-r--r--debian/lenny/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xdebian/lenny/applications/k9copy/debian/rules9
-rw-r--r--debian/lenny/applications/kaffeine/debian/menu2
-rwxr-xr-xdebian/lenny/applications/kaffeine/debian/rules22
-rw-r--r--debian/lenny/applications/kbarcode/debian/menu4
-rw-r--r--debian/lenny/applications/kcpuload/debian/menu2
-rw-r--r--debian/lenny/applications/keep/debian/control2
-rw-r--r--debian/lenny/applications/keep/debian/keep.xml12
-rwxr-xr-xdebian/lenny/applications/keep/debian/rules7
-rw-r--r--debian/lenny/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/applications/kile/debian/menu2
-rw-r--r--debian/lenny/applications/knetload/debian/menu2
-rw-r--r--debian/lenny/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/lenny/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/lenny/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--debian/lenny/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/lenny/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--debian/lenny/applications/konversation/debian/control2
-rw-r--r--debian/lenny/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--debian/lenny/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--debian/lenny/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xdebian/lenny/applications/konversation/debian/rules4
-rw-r--r--debian/lenny/applications/kpicosim/debian/menu2
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--debian/lenny/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--debian/lenny/applications/krusader/debian/menu8
-rwxr-xr-xdebian/lenny/applications/krusader/debian/rules2
-rw-r--r--debian/lenny/applications/ktechlab/debian/menu2
-rw-r--r--debian/lenny/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--debian/lenny/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--debian/lenny/applications/smb4k/debian/menu2
-rw-r--r--debian/lenny/applications/tdepowersave/debian/control4
-rw-r--r--debian/lenny/applications/tdepowersave/debian/install2
-rw-r--r--debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--debian/lenny/applications/tdepowersave/debian/manpages2
-rw-r--r--debian/lenny/applications/tdepowersave/debian/menu8
-rwxr-xr-xdebian/lenny/applications/tdepowersave/debian/rules6
-rw-r--r--debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--debian/lenny/applications/tdepowersave/debian/tdepowersave.1 (renamed from debian/wheezy/applications/tdepowersave/debian/kpowersave.1)22
-rw-r--r--debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm (renamed from debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm)2
-rw-r--r--debian/lenny/applications/tdepowersave/debian/watch2
-rw-r--r--debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--debian/lenny/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--[-rwxr-xr-x]debian/lenny/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]debian/lenny/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]debian/lenny/metapackages/rename-meta/debian/compat0
-rw-r--r--debian/lenny/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]debian/lenny/metapackages/rename-meta/debian/dirs0
-rw-r--r--debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst (renamed from debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst)2
-rw-r--r--debian/lenny/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdeaccessibility/debian/control4
-rw-r--r--debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--debian/lenny/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--debian/lenny/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--debian/lenny/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--debian/lenny/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--debian/lenny/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/lenny/tdeartwork/debian/control4
-rw-r--r--debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install (renamed from debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--debian/lenny/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/lenny/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--debian/lenny/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/lenny/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--debian/lenny/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/katomic-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/klickety-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/klines-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kmines-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kolf-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/konquest-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/kpat-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ksame-trinity.menu8
-rw-r--r--debian/lenny/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--debian/lenny/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ktron-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--debian/lenny/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--debian/lenny/tdegames/debian/lskat-trinity.menu6
-rw-r--r--debian/lenny/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/lenny/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--debian/lenny/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/lenny/tdepim/debian/akregator-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/karm-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/kmail-trinity.menu6
-rw-r--r--debian/lenny/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--debian/lenny/tdepim/debian/knode-trinity.menu6
-rw-r--r--debian/lenny/tdepim/debian/knotes-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/kontact-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/korn-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/lenny/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--debian/lenny/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--debian/lenny/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--debian/lenny/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/control10
-rw-r--r--debian/lenny/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/lenny/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--debian/lenny/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--debian/lenny/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--debian/lenny/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--debian/lenny/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/lenny/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--debian/lenny/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--debian/lenny/tdeutils/debian/tdelirc-trinity.install (renamed from debian/lenny/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--debian/lenny/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--debian/lenny/tdeutils/debian/tdessh-trinity.install (renamed from debian/lenny/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-trinity.menu4
-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
-rw-r--r--debian/squeeze/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--debian/squeeze/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xdebian/squeeze/applications/amarok/debian/rules2
-rw-r--r--debian/squeeze/applications/bibletime/debian/menu2
-rw-r--r--debian/squeeze/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--debian/squeeze/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--debian/squeeze/applications/filelight/debian/menu2
-rw-r--r--debian/squeeze/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--debian/squeeze/applications/gwenview/debian/menu4
-rwxr-xr-xdebian/squeeze/applications/gwenview/debian/rules6
-rw-r--r--debian/squeeze/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--debian/squeeze/applications/k3b/debian/k3b.menu4
-rw-r--r--debian/squeeze/applications/k9copy/debian/control2
-rw-r--r--debian/squeeze/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xdebian/squeeze/applications/k9copy/debian/rules9
-rw-r--r--debian/squeeze/applications/kaffeine/debian/menu2
-rwxr-xr-xdebian/squeeze/applications/kaffeine/debian/rules22
-rw-r--r--debian/squeeze/applications/kbarcode/debian/menu4
-rw-r--r--debian/squeeze/applications/kcpuload/debian/menu2
-rw-r--r--debian/squeeze/applications/keep/debian/control2
-rw-r--r--debian/squeeze/applications/keep/debian/keep.xml12
-rwxr-xr-xdebian/squeeze/applications/keep/debian/rules7
-rw-r--r--debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/applications/kile/debian/menu2
-rw-r--r--debian/squeeze/applications/knetload/debian/menu2
-rw-r--r--debian/squeeze/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--debian/squeeze/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/squeeze/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--debian/squeeze/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/squeeze/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--debian/squeeze/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/squeeze/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--debian/squeeze/applications/konversation/debian/control2
-rw-r--r--debian/squeeze/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--debian/squeeze/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--debian/squeeze/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xdebian/squeeze/applications/konversation/debian/rules4
-rw-r--r--debian/squeeze/applications/kpicosim/debian/menu2
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--debian/squeeze/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--debian/squeeze/applications/krusader/debian/menu8
-rwxr-xr-xdebian/squeeze/applications/krusader/debian/rules2
-rw-r--r--debian/squeeze/applications/ktechlab/debian/menu2
-rw-r--r--debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--debian/squeeze/applications/smb4k/debian/menu2
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/control4
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/install2
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/manpages2
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/menu8
-rwxr-xr-xdebian/squeeze/applications/tdepowersave/debian/rules6
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/tdepowersave.1 (renamed from ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1)22
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm (renamed from debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm)2
-rw-r--r--debian/squeeze/applications/tdepowersave/debian/watch2
-rw-r--r--debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--[-rwxr-xr-x]debian/squeeze/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]debian/squeeze/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]debian/squeeze/metapackages/rename-meta/debian/compat0
-rw-r--r--debian/squeeze/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]debian/squeeze/metapackages/rename-meta/debian/dirs0
-rw-r--r--debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst (renamed from debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst)2
-rw-r--r--debian/squeeze/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdeaccessibility/debian/control4
-rw-r--r--debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--debian/squeeze/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--debian/squeeze/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--debian/squeeze/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--debian/squeeze/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--debian/squeeze/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/squeeze/tdeartwork/debian/control4
-rw-r--r--debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install (renamed from debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--debian/squeeze/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/squeeze/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--debian/squeeze/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/squeeze/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--debian/squeeze/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/katomic-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/klickety-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/klines-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kmines-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kolf-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/konquest-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/kpat-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ksame-trinity.menu8
-rw-r--r--debian/squeeze/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--debian/squeeze/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ktron-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--debian/squeeze/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--debian/squeeze/tdegames/debian/lskat-trinity.menu6
-rw-r--r--debian/squeeze/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/squeeze/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--debian/squeeze/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/squeeze/tdepim/debian/akregator-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/karm-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/kmail-trinity.menu6
-rw-r--r--debian/squeeze/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--debian/squeeze/tdepim/debian/knode-trinity.menu6
-rw-r--r--debian/squeeze/tdepim/debian/knotes-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/kontact-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/korn-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--debian/squeeze/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/squeeze/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--debian/squeeze/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--debian/squeeze/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--debian/squeeze/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/control10
-rw-r--r--debian/squeeze/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/squeeze/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--debian/squeeze/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--debian/squeeze/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--debian/squeeze/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/squeeze/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--debian/squeeze/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--debian/squeeze/tdeutils/debian/tdelirc-trinity.install (renamed from debian/squeeze/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--debian/squeeze/tdeutils/debian/tdessh-trinity.install (renamed from debian/squeeze/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-trinity.menu4
-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
-rw-r--r--debian/wheezy/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--debian/wheezy/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xdebian/wheezy/applications/amarok/debian/rules2
-rw-r--r--debian/wheezy/applications/bibletime/debian/menu2
-rw-r--r--debian/wheezy/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--debian/wheezy/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--debian/wheezy/applications/filelight/debian/menu2
-rw-r--r--debian/wheezy/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--debian/wheezy/applications/gwenview/debian/menu4
-rwxr-xr-xdebian/wheezy/applications/gwenview/debian/rules6
-rw-r--r--debian/wheezy/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--debian/wheezy/applications/k3b/debian/k3b.menu4
-rw-r--r--debian/wheezy/applications/k9copy/debian/control2
-rw-r--r--debian/wheezy/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xdebian/wheezy/applications/k9copy/debian/rules9
-rw-r--r--debian/wheezy/applications/kaffeine/debian/menu2
-rwxr-xr-xdebian/wheezy/applications/kaffeine/debian/rules22
-rw-r--r--debian/wheezy/applications/kbarcode/debian/menu4
-rw-r--r--debian/wheezy/applications/kcpuload/debian/menu2
-rw-r--r--debian/wheezy/applications/keep/debian/control2
-rw-r--r--debian/wheezy/applications/keep/debian/keep.xml12
-rwxr-xr-xdebian/wheezy/applications/keep/debian/rules7
-rw-r--r--debian/wheezy/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/applications/kile/debian/menu2
-rw-r--r--debian/wheezy/applications/knetload/debian/menu2
-rw-r--r--debian/wheezy/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--debian/wheezy/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--debian/wheezy/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--debian/wheezy/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--debian/wheezy/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--debian/wheezy/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--debian/wheezy/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--debian/wheezy/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--debian/wheezy/applications/konversation/debian/control2
-rw-r--r--debian/wheezy/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--debian/wheezy/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--debian/wheezy/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--debian/wheezy/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xdebian/wheezy/applications/konversation/debian/rules4
-rw-r--r--debian/wheezy/applications/kpicosim/debian/menu2
-rw-r--r--debian/wheezy/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--debian/wheezy/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--debian/wheezy/applications/krusader/debian/menu8
-rwxr-xr-xdebian/wheezy/applications/krusader/debian/rules2
-rw-r--r--debian/wheezy/applications/ktechlab/debian/menu2
-rw-r--r--debian/wheezy/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--debian/wheezy/applications/smb4k/debian/menu2
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/control4
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/install2
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/manpages2
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/menu8
-rwxr-xr-xdebian/wheezy/applications/tdepowersave/debian/rules6
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/tdepowersave.1 (renamed from debian/lenny/applications/tdepowersave/debian/kpowersave.1)22
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm (renamed from ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm)2
-rw-r--r--debian/wheezy/applications/tdepowersave/debian/watch2
-rw-r--r--debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--[-rwxr-xr-x]debian/wheezy/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]debian/wheezy/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]debian/wheezy/metapackages/rename-meta/debian/compat0
-rw-r--r--debian/wheezy/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]debian/wheezy/metapackages/rename-meta/debian/dirs0
-rw-r--r--debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst (renamed from debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst)2
-rw-r--r--debian/wheezy/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdeaccessibility/debian/control4
-rw-r--r--debian/wheezy/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from debian/wheezy/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--debian/wheezy/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--debian/wheezy/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--debian/wheezy/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--debian/wheezy/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--debian/wheezy/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--debian/wheezy/tdeartwork/debian/control4
-rw-r--r--debian/wheezy/tdeartwork/debian/tdewallpapers-trinity.install (renamed from debian/wheezy/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--debian/wheezy/tdebase/debian/kate-trinity.lintian4
-rw-r--r--debian/wheezy/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--debian/wheezy/tdebase/debian/twin-trinity.lintian4
-rw-r--r--debian/wheezy/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--debian/wheezy/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/katomic-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/klickety-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/klines-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kmines-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kolf-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/konquest-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/kpat-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ksame-trinity.menu8
-rw-r--r--debian/wheezy/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--debian/wheezy/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ktron-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--debian/wheezy/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--debian/wheezy/tdegames/debian/lskat-trinity.menu6
-rw-r--r--debian/wheezy/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--debian/wheezy/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--debian/wheezy/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--debian/wheezy/tdepim/debian/akregator-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/karm-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/kmail-trinity.menu6
-rw-r--r--debian/wheezy/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--debian/wheezy/tdepim/debian/knode-trinity.menu6
-rw-r--r--debian/wheezy/tdepim/debian/knotes-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/kontact-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/korn-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--debian/wheezy/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--debian/wheezy/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--debian/wheezy/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--debian/wheezy/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--debian/wheezy/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/control10
-rw-r--r--debian/wheezy/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--debian/wheezy/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--debian/wheezy/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--debian/wheezy/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--debian/wheezy/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--debian/wheezy/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--debian/wheezy/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--debian/wheezy/tdeutils/debian/tdelirc-trinity.install (renamed from debian/wheezy/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--debian/wheezy/tdeutils/debian/tdessh-trinity.install (renamed from debian/wheezy/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--debian/wheezy/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--debian/wheezy/tdevelop/debian/tdevelop-trinity.menu4
-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
-rw-r--r--redhat/applications/abakus/abakus-3.5.12.spec2
-rw-r--r--redhat/applications/abakus/abakus-3.5.13.spec2
-rw-r--r--redhat/applications/adept/adept-14.0.0.spec2
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.spec2
-rw-r--r--redhat/applications/basket/basket-3.5.12.spec2
-rw-r--r--redhat/applications/basket/basket-3.5.13.spec2
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.1.spec4
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2.spec4
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.spec2
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.1.spec2
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.2.spec2
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.12.spec2
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.13.1.spec4
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.13.2.spec4
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.13.spec2
-rw-r--r--redhat/applications/filelight-l10n/filelight-l10n.spec2
-rw-r--r--redhat/applications/filelight/filelight-3.5.12.spec2
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.1.spec4
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.2.spec4
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.spec2
-rw-r--r--redhat/applications/fusion-icon/fusion-icon.spec2
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec4
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec4
-rw-r--r--redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec2
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec2
-rw-r--r--redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec2
-rw-r--r--redhat/applications/gwenview/gwenview-3.5.12.spec2
-rw-r--r--redhat/applications/gwenview/gwenview-3.5.13.1.spec4
-rw-r--r--redhat/applications/gwenview/gwenview-3.5.13.2.spec4
-rw-r--r--redhat/applications/gwenview/gwenview-3.5.13.spec2
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec4
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec4
-rw-r--r--redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec2
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.1.spec2
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2.spec2
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.1.spec4
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2.spec4
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.spec2
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec4
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec4
-rw-r--r--redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec2
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.1.spec2
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec2
-rw-r--r--redhat/applications/katapult/katapult-3.5.12.spec2
-rw-r--r--redhat/applications/katapult/katapult-3.5.13.1.spec4
-rw-r--r--redhat/applications/katapult/katapult-3.5.13.2.spec4
-rw-r--r--redhat/applications/katapult/katapult-3.5.13.spec2
-rw-r--r--redhat/applications/kbarcode/kbarcode-3.5.13.1.spec4
-rw-r--r--redhat/applications/kbarcode/kbarcode-3.5.13.2.spec4
-rw-r--r--redhat/applications/kbarcode/kbarcode-3.5.13.spec2
-rw-r--r--redhat/applications/kbfx/kbfx-3.5.13.1.spec4
-rw-r--r--redhat/applications/kbfx/kbfx-3.5.13.2.spec4
-rw-r--r--redhat/applications/kbfx/kbfx-3.5.13.spec2
-rw-r--r--redhat/applications/kbookreader/kbookreader-3.5.13.1.spec2
-rw-r--r--redhat/applications/kbookreader/kbookreader-3.5.13.2.spec2
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec4
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec4
-rw-r--r--redhat/applications/kchmviewer/kchmviewer-3.5.13.spec2
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec4
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec4
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13.spec2
-rw-r--r--redhat/applications/kcpuload/kcpuload-3.5.13.1.spec4
-rw-r--r--redhat/applications/kcpuload/kcpuload-3.5.13.2.spec4
-rw-r--r--redhat/applications/kcpuload/kcpuload-3.5.13.spec2
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec2
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec2
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.12.spec2
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.1.spec4
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.2.spec4
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.spec2
-rw-r--r--redhat/applications/kdirstat/kdirstat-3.5.13.1.spec4
-rw-r--r--redhat/applications/kdirstat/kdirstat-3.5.13.2.spec4
-rw-r--r--redhat/applications/kdirstat/kdirstat-3.5.13.spec2
-rw-r--r--redhat/applications/keep/keep-3.5.13.1.spec4
-rw-r--r--redhat/applications/keep/keep-3.5.13.2.spec4
-rw-r--r--redhat/applications/keep/keep-3.5.13.spec2
-rw-r--r--redhat/applications/kerry/kerry-3.5.13.1.spec4
-rw-r--r--redhat/applications/kerry/kerry-3.5.13.2.spec4
-rw-r--r--redhat/applications/kerry/kerry-3.5.13.spec2
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec4
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec4
-rw-r--r--redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec2
-rw-r--r--redhat/applications/kile/kile-3.5.13.1.spec4
-rw-r--r--redhat/applications/kile/kile-3.5.13.2.spec4
-rw-r--r--redhat/applications/kile/kile-3.5.13.spec2
-rw-r--r--redhat/applications/kima/kima-3.5.13.1.spec4
-rw-r--r--redhat/applications/kima/kima-3.5.13.2.spec4
-rw-r--r--redhat/applications/kima/kima-3.5.13.spec2
-rw-r--r--redhat/applications/kiosktool/kiosktool-3.5.13.1.spec4
-rw-r--r--redhat/applications/kiosktool/kiosktool-3.5.13.2.spec4
-rw-r--r--redhat/applications/kiosktool/kiosktool-3.5.13.spec2
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.1.spec4
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.2.spec4
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.spec2
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec4
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec4
-rw-r--r--redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec2
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.1.spec2
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2.spec2
-rw-r--r--redhat/applications/knemo/knemo-3.5.13.1.spec4
-rw-r--r--redhat/applications/knemo/knemo-3.5.13.2.spec4
-rw-r--r--redhat/applications/knemo/knemo-3.5.13.spec2
-rw-r--r--redhat/applications/knetload/knetload-3.5.13.1.spec4
-rw-r--r--redhat/applications/knetload/knetload-3.5.13.2.spec4
-rw-r--r--redhat/applications/knetload/knetload-3.5.13.spec2
-rw-r--r--redhat/applications/knetstats/knetstats-3.5.13.1.spec4
-rw-r--r--redhat/applications/knetstats/knetstats-3.5.13.2.spec4
-rw-r--r--redhat/applications/knetstats/knetstats-3.5.13.spec2
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec4
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec4
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec2
-rw-r--r--redhat/applications/knights/knights-3.5.13.1.spec4
-rw-r--r--redhat/applications/knights/knights-3.5.13.2.spec4
-rw-r--r--redhat/applications/knights/knights-3.5.13.spec2
-rw-r--r--redhat/applications/knowit/knowit-3.5.13.1.spec4
-rw-r--r--redhat/applications/knowit/knowit-3.5.13.2.spec4
-rw-r--r--redhat/applications/knowit/knowit-3.5.13.spec2
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.1.spec4
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.2.spec4
-rw-r--r--redhat/applications/knutclient/knutclient-3.5.13.spec2
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec4
-rw-r--r--redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec4
-rw-r--r--redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec2
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.1.spec4
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec4
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.spec2
-rw-r--r--redhat/applications/konversation/konversation-3.5.13.1.spec2
-rw-r--r--redhat/applications/konversation/konversation-3.5.13.2.spec2
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec4
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec4
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-3.5.13.spec2
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.1.spec4
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.2.spec4
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.spec2
-rw-r--r--redhat/applications/kpilot/kpilot-3.5.13.1.spec4
-rw-r--r--redhat/applications/kpilot/kpilot-3.5.13.2.spec4
-rw-r--r--redhat/applications/kpilot/kpilot-3.5.13.spec2
-rw-r--r--redhat/applications/kpowersave/kpowersave-3.5.13.1.spec4
-rw-r--r--redhat/applications/kpowersave/kpowersave-3.5.13.2.spec4
-rw-r--r--redhat/applications/kpowersave/kpowersave-3.5.13.spec2
-rw-r--r--redhat/applications/krename/krename-3.5.12.spec2
-rw-r--r--redhat/applications/krename/krename-3.5.13.1.spec4
-rw-r--r--redhat/applications/krename/krename-3.5.13.2.spec4
-rw-r--r--redhat/applications/krename/krename-3.5.13.spec2
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.1.spec4
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.2.spec4
-rw-r--r--redhat/applications/krusader/krusader-3.5.13.spec2
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec4
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec4
-rw-r--r--redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec2
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec4
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec4
-rw-r--r--redhat/applications/ksquirrel/ksquirrel-3.5.13.spec2
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec2
-rw-r--r--redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec2
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec4
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec4
-rw-r--r--redhat/applications/ksystemlog/ksystemlog-3.5.13.spec2
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.1.spec4
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.2.spec4
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.spec2
-rw-r--r--redhat/applications/ktorrent/ktorrent-3.5.13.1.spec4
-rw-r--r--redhat/applications/ktorrent/ktorrent-3.5.13.2.spec4
-rw-r--r--redhat/applications/ktorrent/ktorrent-3.5.13.spec2
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.12.spec2
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.1.spec4
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.2.spec4
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.spec2
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.1.spec4
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.2.spec4
-rw-r--r--redhat/applications/kvirc/kvirc-3.5.13.spec2
-rw-r--r--redhat/applications/kvkbd/kvkbd-3.5.13.1.spec4
-rw-r--r--redhat/applications/kvkbd/kvkbd-3.5.13.2.spec4
-rw-r--r--redhat/applications/kvkbd/kvkbd-3.5.13.spec2
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.1.spec4
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.2.spec4
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.spec2
-rw-r--r--redhat/applications/potracegui/potracegui-3.5.13.1.spec4
-rw-r--r--redhat/applications/potracegui/potracegui-3.5.13.2.spec4
-rw-r--r--redhat/applications/potracegui/potracegui-3.5.13.spec2
-rw-r--r--redhat/applications/rosegarden/rosegarden-3.5.13.1.spec4
-rw-r--r--redhat/applications/rosegarden/rosegarden-3.5.13.2.spec4
-rw-r--r--redhat/applications/rosegarden/rosegarden-3.5.13.spec2
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec4
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec4
-rw-r--r--redhat/applications/smartcardauth/smartcardauth-3.5.13.spec2
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.1.spec4
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.2.spec4
-rw-r--r--redhat/applications/smb4k/smb4k-3.5.13.spec2
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec4
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec4
-rw-r--r--redhat/applications/soundkonverter/soundkonverter-3.5.13.spec2
-rw-r--r--redhat/applications/tde-guidance/guidance-3.5.13.1.spec4
-rw-r--r--redhat/applications/tde-guidance/guidance-3.5.13.spec2
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec4
-rw-r--r--redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec2
-rw-r--r--redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec4
-rw-r--r--redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec2
-rw-r--r--redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec4
-rw-r--r--redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec4
-rw-r--r--redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec2
-rw-r--r--redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec4
-rw-r--r--redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec4
-rw-r--r--redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec2
-rw-r--r--redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec4
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.12.spec2
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec4
-rw-r--r--redhat/applications/tdeio-locate/kio-locate-3.5.13.spec2
-rw-r--r--redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec4
-rw-r--r--redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec4
-rw-r--r--redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec2
-rw-r--r--redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec4
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec2
-rw-r--r--redhat/applications/tderadio/kradio-3.5.13.1.spec4
-rw-r--r--redhat/applications/tderadio/kradio-3.5.13.spec2
-rw-r--r--redhat/applications/tderadio/tderadio-3.5.13.2.spec4
-rw-r--r--redhat/applications/tdesudo/kdesudo-3.5.13.1.spec2
-rw-r--r--redhat/applications/tdesudo/tdesudo-3.5.13.2.spec2
-rw-r--r--redhat/applications/tdesvn/kdesvn-3.5.13.1.spec4
-rw-r--r--redhat/applications/tdesvn/kdesvn-3.5.13.spec2
-rw-r--r--redhat/applications/tdesvn/tdesvn-3.5.13.2.spec4
-rw-r--r--redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec4
-rw-r--r--redhat/applications/tdmtheme/kdmtheme-3.5.13.spec2
-rw-r--r--redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec4
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.1.spec4
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.2.spec4
-rw-r--r--redhat/applications/tellico/tellico-3.5.13.spec2
-rw-r--r--redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec2
-rw-r--r--redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec4
-rw-r--r--redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec2
-rw-r--r--redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec4
-rw-r--r--redhat/applications/wlassistant/wlassistant-3.5.13.1.spec4
-rw-r--r--redhat/applications/wlassistant/wlassistant-3.5.13.2.spec4
-rw-r--r--redhat/applications/wlassistant/wlassistant-3.5.13.spec2
-rw-r--r--redhat/applications/yakuake/yakuake-3.5.12.spec2
-rw-r--r--redhat/applications/yakuake/yakuake-3.5.13.1.spec4
-rw-r--r--redhat/applications/yakuake/yakuake-3.5.13.2.spec4
-rw-r--r--redhat/applications/yakuake/yakuake-3.5.13.spec2
-rw-r--r--redhat/dependencies/arts/arts-14.0.0.spec6
-rw-r--r--redhat/dependencies/arts/arts-3.5.13.1.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec2
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec2
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec2
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec2
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec2
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec2
-rw-r--r--redhat/dependencies/python-tqt/python-tqt-14.0.0.spec2
-rw-r--r--redhat/dependencies/qt3/qt3-3.3.8.d.spec2
-rw-r--r--redhat/dependencies/qt3/qt3-3.5.13.1.spec4
-rw-r--r--redhat/dependencies/qt3/qt3-3.5.13.2.spec4
-rw-r--r--redhat/dependencies/sip4-tqt/sip4-tqt.spec2
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec2
-rw-r--r--redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec2
-rw-r--r--redhat/dependencies/tqca/tqca-14.0.0.spec2
-rw-r--r--redhat/dependencies/tqca/tqca-3.5.13.2.spec2
-rw-r--r--redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec2
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec10
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec2
-rw-r--r--redhat/extras/akode/akode-3.5.13.1.spec2
-rw-r--r--redhat/extras/akode/akode-3.5.13.2.spec2
-rw-r--r--redhat/extras/kasablanca/kasablanca-3.5.13.1.spec4
-rw-r--r--redhat/extras/kasablanca/kasablanca-3.5.13.2.spec4
-rw-r--r--redhat/extras/kasablanca/kasablanca-3.5.13.spec2
-rw-r--r--redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec4
-rw-r--r--redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec4
-rw-r--r--redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec2
-rw-r--r--redhat/extras/ksensors/ksensors-3.5.13.1.spec2
-rw-r--r--redhat/extras/ksensors/ksensors-3.5.13.2.spec2
-rw-r--r--redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec2
-rw-r--r--redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec2
-rw-r--r--redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec2
-rw-r--r--redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec2
-rw-r--r--redhat/extras/trinity-live/trinity-live.spec4
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec2
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec2
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec2
-rw-r--r--redhat/libraries/libkipi/libkipi-14.0.0.spec2
-rw-r--r--redhat/libraries/libkipi/libkipi-3.5.13.2.spec2
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec2
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec2
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.spec2
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec2
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec2
-rw-r--r--redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec2
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.spec2
-rw-r--r--redhat/tde-i18n/tde-i18n-3.5.13.1.spec2
-rw-r--r--redhat/tde-i18n/tde-i18n-3.5.13.2.spec2
-rw-r--r--redhat/tdeaccessibility/kdeaccessibility-3.5.12.spec2
-rw-r--r--redhat/tdeaccessibility/kdeaccessibility-3.5.13.1.spec2
-rw-r--r--redhat/tdeaddons/kdeaddons-3.5.12.spec2
-rw-r--r--redhat/tdeaddons/kdeaddons-3.5.13.1.spec2
-rw-r--r--redhat/tdeadmin/kdeadmin-3.5.12.spec2
-rw-r--r--redhat/tdeadmin/kdeadmin-3.5.13.1.spec2
-rw-r--r--redhat/tdeartwork/kdeartwork-3.5.13.1.spec2
-rw-r--r--redhat/tdebase/kdebase-3.5.13.1.spec2
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec2
-rw-r--r--redhat/tdebindings/kdebindings-3.5.13.1.spec2
-rw-r--r--redhat/tdeedu/kdeedu-3.5.12.spec2
-rw-r--r--redhat/tdeedu/kdeedu-3.5.13.1.spec2
-rw-r--r--redhat/tdegames/kdegames-3.5.12.spec2
-rw-r--r--redhat/tdegames/kdegames-3.5.13.1.spec2
-rw-r--r--redhat/tdegraphics/kdegraphics-3.5.12.spec2
-rw-r--r--redhat/tdegraphics/kdegraphics-3.5.13.1.spec2
-rw-r--r--redhat/tdelibs/kdelibs-3.5.13.1.spec2
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec2
-rw-r--r--redhat/tdemultimedia/kdemultimedia-3.5.12.spec2
-rw-r--r--redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec2
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec2
-rw-r--r--redhat/tdenetwork/kdenetwork-3.5.13.1.spec2
-rw-r--r--redhat/tdepim/kdepim-3.5.13.1.spec2
-rw-r--r--redhat/tdesdk/kdesdk-3.5.13.1.spec2
-rw-r--r--redhat/tdetoys/kdetoys-3.5.13.1.spec2
-rw-r--r--redhat/tdeutils/kdeutils-3.5.13.1.spec2
-rw-r--r--redhat/tdevelop/kdevelop-3.5.12.spec2
-rw-r--r--redhat/tdevelop/kdevelop-3.5.13.1.spec2
-rw-r--r--redhat/tdewebdev/kdewebdev-3.5.12.spec2
-rw-r--r--redhat/tdewebdev/kdewebdev-3.5.13.1.spec2
-rw-r--r--ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xubuntu/maverick/applications/amarok/debian/rules2
-rw-r--r--ubuntu/maverick/applications/bibletime/debian/menu2
-rw-r--r--ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--ubuntu/maverick/applications/filelight/debian/menu2
-rw-r--r--ubuntu/maverick/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--ubuntu/maverick/applications/gwenview/debian/menu4
-rwxr-xr-xubuntu/maverick/applications/gwenview/debian/rules6
-rw-r--r--ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/k3b/debian/k3b.menu4
-rw-r--r--ubuntu/maverick/applications/k9copy/debian/control2
-rw-r--r--ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xubuntu/maverick/applications/k9copy/debian/rules9
-rw-r--r--ubuntu/maverick/applications/kaffeine/debian/menu2
-rwxr-xr-xubuntu/maverick/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/maverick/applications/kbarcode/debian/menu4
-rw-r--r--ubuntu/maverick/applications/kcpuload/debian/menu2
-rw-r--r--ubuntu/maverick/applications/keep/debian/control2
-rw-r--r--ubuntu/maverick/applications/keep/debian/keep.xml12
-rwxr-xr-xubuntu/maverick/applications/keep/debian/rules7
-rw-r--r--ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/applications/kile/debian/menu2
-rw-r--r--ubuntu/maverick/applications/kmatplot/debian/menu2
-rw-r--r--ubuntu/maverick/applications/knetload/debian/menu2
-rw-r--r--ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--ubuntu/maverick/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/konversation/debian/control2
-rw-r--r--ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xubuntu/maverick/applications/konversation/debian/rules4
-rw-r--r--ubuntu/maverick/applications/kpicosim/debian/menu2
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--ubuntu/maverick/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--ubuntu/maverick/applications/krusader/debian/menu8
-rwxr-xr-xubuntu/maverick/applications/krusader/debian/rules2
-rw-r--r--ubuntu/maverick/applications/ktechlab/debian/menu2
-rw-r--r--ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--ubuntu/maverick/applications/smb4k/debian/menu2
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/control4
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/install2
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/manpages2
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/menu8
-rwxr-xr-xubuntu/maverick/applications/tdepowersave/debian/rules6
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1 (renamed from debian/squeeze/applications/tdepowersave/debian/kpowersave.1)22
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm (renamed from debian/lenny/applications/tdepowersave/debian/kpowersave.xpm)2
-rw-r--r--ubuntu/maverick/applications/tdepowersave/debian/watch2
-rw-r--r--ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu8
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu6
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu6
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu8
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu6
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu6
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu8
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/metapackages/rename-meta/debian/compat0
-rw-r--r--ubuntu/maverick/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]ubuntu/maverick/metapackages/rename-meta/debian/dirs0
-rw-r--r--ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst (renamed from ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst)2
-rw-r--r--ubuntu/maverick/metapackages/trinity-livecd/debian/control2
-rw-r--r--ubuntu/maverick/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdeaccessibility/debian/control4
-rw-r--r--ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/maverick/tdeartwork/debian/control4
-rw-r--r--ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install (renamed from ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--ubuntu/maverick/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--ubuntu/maverick/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--ubuntu/maverick/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/katomic-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/klickety-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/klines-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kmines-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kolf-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/konquest-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/kpat-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ksame-trinity.menu8
-rw-r--r--ubuntu/maverick/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ktron-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--ubuntu/maverick/tdegames/debian/lskat-trinity.menu6
-rw-r--r--ubuntu/maverick/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--ubuntu/maverick/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdepim/debian/akregator-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/karm-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/kmail-trinity.menu6
-rw-r--r--ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--ubuntu/maverick/tdepim/debian/knode-trinity.menu6
-rw-r--r--ubuntu/maverick/tdepim/debian/knotes-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/kontact-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/korn-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--ubuntu/maverick/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--ubuntu/maverick/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--ubuntu/maverick/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--ubuntu/maverick/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/control10
-rw-r--r--ubuntu/maverick/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--ubuntu/maverick/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--ubuntu/maverick/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install (renamed from ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--ubuntu/maverick/tdeutils/debian/tdessh-trinity.install (renamed from ubuntu/maverick/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--ubuntu/maverick/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu4
-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
-rw-r--r--ubuntu/precise/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--ubuntu/precise/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--ubuntu/precise/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xubuntu/precise/applications/amarok/debian/rules2
-rw-r--r--ubuntu/precise/applications/bibletime/debian/menu2
-rw-r--r--ubuntu/precise/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--ubuntu/precise/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--ubuntu/precise/applications/filelight/debian/menu2
-rw-r--r--ubuntu/precise/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--ubuntu/precise/applications/gwenview/debian/menu4
-rwxr-xr-xubuntu/precise/applications/gwenview/debian/rules6
-rw-r--r--ubuntu/precise/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--ubuntu/precise/applications/k3b/debian/k3b.menu4
-rw-r--r--ubuntu/precise/applications/k9copy/debian/control2
-rw-r--r--ubuntu/precise/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xubuntu/precise/applications/k9copy/debian/rules9
-rw-r--r--ubuntu/precise/applications/kaffeine/debian/menu2
-rwxr-xr-xubuntu/precise/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/precise/applications/kbarcode/debian/menu4
-rw-r--r--ubuntu/precise/applications/kcpuload/debian/menu2
-rw-r--r--ubuntu/precise/applications/keep/debian/control2
-rw-r--r--ubuntu/precise/applications/keep/debian/keep.xml12
-rwxr-xr-xubuntu/precise/applications/keep/debian/rules7
-rw-r--r--ubuntu/precise/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/applications/kile/debian/menu2
-rw-r--r--ubuntu/precise/applications/kmatplot/debian/menu2
-rw-r--r--ubuntu/precise/applications/knetload/debian/menu2
-rw-r--r--ubuntu/precise/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--ubuntu/precise/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--ubuntu/precise/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/precise/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--ubuntu/precise/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/precise/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--ubuntu/precise/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/precise/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--ubuntu/precise/applications/konversation/debian/control2
-rw-r--r--ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--ubuntu/precise/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xubuntu/precise/applications/konversation/debian/rules4
-rw-r--r--ubuntu/precise/applications/kpicosim/debian/menu2
-rw-r--r--ubuntu/precise/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--ubuntu/precise/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--ubuntu/precise/applications/krusader/debian/menu8
-rwxr-xr-xubuntu/precise/applications/krusader/debian/rules2
-rw-r--r--ubuntu/precise/applications/ktechlab/debian/menu2
-rw-r--r--ubuntu/precise/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/precise/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--ubuntu/precise/applications/smb4k/debian/menu2
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/control4
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/install2
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/kpowersave.1148
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm628
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/manpages2
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/menu8
-rwxr-xr-xubuntu/precise/applications/tdepowersave/debian/rules6
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1148
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm628
-rw-r--r--ubuntu/precise/applications/tdepowersave/debian/watch2
-rw-r--r--ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--ubuntu/precise/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--ubuntu/precise/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kcoloredit-trinity.menu8
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kdvi-trinity.menu6
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kfax-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kfaxview-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.menu6
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kiconedit-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kolourpaint-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kooka-trinity.menu8
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kpdf-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kpovmodeler-trinity.menu6
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kruler-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/ksnapshot-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/precise/kdegraphics.automake/debian/kview-trinity.menu6
-rw-r--r--ubuntu/precise/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.menu8
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/metapackages/rename-meta/debian/compat0
-rw-r--r--ubuntu/precise/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/metapackages/rename-meta/debian/dirs0
-rw-r--r--ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst89
-rw-r--r--ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst89
-rw-r--r--ubuntu/precise/metapackages/trinity-livecd/debian/control2
-rw-r--r--ubuntu/precise/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdeaccessibility/debian/control4
-rw-r--r--ubuntu/precise/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from ubuntu/precise/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--ubuntu/precise/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--ubuntu/precise/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--ubuntu/precise/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--ubuntu/precise/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--ubuntu/precise/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--ubuntu/precise/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/precise/tdeartwork/debian/control4
-rw-r--r--ubuntu/precise/tdeartwork/debian/tdewallpapers-trinity.install (renamed from ubuntu/precise/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--ubuntu/precise/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/precise/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--ubuntu/precise/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/precise/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--ubuntu/precise/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/katomic-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/klickety-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/klines-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kmines-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kolf-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/konquest-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/kpat-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ksame-trinity.menu8
-rw-r--r--ubuntu/precise/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--ubuntu/precise/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ktron-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--ubuntu/precise/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--ubuntu/precise/tdegames/debian/lskat-trinity.menu6
-rw-r--r--ubuntu/precise/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/precise/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--ubuntu/precise/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/precise/tdepim/debian/akregator-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/karm-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/kmail-trinity.menu6
-rw-r--r--ubuntu/precise/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--ubuntu/precise/tdepim/debian/knode-trinity.menu6
-rw-r--r--ubuntu/precise/tdepim/debian/knotes-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/kontact-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/korn-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--ubuntu/precise/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--ubuntu/precise/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/precise/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--ubuntu/precise/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--ubuntu/precise/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--ubuntu/precise/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/control10
-rw-r--r--ubuntu/precise/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/precise/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--ubuntu/precise/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--ubuntu/precise/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--ubuntu/precise/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/precise/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--ubuntu/precise/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--ubuntu/precise/tdeutils/debian/tdelirc-trinity.install (renamed from ubuntu/precise/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--ubuntu/precise/tdeutils/debian/tdessh-trinity.install (renamed from ubuntu/precise/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--ubuntu/precise/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/precise/tdevelop/debian/tdevelop-trinity.menu4
-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
-rw-r--r--ubuntu/raring/applications/abakus/debian/abakus-trinity.menu2
-rw-r--r--ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu4
-rw-r--r--ubuntu/raring/applications/amarok/debian/amarok-trinity.menu4
-rwxr-xr-xubuntu/raring/applications/amarok/debian/rules2
-rw-r--r--ubuntu/raring/applications/bibletime/debian/menu2
-rw-r--r--ubuntu/raring/applications/digikam/debian/digikam-trinity.menu4
-rw-r--r--ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu4
-rw-r--r--ubuntu/raring/applications/filelight/debian/menu2
-rw-r--r--ubuntu/raring/applications/gwenview/debian/gwenview.lintian6
-rw-r--r--ubuntu/raring/applications/gwenview/debian/menu4
-rwxr-xr-xubuntu/raring/applications/gwenview/debian/rules6
-rw-r--r--ubuntu/raring/applications/k3b/debian/k3b-trinity.menu2
-rw-r--r--ubuntu/raring/applications/k3b/debian/k3b.menu4
-rw-r--r--ubuntu/raring/applications/k9copy/debian/control2
-rw-r--r--ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook12
-rwxr-xr-xubuntu/raring/applications/k9copy/debian/rules9
-rw-r--r--ubuntu/raring/applications/kaffeine/debian/menu2
-rwxr-xr-xubuntu/raring/applications/kaffeine/debian/rules22
-rw-r--r--ubuntu/raring/applications/kbarcode/debian/menu4
-rw-r--r--ubuntu/raring/applications/kcpuload/debian/menu2
-rw-r--r--ubuntu/raring/applications/keep/debian/control2
-rw-r--r--ubuntu/raring/applications/keep/debian/keep.xml12
-rwxr-xr-xubuntu/raring/applications/keep/debian/rules7
-rw-r--r--ubuntu/raring/applications/kerry/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/applications/kile/debian/menu2
-rw-r--r--ubuntu/raring/applications/kmatplot/debian/menu2
-rw-r--r--ubuntu/raring/applications/knetload/debian/menu2
-rw-r--r--ubuntu/raring/applications/knetworkmanager.cmake/debian/menu4
-rw-r--r--ubuntu/raring/applications/knetworkmanager8/debian/menu4
-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/chalk-trinity.menu2
-rw-r--r--ubuntu/raring/applications/koffice/debian/karbon-trinity.lintian4
-rw-r--r--ubuntu/raring/applications/koffice/debian/karbon-trinity.menu2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kchart-trinity.lintian6
-rw-r--r--ubuntu/raring/applications/koffice/debian/kchart-trinity.menu2
-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/kivio-trinity.menu2
-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/kpresenter-trinity.menu2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kspread-trinity.lintian12
-rw-r--r--ubuntu/raring/applications/koffice/debian/kspread-trinity.menu2
-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/koffice/debian/kword-trinity.menu2
-rw-r--r--ubuntu/raring/applications/konversation/debian/control2
-rw-r--r--ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages2
-rw-r--r--ubuntu/raring/applications/konversation/debian/konversation-trinity.menu8
-rw-r--r--ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook20
-rw-r--r--ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook4
-rwxr-xr-xubuntu/raring/applications/konversation/debian/rules4
-rw-r--r--ubuntu/raring/applications/kpicosim/debian/menu2
-rw-r--r--ubuntu/raring/applications/kpowersave.cmake/debian/kpowersave-trinity.lintian8
-rw-r--r--ubuntu/raring/applications/kpowersave.cmake/debian/menu2
-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
-rw-r--r--ubuntu/raring/applications/krusader/debian/menu8
-rwxr-xr-xubuntu/raring/applications/krusader/debian/rules2
-rw-r--r--ubuntu/raring/applications/ktechlab/debian/menu2
-rw-r--r--ubuntu/raring/applications/ktorrent/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu2
-rw-r--r--ubuntu/raring/applications/smb4k/debian/menu2
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/control4
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/install2
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian5
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/kpowersave.1148
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm628
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/manpages2
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/menu8
-rwxr-xr-xubuntu/raring/applications/tdepowersave/debian/rules6
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda (renamed from ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda)0
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian5
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1148
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm628
-rw-r--r--ubuntu/raring/applications/tdepowersave/debian/watch2
-rw-r--r--ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu6
-rw-r--r--ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu4
-rw-r--r--ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu8
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu6
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu6
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu8
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu6
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu4
-rw-r--r--ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu6
-rw-r--r--ubuntu/raring/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/kdevelop.cmake/debian/kdevelop-trinity.menu8
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/rename-meta/Makefile0
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/rename-meta/debian/changelog0
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/rename-meta/debian/compat0
-rw-r--r--ubuntu/raring/metapackages/rename-meta/debian/control12
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/rename-meta/debian/dirs0
-rw-r--r--ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst89
-rw-r--r--ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst89
-rw-r--r--ubuntu/raring/metapackages/trinity-livecd/debian/control2
-rw-r--r--ubuntu/raring/tdeaccessibility/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdeaccessibility/debian/control4
-rw-r--r--ubuntu/raring/tdeaccessibility/debian/tde-icons-mono-trinity.install (renamed from ubuntu/raring/tdeaccessibility/debian/kde-icons-mono-trinity.install)0
-rw-r--r--ubuntu/raring/tdeaddons/debian/atlantikdesigner-trinity.menu2
-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/kcron-trinity.menu6
-rw-r--r--ubuntu/raring/tdeadmin/debian/kdat-trinity.menu4
-rw-r--r--ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu6
-rw-r--r--ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu6
-rw-r--r--ubuntu/raring/tdeadmin/debian/kuser-trinity.menu6
-rw-r--r--ubuntu/raring/tdeadmin/debian/lilo-config-trinity.lintian2
-rw-r--r--ubuntu/raring/tdeartwork/debian/control4
-rw-r--r--ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install (renamed from ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install)0
-rw-r--r--ubuntu/raring/tdebase/debian/kate-trinity.lintian4
-rw-r--r--ubuntu/raring/tdebase/debian/kate-trinity.menu4
-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/khelpcenter-trinity.menu2
-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/konqueror-trinity.menu4
-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/ksysguard-trinity.menu4
-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/tdeprint-trinity.menu2
-rw-r--r--ubuntu/raring/tdebase/debian/twin-trinity.lintian4
-rw-r--r--ubuntu/raring/tdebindings/debian/kjscmd-trinity.menu2
-rw-r--r--ubuntu/raring/tdeedu/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegames/debian/atlantik-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegames/debian/kasteroids-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/katomic-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kbattleship-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/kblackbox-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kbounce-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kenolaba-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/klickety-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/klines-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kmines-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/knetwalk-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kolf-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/konquest-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/kpat-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kpoker-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kreversi-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ksame-trinity.menu8
-rw-r--r--ubuntu/raring/tdegames/debian/kshisen-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ksirtet-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ksnake-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ksokoban-trinity.menu8
-rw-r--r--ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ktron-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/ktuberling-trinity.menu6
-rw-r--r--ubuntu/raring/tdegames/debian/kwin4-trinity.menu4
-rw-r--r--ubuntu/raring/tdegames/debian/lskat-trinity.menu6
-rw-r--r--ubuntu/raring/tdegraphics/debian/cdbs/debian-qt-kde.mk4
-rw-r--r--ubuntu/raring/tdegraphics/debian/kdvi-trinity.menu2
-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/kghostview-trinity.menu2
-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/kpovmodeler-trinity.menu2
-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/kview-trinity.menu2
-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/kopete-trinity.menu2
-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/ksirc-trinity.menu2
-rw-r--r--ubuntu/raring/tdenetwork/debian/kwifimanager-trinity.lintian6
-rw-r--r--ubuntu/raring/tdepim/debian/akregator-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/kaddressbook-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/kalarm-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/karm-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/kmail-trinity.menu6
-rw-r--r--ubuntu/raring/tdepim/debian/kmailcvt-trinity.menu2
-rw-r--r--ubuntu/raring/tdepim/debian/knode-trinity.menu6
-rw-r--r--ubuntu/raring/tdepim/debian/knotes-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/kontact-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/korganizer-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/korn-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/ktnef-trinity.menu4
-rw-r--r--ubuntu/raring/tdepim/debian/tdepim-wizards-trinity.menu2
-rw-r--r--ubuntu/raring/tdesdk/debian/cervisia-trinity.lintian12
-rw-r--r--ubuntu/raring/tdesdk/debian/cervisia-trinity.menu4
-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/kbabel-trinity.menu12
-rw-r--r--ubuntu/raring/tdesdk/debian/kbugbuster-trinity.menu4
-rw-r--r--ubuntu/raring/tdesdk/debian/kompare-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/kompare-trinity.menu2
-rw-r--r--ubuntu/raring/tdesdk/debian/kspy-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/kuiviewer-trinity.menu2
-rw-r--r--ubuntu/raring/tdesdk/debian/libcvsservice0-trinity.lintian4
-rw-r--r--ubuntu/raring/tdesdk/debian/tdecachegrind-trinity.menu2
-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/tdesdk/debian/umbrello-trinity.menu2
-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/ark-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/control10
-rw-r--r--ubuntu/raring/tdeutils/debian/kcalc-trinity-trinity.lintian6
-rw-r--r--ubuntu/raring/tdeutils/debian/kcalc-trinity.menu6
-rw-r--r--ubuntu/raring/tdeutils/debian/kcharselect-trinity.menu6
-rw-r--r--ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian3
-rw-r--r--ubuntu/raring/tdeutils/debian/kdf-trinity.menu8
-rw-r--r--ubuntu/raring/tdeutils/debian/kedit-trinity.lintian6
-rw-r--r--ubuntu/raring/tdeutils/debian/kedit-trinity.menu6
-rw-r--r--ubuntu/raring/tdeutils/debian/kfloppy-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/kgpg-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/khexedit-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/kjots-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/kregexpeditor-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/ktimer-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/superkaramba-trinity.menu4
-rw-r--r--ubuntu/raring/tdeutils/debian/tdelirc-trinity.install (renamed from ubuntu/raring/tdeutils/debian/kdelirc-trinity.install)0
-rw-r--r--ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian3
-rw-r--r--ubuntu/raring/tdeutils/debian/tdessh-trinity.install (renamed from ubuntu/raring/tdeutils/debian/kdessh-trinity.install)0
-rw-r--r--ubuntu/raring/tdevelop/debian/tdevelop-data-trinity.lintian14
-rw-r--r--ubuntu/raring/tdevelop/debian/tdevelop-trinity.menu4
-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
1831 files changed, 5965 insertions, 6009 deletions
diff --git a/debian/lenny/applications/abakus/debian/abakus-trinity.menu b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/lenny/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.menu b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/lenny/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/debian/lenny/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/lenny/applications/bibletime/debian/menu
+++ b/debian/lenny/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.menu b/debian/lenny/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/lenny/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/lenny/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/debian/lenny/applications/filelight/debian/menu b/debian/lenny/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/lenny/applications/filelight/debian/menu
+++ b/debian/lenny/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/debian/lenny/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/lenny/applications/gwenview/debian/menu
+++ b/debian/lenny/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/debian/lenny/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/lenny/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/lenny/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/lenny/applications/k3b/debian/k3b.menu b/debian/lenny/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/lenny/applications/k3b/debian/k3b.menu
+++ b/debian/lenny/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index 6453a7353..6fc30c6ea 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/debian/lenny/applications/kaffeine/debian/menu b/debian/lenny/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/lenny/applications/kaffeine/debian/menu
+++ b/debian/lenny/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/debian/lenny/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/lenny/applications/kbarcode/debian/menu
+++ b/debian/lenny/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/debian/lenny/applications/kcpuload/debian/menu b/debian/lenny/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/lenny/applications/kcpuload/debian/menu
+++ b/debian/lenny/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/lenny/applications/keep/debian/control b/debian/lenny/applications/keep/debian/control
index 0adb5638a..ea5cae910 100644
--- a/debian/lenny/applications/keep/debian/control
+++ b/debian/lenny/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/lenny/applications/keep/debian/keep.xml b/debian/lenny/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/debian/lenny/applications/keep/debian/keep.xml
+++ b/debian/lenny/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/debian/lenny/applications/keep/debian/rules
+++ b/debian/lenny/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/debian/lenny/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/lenny/applications/kile/debian/menu
+++ b/debian/lenny/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/lenny/applications/knetload/debian/menu b/debian/lenny/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/lenny/applications/knetload/debian/menu
+++ b/debian/lenny/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/menu b/debian/lenny/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanager8/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/menu
+++ b/debian/lenny/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/debian/lenny/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/debian/lenny/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/debian/lenny/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/debian/lenny/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/debian/lenny/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/debian/lenny/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/lenny/applications/konversation/debian/control b/debian/lenny/applications/konversation/debian/control
index 0484a4144..b82a416b3 100644
--- a/debian/lenny/applications/konversation/debian/control
+++ b/debian/lenny/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/debian/lenny/applications/konversation/debian/konversation-trinity.manpages b/debian/lenny/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/debian/lenny/applications/konversation/debian/konversation-trinity.manpages
+++ b/debian/lenny/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/debian/lenny/applications/konversation/debian/konversation-trinity.menu b/debian/lenny/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/debian/lenny/applications/konversation/debian/konversation-trinity.menu
+++ b/debian/lenny/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/debian/lenny/applications/konversation/debian/man/konversation.1.docbook b/debian/lenny/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/debian/lenny/applications/konversation/debian/man/konversation.1.docbook
+++ b/debian/lenny/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/debian/lenny/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/debian/lenny/applications/konversation/debian/rules
+++ b/debian/lenny/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/lenny/applications/kpicosim/debian/menu b/debian/lenny/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/lenny/applications/kpicosim/debian/menu
+++ b/debian/lenny/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/debian/lenny/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/menu
+++ b/debian/lenny/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/debian/lenny/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/lenny/applications/krusader/debian/menu
+++ b/debian/lenny/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/debian/lenny/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/lenny/applications/ktechlab/debian/menu
+++ b/debian/lenny/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/debian/lenny/applications/smb4k/debian/menu b/debian/lenny/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/lenny/applications/smb4k/debian/menu
+++ b/debian/lenny/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/debian/lenny/applications/tdepowersave/debian/control b/debian/lenny/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/lenny/applications/tdepowersave/debian/control
+++ b/debian/lenny/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/debian/lenny/applications/tdepowersave/debian/install b/debian/lenny/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/lenny/applications/tdepowersave/debian/install
+++ b/debian/lenny/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/debian/lenny/applications/tdepowersave/debian/manpages b/debian/lenny/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/lenny/applications/tdepowersave/debian/manpages
+++ b/debian/lenny/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/lenny/applications/tdepowersave/debian/menu b/debian/lenny/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/lenny/applications/tdepowersave/debian/menu
+++ b/debian/lenny/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/lenny/applications/tdepowersave/debian/rules b/debian/lenny/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/lenny/applications/tdepowersave/debian/rules
+++ b/debian/lenny/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1 b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1
index 0ab1d6f90..d79cfd21d 100644
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.1
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.1
@@ -1,12 +1,12 @@
.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
.SH NAME
-kpowersave
-\- A KDE KPart Application
+tdepowersave
+\- A TDE KPart Application
.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
+tdepowersave [Qt\-options] [TDE\-options]
.SH DESCRIPTION
-A KDE KPart Application
+A TDE KPart Application
.SH OPTIONS
.SS Generic options:
.TP
@@ -16,8 +16,8 @@ Show help about options
.B \-\-help\-qt
Show Qt specific options
.TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
.TP
.B \-\-help\-all
Show all options
@@ -34,7 +34,7 @@ Show license information
.B \-\-
End of options
.SS
-.SS KDE options:
+.SS TDE options:
.TP
.B \-\-caption <caption>
Use 'caption' as name in the titlebar
@@ -133,10 +133,10 @@ mirrors the whole layout of widgets
.SS
.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
+.BR "`khelpcenter help:/tdepowersave/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm
index 99d178492..a7b0f2e7c 100644
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.xpm
+++ b/debian/lenny/applications/tdepowersave/debian/tdepowersave.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * kpowersave_xpm[] = {
+static char * tdepowersave_xpm[] = {
"32 32 593 2",
" c None",
". c #6D2121",
diff --git a/debian/lenny/applications/tdepowersave/debian/watch b/debian/lenny/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/lenny/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
diff --git a/debian/lenny/metapackages/rename-meta/Makefile b/debian/lenny/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/debian/lenny/metapackages/rename-meta/Makefile
+++ b/debian/lenny/metapackages/rename-meta/Makefile
diff --git a/debian/lenny/metapackages/rename-meta/debian/changelog b/debian/lenny/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/debian/lenny/metapackages/rename-meta/debian/changelog
+++ b/debian/lenny/metapackages/rename-meta/debian/changelog
diff --git a/debian/lenny/metapackages/rename-meta/debian/compat b/debian/lenny/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/lenny/metapackages/rename-meta/debian/compat
+++ b/debian/lenny/metapackages/rename-meta/debian/compat
diff --git a/debian/lenny/metapackages/rename-meta/debian/control b/debian/lenny/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/debian/lenny/metapackages/rename-meta/debian/control
+++ b/debian/lenny/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/debian/lenny/metapackages/rename-meta/debian/dirs b/debian/lenny/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/debian/lenny/metapackages/rename-meta/debian/dirs
+++ b/debian/lenny/metapackages/rename-meta/debian/dirs
diff --git a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/debian/lenny/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/debian/lenny/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for kdm-kde3
+# postinst script for kdm-trinity
#
# see: dh_installdeb(1)
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/tdeaccessibility/debian/control b/debian/lenny/tdeaccessibility/debian/control
index bc2ab50d2..fef62b6bc 100644
--- a/debian/lenny/tdeaccessibility/debian/control
+++ b/debian/lenny/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/debian/lenny/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/debian/lenny/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/lenny/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/debian/lenny/tdeadmin/debian/kdat-trinity.menu b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/lenny/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/debian/lenny/tdeadmin/debian/kuser-trinity.menu b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/lenny/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control
index 56a6ec0d3..7ac1920c6 100644
--- a/debian/lenny/tdeartwork/debian/control
+++ b/debian/lenny/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install b/debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/debian/lenny/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/debian/lenny/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/debian/lenny/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.menu
+++ b/debian/lenny/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/debian/lenny/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.menu
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/lenny/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/debian/lenny/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/lenny/tdegames/debian/atlantik-trinity.menu
+++ b/debian/lenny/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/lenny/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/debian/lenny/tdegames/debian/katomic-trinity.menu b/debian/lenny/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/lenny/tdegames/debian/katomic-trinity.menu
+++ b/debian/lenny/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/debian/lenny/tdegames/debian/kbattleship-trinity.menu b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/lenny/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/debian/lenny/tdegames/debian/kblackbox-trinity.menu b/debian/lenny/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/lenny/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/lenny/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/debian/lenny/tdegames/debian/kbounce-trinity.menu b/debian/lenny/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/lenny/tdegames/debian/kbounce-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/debian/lenny/tdegames/debian/kenolaba-trinity.menu b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/lenny/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/debian/lenny/tdegames/debian/klickety-trinity.menu b/debian/lenny/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/lenny/tdegames/debian/klickety-trinity.menu
+++ b/debian/lenny/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/debian/lenny/tdegames/debian/klines-trinity.menu b/debian/lenny/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/lenny/tdegames/debian/klines-trinity.menu
+++ b/debian/lenny/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/debian/lenny/tdegames/debian/kmines-trinity.menu b/debian/lenny/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/lenny/tdegames/debian/kmines-trinity.menu
+++ b/debian/lenny/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/debian/lenny/tdegames/debian/knetwalk-trinity.menu b/debian/lenny/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/lenny/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/lenny/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/debian/lenny/tdegames/debian/kolf-trinity.menu b/debian/lenny/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity.menu
+++ b/debian/lenny/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/debian/lenny/tdegames/debian/konquest-trinity.menu b/debian/lenny/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/lenny/tdegames/debian/konquest-trinity.menu
+++ b/debian/lenny/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/debian/lenny/tdegames/debian/kpat-trinity.menu b/debian/lenny/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/lenny/tdegames/debian/kpat-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/debian/lenny/tdegames/debian/kpoker-trinity.menu b/debian/lenny/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/lenny/tdegames/debian/kpoker-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/debian/lenny/tdegames/debian/kreversi-trinity.menu b/debian/lenny/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/lenny/tdegames/debian/kreversi-trinity.menu
+++ b/debian/lenny/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/debian/lenny/tdegames/debian/ksame-trinity.menu b/debian/lenny/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/lenny/tdegames/debian/ksame-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/debian/lenny/tdegames/debian/kshisen-trinity.menu b/debian/lenny/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/lenny/tdegames/debian/kshisen-trinity.menu
+++ b/debian/lenny/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/debian/lenny/tdegames/debian/ksirtet-trinity.menu b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/lenny/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/debian/lenny/tdegames/debian/ksnake-trinity.menu b/debian/lenny/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/lenny/tdegames/debian/ksnake-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/debian/lenny/tdegames/debian/ksokoban-trinity.menu b/debian/lenny/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/lenny/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/debian/lenny/tdegames/debian/ktron-trinity.menu b/debian/lenny/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/lenny/tdegames/debian/ktron-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/debian/lenny/tdegames/debian/ktuberling-trinity.menu b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/lenny/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.menu b/debian/lenny/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/lenny/tdegames/debian/kwin4-trinity.menu
+++ b/debian/lenny/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/debian/lenny/tdegames/debian/lskat-trinity.menu b/debian/lenny/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/lenny/tdegames/debian/lskat-trinity.menu
+++ b/debian/lenny/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/debian/lenny/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/debian/lenny/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/lenny/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/debian/lenny/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/lenny/tdepim/debian/akregator-trinity.menu
+++ b/debian/lenny/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/lenny/tdepim/debian/kalarm-trinity.menu b/debian/lenny/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/lenny/tdepim/debian/kalarm-trinity.menu
+++ b/debian/lenny/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/debian/lenny/tdepim/debian/karm-trinity.menu b/debian/lenny/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/lenny/tdepim/debian/karm-trinity.menu
+++ b/debian/lenny/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/debian/lenny/tdepim/debian/kmail-trinity.menu b/debian/lenny/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/lenny/tdepim/debian/kmail-trinity.menu
+++ b/debian/lenny/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/lenny/tdepim/debian/knode-trinity.menu b/debian/lenny/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/lenny/tdepim/debian/knode-trinity.menu
+++ b/debian/lenny/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/debian/lenny/tdepim/debian/knotes-trinity.menu b/debian/lenny/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/lenny/tdepim/debian/knotes-trinity.menu
+++ b/debian/lenny/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/debian/lenny/tdepim/debian/kontact-trinity.menu b/debian/lenny/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/lenny/tdepim/debian/kontact-trinity.menu
+++ b/debian/lenny/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.menu b/debian/lenny/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/lenny/tdepim/debian/korganizer-trinity.menu
+++ b/debian/lenny/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/debian/lenny/tdepim/debian/korn-trinity.menu b/debian/lenny/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/lenny/tdepim/debian/korn-trinity.menu
+++ b/debian/lenny/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/debian/lenny/tdepim/debian/ktnef-trinity.menu b/debian/lenny/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/lenny/tdepim/debian/ktnef-trinity.menu
+++ b/debian/lenny/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/debian/lenny/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/debian/lenny/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/debian/lenny/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/lenny/tdesdk/debian/kompare-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/lenny/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/debian/lenny/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/lenny/tdeutils/debian/control b/debian/lenny/tdeutils/debian/control
index 56d984a2a..43aff85f0 100644
--- a/debian/lenny/tdeutils/debian/control
+++ b/debian/lenny/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/debian/lenny/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/debian/lenny/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.menu b/debian/lenny/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/lenny/tdeutils/debian/kdf-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/debian/lenny/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/lenny/tdeutils/debian/kgpg-trinity.menu b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/lenny/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/lenny/tdeutils/debian/khexedit-trinity.menu b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/lenny/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/lenny/tdeutils/debian/kjots-trinity.menu b/debian/lenny/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/lenny/tdeutils/debian/kjots-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/lenny/tdeutils/debian/ktimer-trinity.menu b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/lenny/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/lenny/tdeutils/debian/kdelirc-trinity.install b/debian/lenny/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/debian/lenny/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/lenny/tdeutils/debian/tdelirc-trinity.install
diff --git a/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/debian/lenny/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/lenny/tdeutils/debian/kdessh-trinity.install b/debian/lenny/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/debian/lenny/tdeutils/debian/kdessh-trinity.install
+++ b/debian/lenny/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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/abakus/debian/abakus-trinity.menu b/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu b/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/debian/squeeze/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/squeeze/applications/bibletime/debian/menu
+++ b/debian/squeeze/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu b/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu b/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/debian/squeeze/applications/filelight/debian/menu b/debian/squeeze/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/squeeze/applications/filelight/debian/menu
+++ b/debian/squeeze/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/debian/squeeze/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/squeeze/applications/gwenview/debian/menu
+++ b/debian/squeeze/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/squeeze/applications/k3b/debian/k3b.menu b/debian/squeeze/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.menu
+++ b/debian/squeeze/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index 6453a7353..6fc30c6ea 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook b/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/squeeze/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/debian/squeeze/applications/kaffeine/debian/menu b/debian/squeeze/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/squeeze/applications/kaffeine/debian/menu
+++ b/debian/squeeze/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/debian/squeeze/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/squeeze/applications/kbarcode/debian/menu
+++ b/debian/squeeze/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/debian/squeeze/applications/kcpuload/debian/menu b/debian/squeeze/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/squeeze/applications/kcpuload/debian/menu
+++ b/debian/squeeze/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/squeeze/applications/keep/debian/control b/debian/squeeze/applications/keep/debian/control
index 0adb5638a..ea5cae910 100644
--- a/debian/squeeze/applications/keep/debian/control
+++ b/debian/squeeze/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/squeeze/applications/keep/debian/keep.xml b/debian/squeeze/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/debian/squeeze/applications/keep/debian/keep.xml
+++ b/debian/squeeze/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/debian/squeeze/applications/keep/debian/rules
+++ b/debian/squeeze/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/debian/squeeze/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/squeeze/applications/kile/debian/menu
+++ b/debian/squeeze/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/squeeze/applications/knetload/debian/menu b/debian/squeeze/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/squeeze/applications/knetload/debian/menu
+++ b/debian/squeeze/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/menu b/debian/squeeze/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/menu
+++ b/debian/squeeze/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/squeeze/applications/konversation/debian/control b/debian/squeeze/applications/konversation/debian/control
index 0484a4144..b82a416b3 100644
--- a/debian/squeeze/applications/konversation/debian/control
+++ b/debian/squeeze/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages b/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages
+++ b/debian/squeeze/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/debian/squeeze/applications/konversation/debian/konversation-trinity.menu b/debian/squeeze/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/debian/squeeze/applications/konversation/debian/konversation-trinity.menu
+++ b/debian/squeeze/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook b/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook
+++ b/debian/squeeze/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/debian/squeeze/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/debian/squeeze/applications/konversation/debian/rules b/debian/squeeze/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/debian/squeeze/applications/konversation/debian/rules
+++ b/debian/squeeze/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/squeeze/applications/kpicosim/debian/menu b/debian/squeeze/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/squeeze/applications/kpicosim/debian/menu
+++ b/debian/squeeze/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/debian/squeeze/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/menu
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/debian/squeeze/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/squeeze/applications/krusader/debian/menu
+++ b/debian/squeeze/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/debian/squeeze/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/squeeze/applications/ktechlab/debian/menu
+++ b/debian/squeeze/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu b/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/debian/squeeze/applications/smb4k/debian/menu b/debian/squeeze/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/squeeze/applications/smb4k/debian/menu
+++ b/debian/squeeze/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/debian/squeeze/applications/tdepowersave/debian/control b/debian/squeeze/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/squeeze/applications/tdepowersave/debian/control
+++ b/debian/squeeze/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/debian/squeeze/applications/tdepowersave/debian/install b/debian/squeeze/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/squeeze/applications/tdepowersave/debian/install
+++ b/debian/squeeze/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/debian/squeeze/applications/tdepowersave/debian/manpages b/debian/squeeze/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/squeeze/applications/tdepowersave/debian/manpages
+++ b/debian/squeeze/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/squeeze/applications/tdepowersave/debian/menu b/debian/squeeze/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/squeeze/applications/tdepowersave/debian/menu
+++ b/debian/squeeze/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/squeeze/applications/tdepowersave/debian/rules b/debian/squeeze/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/squeeze/applications/tdepowersave/debian/rules
+++ b/debian/squeeze/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1 b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1
index 0ab1d6f90..d79cfd21d 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.1
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.1
@@ -1,12 +1,12 @@
.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
.SH NAME
-kpowersave
-\- A KDE KPart Application
+tdepowersave
+\- A TDE KPart Application
.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
+tdepowersave [Qt\-options] [TDE\-options]
.SH DESCRIPTION
-A KDE KPart Application
+A TDE KPart Application
.SH OPTIONS
.SS Generic options:
.TP
@@ -16,8 +16,8 @@ Show help about options
.B \-\-help\-qt
Show Qt specific options
.TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
.TP
.B \-\-help\-all
Show all options
@@ -34,7 +34,7 @@ Show license information
.B \-\-
End of options
.SS
-.SS KDE options:
+.SS TDE options:
.TP
.B \-\-caption <caption>
Use 'caption' as name in the titlebar
@@ -133,10 +133,10 @@ mirrors the whole layout of widgets
.SS
.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
+.BR "`khelpcenter help:/tdepowersave/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm
index 99d178492..a7b0f2e7c 100644
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave.xpm
+++ b/debian/squeeze/applications/tdepowersave/debian/tdepowersave.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * kpowersave_xpm[] = {
+static char * tdepowersave_xpm[] = {
"32 32 593 2",
" c None",
". c #6D2121",
diff --git a/debian/squeeze/applications/tdepowersave/debian/watch b/debian/squeeze/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
diff --git a/debian/squeeze/metapackages/rename-meta/Makefile b/debian/squeeze/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/debian/squeeze/metapackages/rename-meta/Makefile
+++ b/debian/squeeze/metapackages/rename-meta/Makefile
diff --git a/debian/squeeze/metapackages/rename-meta/debian/changelog b/debian/squeeze/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/debian/squeeze/metapackages/rename-meta/debian/changelog
+++ b/debian/squeeze/metapackages/rename-meta/debian/changelog
diff --git a/debian/squeeze/metapackages/rename-meta/debian/compat b/debian/squeeze/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/squeeze/metapackages/rename-meta/debian/compat
+++ b/debian/squeeze/metapackages/rename-meta/debian/compat
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/debian/squeeze/metapackages/rename-meta/debian/dirs b/debian/squeeze/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/debian/squeeze/metapackages/rename-meta/debian/dirs
+++ b/debian/squeeze/metapackages/rename-meta/debian/dirs
diff --git a/debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/debian/squeeze/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for kdm-kde3
+# postinst script for kdm-trinity
#
# see: dh_installdeb(1)
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/tdeaccessibility/debian/control b/debian/squeeze/tdeaccessibility/debian/control
index bc2ab50d2..fef62b6bc 100644
--- a/debian/squeeze/tdeaccessibility/debian/control
+++ b/debian/squeeze/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/debian/squeeze/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/debian/squeeze/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/debian/squeeze/tdeadmin/debian/kdat-trinity.menu b/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu b/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu b/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/debian/squeeze/tdeadmin/debian/kuser-trinity.menu b/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control
index 56a6ec0d3..7ac1920c6 100644
--- a/debian/squeeze/tdeartwork/debian/control
+++ b/debian/squeeze/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install b/debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/debian/squeeze/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/debian/squeeze/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/debian/squeeze/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/squeeze/tdebase/debian/kate-trinity.menu
+++ b/debian/squeeze/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/debian/squeeze/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.menu
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/debian/squeeze/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/squeeze/tdegames/debian/atlantik-trinity.menu
+++ b/debian/squeeze/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/debian/squeeze/tdegames/debian/katomic-trinity.menu b/debian/squeeze/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/squeeze/tdegames/debian/katomic-trinity.menu
+++ b/debian/squeeze/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu b/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/debian/squeeze/tdegames/debian/kbattleship-trinity.menu b/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/debian/squeeze/tdegames/debian/kblackbox-trinity.menu b/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/debian/squeeze/tdegames/debian/kbounce-trinity.menu b/debian/squeeze/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/squeeze/tdegames/debian/kbounce-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/debian/squeeze/tdegames/debian/kenolaba-trinity.menu b/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu b/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu b/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu b/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/debian/squeeze/tdegames/debian/klickety-trinity.menu b/debian/squeeze/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/squeeze/tdegames/debian/klickety-trinity.menu
+++ b/debian/squeeze/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/debian/squeeze/tdegames/debian/klines-trinity.menu b/debian/squeeze/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/squeeze/tdegames/debian/klines-trinity.menu
+++ b/debian/squeeze/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu b/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/debian/squeeze/tdegames/debian/kmines-trinity.menu b/debian/squeeze/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/squeeze/tdegames/debian/kmines-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/debian/squeeze/tdegames/debian/knetwalk-trinity.menu b/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/debian/squeeze/tdegames/debian/kolf-trinity.menu b/debian/squeeze/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/squeeze/tdegames/debian/kolf-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/debian/squeeze/tdegames/debian/konquest-trinity.menu b/debian/squeeze/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/squeeze/tdegames/debian/konquest-trinity.menu
+++ b/debian/squeeze/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/debian/squeeze/tdegames/debian/kpat-trinity.menu b/debian/squeeze/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/squeeze/tdegames/debian/kpat-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/debian/squeeze/tdegames/debian/kpoker-trinity.menu b/debian/squeeze/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/squeeze/tdegames/debian/kpoker-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/debian/squeeze/tdegames/debian/kreversi-trinity.menu b/debian/squeeze/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/squeeze/tdegames/debian/kreversi-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/debian/squeeze/tdegames/debian/ksame-trinity.menu b/debian/squeeze/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/squeeze/tdegames/debian/ksame-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/debian/squeeze/tdegames/debian/kshisen-trinity.menu b/debian/squeeze/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/squeeze/tdegames/debian/kshisen-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/debian/squeeze/tdegames/debian/ksirtet-trinity.menu b/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu b/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/debian/squeeze/tdegames/debian/ksnake-trinity.menu b/debian/squeeze/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/squeeze/tdegames/debian/ksnake-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/debian/squeeze/tdegames/debian/ksokoban-trinity.menu b/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu b/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/debian/squeeze/tdegames/debian/ktron-trinity.menu b/debian/squeeze/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/squeeze/tdegames/debian/ktron-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/debian/squeeze/tdegames/debian/ktuberling-trinity.menu b/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.menu b/debian/squeeze/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/squeeze/tdegames/debian/kwin4-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/debian/squeeze/tdegames/debian/lskat-trinity.menu b/debian/squeeze/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/squeeze/tdegames/debian/lskat-trinity.menu
+++ b/debian/squeeze/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/debian/squeeze/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/squeeze/tdepim/debian/akregator-trinity.menu
+++ b/debian/squeeze/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu b/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/squeeze/tdepim/debian/kalarm-trinity.menu b/debian/squeeze/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/squeeze/tdepim/debian/kalarm-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/debian/squeeze/tdepim/debian/karm-trinity.menu b/debian/squeeze/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/squeeze/tdepim/debian/karm-trinity.menu
+++ b/debian/squeeze/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/debian/squeeze/tdepim/debian/kmail-trinity.menu b/debian/squeeze/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/squeeze/tdepim/debian/kmail-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu b/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/squeeze/tdepim/debian/knode-trinity.menu b/debian/squeeze/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/squeeze/tdepim/debian/knode-trinity.menu
+++ b/debian/squeeze/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/debian/squeeze/tdepim/debian/knotes-trinity.menu b/debian/squeeze/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/squeeze/tdepim/debian/knotes-trinity.menu
+++ b/debian/squeeze/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/debian/squeeze/tdepim/debian/kontact-trinity.menu b/debian/squeeze/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/squeeze/tdepim/debian/kontact-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/debian/squeeze/tdepim/debian/korganizer-trinity.menu b/debian/squeeze/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/squeeze/tdepim/debian/korganizer-trinity.menu
+++ b/debian/squeeze/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/debian/squeeze/tdepim/debian/korn-trinity.menu b/debian/squeeze/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/squeeze/tdepim/debian/korn-trinity.menu
+++ b/debian/squeeze/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/debian/squeeze/tdepim/debian/ktnef-trinity.menu b/debian/squeeze/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/squeeze/tdepim/debian/ktnef-trinity.menu
+++ b/debian/squeeze/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu b/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/debian/squeeze/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/squeeze/tdesdk/debian/kompare-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/debian/squeeze/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/squeeze/tdeutils/debian/ark-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/squeeze/tdeutils/debian/control b/debian/squeeze/tdeutils/debian/control
index 56d984a2a..43aff85f0 100644
--- a/debian/squeeze/tdeutils/debian/control
+++ b/debian/squeeze/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu b/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/squeeze/tdeutils/debian/kdf-trinity.menu b/debian/squeeze/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/squeeze/tdeutils/debian/kdf-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/debian/squeeze/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/squeeze/tdeutils/debian/kedit-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu b/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/squeeze/tdeutils/debian/kgpg-trinity.menu b/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/squeeze/tdeutils/debian/khexedit-trinity.menu b/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/squeeze/tdeutils/debian/kjots-trinity.menu b/debian/squeeze/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/squeeze/tdeutils/debian/kjots-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu b/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/squeeze/tdeutils/debian/ktimer-trinity.menu b/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu b/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install b/debian/squeeze/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/debian/squeeze/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/squeeze/tdeutils/debian/tdelirc-trinity.install
diff --git a/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/debian/squeeze/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/squeeze/tdeutils/debian/kdessh-trinity.install b/debian/squeeze/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/debian/squeeze/tdeutils/debian/kdessh-trinity.install
+++ b/debian/squeeze/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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/abakus/debian/abakus-trinity.menu b/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/debian/wheezy/applications/amarok/debian/amarok-trinity.menu b/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/debian/wheezy/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/wheezy/applications/bibletime/debian/menu
+++ b/debian/wheezy/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/wheezy/applications/digikam/debian/digikam-trinity.menu b/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu b/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/debian/wheezy/applications/filelight/debian/menu b/debian/wheezy/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/wheezy/applications/filelight/debian/menu
+++ b/debian/wheezy/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/debian/wheezy/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/wheezy/applications/gwenview/debian/menu
+++ b/debian/wheezy/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/wheezy/applications/k3b/debian/k3b.menu b/debian/wheezy/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/wheezy/applications/k3b/debian/k3b.menu
+++ b/debian/wheezy/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/wheezy/applications/k9copy/debian/control b/debian/wheezy/applications/k9copy/debian/control
index 6453a7353..6fc30c6ea 100644
--- a/debian/wheezy/applications/k9copy/debian/control
+++ b/debian/wheezy/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/debian/wheezy/applications/k9copy/debian/k9copy.1.docbook b/debian/wheezy/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/debian/wheezy/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/wheezy/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/wheezy/applications/k9copy/debian/rules b/debian/wheezy/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/debian/wheezy/applications/k9copy/debian/rules
+++ b/debian/wheezy/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/debian/wheezy/applications/kaffeine/debian/menu b/debian/wheezy/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/wheezy/applications/kaffeine/debian/menu
+++ b/debian/wheezy/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/debian/wheezy/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/wheezy/applications/kbarcode/debian/menu
+++ b/debian/wheezy/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/debian/wheezy/applications/kcpuload/debian/menu b/debian/wheezy/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/wheezy/applications/kcpuload/debian/menu
+++ b/debian/wheezy/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/wheezy/applications/keep/debian/control b/debian/wheezy/applications/keep/debian/control
index 0adb5638a..ea5cae910 100644
--- a/debian/wheezy/applications/keep/debian/control
+++ b/debian/wheezy/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/debian/wheezy/applications/keep/debian/keep.xml b/debian/wheezy/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/debian/wheezy/applications/keep/debian/keep.xml
+++ b/debian/wheezy/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/debian/wheezy/applications/keep/debian/rules b/debian/wheezy/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/debian/wheezy/applications/keep/debian/rules
+++ b/debian/wheezy/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/debian/wheezy/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/wheezy/applications/kile/debian/menu
+++ b/debian/wheezy/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/wheezy/applications/knetload/debian/menu b/debian/wheezy/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/wheezy/applications/knetload/debian/menu
+++ b/debian/wheezy/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/menu b/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/wheezy/applications/knetworkmanager8/debian/menu b/debian/wheezy/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/wheezy/applications/knetworkmanager8/debian/menu
+++ b/debian/wheezy/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/debian/wheezy/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/wheezy/applications/koffice/debian/kword-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/wheezy/applications/konversation/debian/control b/debian/wheezy/applications/konversation/debian/control
index 0484a4144..b82a416b3 100644
--- a/debian/wheezy/applications/konversation/debian/control
+++ b/debian/wheezy/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/debian/wheezy/applications/konversation/debian/konversation-trinity.manpages b/debian/wheezy/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/debian/wheezy/applications/konversation/debian/konversation-trinity.manpages
+++ b/debian/wheezy/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/debian/wheezy/applications/konversation/debian/konversation-trinity.menu b/debian/wheezy/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/debian/wheezy/applications/konversation/debian/konversation-trinity.menu
+++ b/debian/wheezy/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/debian/wheezy/applications/konversation/debian/man/konversation.1.docbook b/debian/wheezy/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/debian/wheezy/applications/konversation/debian/man/konversation.1.docbook
+++ b/debian/wheezy/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/debian/wheezy/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/debian/wheezy/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/debian/wheezy/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/debian/wheezy/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/debian/wheezy/applications/konversation/debian/rules b/debian/wheezy/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/debian/wheezy/applications/konversation/debian/rules
+++ b/debian/wheezy/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/debian/wheezy/applications/kpicosim/debian/menu b/debian/wheezy/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/wheezy/applications/kpicosim/debian/menu
+++ b/debian/wheezy/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/debian/wheezy/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/wheezy/applications/kpowersave.cmake/debian/menu
+++ b/debian/wheezy/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/debian/wheezy/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/wheezy/applications/krusader/debian/menu
+++ b/debian/wheezy/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/debian/wheezy/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/wheezy/applications/ktechlab/debian/menu
+++ b/debian/wheezy/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu b/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/debian/wheezy/applications/smb4k/debian/menu b/debian/wheezy/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/wheezy/applications/smb4k/debian/menu
+++ b/debian/wheezy/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/debian/wheezy/applications/tdepowersave/debian/control b/debian/wheezy/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/debian/wheezy/applications/tdepowersave/debian/control
+++ b/debian/wheezy/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/debian/wheezy/applications/tdepowersave/debian/install b/debian/wheezy/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/debian/wheezy/applications/tdepowersave/debian/install
+++ b/debian/wheezy/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/debian/wheezy/applications/tdepowersave/debian/manpages b/debian/wheezy/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/debian/wheezy/applications/tdepowersave/debian/manpages
+++ b/debian/wheezy/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/debian/wheezy/applications/tdepowersave/debian/menu b/debian/wheezy/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/debian/wheezy/applications/tdepowersave/debian/menu
+++ b/debian/wheezy/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/debian/wheezy/applications/tdepowersave/debian/rules b/debian/wheezy/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/debian/wheezy/applications/tdepowersave/debian/rules
+++ b/debian/wheezy/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/debian/wheezy/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.1 b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1
index 0ab1d6f90..d79cfd21d 100644
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave.1
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.1
@@ -1,12 +1,12 @@
.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
.SH NAME
-kpowersave
-\- A KDE KPart Application
+tdepowersave
+\- A TDE KPart Application
.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
+tdepowersave [Qt\-options] [TDE\-options]
.SH DESCRIPTION
-A KDE KPart Application
+A TDE KPart Application
.SH OPTIONS
.SS Generic options:
.TP
@@ -16,8 +16,8 @@ Show help about options
.B \-\-help\-qt
Show Qt specific options
.TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
.TP
.B \-\-help\-all
Show all options
@@ -34,7 +34,7 @@ Show license information
.B \-\-
End of options
.SS
-.SS KDE options:
+.SS TDE options:
.TP
.B \-\-caption <caption>
Use 'caption' as name in the titlebar
@@ -133,10 +133,10 @@ mirrors the whole layout of widgets
.SS
.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
+.BR "`khelpcenter help:/tdepowersave/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm
index 99d178492..a7b0f2e7c 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave.xpm
+++ b/debian/wheezy/applications/tdepowersave/debian/tdepowersave.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * kpowersave_xpm[] = {
+static char * tdepowersave_xpm[] = {
"32 32 593 2",
" c None",
". c #6D2121",
diff --git a/debian/wheezy/applications/tdepowersave/debian/watch b/debian/wheezy/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/debian/wheezy/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu b/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
diff --git a/debian/wheezy/metapackages/rename-meta/Makefile b/debian/wheezy/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/debian/wheezy/metapackages/rename-meta/Makefile
+++ b/debian/wheezy/metapackages/rename-meta/Makefile
diff --git a/debian/wheezy/metapackages/rename-meta/debian/changelog b/debian/wheezy/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/debian/wheezy/metapackages/rename-meta/debian/changelog
+++ b/debian/wheezy/metapackages/rename-meta/debian/changelog
diff --git a/debian/wheezy/metapackages/rename-meta/debian/compat b/debian/wheezy/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/wheezy/metapackages/rename-meta/debian/compat
+++ b/debian/wheezy/metapackages/rename-meta/debian/compat
diff --git a/debian/wheezy/metapackages/rename-meta/debian/control b/debian/wheezy/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/debian/wheezy/metapackages/rename-meta/debian/control
+++ b/debian/wheezy/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/debian/wheezy/metapackages/rename-meta/debian/dirs b/debian/wheezy/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/debian/wheezy/metapackages/rename-meta/debian/dirs
+++ b/debian/wheezy/metapackages/rename-meta/debian/dirs
diff --git a/debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst b/debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/debian/wheezy/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for kdm-kde3
+# postinst script for kdm-trinity
#
# see: dh_installdeb(1)
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/tdeaccessibility/debian/control b/debian/wheezy/tdeaccessibility/debian/control
index bc2ab50d2..fef62b6bc 100644
--- a/debian/wheezy/tdeaccessibility/debian/control
+++ b/debian/wheezy/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/debian/wheezy/tdeaccessibility/debian/kde-icons-mono-trinity.install b/debian/wheezy/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/debian/wheezy/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/debian/wheezy/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/debian/wheezy/tdeadmin/debian/kdat-trinity.menu b/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu b/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu b/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/debian/wheezy/tdeadmin/debian/kuser-trinity.menu b/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control
index 56a6ec0d3..7ac1920c6 100644
--- a/debian/wheezy/tdeartwork/debian/control
+++ b/debian/wheezy/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/debian/wheezy/tdeartwork/debian/kdewallpapers-trinity.install b/debian/wheezy/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/debian/wheezy/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/debian/wheezy/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/debian/wheezy/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/wheezy/tdebase/debian/kate-trinity.menu
+++ b/debian/wheezy/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/debian/wheezy/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/wheezy/tdebase/debian/konqueror-trinity.menu
+++ b/debian/wheezy/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/debian/wheezy/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/wheezy/tdegames/debian/atlantik-trinity.menu
+++ b/debian/wheezy/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/debian/wheezy/tdegames/debian/katomic-trinity.menu b/debian/wheezy/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/wheezy/tdegames/debian/katomic-trinity.menu
+++ b/debian/wheezy/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu b/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/debian/wheezy/tdegames/debian/kbattleship-trinity.menu b/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/debian/wheezy/tdegames/debian/kblackbox-trinity.menu b/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/debian/wheezy/tdegames/debian/kbounce-trinity.menu b/debian/wheezy/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/wheezy/tdegames/debian/kbounce-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/debian/wheezy/tdegames/debian/kenolaba-trinity.menu b/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu b/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu b/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu b/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/debian/wheezy/tdegames/debian/klickety-trinity.menu b/debian/wheezy/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/wheezy/tdegames/debian/klickety-trinity.menu
+++ b/debian/wheezy/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/debian/wheezy/tdegames/debian/klines-trinity.menu b/debian/wheezy/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/wheezy/tdegames/debian/klines-trinity.menu
+++ b/debian/wheezy/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu b/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/debian/wheezy/tdegames/debian/kmines-trinity.menu b/debian/wheezy/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/wheezy/tdegames/debian/kmines-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/debian/wheezy/tdegames/debian/knetwalk-trinity.menu b/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/debian/wheezy/tdegames/debian/kolf-trinity.menu b/debian/wheezy/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/wheezy/tdegames/debian/kolf-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/debian/wheezy/tdegames/debian/konquest-trinity.menu b/debian/wheezy/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/wheezy/tdegames/debian/konquest-trinity.menu
+++ b/debian/wheezy/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/debian/wheezy/tdegames/debian/kpat-trinity.menu b/debian/wheezy/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/wheezy/tdegames/debian/kpat-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/debian/wheezy/tdegames/debian/kpoker-trinity.menu b/debian/wheezy/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/wheezy/tdegames/debian/kpoker-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/debian/wheezy/tdegames/debian/kreversi-trinity.menu b/debian/wheezy/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/wheezy/tdegames/debian/kreversi-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/debian/wheezy/tdegames/debian/ksame-trinity.menu b/debian/wheezy/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/wheezy/tdegames/debian/ksame-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/debian/wheezy/tdegames/debian/kshisen-trinity.menu b/debian/wheezy/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/wheezy/tdegames/debian/kshisen-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/debian/wheezy/tdegames/debian/ksirtet-trinity.menu b/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu b/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/debian/wheezy/tdegames/debian/ksnake-trinity.menu b/debian/wheezy/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/wheezy/tdegames/debian/ksnake-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/debian/wheezy/tdegames/debian/ksokoban-trinity.menu b/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu b/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/debian/wheezy/tdegames/debian/ktron-trinity.menu b/debian/wheezy/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/wheezy/tdegames/debian/ktron-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/debian/wheezy/tdegames/debian/ktuberling-trinity.menu b/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/debian/wheezy/tdegames/debian/kwin4-trinity.menu b/debian/wheezy/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/wheezy/tdegames/debian/kwin4-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/debian/wheezy/tdegames/debian/lskat-trinity.menu b/debian/wheezy/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/wheezy/tdegames/debian/lskat-trinity.menu
+++ b/debian/wheezy/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/wheezy/tdegraphics/debian/kview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/debian/wheezy/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/wheezy/tdepim/debian/akregator-trinity.menu
+++ b/debian/wheezy/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/wheezy/tdepim/debian/kalarm-trinity.menu b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/wheezy/tdepim/debian/kalarm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/debian/wheezy/tdepim/debian/karm-trinity.menu b/debian/wheezy/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/wheezy/tdepim/debian/karm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/debian/wheezy/tdepim/debian/kmail-trinity.menu b/debian/wheezy/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/wheezy/tdepim/debian/kmail-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/wheezy/tdepim/debian/knode-trinity.menu b/debian/wheezy/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/wheezy/tdepim/debian/knode-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/debian/wheezy/tdepim/debian/knotes-trinity.menu b/debian/wheezy/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/wheezy/tdepim/debian/knotes-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/debian/wheezy/tdepim/debian/kontact-trinity.menu b/debian/wheezy/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/wheezy/tdepim/debian/kontact-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/debian/wheezy/tdepim/debian/korganizer-trinity.menu b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/wheezy/tdepim/debian/korganizer-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/debian/wheezy/tdepim/debian/korn-trinity.menu b/debian/wheezy/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/wheezy/tdepim/debian/korn-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/debian/wheezy/tdepim/debian/ktnef-trinity.menu b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/wheezy/tdepim/debian/ktnef-trinity.menu
+++ b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/debian/wheezy/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/wheezy/tdesdk/debian/kompare-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/debian/wheezy/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/wheezy/tdeutils/debian/ark-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/wheezy/tdeutils/debian/control b/debian/wheezy/tdeutils/debian/control
index 56d984a2a..43aff85f0 100644
--- a/debian/wheezy/tdeutils/debian/control
+++ b/debian/wheezy/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu b/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian b/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/debian/wheezy/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/wheezy/tdeutils/debian/kdf-trinity.menu b/debian/wheezy/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/wheezy/tdeutils/debian/kdf-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/debian/wheezy/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/wheezy/tdeutils/debian/kedit-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu b/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/wheezy/tdeutils/debian/kgpg-trinity.menu b/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/wheezy/tdeutils/debian/khexedit-trinity.menu b/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/wheezy/tdeutils/debian/kjots-trinity.menu b/debian/wheezy/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/wheezy/tdeutils/debian/kjots-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu b/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/wheezy/tdeutils/debian/ktimer-trinity.menu b/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu b/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/wheezy/tdeutils/debian/kdelirc-trinity.install b/debian/wheezy/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/debian/wheezy/tdeutils/debian/kdelirc-trinity.install
+++ b/debian/wheezy/tdeutils/debian/tdelirc-trinity.install
diff --git a/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian b/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/debian/wheezy/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/debian/wheezy/tdeutils/debian/kdessh-trinity.install b/debian/wheezy/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/debian/wheezy/tdeutils/debian/kdessh-trinity.install
+++ b/debian/wheezy/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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/redhat/applications/abakus/abakus-3.5.12.spec b/redhat/applications/abakus/abakus-3.5.12.spec
index 54880e8ae..91d7f27cd 100644
--- a/redhat/applications/abakus/abakus-3.5.12.spec
+++ b/redhat/applications/abakus/abakus-3.5.12.spec
@@ -89,5 +89,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%changelog
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
-- Initial build for RHEL 6 and Fedora 15
+- Initial release for RHEL 6 and Fedora 15
- Import to GIT
diff --git a/redhat/applications/abakus/abakus-3.5.13.spec b/redhat/applications/abakus/abakus-3.5.13.spec
index 881134d4e..b0a33e2cc 100644
--- a/redhat/applications/abakus/abakus-3.5.13.spec
+++ b/redhat/applications/abakus/abakus-3.5.13.spec
@@ -103,5 +103,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.91-1
-- Initial build for RHEL 6 and Fedora 15
+- Initial release for RHEL 6 and Fedora 15
- Import to GIT
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec
index dc149c9c8..0e97b9760 100644
--- a/redhat/applications/adept/adept-14.0.0.spec
+++ b/redhat/applications/adept/adept-14.0.0.spec
@@ -177,7 +177,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-%find_lang adept
+%find_lang %{tde_pkg}
%clean
diff --git a/redhat/applications/amarok/amarok-3.5.13.spec b/redhat/applications/amarok/amarok-3.5.13.spec
index a5eb0d8ae..e246498ea 100644
--- a/redhat/applications/amarok/amarok-3.5.13.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.spec
@@ -377,5 +377,5 @@ done
- Add konqueror sidebar
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-1
-- Initial build for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Spec file based on Fedora 8 'amarok-1.4.10-1'
diff --git a/redhat/applications/basket/basket-3.5.12.spec b/redhat/applications/basket/basket-3.5.12.spec
index a97f0bc9f..fbd83bef0 100644
--- a/redhat/applications/basket/basket-3.5.12.spec
+++ b/redhat/applications/basket/basket-3.5.12.spec
@@ -114,5 +114,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/basket/basket-3.5.13.spec b/redhat/applications/basket/basket-3.5.13.spec
index 07e8e4951..b9d845859 100644
--- a/redhat/applications/basket/basket-3.5.13.spec
+++ b/redhat/applications/basket/basket-3.5.13.spec
@@ -160,5 +160,5 @@ done
- Fix compilation with GCC 4.7
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.1.spec b/redhat/applications/bibletime/bibletime-3.5.13.1.spec
index 69683bfae..520f147cb 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.1.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.1.spec
@@ -154,11 +154,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
- Fix compilation on RHEL 5
- Fix compilation with GCC 4.7
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
index 11885837c..2a590f7af 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
@@ -147,11 +147,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
- Fix compilation on RHEL 5
- Fix compilation with GCC 4.7
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.spec b/redhat/applications/bibletime/bibletime-3.5.13.spec
index d88da085b..8b8bfe792 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.spec
@@ -156,4 +156,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix compilation with GCC 4.7
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/digikam/digikam-3.5.13.1.spec b/redhat/applications/digikam/digikam-3.5.13.1.spec
index b853f6c16..9901bd7ab 100644
--- a/redhat/applications/digikam/digikam-3.5.13.1.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.1.spec
@@ -312,7 +312,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
- Add support for Mageia 2 and Mandriva 2011
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
index 92e48cadb..23cf5320e 100644
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.2.spec
@@ -316,7 +316,7 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
- Add support for Mageia 2 and Mandriva 2011
diff --git a/redhat/applications/dolphin/dolphin-3.5.12.spec b/redhat/applications/dolphin/dolphin-3.5.12.spec
index 30b0eeb2f..38f7059e5 100644
--- a/redhat/applications/dolphin/dolphin-3.5.12.spec
+++ b/redhat/applications/dolphin/dolphin-3.5.12.spec
@@ -129,6 +129,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.1.spec b/redhat/applications/dolphin/dolphin-3.5.13.1.spec
index fa40c513f..f412efa0f 100644
--- a/redhat/applications/dolphin/dolphin-3.5.13.1.spec
+++ b/redhat/applications/dolphin/dolphin-3.5.13.1.spec
@@ -173,7 +173,7 @@ fi
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-6
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
- Add alternatives with 'kio-umountwrapper'
@@ -192,6 +192,6 @@ fi
- Correct macro to install under "/opt", if desired
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec
index 632aaaaa3..711989c20 100644
--- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec
+++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec
@@ -172,7 +172,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-6
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.2-5
- Add alternatives with 'kio-umountwrapper'
@@ -191,6 +191,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
diff --git a/redhat/applications/dolphin/dolphin-3.5.13.spec b/redhat/applications/dolphin/dolphin-3.5.13.spec
index 667efc4f7..5cafa107c 100644
--- a/redhat/applications/dolphin/dolphin-3.5.13.spec
+++ b/redhat/applications/dolphin/dolphin-3.5.13.spec
@@ -175,6 +175,6 @@ fi
- Correct macro to install under "/opt", if desired
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Based on FC7 'Dolphin 0.8.2-2" SPEC file.
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec
index cb1920957..9040a00e9 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/filelight-l10n/filelight-l10n.spec
@@ -120,4 +120,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes useless post and postun
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/filelight/filelight-3.5.12.spec b/redhat/applications/filelight/filelight-3.5.12.spec
index 8340303f6..e1b02b0ee 100644
--- a/redhat/applications/filelight/filelight-3.5.12.spec
+++ b/redhat/applications/filelight/filelight-3.5.12.spec
@@ -102,5 +102,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/filelight/filelight-3.5.13.1.spec b/redhat/applications/filelight/filelight-3.5.13.1.spec
index 7d2172a5e..50af74c0d 100644
--- a/redhat/applications/filelight/filelight-3.5.13.1.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.1.spec
@@ -137,7 +137,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
- Obsoletes package 'filelight-l10n'
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4
@@ -154,5 +154,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
index 8857edebd..2223e626e 100644
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.2.spec
@@ -140,7 +140,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
- Obsoletes package 'filelight-l10n'
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4
@@ -157,5 +157,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/filelight/filelight-3.5.13.spec b/redhat/applications/filelight/filelight-3.5.13.spec
index 77fc17afa..30ed48ac7 100644
--- a/redhat/applications/filelight/filelight-3.5.13.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.spec
@@ -137,5 +137,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec
index 276c357c5..6580ca75b 100644
--- a/redhat/applications/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/fusion-icon/fusion-icon.spec
@@ -116,4 +116,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix python module installation
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.0.0+git20071028-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec
index 387bb7ffe..c17e4ce0b 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec
@@ -135,7 +135,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
- Add missing gtkrc files
@@ -146,4 +146,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes useless post and postun
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
index f94b6e9e4..df1677c87 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec
@@ -138,7 +138,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
- Add missing gtkrc files
@@ -149,4 +149,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes useless post and postun
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec
index 409e4c706..88dcb55ab 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec
@@ -142,4 +142,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes useless post and postun
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
index 81fb352a0..c26279a74 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.1.spec
@@ -176,5 +176,5 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
index 9f822adac..73a30a059 100644
--- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
+++ b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec
@@ -180,5 +180,5 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/gwenview/gwenview-3.5.12.spec b/redhat/applications/gwenview/gwenview-3.5.12.spec
index a46d016e2..bbe7a61fe 100644
--- a/redhat/applications/gwenview/gwenview-3.5.12.spec
+++ b/redhat/applications/gwenview/gwenview-3.5.12.spec
@@ -149,5 +149,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.1.spec b/redhat/applications/gwenview/gwenview-3.5.13.1.spec
index 8cd9660bd..69d17dfc1 100644
--- a/redhat/applications/gwenview/gwenview-3.5.13.1.spec
+++ b/redhat/applications/gwenview/gwenview-3.5.13.1.spec
@@ -221,7 +221,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
- Add support for Mageia 2 and Mandriva 2011
@@ -251,5 +251,5 @@ done
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec
index c5d8fe144..815b4bf44 100644
--- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec
+++ b/redhat/applications/gwenview/gwenview-3.5.13.2.spec
@@ -212,7 +212,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.2-8
- Add support for Mageia 2 and Mandriva 2011
@@ -242,5 +242,5 @@ done
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/gwenview/gwenview-3.5.13.spec b/redhat/applications/gwenview/gwenview-3.5.13.spec
index e2c3d63bc..6129af795 100644
--- a/redhat/applications/gwenview/gwenview-3.5.13.spec
+++ b/redhat/applications/gwenview/gwenview-3.5.13.spec
@@ -265,5 +265,5 @@ done
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.2-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec
index 2691b3956..12a9678a8 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.1.spec
@@ -319,7 +319,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
index 493a84511..c43bf768d 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec
@@ -322,7 +322,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec
index fa2b67c60..1b10a6802 100644
--- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec
+++ b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.spec
@@ -305,4 +305,4 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%changelog
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/k3b/k3b-3.5.13.1.spec b/redhat/applications/k3b/k3b-3.5.13.1.spec
index 3c3ed5ba9..5cb371b5f 100644
--- a/redhat/applications/k3b/k3b-3.5.13.1.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.1.spec
@@ -384,7 +384,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Enables MAD support
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
- Remove requirement for resmgr
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index 140701e95..3feb6a38d 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -467,7 +467,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Enables MAD support
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
- Remove requirement for resmgr
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.1.spec b/redhat/applications/k9copy/k9copy-3.5.13.1.spec
index 9766a9dcf..c3798c154 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.1.spec
+++ b/redhat/applications/k9copy/k9copy-3.5.13.1.spec
@@ -129,7 +129,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
- Add support for MGA2 and MDV2011
@@ -145,4 +145,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
index 78a5fcbc9..537d72a3d 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2.spec
@@ -142,7 +142,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.3-2
- Add support for MGA2 and MDV2011
@@ -158,4 +158,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.spec b/redhat/applications/k9copy/k9copy-3.5.13.spec
index cf6993ed6..187016882 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.spec
+++ b/redhat/applications/k9copy/k9copy-3.5.13.spec
@@ -161,4 +161,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
index ac832b16f..018c2d05b 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec
@@ -124,11 +124,11 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
- Rebuild with nicer patch.
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
index b059206e1..3e9694e3d 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec
@@ -133,11 +133,11 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2
- Rebuild with nicer patch.
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
index 01b03b014..dfbc6152d 100644
--- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
+++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec
@@ -117,5 +117,5 @@ export PATH="%{tde_bindir}:${PATH}"
- Rebuild with nicer patch.
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
index 57eda8d5d..4e87fd16a 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.1.spec
@@ -258,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
- Add support for Mageia 2 and Mandriva 2011
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 3105fd8ef..cd0a75785 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -278,7 +278,7 @@ rm -rf $RPM_BUILD_ROOT
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
- Add support for Mageia 2 and Mandriva 2011
diff --git a/redhat/applications/katapult/katapult-3.5.12.spec b/redhat/applications/katapult/katapult-3.5.12.spec
index 4f1b16493..1ae79b3cd 100644
--- a/redhat/applications/katapult/katapult-3.5.12.spec
+++ b/redhat/applications/katapult/katapult-3.5.12.spec
@@ -115,6 +115,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Import to GIT
diff --git a/redhat/applications/katapult/katapult-3.5.13.1.spec b/redhat/applications/katapult/katapult-3.5.13.1.spec
index 03ab13a35..bdff714ad 100644
--- a/redhat/applications/katapult/katapult-3.5.13.1.spec
+++ b/redhat/applications/katapult/katapult-3.5.13.1.spec
@@ -178,7 +178,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
- Rebuilt for Fedora 17
@@ -191,6 +191,6 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Import to GIT
diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
index 2d15344db..5ce7161d8 100644
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ b/redhat/applications/katapult/katapult-3.5.13.2.spec
@@ -181,7 +181,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-4
- Rebuilt for Fedora 17
@@ -194,6 +194,6 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Import to GIT
diff --git a/redhat/applications/katapult/katapult-3.5.13.spec b/redhat/applications/katapult/katapult-3.5.13.spec
index 8f31e7360..dff27c6e6 100644
--- a/redhat/applications/katapult/katapult-3.5.13.spec
+++ b/redhat/applications/katapult/katapult-3.5.13.spec
@@ -184,6 +184,6 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- Import to GIT
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
index f1816a467..eb1805d37 100644
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
+++ b/redhat/applications/kbarcode/kbarcode-3.5.13.1.spec
@@ -154,7 +154,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
index 868dfc956..99d77f8a8 100644
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
+++ b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec
@@ -157,7 +157,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.6-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.spec
index 83e71e5a2..287fea1b6 100644
--- a/redhat/applications/kbarcode/kbarcode-3.5.13.spec
+++ b/redhat/applications/kbarcode/kbarcode-3.5.13.spec
@@ -158,4 +158,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
%Changelog
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.1.spec b/redhat/applications/kbfx/kbfx-3.5.13.1.spec
index 78b6bd502..c6eb49dab 100644
--- a/redhat/applications/kbfx/kbfx-3.5.13.1.spec
+++ b/redhat/applications/kbfx/kbfx-3.5.13.1.spec
@@ -163,7 +163,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec
index 151e1a240..a42e59de6 100644
--- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec
+++ b/redhat/applications/kbfx/kbfx-3.5.13.2.spec
@@ -169,7 +169,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbfx/kbfx-3.5.13.spec b/redhat/applications/kbfx/kbfx-3.5.13.spec
index 7c8887c04..47b4831e0 100644
--- a/redhat/applications/kbfx/kbfx-3.5.13.spec
+++ b/redhat/applications/kbfx/kbfx-3.5.13.spec
@@ -162,4 +162,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
%Changelog
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.9.3.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec
index 725bd59f6..825244f38 100644
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec
+++ b/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec
@@ -145,7 +145,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
index ab4368d07..f196d7a0c 100644
--- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
+++ b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec
@@ -148,7 +148,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.0-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec
index a940e3c07..774a8ff7a 100644
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec
@@ -147,7 +147,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2
- Rebuilt for Fedora 17
@@ -155,4 +155,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
index df86ff206..456c6942f 100644
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec
@@ -151,7 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.1.2-2
- Rebuilt for Fedora 17
@@ -159,4 +159,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec
index c3fb589ab..e2dba2a34 100644
--- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec
+++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec
@@ -146,4 +146,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.1.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec
index b63ede854..8212e91f3 100644
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec
@@ -119,7 +119,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
index 00c9d8085..e00deb351 100644
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec
@@ -128,7 +128,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec
index 70db276de..522deb769 100644
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec
+++ b/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec
@@ -113,4 +113,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Thu May 10 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec
index 39dfe5af2..4632b6607 100644
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec
+++ b/redhat/applications/kcpuload/kcpuload-3.5.13.1.spec
@@ -128,7 +128,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2
- Rebuilt for Fedora 17
@@ -136,4 +136,4 @@ done
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
index 848897372..e9da08b8a 100644
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
+++ b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec
@@ -131,7 +131,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.00-2
- Rebuilt for Fedora 17
@@ -139,4 +139,4 @@ done
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.spec
index e1fde24ab..828d6ee84 100644
--- a/redhat/applications/kcpuload/kcpuload-3.5.13.spec
+++ b/redhat/applications/kcpuload/kcpuload-3.5.13.spec
@@ -127,4 +127,4 @@ done
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.00-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec
index 784edb28d..b44e41ab8 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.1.spec
@@ -118,7 +118,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index 5d5919651..3357790a1 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -121,7 +121,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.12.spec b/redhat/applications/kdiff3/kdiff3-3.5.12.spec
index 6383af2d2..8c378cd72 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.12.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.12.spec
@@ -107,5 +107,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec
index 625cd5991..f8912c6d3 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec
@@ -135,7 +135,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
- Rebuilt for Fedora 17
@@ -155,5 +155,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
index b5d2ee93b..0253cfa26 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
@@ -144,7 +144,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4
- Rebuilt for Fedora 17
@@ -164,5 +164,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.spec
index b560c7647..bf89b7f56 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.spec
@@ -156,5 +156,5 @@ done
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec
index e0024e263..47e8fea50 100644
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec
+++ b/redhat/applications/kdirstat/kdirstat-3.5.13.1.spec
@@ -138,11 +138,11 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
- Rebuilt for Fedora 17
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
index ba27622a0..260526dc0 100644
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
+++ b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec
@@ -141,11 +141,11 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.4.4-2
- Rebuilt for Fedora 17
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.spec
index 90691838f..843e486b8 100644
--- a/redhat/applications/kdirstat/kdirstat-3.5.13.spec
+++ b/redhat/applications/kdirstat/kdirstat-3.5.13.spec
@@ -136,4 +136,4 @@ done
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.4.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-3.5.13.1.spec b/redhat/applications/keep/keep-3.5.13.1.spec
index f0d3cd583..be0abbb80 100644
--- a/redhat/applications/keep/keep-3.5.13.1.spec
+++ b/redhat/applications/keep/keep-3.5.13.1.spec
@@ -130,10 +130,10 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
- Rebuilt for Fedora 17
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec
index 7e82cca0c..029952029 100644
--- a/redhat/applications/keep/keep-3.5.13.2.spec
+++ b/redhat/applications/keep/keep-3.5.13.2.spec
@@ -133,10 +133,10 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-2
- Rebuilt for Fedora 17
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/keep/keep-3.5.13.spec b/redhat/applications/keep/keep-3.5.13.spec
index a9e17885c..3518b879e 100644
--- a/redhat/applications/keep/keep-3.5.13.spec
+++ b/redhat/applications/keep/keep-3.5.13.spec
@@ -127,4 +127,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Rebuilt for Fedora 17
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec
index 632e27917..9bc265341 100644
--- a/redhat/applications/kerry/kerry-3.5.13.1.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.1.spec
@@ -152,7 +152,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec
index c3d3f8ca6..09949032e 100644
--- a/redhat/applications/kerry/kerry-3.5.13.2.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.2.spec
@@ -155,7 +155,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec
index 683baa429..49b070395 100644
--- a/redhat/applications/kerry/kerry-3.5.13.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.spec
@@ -150,4 +150,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
%Changelog
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
index 6a32e5073..a0b4ae4bd 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.1.spec
@@ -132,7 +132,7 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
- Add 'preload' file for startkde script
@@ -142,4 +142,4 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
- Removes post and postun
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
index ec6c53108..08edc9c77 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec
@@ -135,7 +135,7 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
- Add 'preload' file for startkde script
@@ -145,4 +145,4 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
- Removes post and postun
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
index d0f1e46c6..c15f8b933 100644
--- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
+++ b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.spec
@@ -135,4 +135,4 @@ echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
- Removes post and postun
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-3.5.13.1.spec b/redhat/applications/kile/kile-3.5.13.1.spec
index dbd5e8f8d..039e3afd2 100644
--- a/redhat/applications/kile/kile-3.5.13.1.spec
+++ b/redhat/applications/kile/kile-3.5.13.1.spec
@@ -197,7 +197,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
- Rebuilt for Fedora 17
@@ -207,4 +207,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix file conflict with trinity-kdelibs
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec
index 7ba48dfae..cba7e4f2d 100644
--- a/redhat/applications/kile/kile-3.5.13.2.spec
+++ b/redhat/applications/kile/kile-3.5.13.2.spec
@@ -200,7 +200,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
- Rebuilt for Fedora 17
@@ -210,4 +210,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix file conflict with trinity-kdelibs
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kile/kile-3.5.13.spec b/redhat/applications/kile/kile-3.5.13.spec
index 96318c5a9..c67f253fd 100644
--- a/redhat/applications/kile/kile-3.5.13.spec
+++ b/redhat/applications/kile/kile-3.5.13.spec
@@ -645,4 +645,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix file conflict with trinity-kdelibs
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-3.5.13.1.spec b/redhat/applications/kima/kima-3.5.13.1.spec
index 605193879..adf052a06 100644
--- a/redhat/applications/kima/kima-3.5.13.1.spec
+++ b/redhat/applications/kima/kima-3.5.13.1.spec
@@ -117,11 +117,11 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
- Rebuilt for Fedora 17
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec
index b2e594987..03068edbd 100644
--- a/redhat/applications/kima/kima-3.5.13.2.spec
+++ b/redhat/applications/kima/kima-3.5.13.2.spec
@@ -120,11 +120,11 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-2
- Rebuilt for Fedora 17
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/kima-3.5.13.spec b/redhat/applications/kima/kima-3.5.13.spec
index 657029f3c..80f5dc115 100644
--- a/redhat/applications/kima/kima-3.5.13.spec
+++ b/redhat/applications/kima/kima-3.5.13.spec
@@ -115,4 +115,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Fix post and postun
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec
index 0c6bbfe1b..c95fcd01c 100644
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec
+++ b/redhat/applications/kiosktool/kiosktool-3.5.13.1.spec
@@ -149,11 +149,11 @@ update-desktop-database >& /dev/null ||:
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
- Rebuilt for Fedora 17
- Fix post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
index de047b8d4..885e4131b 100644
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
+++ b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec
@@ -152,11 +152,11 @@ update-desktop-database >& /dev/null ||:
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
- Rebuilt for Fedora 17
- Fix post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.spec
index 3195e466b..8ec53de65 100644
--- a/redhat/applications/kiosktool/kiosktool-3.5.13.spec
+++ b/redhat/applications/kiosktool/kiosktool-3.5.13.spec
@@ -147,4 +147,4 @@ update-desktop-database >& /dev/null ||:
- Fix post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
index ef7b3201b..e01ee9a36 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
@@ -237,11 +237,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix xine 1.2 support (openSUSE 12.2 only)
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
- Fix compilation with GCC 4.7 [Commit #5106117b]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index a4deea68a..c5d8f4b37 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -242,11 +242,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix xine 1.2 support (openSUSE 12.2 only)
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
- Fix compilation with GCC 4.7 [Commit #5106117b]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.spec
index 70589fe00..47248bc5d 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.spec
@@ -228,5 +228,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix compilation with GCC 4.7 [Commit #5106117b]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
index 9aa03a339..22037de91 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
@@ -198,11 +198,11 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
- GCC 4.7 fixes. [Commit #88d2d2a7]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
index c4e600952..6e2f52062 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec
@@ -201,11 +201,11 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
- GCC 4.7 fixes. [Commit #88d2d2a7]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
index 5a0cde153..0414eddca 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
@@ -203,5 +203,5 @@ done
- GCC 4.7 fixes. [Commit #88d2d2a7]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
index e6a0dad45..9cc8c496b 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
@@ -264,7 +264,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
- Rebuild for Fedora 17
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index 99ac0885b..5fa0965b2 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -290,7 +290,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
- Rebuild for Fedora 17
diff --git a/redhat/applications/knemo/knemo-3.5.13.1.spec b/redhat/applications/knemo/knemo-3.5.13.1.spec
index da7910aeb..4072c693b 100644
--- a/redhat/applications/knemo/knemo-3.5.13.1.spec
+++ b/redhat/applications/knemo/knemo-3.5.13.1.spec
@@ -134,10 +134,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
- Rebuild for Fedora 17
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec
index c7409a810..e82a328a2 100644
--- a/redhat/applications/knemo/knemo-3.5.13.2.spec
+++ b/redhat/applications/knemo/knemo-3.5.13.2.spec
@@ -141,10 +141,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
- Rebuild for Fedora 17
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knemo/knemo-3.5.13.spec b/redhat/applications/knemo/knemo-3.5.13.spec
index 3db393ccd..b316cf6b5 100644
--- a/redhat/applications/knemo/knemo-3.5.13.spec
+++ b/redhat/applications/knemo/knemo-3.5.13.spec
@@ -132,4 +132,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Rebuild for Fedora 17
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.1.spec b/redhat/applications/knetload/knetload-3.5.13.1.spec
index 4b20989cd..0dc01dc02 100644
--- a/redhat/applications/knetload/knetload-3.5.13.1.spec
+++ b/redhat/applications/knetload/knetload-3.5.13.1.spec
@@ -135,10 +135,10 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec
index ee588af4e..95a255ade 100644
--- a/redhat/applications/knetload/knetload-3.5.13.2.spec
+++ b/redhat/applications/knetload/knetload-3.5.13.2.spec
@@ -138,10 +138,10 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetload/knetload-3.5.13.spec b/redhat/applications/knetload/knetload-3.5.13.spec
index 89b234ac9..0d4293016 100644
--- a/redhat/applications/knetload/knetload-3.5.13.spec
+++ b/redhat/applications/knetload/knetload-3.5.13.spec
@@ -133,4 +133,4 @@ done
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.1.spec b/redhat/applications/knetstats/knetstats-3.5.13.1.spec
index 47d79ee12..0d12ef070 100644
--- a/redhat/applications/knetstats/knetstats-3.5.13.1.spec
+++ b/redhat/applications/knetstats/knetstats-3.5.13.1.spec
@@ -126,7 +126,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec
index 9ab1fe7c1..a1cadd729 100644
--- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec
+++ b/redhat/applications/knetstats/knetstats-3.5.13.2.spec
@@ -129,7 +129,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.1-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetstats/knetstats-3.5.13.spec b/redhat/applications/knetstats/knetstats-3.5.13.spec
index 9e37f55c6..17a63d2bf 100644
--- a/redhat/applications/knetstats/knetstats-3.5.13.spec
+++ b/redhat/applications/knetstats/knetstats-3.5.13.spec
@@ -121,4 +121,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
index ffc5400d6..38e901008 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.1.spec
@@ -174,7 +174,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
- Rebuild for Fedora 17
@@ -183,4 +183,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Remove faulty patch for WPA authentication
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial build
+- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
index 349203c3e..ef8d9e323 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
@@ -177,7 +177,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - %{?version}-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3 / 0.9-3
- Rebuild for Fedora 17
@@ -186,4 +186,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Remove faulty patch for WPA authentication
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial build
+- Initial release
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
index 8adbb5f6d..b51395370 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.spec
@@ -177,4 +177,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Remove faulty patch for WPA authentication
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
-- Initial build
+- Initial release
diff --git a/redhat/applications/knights/knights-3.5.13.1.spec b/redhat/applications/knights/knights-3.5.13.1.spec
index 9e8647c3b..bba7572b4 100644
--- a/redhat/applications/knights/knights-3.5.13.1.spec
+++ b/redhat/applications/knights/knights-3.5.13.1.spec
@@ -133,7 +133,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
- Rebuild for Fedora 17
@@ -142,4 +142,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec
index 564e911c9..be11af866 100644
--- a/redhat/applications/knights/knights-3.5.13.2.spec
+++ b/redhat/applications/knights/knights-3.5.13.2.spec
@@ -136,7 +136,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.6-3
- Rebuild for Fedora 17
@@ -145,4 +145,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knights/knights-3.5.13.spec b/redhat/applications/knights/knights-3.5.13.spec
index e0271e12d..0ce527693 100644
--- a/redhat/applications/knights/knights-3.5.13.spec
+++ b/redhat/applications/knights/knights-3.5.13.spec
@@ -134,4 +134,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.1.spec b/redhat/applications/knowit/knowit-3.5.13.1.spec
index be9c9fffe..6fb781e27 100644
--- a/redhat/applications/knowit/knowit-3.5.13.1.spec
+++ b/redhat/applications/knowit/knowit-3.5.13.1.spec
@@ -136,7 +136,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec
index bf985b582..8dbbf544d 100644
--- a/redhat/applications/knowit/knowit-3.5.13.2.spec
+++ b/redhat/applications/knowit/knowit-3.5.13.2.spec
@@ -139,7 +139,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knowit/knowit-3.5.13.spec b/redhat/applications/knowit/knowit-3.5.13.spec
index 76467be17..b76bc64db 100644
--- a/redhat/applications/knowit/knowit-3.5.13.spec
+++ b/redhat/applications/knowit/knowit-3.5.13.spec
@@ -131,4 +131,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.10-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.1.spec b/redhat/applications/knutclient/knutclient-3.5.13.1.spec
index 0cb3e6b61..e10e2a487 100644
--- a/redhat/applications/knutclient/knutclient-3.5.13.1.spec
+++ b/redhat/applications/knutclient/knutclient-3.5.13.1.spec
@@ -131,11 +131,11 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec
index 08aa0cc6d..54843f70f 100644
--- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec
+++ b/redhat/applications/knutclient/knutclient-3.5.13.2.spec
@@ -134,11 +134,11 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.5-2
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/knutclient/knutclient-3.5.13.spec b/redhat/applications/knutclient/knutclient-3.5.13.spec
index a7c88e8af..989670893 100644
--- a/redhat/applications/knutclient/knutclient-3.5.13.spec
+++ b/redhat/applications/knutclient/knutclient-3.5.13.spec
@@ -129,5 +129,5 @@ done
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec
index 2bf81b861..5ce586eb3 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.1.spec
@@ -1079,8 +1079,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
index 273203c45..023fafa5b 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec
@@ -1082,8 +1082,8 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec b/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec
index 790ce5f71..043e71331 100644
--- a/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec
+++ b/redhat/applications/koffice-i18n/koffice-l10n-3.5.13.spec
@@ -1086,5 +1086,5 @@ find "%{buildroot}%{tde_docdir}/HTML" -size 0 -exec rm -f {} \;
%changelog
* Sun Jul 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/applications/koffice/koffice-3.5.13.1.spec b/redhat/applications/koffice/koffice-3.5.13.1.spec
index 33821517b..b2b002f1c 100644
--- a/redhat/applications/koffice/koffice-3.5.13.1.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.1.spec
@@ -1051,7 +1051,7 @@ update-desktop-database -q &> /dev/null ||:
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
- Fix kformula dependancies (for RHEL6)
@@ -1076,6 +1076,6 @@ update-desktop-database -q &> /dev/null ||:
- Fix HTML directory location
* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index ab290b820..610a50901 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -1176,7 +1176,7 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-6
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.3-5
- Fix kformula dependancies (for RHEL6)
@@ -1201,6 +1201,6 @@ rm -f %{buildroot}%{tde_libdir}/libkugar*.so
- Fix HTML directory location
* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/koffice/koffice-3.5.13.spec b/redhat/applications/koffice/koffice-3.5.13.spec
index 255c5560f..803407cb6 100644
--- a/redhat/applications/koffice/koffice-3.5.13.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.spec
@@ -1076,6 +1076,6 @@ update-desktop-database -q &> /dev/null ||:
- Fix HTML directory location
* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Spec file from Fedora 11 'koffice-2:1.6.3-25.20090306svn'
- Removed 'krita', added 'chalk'
diff --git a/redhat/applications/konversation/konversation-3.5.13.1.spec b/redhat/applications/konversation/konversation-3.5.13.1.spec
index 7d7928012..c6c77edf3 100644
--- a/redhat/applications/konversation/konversation-3.5.13.1.spec
+++ b/redhat/applications/konversation/konversation-3.5.13.1.spec
@@ -174,7 +174,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
- Rebuild for Fedora 17
diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec
index a325f2f24..ac7cce336 100644
--- a/redhat/applications/konversation/konversation-3.5.13.2.spec
+++ b/redhat/applications/konversation/konversation-3.5.13.2.spec
@@ -181,7 +181,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 1.1-2
- Rebuild for Fedora 17
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec
index 8ab878484..0f1b12ffc 100644
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.1.spec
@@ -143,11 +143,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
index 264e38f2e..d0f676d0a 100644
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
@@ -151,11 +151,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec
index c5a11710b..6ad567900 100644
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.spec
@@ -141,5 +141,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
- Rebuild for Fedora 17
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
index 9a278f982..06140eb27 100644
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
+++ b/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
@@ -129,7 +129,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec
index 7a726fc4e..09d643b7f 100644
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec
+++ b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec
@@ -132,7 +132,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.spec
index 43c024ed5..3d7b5f8c3 100644
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.spec
+++ b/redhat/applications/kpicosim/kpicosim-3.5.13.spec
@@ -128,4 +128,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.1.spec b/redhat/applications/kpilot/kpilot-3.5.13.1.spec
index 84dc669aa..8a0a7ef69 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.1.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.1.spec
@@ -175,10 +175,10 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
index 2a3599c7c..4cd596fd7 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.2.spec
@@ -178,10 +178,10 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.7-2
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpilot/kpilot-3.5.13.spec b/redhat/applications/kpilot/kpilot-3.5.13.spec
index 1c2fff802..b03a819d3 100644
--- a/redhat/applications/kpilot/kpilot-3.5.13.spec
+++ b/redhat/applications/kpilot/kpilot-3.5.13.spec
@@ -182,4 +182,4 @@ done
- Rebuild for Fedora 17
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
index a848d1694..7ee0dff8d 100644
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
+++ b/redhat/applications/kpowersave/kpowersave-3.5.13.1.spec
@@ -148,11 +148,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
- Add missing /sbin/ldconfig
- Add missing doc file
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec
index e19245c48..60f32e769 100644
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec
+++ b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec
@@ -155,11 +155,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
- Add missing /sbin/ldconfig
- Add missing doc file
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.spec
index b496d3af6..61c9fe930 100644
--- a/redhat/applications/kpowersave/kpowersave-3.5.13.spec
+++ b/redhat/applications/kpowersave/kpowersave-3.5.13.spec
@@ -147,4 +147,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Add missing doc file
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krename/krename-3.5.12.spec b/redhat/applications/krename/krename-3.5.12.spec
index d76ed0723..dce4f5655 100644
--- a/redhat/applications/krename/krename-3.5.12.spec
+++ b/redhat/applications/krename/krename-3.5.12.spec
@@ -101,5 +101,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/krename/krename-3.5.13.1.spec b/redhat/applications/krename/krename-3.5.13.1.spec
index 18ae34c09..2a5d281c1 100644
--- a/redhat/applications/krename/krename-3.5.13.1.spec
+++ b/redhat/applications/krename/krename-3.5.13.1.spec
@@ -135,7 +135,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
- Rebuild for Fedora 17
@@ -151,5 +151,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec
index 0ca408b48..33048ac5e 100644
--- a/redhat/applications/krename/krename-3.5.13.2.spec
+++ b/redhat/applications/krename/krename-3.5.13.2.spec
@@ -134,7 +134,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.0.14-4
- Rebuild for Fedora 17
@@ -150,5 +150,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/krename/krename-3.5.13.spec b/redhat/applications/krename/krename-3.5.13.spec
index bb74edf1d..21d91105f 100644
--- a/redhat/applications/krename/krename-3.5.13.spec
+++ b/redhat/applications/krename/krename-3.5.13.spec
@@ -140,5 +140,5 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.0.14-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/krusader/krusader-3.5.13.1.spec b/redhat/applications/krusader/krusader-3.5.13.1.spec
index 955e6d0ee..07a376302 100644
--- a/redhat/applications/krusader/krusader-3.5.13.1.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.1.spec
@@ -153,12 +153,12 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
- Rebuild for Fedora 17
- GCC 4.7 fixes. [Commit #fdf6d340]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index bcd0478af..49967cddc 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.2.spec
@@ -156,12 +156,12 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.90.0-2
- Rebuild for Fedora 17
- GCC 4.7 fixes. [Commit #fdf6d340]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/krusader/krusader-3.5.13.spec b/redhat/applications/krusader/krusader-3.5.13.spec
index d4e84f369..db8e3bd3a 100644
--- a/redhat/applications/krusader/krusader-3.5.13.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.spec
@@ -159,5 +159,5 @@ done
- GCC 4.7 fixes. [Commit #fdf6d340]
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.90.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec
index 70fcd9dba..97dc989ad 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec
@@ -124,11 +124,11 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
- Rebuild for Fedora 17
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec
index 9478b2370..60daa21ec 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec
@@ -127,11 +127,11 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.2-2
- Rebuild for Fedora 17
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec
index 192bf9cc3..0b70d5036 100644
--- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec
+++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec
@@ -123,4 +123,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec
index f03b50115..7a27d58d9 100644
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec
@@ -144,11 +144,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
- Rebuild for Fedora 17
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
index 16eb31a0e..5a9e16495 100644
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec
@@ -152,11 +152,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2
- Rebuild for Fedora 17
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec
index 90abc45cd..60d1484dd 100644
--- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec
+++ b/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec
@@ -143,4 +143,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec
index 79197e16f..e76091312 100644
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec
@@ -123,7 +123,7 @@ fi
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.4-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
index 4d41f0f45..3ed53876f 100644
--- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec
@@ -123,7 +123,7 @@ fi
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.4-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Nov 02 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.4-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec
index 6e5cacdda..f2b6ace79 100644
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec
@@ -127,8 +127,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec
index 57bf580d3..af4ac36f6 100644
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec
@@ -130,8 +130,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.2-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec
index 9f74d8b0a..6b8f7aaeb 100644
--- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec
+++ b/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec
@@ -122,5 +122,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
index 969d0700f..91af2d22a 100644
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
@@ -135,11 +135,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec
index 459ef3a0d..cf1dcb302 100644
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec
@@ -134,11 +134,11 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.spec
index 45134f847..3f582d2f9 100644
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.spec
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13.spec
@@ -136,5 +136,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec
index 2fa1a79e2..6bf9eff98 100644
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13.1.spec
@@ -166,7 +166,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1
- Rename old tq methods that no longer need a unique name [Commit #a90eb215]
@@ -179,4 +179,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
index 25258fc51..b4e302a1e 100644
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
@@ -168,7 +168,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.8-1
- Rename old tq methods that no longer need a unique name [Commit #a90eb215]
@@ -181,4 +181,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.spec
index cee7ff745..71908a999 100644
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.spec
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13.spec
@@ -201,4 +201,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Change default configuration to use external geoip database when found and use internal database only when external database is not found. [Bug #443] [Commit #355c6b69]
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.6-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.12.spec b/redhat/applications/kuickshow/kuickshow-3.5.12.spec
index bf7c79c3b..658222daf 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.12.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.12.spec
@@ -106,5 +106,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
index cc0e4a7eb..ca085bf1d 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
@@ -129,7 +129,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
- Removes conflict with 'kdegraphics'
@@ -147,5 +147,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index 44949183e..15be9e31d 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -135,7 +135,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
- Removes conflict with 'kdegraphics'
@@ -153,5 +153,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.spec
index aa01c55fb..6602f889f 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.spec
@@ -152,5 +152,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.1.spec b/redhat/applications/kvirc/kvirc-3.5.13.1.spec
index 5e23611c6..2dae17287 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.1.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.1.spec
@@ -212,7 +212,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2
- Rebuilt for Fedora 17
@@ -227,4 +227,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix "acinclude.m4" file [Bug #980]
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
index d620baf4e..44c8a3598 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
@@ -215,7 +215,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.4.0-2
- Rebuilt for Fedora 17
@@ -230,4 +230,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix "acinclude.m4" file [Bug #980]
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.spec b/redhat/applications/kvirc/kvirc-3.5.13.spec
index b41ead906..cd63f4d00 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.spec
@@ -243,4 +243,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix "acinclude.m4" file [Bug #980]
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec
index 5822bc548..42adc560b 100644
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec
+++ b/redhat/applications/kvkbd/kvkbd-3.5.13.1.spec
@@ -121,8 +121,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec
index 5c3b32191..bebd592b9 100644
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec
+++ b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec
@@ -124,8 +124,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.spec
index cd5159319..4421cbc1d 100644
--- a/redhat/applications/kvkbd/kvkbd-3.5.13.spec
+++ b/redhat/applications/kvkbd/kvkbd-3.5.13.spec
@@ -116,5 +116,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/piklab-3.5.13.1.spec b/redhat/applications/piklab/piklab-3.5.13.1.spec
index ff5205db7..fa08d970e 100644
--- a/redhat/applications/piklab/piklab-3.5.13.1.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.1.spec
@@ -148,7 +148,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
- Fix MAN directory location
@@ -158,4 +158,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec
index 716da9a18..6e1ad5c29 100644
--- a/redhat/applications/piklab/piklab-3.5.13.2.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.2.spec
@@ -147,7 +147,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
- Fix MAN directory location
@@ -157,4 +157,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/piklab-3.5.13.spec b/redhat/applications/piklab/piklab-3.5.13.spec
index 93fd28370..91aeea1e8 100644
--- a/redhat/applications/piklab/piklab-3.5.13.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.spec
@@ -150,4 +150,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.1.spec b/redhat/applications/potracegui/potracegui-3.5.13.1.spec
index 9dc49956e..a41345cca 100644
--- a/redhat/applications/potracegui/potracegui-3.5.13.1.spec
+++ b/redhat/applications/potracegui/potracegui-3.5.13.1.spec
@@ -127,8 +127,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec
index 371cd9240..76023d7da 100644
--- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec
+++ b/redhat/applications/potracegui/potracegui-3.5.13.2.spec
@@ -130,8 +130,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/potracegui/potracegui-3.5.13.spec b/redhat/applications/potracegui/potracegui-3.5.13.spec
index a90649337..b6d62d09b 100644
--- a/redhat/applications/potracegui/potracegui-3.5.13.spec
+++ b/redhat/applications/potracegui/potracegui-3.5.13.spec
@@ -122,5 +122,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
index 9f121c768..081bc5d98 100644
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13.1.spec
@@ -212,11 +212,11 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
- Updated to build with gcc 4.7. [Commit #15276f36]
- Enables JACK support
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
index dc4b8cdc6..22239302f 100644
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec
@@ -211,11 +211,11 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 1.7.0-2
- Updated to build with gcc 4.7. [Commit #15276f36]
- Enables JACK support
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.spec
index 053e24ad0..f80dc9573 100644
--- a/redhat/applications/rosegarden/rosegarden-3.5.13.spec
+++ b/redhat/applications/rosegarden/rosegarden-3.5.13.spec
@@ -219,4 +219,4 @@ done
- Enables JACK support
* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 1.7.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
index c2effe795..4c3e28317 100644
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.1.spec
@@ -149,8 +149,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
index 4e5c3f16d..79cf16813 100644
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec
@@ -150,8 +150,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
index 9cbfc6941..8143809d4 100644
--- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
+++ b/redhat/applications/smartcardauth/smartcardauth-3.5.13.spec
@@ -140,5 +140,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.1.spec b/redhat/applications/smb4k/smb4k-3.5.13.1.spec
index e54dc0eb4..9b6e0320b 100644
--- a/redhat/applications/smb4k/smb4k-3.5.13.1.spec
+++ b/redhat/applications/smb4k/smb4k-3.5.13.1.spec
@@ -178,11 +178,11 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
- Rebuild for Fedora 17
- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec
index ff61163b4..9e37d98a9 100644
--- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec
+++ b/redhat/applications/smb4k/smb4k-3.5.13.2.spec
@@ -182,11 +182,11 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.4-2
- Rebuild for Fedora 17
- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/smb4k/smb4k-3.5.13.spec b/redhat/applications/smb4k/smb4k-3.5.13.spec
index 23ba5ba87..8eba1163c 100644
--- a/redhat/applications/smb4k/smb4k-3.5.13.spec
+++ b/redhat/applications/smb4k/smb4k-3.5.13.spec
@@ -181,4 +181,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Fix compilation with GCC 4.7 |Commit #b4c7fd48]
* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
index 8e7899fe2..221f14ed2 100644
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.1.spec
@@ -174,8 +174,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec
index 69cd98a8c..f8d9faa30 100644
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec
@@ -177,8 +177,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
index 5cfc41054..1e8955d15 100644
--- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-3.5.13.spec
@@ -169,5 +169,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.8-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec b/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
index c0a61ba05..3ca00a641 100644
--- a/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
+++ b/redhat/applications/tde-guidance/guidance-3.5.13.1.spec
@@ -400,7 +400,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3
- Fix Python search dir
@@ -411,4 +411,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix library locations
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/guidance-3.5.13.spec b/redhat/applications/tde-guidance/guidance-3.5.13.spec
index 4d9452f32..3c7bcb7fe 100644
--- a/redhat/applications/tde-guidance/guidance-3.5.13.spec
+++ b/redhat/applications/tde-guidance/guidance-3.5.13.spec
@@ -387,4 +387,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix library locations
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
index 6d287c7d3..9a1561ec0 100644
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
@@ -435,7 +435,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri May 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-3
- Fix Python search dir
@@ -446,4 +446,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix library locations
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0svn20080103-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec
index 30f8e8a67..e2e128c2b 100644
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec
+++ b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.12.spec
@@ -105,4 +105,4 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec
index d23300c5a..efd966e36 100644
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec
+++ b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.1.spec
@@ -118,7 +118,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
- Rebuilt for Fedora 17
@@ -126,4 +126,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec
index 8834e935a..3acbd7bf3 100644
--- a/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec
+++ b/redhat/applications/tde-style-lipstik/kde-style-lipstik-3.5.13.spec
@@ -117,4 +117,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec
index fe718d23f..ffef5b227 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec
+++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec
@@ -124,7 +124,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.2.3-2
- Rebuilt for Fedora 17
@@ -132,4 +132,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 2.2.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec
index f7f0f040c..d039d84d3 100644
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec
+++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.1.spec
@@ -128,7 +128,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
- Switch to v3.5.13-sru branch
@@ -138,4 +138,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec
index 2fcec0dd2..178acd051 100644
--- a/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec
+++ b/redhat/applications/tde-style-qtcurve/kde-style-qtcurve-3.5.13.spec
@@ -137,4 +137,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec
index b9d4a9d6b..6915852be 100644
--- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec
+++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec
@@ -147,7 +147,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Sep 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.55.2-3
- Switch to v3.5.13-sru branch
@@ -157,4 +157,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Removes post and postun
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.55.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
index 2107afe79..0059bb744 100644
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
+++ b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.1.spec
@@ -143,7 +143,7 @@ xdg-user-dirs-update
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
- Fix XDG menu directory location (again)
@@ -155,5 +155,5 @@ xdg-user-dirs-update
- Fix XDG menu directory location
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
index ed156aba8..926efcf41 100644
--- a/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
+++ b/redhat/applications/tde-systemsettings/kde-systemsettings-3.5.13.spec
@@ -146,5 +146,5 @@ xdg-user-dirs-update
- Fix XDG menu directory location
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
index 767ed5d21..bf6bddbd6 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec
@@ -152,7 +152,7 @@ xdg-user-dirs-update
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
- Fix XDG menu directory location (again)
@@ -164,5 +164,5 @@ xdg-user-dirs-update
- Fix XDG menu directory location
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
index f24f3a2f7..83bfc919b 100644
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
+++ b/redhat/applications/tdeio-locate/kio-locate-3.5.12.spec
@@ -107,5 +107,5 @@ scons install DESTDIR=%{buildroot}
- Fix compilation with GCC 4.7
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
index f673baeb6..24f010d15 100644
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
+++ b/redhat/applications/tdeio-locate/kio-locate-3.5.13.1.spec
@@ -123,7 +123,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
- Rebuilt for Fedora 17
@@ -131,5 +131,5 @@ export PATH="%{tde_bindir}:${PATH}"
- Fix compilation with GCC 4.7
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec b/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
index 72b4e1032..a43cea13a 100644
--- a/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
+++ b/redhat/applications/tdeio-locate/kio-locate-3.5.13.spec
@@ -109,5 +109,5 @@ scons install DESTDIR=%{buildroot}
- Fix compilation with GCC 4.7
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec
index 2f76d01c2..fe83d5815 100644
--- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec
+++ b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec
@@ -136,7 +136,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.5-2
- Rebuilt for Fedora 17
@@ -144,5 +144,5 @@ export PATH="%{tde_bindir}:${PATH}"
- Fix compilation with GCC 4.7
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
index 20b3ceef4..b13800f97 100644
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
+++ b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.1.spec
@@ -143,7 +143,7 @@ fi
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
- Add 'desktop' file, to make this program useful :-)
@@ -153,5 +153,5 @@ fi
- Removes post and postun
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
index 352e39845..968f3cab9 100644
--- a/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
+++ b/redhat/applications/tdeio-umountwrapper/kio-umountwrapper-3.5.13.spec
@@ -136,5 +136,5 @@ fi
- Removes post and postun
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
index cd7a252d8..358ca9f70 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
@@ -140,7 +140,7 @@ fi
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
- Add 'desktop' file, to make this program useful :-)
@@ -150,5 +150,5 @@ fi
- Removes post and postun
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index b7e1940ef..72733522b 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -167,4 +167,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Add missing doc file
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/kradio-3.5.13.1.spec b/redhat/applications/tderadio/kradio-3.5.13.1.spec
index cc5903e88..88ed49959 100644
--- a/redhat/applications/tderadio/kradio-3.5.13.1.spec
+++ b/redhat/applications/tderadio/kradio-3.5.13.1.spec
@@ -168,7 +168,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
- Updates presets
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
- Rebuild for RHEL 5
@@ -179,4 +179,4 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/kradio-3.5.13.spec b/redhat/applications/tderadio/kradio-3.5.13.spec
index dfaedd47d..2282c7994 100644
--- a/redhat/applications/tderadio/kradio-3.5.13.spec
+++ b/redhat/applications/tderadio/kradio-3.5.13.spec
@@ -161,4 +161,4 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
index 8f03de6d2..ae58cf081 100644
--- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec
+++ b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
@@ -182,7 +182,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
- Updates presets
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
- Rebuild for RHEL 5
@@ -193,4 +193,4 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
- Fix HTML directory location
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec b/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec
index 41d24ea5c..d703c162c 100644
--- a/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec
+++ b/redhat/applications/tdesudo/kdesudo-3.5.13.1.spec
@@ -128,7 +128,7 @@ fi
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec
index d1464f829..6cfd9e75c 100644
--- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec
+++ b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec
@@ -135,7 +135,7 @@ fi
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.5.1-2
- Rebuilt for Fedora 17
diff --git a/redhat/applications/tdesvn/kdesvn-3.5.13.1.spec b/redhat/applications/tdesvn/kdesvn-3.5.13.1.spec
index c4b49483f..b6b17d473 100644
--- a/redhat/applications/tdesvn/kdesvn-3.5.13.1.spec
+++ b/redhat/applications/tdesvn/kdesvn-3.5.13.1.spec
@@ -273,7 +273,7 @@ fi
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-3
- Installs SVN protocols as alternative, avoids conlict with TDESDK
@@ -284,4 +284,4 @@ fi
- Fix compilation with GCC 4.7
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdesvn/kdesvn-3.5.13.spec b/redhat/applications/tdesvn/kdesvn-3.5.13.spec
index ce67e8923..0e6f331d8 100644
--- a/redhat/applications/tdesvn/kdesvn-3.5.13.spec
+++ b/redhat/applications/tdesvn/kdesvn-3.5.13.spec
@@ -271,4 +271,4 @@ fi
- Fix compilation with GCC 4.7
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
index 9f467d5d9..54a443726 100644
--- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
+++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
@@ -275,7 +275,7 @@ fi
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-3
- Installs SVN protocols as alternative, avoids conlict with TDESDK
@@ -286,4 +286,4 @@ fi
- Fix compilation with GCC 4.7
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
index bdd0aefab..4c0d455af 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
@@ -119,7 +119,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
- Rebuilt for Fedora 17
@@ -127,4 +127,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Removes the 'lintian' stuff from Debian
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
index 71d5dbdf0..63f849db5 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
@@ -118,4 +118,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Removes the 'lintian' stuff from Debian
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
index 1b1d7dc0c..c653973f1 100644
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
@@ -133,7 +133,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.2.2-2
- Rebuilt for Fedora 17
@@ -141,4 +141,4 @@ update-desktop-database %{tde_appdir} &> /dev/null
- Removes the 'lintian' stuff from Debian
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.2.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.1.spec b/redhat/applications/tellico/tellico-3.5.13.1.spec
index d7abea5b4..4827ec653 100644
--- a/redhat/applications/tellico/tellico-3.5.13.1.spec
+++ b/redhat/applications/tellico/tellico-3.5.13.1.spec
@@ -227,7 +227,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
- Fix compilation with GCC 4.7 [Bug #958]
@@ -236,4 +236,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec
index 5d2cc9006..f28e3d813 100644
--- a/redhat/applications/tellico/tellico-3.5.13.2.spec
+++ b/redhat/applications/tellico/tellico-3.5.13.2.spec
@@ -221,7 +221,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
- Fix compilation with GCC 4.7 [Bug #958]
@@ -230,4 +230,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.spec b/redhat/applications/tellico/tellico-3.5.13.spec
index 575a0b426..64b7fed47 100644
--- a/redhat/applications/tellico/tellico-3.5.13.spec
+++ b/redhat/applications/tellico/tellico-3.5.13.spec
@@ -223,4 +223,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Fix HTML directory location
* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
index 624249bf0..2729aa1bf 100644
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
+++ b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.12.spec
@@ -106,4 +106,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
index 43e81df9c..0c98d0697 100644
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
+++ b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.1.spec
@@ -118,7 +118,7 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
index 0febc8eb1..82a1ccf7e 100644
--- a/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
+++ b/redhat/applications/twin-style-crystal/kwin-style-crystal-3.5.13.spec
@@ -113,4 +113,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec
index d18037573..d110e6813 100644
--- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec
+++ b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec
@@ -123,7 +123,7 @@ export PATH="%{tde_bindir}:${PATH}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
index 6641887f6..642d35393 100644
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
+++ b/redhat/applications/wlassistant/wlassistant-3.5.13.1.spec
@@ -128,7 +128,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
index 1699d55c6..5d103eb87 100644
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
+++ b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec
@@ -137,7 +137,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.5.7-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.spec
index 7c8130a21..97e4344e7 100644
--- a/redhat/applications/wlassistant/wlassistant-3.5.13.spec
+++ b/redhat/applications/wlassistant/wlassistant-3.5.13.spec
@@ -125,4 +125,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%Changelog
* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 0.5.7-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/yakuake/yakuake-3.5.12.spec b/redhat/applications/yakuake/yakuake-3.5.12.spec
index 0bec5e1f4..351a99acb 100644
--- a/redhat/applications/yakuake/yakuake-3.5.12.spec
+++ b/redhat/applications/yakuake/yakuake-3.5.12.spec
@@ -93,5 +93,5 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.1.spec b/redhat/applications/yakuake/yakuake-3.5.13.1.spec
index 8b05e7122..3eae2c506 100644
--- a/redhat/applications/yakuake/yakuake-3.5.13.1.spec
+++ b/redhat/applications/yakuake/yakuake-3.5.13.1.spec
@@ -118,7 +118,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
@@ -130,5 +130,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec
index b4a5292d5..eba5001ac 100644
--- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec
+++ b/redhat/applications/yakuake/yakuake-3.5.13.2.spec
@@ -122,7 +122,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.8.1-4
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-3
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
@@ -134,5 +134,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/applications/yakuake/yakuake-3.5.13.spec b/redhat/applications/yakuake/yakuake-3.5.13.spec
index dd311853e..b21e4e76d 100644
--- a/redhat/applications/yakuake/yakuake-3.5.13.spec
+++ b/redhat/applications/yakuake/yakuake-3.5.13.spec
@@ -122,5 +122,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Correct macro to install under "/opt", if desired
* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 2.8.1-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 8a2c5c242..5c81da101 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -98,7 +98,7 @@ Obsoletes: arts
%endif
%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
+arts (analog real-time synthesizer) is the sound system of TDE.
The principle of arts is to create/process sound using small modules which do
certain tasks. These may be create a waveform (oscillators), play samples,
@@ -235,5 +235,5 @@ cd build
%changelog
-* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/arts/arts-3.5.13.1.spec b/redhat/dependencies/arts/arts-3.5.13.1.spec
index 03a922e4e..4b5f276a4 100644
--- a/redhat/dependencies/arts/arts-3.5.13.1.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.1.spec
@@ -179,4 +179,4 @@ cd build
%changelog
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 17acc05e1..32a0f3102 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -146,4 +146,4 @@ unset QTDIR
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
index e7b01f89b..81652edf4 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.1.spec
@@ -153,4 +153,4 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
%changelog
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
index 18e0f0401..41772b84d 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -151,4 +151,4 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
%changelog
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index ef6247ec4..7657a1bdc 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -119,5 +119,5 @@ cd build
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
index 2223132d7..cf0f70911 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.1.spec
@@ -112,4 +112,4 @@ cd build
%changelog
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 0ddd1f933..217e25493 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -127,4 +127,4 @@ cd build
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
index 95f28d6af..f9953eb5a 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.1.spec
@@ -122,4 +122,4 @@ cd build
%changelog
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index c224832e9..a31156cc2 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -177,4 +177,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.3.22-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 0d6745c90..f792bb98d 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -136,4 +136,4 @@ autoreconf --force --install --symlink
- Add missing BuildRequires
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index 8c4f62ff7..3bb4deca1 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -129,4 +129,4 @@ autoreconf --force --install --symlink
- Build on MGA2
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index d84be561c..1e33edf24 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -168,5 +168,5 @@ echo yes | python ../configure.py \
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index fb3f71ace..9d61f454d 100644
--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@@ -697,6 +697,6 @@ rm -rf %{buildroot}
- Add missing BuildRequires
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
- Switch to Trinity Version
- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.1.spec b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
index 93e69b5ee..9fa6ee8ac 100644
--- a/redhat/dependencies/qt3/qt3-3.5.13.1.spec
+++ b/redhat/dependencies/qt3/qt3-3.5.13.1.spec
@@ -670,7 +670,7 @@ rm -rf %{buildroot}
%changelog
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
- Fix Provides and Obsoletes, again and again ...
@@ -694,6 +694,6 @@ rm -rf %{buildroot}
- Add missing BuildRequires
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
- Switch to Trinity Version
- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
index 1e29d2984..0c4d25c81 100644
--- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec
+++ b/redhat/dependencies/qt3/qt3-3.5.13.2.spec
@@ -629,7 +629,7 @@ rm -rf %{buildroot}
- Initial release for TDE 3.5.13.2
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-9
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
- Fix Provides and Obsoletes, again and again ...
@@ -653,6 +653,6 @@ rm -rf %{buildroot}
- Add missing BuildRequires
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
-- Initial build for RHEL 6, RHEL 5, and Fedora 15
+- Initial release for RHEL 6, RHEL 5, and Fedora 15
- Switch to Trinity Version
- Spec file based on RHEL 6 'qt3-3.3.8b-29'
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 2de637176..adc9f2641 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -133,4 +133,4 @@ python ../configure.py \
%changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE R14, using 'tqt3' instead of 'qt3'
+- Initial release for TDE R14, using 'tqt3' instead of 'qt3'
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index 83531ed01..1112dfbbb 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -81,4 +81,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
index 003eb95e5..9b07e7087 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec
@@ -103,4 +103,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
- Renames TQCA to QCA in source code
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index e2b23a10b..7d46981ae 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -120,4 +120,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-3
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
index eefe8a16e..423c9104d 100644
--- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec
+++ b/redhat/dependencies/tqca/tqca-3.5.13.2.spec
@@ -128,4 +128,4 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
- Renames TQCA to QCA in source code
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 7bad7ffb1..021d612f3 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -175,4 +175,4 @@ done
%changelog
* Tue Jul 02 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 33b5ecfc5..2b178e846 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -7,14 +7,6 @@
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
-# The following QT4 packages should NOT be installed to
-# allow QT3 compilation (please uninstall them prior to compile)
-# qt
-# qt-sqlite
-# qt-mysql
-# qt-x11
-# qt-devel
-# ...maybe others !!!!
Name: trinity-tqt3
Version: 3.5.0
@@ -585,4 +577,4 @@ export PATH=${QTDIR}/stripbin:${QTDIR}/bin:$PATH
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
-- Initial build for TDE R14.0.0
+- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index e9ddaadcb..5f26d41ca 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -171,4 +171,4 @@ done
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/extras/akode/akode-3.5.13.1.spec b/redhat/extras/akode/akode-3.5.13.1.spec
index 2c3edf62e..aae1f4ec2 100644
--- a/redhat/extras/akode/akode-3.5.13.1.spec
+++ b/redhat/extras/akode/akode-3.5.13.1.spec
@@ -260,7 +260,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
- Re-adds '.la' files
diff --git a/redhat/extras/akode/akode-3.5.13.2.spec b/redhat/extras/akode/akode-3.5.13.2.spec
index cdedc117b..39239c86c 100644
--- a/redhat/extras/akode/akode-3.5.13.2.spec
+++ b/redhat/extras/akode/akode-3.5.13.2.spec
@@ -343,7 +343,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
- Re-adds '.la' files
diff --git a/redhat/extras/kasablanca/kasablanca-3.5.13.1.spec b/redhat/extras/kasablanca/kasablanca-3.5.13.1.spec
index effbdeefa..37345953e 100644
--- a/redhat/extras/kasablanca/kasablanca-3.5.13.1.spec
+++ b/redhat/extras/kasablanca/kasablanca-3.5.13.1.spec
@@ -175,8 +175,8 @@ gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'
diff --git a/redhat/extras/kasablanca/kasablanca-3.5.13.2.spec b/redhat/extras/kasablanca/kasablanca-3.5.13.2.spec
index c9468b9c2..050fc4689 100644
--- a/redhat/extras/kasablanca/kasablanca-3.5.13.2.spec
+++ b/redhat/extras/kasablanca/kasablanca-3.5.13.2.spec
@@ -181,8 +181,8 @@ gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'
diff --git a/redhat/extras/kasablanca/kasablanca-3.5.13.spec b/redhat/extras/kasablanca/kasablanca-3.5.13.spec
index 16c5f61ce..cb8c68e9a 100644
--- a/redhat/extras/kasablanca/kasablanca-3.5.13.spec
+++ b/redhat/extras/kasablanca/kasablanca-3.5.13.spec
@@ -165,5 +165,5 @@ gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Based on Fedora 12 Spec 'kasablanca-0.4.0.2-17'
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
index 4a1b84a1d..ee835164b 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.1.spec
@@ -95,7 +95,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
index 18e6c3339..a0e684814 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.2.spec
@@ -98,7 +98,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
index 31e76f50b..eb4540bd2 100644
--- a/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
+++ b/redhat/extras/kickoff-i18n/kickoff-i18n-3.5.13.spec
@@ -86,4 +86,4 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%changelog
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial build for TDE 3.5.13
+- Initial release for TDE 3.5.13
diff --git a/redhat/extras/ksensors/ksensors-3.5.13.1.spec b/redhat/extras/ksensors/ksensors-3.5.13.1.spec
index f00bcc569..1c2936730 100644
--- a/redhat/extras/ksensors/ksensors-3.5.13.1.spec
+++ b/redhat/extras/ksensors/ksensors-3.5.13.1.spec
@@ -158,7 +158,7 @@ done
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
- Update Debian patch to -18 release
diff --git a/redhat/extras/ksensors/ksensors-3.5.13.2.spec b/redhat/extras/ksensors/ksensors-3.5.13.2.spec
index 5f97dd4e1..6114d78da 100644
--- a/redhat/extras/ksensors/ksensors-3.5.13.2.spec
+++ b/redhat/extras/ksensors/ksensors-3.5.13.2.spec
@@ -161,7 +161,7 @@ done
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p3
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Thu Dec 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-19p2
- Update Debian patch to -18 release
diff --git a/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec b/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec
index 29fa1131d..8e61b21ea 100644
--- a/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec
+++ b/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.1.spec
@@ -116,7 +116,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-1
- Initial version for TDE 3.5.13
diff --git a/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec b/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec
index 885ee3e88..8a1757769 100644
--- a/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec
+++ b/redhat/extras/style-ia-ora/style-ia-ora-3.5.13.2.spec
@@ -119,7 +119,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-2
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.8-1
- Initial version for TDE 3.5.13
diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec
index 78d77eed8..ef5ef5c7e 100644
--- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec
+++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.1.spec
@@ -167,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Nov 20 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue Jan 8 2008 Javier Rodas <jrodas@zarb.org> 0.8-2plf2008.1
- KDE 3.5.8 version in Mandriva 2008.1
diff --git a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec
index 4ed4a9307..09dfee3b6 100644
--- a/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec
+++ b/redhat/extras/theme-baghira/theme-baghira-3.5.13.2.spec
@@ -174,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
- Initial release for TDE 3.5.13.2
* Tue Nov 20 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Tue Jan 8 2008 Javier Rodas <jrodas@zarb.org> 0.8-2plf2008.1
- KDE 3.5.8 version in Mandriva 2008.1
diff --git a/redhat/extras/trinity-live/trinity-live.spec b/redhat/extras/trinity-live/trinity-live.spec
index e66cc7219..fd61344ff 100644
--- a/redhat/extras/trinity-live/trinity-live.spec
+++ b/redhat/extras/trinity-live/trinity-live.spec
@@ -76,7 +76,7 @@ EOF
%changelog
* Sun Oct 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Updates with new split packages
@@ -91,4 +91,4 @@ EOF
- Add more applications
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
-- Initial build
+- Initial release
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
index e774348b8..a6f4ce8b9 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
@@ -162,4 +162,4 @@ done
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
index d2e2dfe2c..d42c6ef8c 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
@@ -169,4 +169,4 @@ done
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
index 537aae5cc..26058fe71 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
@@ -151,4 +151,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
index a986160a3..2aa947dc4 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
@@ -158,4 +158,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec
index dda363ec7..116c8740f 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec
@@ -166,4 +166,4 @@ done
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
index f430a3985..45ede0c38 100644
--- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
+++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
@@ -173,4 +173,4 @@ done
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 4cfac52cc..c5d093478 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -499,4 +499,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index fd6c0d9b0..86943b89e 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -499,4 +499,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.spec
index 815c83075..ddbff4f41 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.spec
@@ -420,4 +420,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
index 1016562fd..c0cf78e18 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
@@ -139,4 +139,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial build for TDE 3.5.13.2
+- Initial release for TDE 3.5.13.2
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
index 0c45258cc..d8cacece0 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
@@ -128,4 +128,4 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec
index 18de0507e..d8c991ba1 100644
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec
+++ b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec
@@ -212,4 +212,4 @@ done
- Fix hardcoded path to Guidance python libraries [Bug #999]
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
index b0696ad3e..dfc5520f9 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
@@ -174,4 +174,4 @@ export PATH="%{tde_bindir}:${PATH}"
- Fix compilation for RHEL 5
* Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
-- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/tde-i18n/tde-i18n-3.5.13.1.spec b/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
index 55a9ffb58..bd5bdbd80 100644
--- a/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
+++ b/redhat/tde-i18n/tde-i18n-3.5.13.1.spec
@@ -1242,7 +1242,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%changelog
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
- Renames to 'trinity-i18n'
diff --git a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
index 5aaea6aa3..908c0ad57 100644
--- a/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
+++ b/redhat/tde-i18n/tde-i18n-3.5.13.2.spec
@@ -1254,7 +1254,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
* Wed Aug 15 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
- Renames to 'trinity-i18n'
diff --git a/redhat/tdeaccessibility/kdeaccessibility-3.5.12.spec b/redhat/tdeaccessibility/kdeaccessibility-3.5.12.spec
index 633fdc76b..5323425dd 100644
--- a/redhat/tdeaccessibility/kdeaccessibility-3.5.12.spec
+++ b/redhat/tdeaccessibility/kdeaccessibility-3.5.12.spec
@@ -175,6 +175,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdeaccessibility/kdeaccessibility-3.5.13.1.spec b/redhat/tdeaccessibility/kdeaccessibility-3.5.13.1.spec
index 9fcde2131..085e966c9 100644
--- a/redhat/tdeaccessibility/kdeaccessibility-3.5.13.1.spec
+++ b/redhat/tdeaccessibility/kdeaccessibility-3.5.13.1.spec
@@ -522,4 +522,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeaddons/kdeaddons-3.5.12.spec b/redhat/tdeaddons/kdeaddons-3.5.12.spec
index 348dd4d30..40bc63aee 100644
--- a/redhat/tdeaddons/kdeaddons-3.5.12.spec
+++ b/redhat/tdeaddons/kdeaddons-3.5.12.spec
@@ -244,6 +244,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdeaddons-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdeaddons/kdeaddons-3.5.13.1.spec b/redhat/tdeaddons/kdeaddons-3.5.13.1.spec
index be4560c8f..8b3f3dd60 100644
--- a/redhat/tdeaddons/kdeaddons-3.5.13.1.spec
+++ b/redhat/tdeaddons/kdeaddons-3.5.13.1.spec
@@ -727,4 +727,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeadmin/kdeadmin-3.5.12.spec b/redhat/tdeadmin/kdeadmin-3.5.12.spec
index 73af2969a..939c929de 100644
--- a/redhat/tdeadmin/kdeadmin-3.5.12.spec
+++ b/redhat/tdeadmin/kdeadmin-3.5.12.spec
@@ -192,6 +192,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdeadmin-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdeadmin/kdeadmin-3.5.13.1.spec b/redhat/tdeadmin/kdeadmin-3.5.13.1.spec
index 89a58392b..788ce403f 100644
--- a/redhat/tdeadmin/kdeadmin-3.5.13.1.spec
+++ b/redhat/tdeadmin/kdeadmin-3.5.13.1.spec
@@ -479,4 +479,4 @@ done
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeartwork/kdeartwork-3.5.13.1.spec b/redhat/tdeartwork/kdeartwork-3.5.13.1.spec
index 32c66dd05..076ab023c 100644
--- a/redhat/tdeartwork/kdeartwork-3.5.13.1.spec
+++ b/redhat/tdeartwork/kdeartwork-3.5.13.1.spec
@@ -698,4 +698,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdebase/kdebase-3.5.13.1.spec b/redhat/tdebase/kdebase-3.5.13.1.spec
index f58a045fb..4812fea90 100644
--- a/redhat/tdebase/kdebase-3.5.13.1.spec
+++ b/redhat/tdebase/kdebase-3.5.13.1.spec
@@ -3263,4 +3263,4 @@ EOF
- openSUSE: fix TDM detection by XDM scripts
* Mon Sep 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 662e11f80..9d0c4e21c 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -3436,4 +3436,4 @@ EOF
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdebindings/kdebindings-3.5.13.1.spec b/redhat/tdebindings/kdebindings-3.5.13.1.spec
index e94009b78..a66b202d3 100644
--- a/redhat/tdebindings/kdebindings-3.5.13.1.spec
+++ b/redhat/tdebindings/kdebindings-3.5.13.1.spec
@@ -1109,4 +1109,4 @@ fi
%changelog
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeedu/kdeedu-3.5.12.spec b/redhat/tdeedu/kdeedu-3.5.12.spec
index 744c4c8e4..89870eca1 100644
--- a/redhat/tdeedu/kdeedu-3.5.12.spec
+++ b/redhat/tdeedu/kdeedu-3.5.12.spec
@@ -230,6 +230,6 @@ update-desktop-database >& /dev/null ||:
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdeedu-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdeedu/kdeedu-3.5.13.1.spec b/redhat/tdeedu/kdeedu-3.5.13.1.spec
index 40e829b90..961936cb5 100644
--- a/redhat/tdeedu/kdeedu-3.5.13.1.spec
+++ b/redhat/tdeedu/kdeedu-3.5.13.1.spec
@@ -1397,4 +1397,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdegames/kdegames-3.5.12.spec b/redhat/tdegames/kdegames-3.5.12.spec
index 148a3c7d2..0d2ededcf 100644
--- a/redhat/tdegames/kdegames-3.5.12.spec
+++ b/redhat/tdegames/kdegames-3.5.12.spec
@@ -191,6 +191,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdegames-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdegames/kdegames-3.5.13.1.spec b/redhat/tdegames/kdegames-3.5.13.1.spec
index d8dffc2ad..8ed35436d 100644
--- a/redhat/tdegames/kdegames-3.5.13.1.spec
+++ b/redhat/tdegames/kdegames-3.5.13.1.spec
@@ -1601,4 +1601,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdegraphics/kdegraphics-3.5.12.spec b/redhat/tdegraphics/kdegraphics-3.5.12.spec
index 9e1e07e3b..d43b5315a 100644
--- a/redhat/tdegraphics/kdegraphics-3.5.12.spec
+++ b/redhat/tdegraphics/kdegraphics-3.5.12.spec
@@ -365,5 +365,5 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Correct macro to install under "/opt", if desired
* Thu Jun 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
-- Initial build for RHEL 6.0
+- Initial release for RHEL 6.0
- SPEC file taken from Fedora 8 "kdegraphics 7:3.5.10-1"
diff --git a/redhat/tdegraphics/kdegraphics-3.5.13.1.spec b/redhat/tdegraphics/kdegraphics-3.5.13.1.spec
index 2268633da..eaa53b7bd 100644
--- a/redhat/tdegraphics/kdegraphics-3.5.13.1.spec
+++ b/redhat/tdegraphics/kdegraphics-3.5.13.1.spec
@@ -1309,4 +1309,4 @@ done
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdelibs/kdelibs-3.5.13.1.spec b/redhat/tdelibs/kdelibs-3.5.13.1.spec
index 67847efec..88d4e36f6 100644
--- a/redhat/tdelibs/kdelibs-3.5.13.1.spec
+++ b/redhat/tdelibs/kdelibs-3.5.13.1.spec
@@ -431,4 +431,4 @@ EOF
%changelog
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index e0090666a..22303545a 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -481,4 +481,4 @@ echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.12.spec b/redhat/tdemultimedia/kdemultimedia-3.5.12.spec
index e7dd20564..28565c4a9 100644
--- a/redhat/tdemultimedia/kdemultimedia-3.5.12.spec
+++ b/redhat/tdemultimedia/kdemultimedia-3.5.12.spec
@@ -392,5 +392,5 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec b/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
index 3bd093778..519d50aaa 100644
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
+++ b/redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
@@ -1182,4 +1182,4 @@ fi
%changelog
* Sat Sep 29 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 8333db174..c1378b00f 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -1227,4 +1227,4 @@ fi
%changelog
* Mon Jun 17 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial build for TDE 14.0.0
+- Initial release for TDE 14.0.0
diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1.spec b/redhat/tdenetwork/kdenetwork-3.5.13.1.spec
index 17f8e2140..02d1fe58e 100644
--- a/redhat/tdenetwork/kdenetwork-3.5.13.1.spec
+++ b/redhat/tdenetwork/kdenetwork-3.5.13.1.spec
@@ -1185,4 +1185,4 @@ EOF
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdepim/kdepim-3.5.13.1.spec b/redhat/tdepim/kdepim-3.5.13.1.spec
index e95b6798e..eeaec366e 100644
--- a/redhat/tdepim/kdepim-3.5.13.1.spec
+++ b/redhat/tdepim/kdepim-3.5.13.1.spec
@@ -2163,4 +2163,4 @@ export PATH="%{_bindir}:${PATH}"
- Fix korganizer packaging
* Tue Sep 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdesdk/kdesdk-3.5.13.1.spec b/redhat/tdesdk/kdesdk-3.5.13.1.spec
index 1301a84ab..3d4ec0056 100644
--- a/redhat/tdesdk/kdesdk-3.5.13.1.spec
+++ b/redhat/tdesdk/kdesdk-3.5.13.1.spec
@@ -1158,4 +1158,4 @@ fi
- Fix various cmake issues [Bug #1262]
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdetoys/kdetoys-3.5.13.1.spec b/redhat/tdetoys/kdetoys-3.5.13.1.spec
index 15373cca0..364cb87e9 100644
--- a/redhat/tdetoys/kdetoys-3.5.13.1.spec
+++ b/redhat/tdetoys/kdetoys-3.5.13.1.spec
@@ -447,4 +447,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdeutils/kdeutils-3.5.13.1.spec b/redhat/tdeutils/kdeutils-3.5.13.1.spec
index a7465fceb..75385a030 100644
--- a/redhat/tdeutils/kdeutils-3.5.13.1.spec
+++ b/redhat/tdeutils/kdeutils-3.5.13.1.spec
@@ -1035,4 +1035,4 @@ fi
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdevelop/kdevelop-3.5.12.spec b/redhat/tdevelop/kdevelop-3.5.12.spec
index de36a42ff..7c63141c3 100644
--- a/redhat/tdevelop/kdevelop-3.5.12.spec
+++ b/redhat/tdevelop/kdevelop-3.5.12.spec
@@ -249,6 +249,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6
+- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdeedu-3.5.3-1"
- Import to GIT
diff --git a/redhat/tdevelop/kdevelop-3.5.13.1.spec b/redhat/tdevelop/kdevelop-3.5.13.1.spec
index 2a8d59cc2..f2983f77c 100644
--- a/redhat/tdevelop/kdevelop-3.5.13.1.spec
+++ b/redhat/tdevelop/kdevelop-3.5.13.1.spec
@@ -633,4 +633,4 @@ cd ..
%changelog
* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/tdewebdev/kdewebdev-3.5.12.spec b/redhat/tdewebdev/kdewebdev-3.5.12.spec
index 9dcec5cd7..611b7dbc6 100644
--- a/redhat/tdewebdev/kdewebdev-3.5.12.spec
+++ b/redhat/tdewebdev/kdewebdev-3.5.12.spec
@@ -223,6 +223,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Add support for RHEL5
* Thu Sep 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
-- Initial build for RHEL 6 / Fedora 15
+- Initial release for RHEL 6 / Fedora 15
- Use Spec file from Fedora8 "kdewebdev-3.5.10-1"
- Import to GIT
diff --git a/redhat/tdewebdev/kdewebdev-3.5.13.1.spec b/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
index b415c063f..6d664bab4 100644
--- a/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
+++ b/redhat/tdewebdev/kdewebdev-3.5.13.1.spec
@@ -563,4 +563,4 @@ popd
%changelog
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
-- Initial build for TDE 3.5.13.1
+- Initial release for TDE 3.5.13.1
diff --git a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu b/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu
+++ b/ubuntu/maverick/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/maverick/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/ubuntu/maverick/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/ubuntu/maverick/applications/bibletime/debian/menu
+++ b/ubuntu/maverick/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/ubuntu/maverick/applications/filelight/debian/menu b/ubuntu/maverick/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/ubuntu/maverick/applications/filelight/debian/menu
+++ b/ubuntu/maverick/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/ubuntu/maverick/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/ubuntu/maverick/applications/gwenview/debian/menu
+++ b/ubuntu/maverick/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.menu b/ubuntu/maverick/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.menu
+++ b/ubuntu/maverick/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index d9a4ccd4e..96101dafe 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/ubuntu/maverick/applications/kaffeine/debian/menu b/ubuntu/maverick/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/menu
+++ b/ubuntu/maverick/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/ubuntu/maverick/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/menu
+++ b/ubuntu/maverick/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/ubuntu/maverick/applications/kcpuload/debian/menu b/ubuntu/maverick/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/menu
+++ b/ubuntu/maverick/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/ubuntu/maverick/applications/keep/debian/control b/ubuntu/maverick/applications/keep/debian/control
index f3213cd45..17e87e581 100644
--- a/ubuntu/maverick/applications/keep/debian/control
+++ b/ubuntu/maverick/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/ubuntu/maverick/applications/keep/debian/keep.xml b/ubuntu/maverick/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/ubuntu/maverick/applications/keep/debian/keep.xml
+++ b/ubuntu/maverick/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/ubuntu/maverick/applications/keep/debian/rules
+++ b/ubuntu/maverick/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/ubuntu/maverick/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/ubuntu/maverick/applications/kile/debian/menu
+++ b/ubuntu/maverick/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/ubuntu/maverick/applications/kmatplot/debian/menu b/ubuntu/maverick/applications/kmatplot/debian/menu
index 6cb3a60a8..31de047d3 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/menu
+++ b/ubuntu/maverick/applications/kmatplot/debian/menu
@@ -1,2 +1,2 @@
?package(kmatplot):needs="X11" section="Apps/Math"\
- title="kmatplot" command="/usr/bin/kmatplot"
+ title="kmatplot" command="/opt/trinity/bin/kmatplot"
diff --git a/ubuntu/maverick/applications/knetload/debian/menu b/ubuntu/maverick/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/ubuntu/maverick/applications/knetload/debian/menu
+++ b/ubuntu/maverick/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/menu b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/ubuntu/maverick/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-trinity.menu
+++ b/ubuntu/maverick/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/ubuntu/maverick/applications/konversation/debian/control b/ubuntu/maverick/applications/konversation/debian/control
index 9728d2f8e..7d96a609e 100644
--- a/ubuntu/maverick/applications/konversation/debian/control
+++ b/ubuntu/maverick/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/maverick/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/maverick/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/maverick/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/ubuntu/maverick/applications/konversation/debian/rules
+++ b/ubuntu/maverick/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/maverick/applications/kpicosim/debian/menu b/ubuntu/maverick/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/menu
+++ b/ubuntu/maverick/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/ubuntu/maverick/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/ubuntu/maverick/applications/krusader/debian/menu
+++ b/ubuntu/maverick/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/ubuntu/maverick/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/menu
+++ b/ubuntu/maverick/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu
+++ b/ubuntu/maverick/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/ubuntu/maverick/applications/smb4k/debian/menu b/ubuntu/maverick/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/ubuntu/maverick/applications/smb4k/debian/menu
+++ b/ubuntu/maverick/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/control b/ubuntu/maverick/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/control
+++ b/ubuntu/maverick/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/install b/ubuntu/maverick/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/install
+++ b/ubuntu/maverick/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/manpages b/ubuntu/maverick/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/manpages
+++ b/ubuntu/maverick/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/menu b/ubuntu/maverick/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/menu
+++ b/ubuntu/maverick/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/rules b/ubuntu/maverick/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/maverick/applications/tdepowersave/debian/rules
+++ b/ubuntu/maverick/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
index 0ab1d6f90..d79cfd21d 100644
--- a/debian/squeeze/applications/tdepowersave/debian/kpowersave.1
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.1
@@ -1,12 +1,12 @@
.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
.SH NAME
-kpowersave
-\- A KDE KPart Application
+tdepowersave
+\- A TDE KPart Application
.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
+tdepowersave [Qt\-options] [TDE\-options]
.SH DESCRIPTION
-A KDE KPart Application
+A TDE KPart Application
.SH OPTIONS
.SS Generic options:
.TP
@@ -16,8 +16,8 @@ Show help about options
.B \-\-help\-qt
Show Qt specific options
.TP
-.B \-\-help\-kde
-Show KDE specific options
+.B \-\-help\-tde
+Show TDE specific options
.TP
.B \-\-help\-all
Show all options
@@ -34,7 +34,7 @@ Show license information
.B \-\-
End of options
.SS
-.SS KDE options:
+.SS TDE options:
.TP
.B \-\-caption <caption>
Use 'caption' as name in the titlebar
@@ -133,10 +133,10 @@ mirrors the whole layout of widgets
.SS
.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
+.BR "`khelpcenter help:/tdepowersave/'"
from the command-line.
.br
.SH AUTHORS
diff --git a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
index 99d178492..a7b0f2e7c 100644
--- a/debian/lenny/applications/tdepowersave/debian/kpowersave.xpm
+++ b/ubuntu/maverick/applications/tdepowersave/debian/tdepowersave.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * kpowersave_xpm[] = {
+static char * tdepowersave_xpm[] = {
"32 32 593 2",
" c None",
". c #6D2121",
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/watch b/ubuntu/maverick/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/maverick/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/ubuntu/maverick/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/maverick/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu
+++ b/ubuntu/maverick/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
index a4e1eaef5..df08f2d37 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/debian-qt-kde.mk
@@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
fi
if test -e debian/$(cdbs_curpkg).presubj; then \
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
index 73907fedd..24dc70519 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kcoloredit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorChooser"\
- icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
- icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcolorchooser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
command="/opt/trinity/bin/kcolorchooser"
?package(kcoloredit):\
@@ -12,8 +12,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorEdit"\
- icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
- icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcoloredit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcoloredit-16.xpm"\
command="/opt/trinity/bin/kcoloredit"
# Icon 22x22 kcoloredit/cr22-app-kcolorchooser.png kcolorchooser.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..f1bfa96a5 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kdvi-trinity.menu
@@ -1,10 +1,10 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
- icon32x32="/usr/share/pixmaps/kdvi.xpm"\
- icon16x16="/usr/share/pixmaps/kdvi-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
command="/opt/trinity/bin/kdvi"
# Icon 32x32 kdvi/pix/cr32-app-kdvi.png kdvi.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
index 344e227f7..810a67ff6 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfax-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFax"\
- icon32x32="/usr/share/pixmaps/kfax.xpm"\
- icon16x16="/usr/share/pixmaps/kfax-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfax.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfax-16.xpm"\
command="/opt/trinity/bin/kfax"
# Icon 32x32 kfax/cr32-app-kfax.png kfax.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
index edc02c8d2..a44fcd5a1 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kfaxview-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFaxView"\
- icon32x32="/usr/share/pixmaps/kfaxview.xpm"\
- icon16x16="/usr/share/pixmaps/kfaxview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfaxview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfaxview-16.xpm"\
command="/opt/trinity/bin/kfaxview"
# Icon 32x32 kfaxview/hi32-app-kfaxview.png kfaxview.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..cd27c5660 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kghostview-trinity.menu
@@ -1,10 +1,10 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
- icon32x32="/usr/share/pixmaps/kghostview.xpm"\
- icon16x16="/usr/share/pixmaps/kghostview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
command="/opt/trinity/bin/kghostview"
# Icon 32x32 kghostview/cr32-app-kghostview.png kghostview.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
index e8a17b104..7fb1d2a3b 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kiconedit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="TDEIconEdit"\
- icon32x32="/usr/share/pixmaps/kiconedit.xpm"\
- icon16x16="/usr/share/pixmaps/kiconedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
command="/opt/trinity/bin/kiconedit"
# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 53e88edba..9372e79f3 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kolourpaint-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KolourPaint"\
- icon32x32="/usr/share/pixmaps/kolourpaint.xpm"\
- icon16x16="/usr/share/pixmaps/kolourpaint-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kolourpaint.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolourpaint-16.xpm"\
command="/opt/trinity/bin/kolourpaint"
# Icon 32x32 kolourpaint/pics/hi32-app-kolourpaint.png kolourpaint.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
index 63fcecea8..e922d7a70 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kooka-trinity.menu
@@ -3,9 +3,9 @@
section="Applications/Graphics"\
hints="TDE"\
title="Kooka"\
- icon32x32="/usr/share/pixmaps/kooka.xpm"\
- icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kooka.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kooka-16.xpm"\
command="/opt/trinity/bin/kooka"
-# Icon 32x32 /usr/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
-# Icon 16x16 /usr/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
+# Icon 32x32 /opt/trinity/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
+# Icon 16x16 /opt/trinity/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
index 971b89101..da324176a 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpdf-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KPDF"\
- icon32x32="/usr/share/pixmaps/kpdf.xpm"\
- icon16x16="/usr/share/pixmaps/kpdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpdf-16.xpm"\
command="/opt/trinity/bin/kpdf"
# Icon 32x32 kpdf/cr32-app-kpdf.png kpdf.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..3287726f7 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kpovmodeler-trinity.menu
@@ -1,10 +1,10 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
- icon32x32="/usr/share/pixmaps/kpovmodeler.xpm"\
- icon16x16="/usr/share/pixmaps/kpovmodeler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
command="/opt/trinity/bin/kpovmodeler"
# Icon 32x32 kpovmodeler/cr32-app-kpovmodeler.png kpovmodeler.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
index 0f1e9c2c1..906bcae11 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kruler-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KRuler"\
- icon32x32="/usr/share/pixmaps/kruler.xpm"\
- icon16x16="/usr/share/pixmaps/kruler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kruler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kruler-16.xpm"\
command="/opt/trinity/bin/kruler"
# Icon 32x32 kruler/pics/cr32-app-kruler.png kruler.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
index c490d6cf4..b82c77733 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/ksnapshot-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KSnapshot"\
- icon32x32="/usr/share/pixmaps/ksnapshot.xpm"\
- icon16x16="/usr/share/pixmaps/ksnapshot-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnapshot.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnapshot-16.xpm"\
command="/opt/trinity/bin/ksnapshot"
# Icon 32x32 ksnapshot/cr32-app-ksnapshot.png ksnapshot.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
index 3e92e9147..ed69377fb 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e40a31e43 100644
--- a/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
+++ b/ubuntu/maverick/kdegraphics.automake/debian/kview-trinity.menu
@@ -1,10 +1,10 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
- icon32x32="/usr/share/pixmaps/kview.xpm"\
- icon16x16="/usr/share/pixmaps/kview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
command="/opt/trinity/bin/kview"
# Icon 32x32 kview/cr32-app-kview.png kview.xpm
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
index d135c4257..4a11bc028 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/debian-qt-kde.mk
@@ -75,11 +75,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
if test -e debian/$(cdbs_curpkg).lintian; then \
install -p -D -m644 debian/$(cdbs_curpkg).lintian \
- debian/$(cdbs_curpkg)/opt/trinity/share/lintian/overrides/$(cdbs_curpkg); \
+ debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
fi
if test -e debian/$(cdbs_curpkg).presubj; then \
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
- debian/$(cdbs_curpkg)/opt/trinity/share/bug/$(cdbs_curpkg)/presubj; \
+ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
diff --git a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu
index 7f40efdc4..dbf27f386 100644
--- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu
+++ b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity.menu
@@ -1,8 +1,8 @@
-?package(kdevelop):\
+?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/kdevelop.xpm"\
- command="/opt/trinity/bin/kdevelop"
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
+ command="/opt/trinity/bin/tdevelop"
diff --git a/ubuntu/maverick/metapackages/rename-meta/Makefile b/ubuntu/maverick/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/Makefile
+++ b/ubuntu/maverick/metapackages/rename-meta/Makefile
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/changelog b/ubuntu/maverick/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/compat b/ubuntu/maverick/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/compat
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/dirs b/ubuntu/maverick/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -1,5 +1,5 @@
#! /bin/sh
-# postinst script for kdm-kde3
+# postinst script for kdm-trinity
#
# see: dh_installdeb(1)
diff --git a/ubuntu/maverick/metapackages/trinity-livecd/debian/control b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
index a6e95b5b5..6adca2f1e 100644
--- a/ubuntu/maverick/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/maverick/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
Package: trinity-livecd
Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
Recommends:
kpresenter-trinity, kspread-trinity, kword-trinity,
tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,
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/tdeaccessibility/debian/control b/ubuntu/maverick/tdeaccessibility/debian/control
index 3d7149dd4..efaba8305 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/control
+++ b/ubuntu/maverick/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/ubuntu/maverick/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/maverick/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/maverick/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 09df752cf..ca1cdd6d6 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/maverick/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/ubuntu/maverick/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/ubuntu/maverick/tdebase/debian/kate-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/ubuntu/maverick/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/ubuntu/maverick/tdebase/debian/konqueror-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/ubuntu/maverick/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/ubuntu/maverick/tdebase/debian/ksysguard-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
+++ b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/maverick/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/ubuntu/maverick/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/ubuntu/maverick/tdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/ubuntu/maverick/tdegames/debian/katomic-trinity.menu b/ubuntu/maverick/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/ubuntu/maverick/tdegames/debian/katomic-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu b/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/ubuntu/maverick/tdegames/debian/klickety-trinity.menu b/ubuntu/maverick/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/ubuntu/maverick/tdegames/debian/klickety-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/ubuntu/maverick/tdegames/debian/klines-trinity.menu b/ubuntu/maverick/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/ubuntu/maverick/tdegames/debian/klines-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu b/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/ubuntu/maverick/tdegames/debian/kmines-trinity.menu b/ubuntu/maverick/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/ubuntu/maverick/tdegames/debian/kmines-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu b/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/ubuntu/maverick/tdegames/debian/kolf-trinity.menu b/ubuntu/maverick/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/ubuntu/maverick/tdegames/debian/kolf-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/ubuntu/maverick/tdegames/debian/konquest-trinity.menu b/ubuntu/maverick/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/ubuntu/maverick/tdegames/debian/konquest-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/ubuntu/maverick/tdegames/debian/kpat-trinity.menu b/ubuntu/maverick/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/ubuntu/maverick/tdegames/debian/kpat-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu b/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu b/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/ubuntu/maverick/tdegames/debian/ksame-trinity.menu b/ubuntu/maverick/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/ubuntu/maverick/tdegames/debian/ksame-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu b/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu b/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu b/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/ubuntu/maverick/tdegames/debian/ktron-trinity.menu b/ubuntu/maverick/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/ubuntu/maverick/tdegames/debian/ktron-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/ubuntu/maverick/tdegames/debian/lskat-trinity.menu b/ubuntu/maverick/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/ubuntu/maverick/tdegames/debian/lskat-trinity.menu
+++ b/ubuntu/maverick/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/maverick/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/maverick/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu b/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/ubuntu/maverick/tdepim/debian/karm-trinity.menu b/ubuntu/maverick/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/ubuntu/maverick/tdepim/debian/karm-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu b/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu b/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/ubuntu/maverick/tdepim/debian/knode-trinity.menu b/ubuntu/maverick/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/ubuntu/maverick/tdepim/debian/knode-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu b/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu b/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu b/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/ubuntu/maverick/tdepim/debian/korn-trinity.menu b/ubuntu/maverick/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/ubuntu/maverick/tdepim/debian/korn-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu b/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/ubuntu/maverick/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/maverick/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index d0556e97b..599a692dd 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/maverick/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/ubuntu/maverick/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.install
diff --git a/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/ubuntu/maverick/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/ubuntu/maverick/tdeutils/debian/kdessh-trinity.install
+++ b/ubuntu/maverick/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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/abakus/debian/abakus-trinity.menu b/ubuntu/precise/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/ubuntu/precise/applications/abakus/debian/abakus-trinity.menu
+++ b/ubuntu/precise/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/ubuntu/precise/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/precise/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/precise/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/ubuntu/precise/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/ubuntu/precise/applications/amarok/debian/amarok-trinity.menu b/ubuntu/precise/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/precise/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/precise/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/ubuntu/precise/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/ubuntu/precise/applications/bibletime/debian/menu
+++ b/ubuntu/precise/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/ubuntu/precise/applications/digikam/debian/digikam-trinity.menu b/ubuntu/precise/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/ubuntu/precise/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/precise/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/ubuntu/precise/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/precise/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/ubuntu/precise/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/precise/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/ubuntu/precise/applications/filelight/debian/menu b/ubuntu/precise/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/ubuntu/precise/applications/filelight/debian/menu
+++ b/ubuntu/precise/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/ubuntu/precise/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/ubuntu/precise/applications/gwenview/debian/menu
+++ b/ubuntu/precise/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/ubuntu/precise/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/ubuntu/precise/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/precise/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/precise/applications/k3b/debian/k3b.menu b/ubuntu/precise/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/ubuntu/precise/applications/k3b/debian/k3b.menu
+++ b/ubuntu/precise/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/precise/applications/k9copy/debian/control b/ubuntu/precise/applications/k9copy/debian/control
index d9a4ccd4e..96101dafe 100644
--- a/ubuntu/precise/applications/k9copy/debian/control
+++ b/ubuntu/precise/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/ubuntu/precise/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/precise/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/ubuntu/precise/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/precise/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/precise/applications/k9copy/debian/rules b/ubuntu/precise/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/ubuntu/precise/applications/k9copy/debian/rules
+++ b/ubuntu/precise/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/ubuntu/precise/applications/kaffeine/debian/menu b/ubuntu/precise/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/ubuntu/precise/applications/kaffeine/debian/menu
+++ b/ubuntu/precise/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/ubuntu/precise/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/ubuntu/precise/applications/kbarcode/debian/menu
+++ b/ubuntu/precise/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/ubuntu/precise/applications/kcpuload/debian/menu b/ubuntu/precise/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/ubuntu/precise/applications/kcpuload/debian/menu
+++ b/ubuntu/precise/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/ubuntu/precise/applications/keep/debian/control b/ubuntu/precise/applications/keep/debian/control
index f3213cd45..17e87e581 100644
--- a/ubuntu/precise/applications/keep/debian/control
+++ b/ubuntu/precise/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/ubuntu/precise/applications/keep/debian/keep.xml b/ubuntu/precise/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/ubuntu/precise/applications/keep/debian/keep.xml
+++ b/ubuntu/precise/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/precise/applications/keep/debian/rules b/ubuntu/precise/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/ubuntu/precise/applications/keep/debian/rules
+++ b/ubuntu/precise/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/ubuntu/precise/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/ubuntu/precise/applications/kile/debian/menu
+++ b/ubuntu/precise/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/ubuntu/precise/applications/kmatplot/debian/menu b/ubuntu/precise/applications/kmatplot/debian/menu
index 6cb3a60a8..31de047d3 100644
--- a/ubuntu/precise/applications/kmatplot/debian/menu
+++ b/ubuntu/precise/applications/kmatplot/debian/menu
@@ -1,2 +1,2 @@
?package(kmatplot):needs="X11" section="Apps/Math"\
- title="kmatplot" command="/usr/bin/kmatplot"
+ title="kmatplot" command="/opt/trinity/bin/kmatplot"
diff --git a/ubuntu/precise/applications/knetload/debian/menu b/ubuntu/precise/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/ubuntu/precise/applications/knetload/debian/menu
+++ b/ubuntu/precise/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/ubuntu/precise/applications/knetworkmanager.cmake/debian/menu b/ubuntu/precise/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/precise/applications/knetworkmanager.cmake/debian/menu
+++ b/ubuntu/precise/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/precise/applications/knetworkmanager8/debian/menu b/ubuntu/precise/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/precise/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/precise/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/ubuntu/precise/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/ubuntu/precise/applications/koffice/debian/chalk-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/ubuntu/precise/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/ubuntu/precise/applications/koffice/debian/karbon-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/ubuntu/precise/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/ubuntu/precise/applications/koffice/debian/kchart-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/ubuntu/precise/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/ubuntu/precise/applications/koffice/debian/kivio-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/ubuntu/precise/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/ubuntu/precise/applications/koffice/debian/kspread-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/ubuntu/precise/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/ubuntu/precise/applications/koffice/debian/kword-trinity.menu
+++ b/ubuntu/precise/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/ubuntu/precise/applications/konversation/debian/control b/ubuntu/precise/applications/konversation/debian/control
index 9728d2f8e..7d96a609e 100644
--- a/ubuntu/precise/applications/konversation/debian/control
+++ b/ubuntu/precise/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu b/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/ubuntu/precise/applications/konversation/debian/rules b/ubuntu/precise/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/ubuntu/precise/applications/konversation/debian/rules
+++ b/ubuntu/precise/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/precise/applications/kpicosim/debian/menu b/ubuntu/precise/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/ubuntu/precise/applications/kpicosim/debian/menu
+++ b/ubuntu/precise/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/ubuntu/precise/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/ubuntu/precise/applications/kpowersave.cmake/debian/menu
+++ b/ubuntu/precise/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/ubuntu/precise/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/ubuntu/precise/applications/krusader/debian/menu
+++ b/ubuntu/precise/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/ubuntu/precise/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/ubuntu/precise/applications/ktechlab/debian/menu
+++ b/ubuntu/precise/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/precise/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/ubuntu/precise/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/precise/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/precise/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/precise/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/ubuntu/precise/applications/potracegui/debian/potracegui-trinity.menu
+++ b/ubuntu/precise/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/ubuntu/precise/applications/smb4k/debian/menu b/ubuntu/precise/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/ubuntu/precise/applications/smb4k/debian/menu
+++ b/ubuntu/precise/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/ubuntu/precise/applications/tdepowersave/debian/control b/ubuntu/precise/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/control
+++ b/ubuntu/precise/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/ubuntu/precise/applications/tdepowersave/debian/install b/ubuntu/precise/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/install
+++ b/ubuntu/precise/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
-.SH NAME
-kpowersave
-\- A KDE KPart Application
-.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
-.SH DESCRIPTION
-A KDE KPart Application
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS KDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-" c None",
-". c #6D2121",
-"+ c #783738",
-"@ c #743E40",
-"# c #5D2F30",
-"$ c #3E1618",
-"% c #8A0200",
-"& c #982306",
-"* c #A75C4B",
-"= c #D3B8BC",
-"- c #E9E0E1",
-"; c #E7E7ED",
-"> c #DDDFE7",
-", c #CCCBD7",
-"' c #B3ADBB",
-") c #827583",
-"! c #6A3227",
-"~ c #410B00",
-"{ c #080000",
-"] c #AE381A",
-"^ c #C79676",
-"/ c #D8C9B7",
-"( c #B3B7C2",
-"_ c #F2F8FF",
-": c #EBEDF4",
-"< c #D8D9E3",
-"[ c #CBCBD8",
-"} c #BEC0CF",
-"| c #B4B5C9",
-"1 c #A0A4BD",
-"2 c #9B90A1",
-"3 c #B08583",
-"4 c #8F493D",
-"5 c #340B02",
-"6 c #A71F09",
-"7 c #D5BEA2",
-"8 c #F1FFFF",
-"9 c #EEF2F6",
-"0 c #999AAD",
-"a c #C8C8D7",
-"b c #CFCFDB",
-"c c #C2C2D0",
-"d c #B6B6C6",
-"e c #A8A8BC",
-"f c #9B9BB1",
-"g c #8685A0",
-"h c #8D8EA6",
-"i c #AFB8CD",
-"j c #ABAFC6",
-"k c #9F534D",
-"l c #1C0000",
-"m c #B63F26",
-"n c #DAC1A4",
-"o c #DCD9DF",
-"p c #EEF3F6",
-"q c #B0B6C4",
-"r c #AEB0C4",
-"s c #BDBECF",
-"t c #B2B3C6",
-"u c #A6A7BB",
-"v c #9A9BB1",
-"w c #8C8EA5",
-"x c #797D94",
-"y c #98A0B4",
-"z c #B3BCD0",
-"A c #A99EAF",
-"B c #C46347",
-"C c #2B0C00",
-"D c #B63C1A",
-"E c #FED76A",
-"F c #E2BE8D",
-"G c #DCB4A6",
-"H c #D6BCBA",
-"I c #B3ABB9",
-"J c #A9A7B9",
-"K c #A4A5B7",
-"L c #9EA1B1",
-"M c #9798A9",
-"N c #9392A1",
-"O c #A2969F",
-"P c #C29994",
-"Q c #CD866F",
-"R c #DC6A3D",
-"S c #B42A0E",
-"T c #160101",
-"U c #B53817",
-"V c #FFDA34",
-"W c #FFF727",
-"X c #FCE43C",
-"Y c #F5B84C",
-"Z c #EDA45F",
-"` c #E79B6C",
-" . c #E39872",
-".. c #E2926F",
-"+. c #E08764",
-"@. c #E07853",
-"#. c #DF623C",
-"$. c #DA4925",
-"%. c #C83415",
-"&. c #B10E04",
-"*. c #900000",
-"=. c #180000",
-"-. c #B53918",
-";. c #FFD83B",
-">. c #FFF30F",
-",. c #FBED00",
-"'. c #F2BD00",
-"). c #EB8F02",
-"!. c #E4650D",
-"~. c #DE3B14",
-"{. c #D71E15",
-"]. c #CF180F",
-"^. c #C60D07",
-"/. c #BA0100",
-"(. c #B10000",
-"_. c #AA0000",
-":. c #AB0000",
-"<. c #980000",
-"[. c #170000",
-"}. c #FFF312",
-"|. c #FBEC00",
-"1. c #F2BA00",
-"2. c #EA8B00",
-"3. c #E45A00",
-"4. c #DE2200",
-"5. c #D40000",
-"6. c #CC0000",
-"7. c #C00000",
-"8. c #A20103",
-"9. c #8D0811",
-"0. c #7F1825",
-"a. c #6D293B",
-"b. c #474158",
-"c. c #60637E",
-"d. c #7D7D99",
-"e. c #9292AB",
-"f. c #77779C",
-"g. c #FDEE00",
-"h. c #F9BF00",
-"i. c #E68600",
-"j. c #CC5100",
-"k. c #AB260B",
-"l. c #95161A",
-"m. c #83232C",
-"n. c #803D48",
-"o. c #875E6B",
-"p. c #8D7C8A",
-"q. c #9698A7",
-"r. c #A5ABB8",
-"s. c #B7BCC6",
-"t. c #CBC7CD",
-"u. c #D0CBCF",
-"v. c #C7C4CC",
-"w. c #CAC9CF",
-"x. c #9F9FB8",
-"y. c #262641",
-"z. c #B63915",
-"A. c #FFD838",
-"B. c #FFF413",
-"C. c #F9EA00",
-"D. c #99822F",
-"E. c #8D7B67",
-"F. c #958B89",
-"G. c #A2A5A9",
-"H. c #B4BABD",
-"I. c #C6CDCE",
-"J. c #D2DADA",
-"K. c #D5DCE2",
-"L. c #CDD5DF",
-"M. c #BCC5D7",
-"N. c #A0B5D8",
-"O. c #83A5D9",
-"P. c #6B98DB",
-"Q. c #5A8FDE",
-"R. c #3C80E3",
-"S. c #5E8AD2",
-"T. c #B4B0BE",
-"U. c #3F3F61",
-"V. c #AA372A",
-"W. c #F9D742",
-"X. c #FFFC02",
-"Y. c #B1AB13",
-"Z. c #6F7184",
-"`. c #EDF1F8",
-" + c #EAECEF",
-".+ c #CBD4E0",
-"++ c #B2C6E0",
-"@+ c #97B7E0",
-"#+ c #84ADE2",
-"$+ c #79A8E5",
-"%+ c #6DA2E9",
-"&+ c #5E9CED",
-"*+ c #5299F8",
-"=+ c #509AFD",
-"-+ c #529BFE",
-";+ c #509CFF",
-">+ c #4094FF",
-",+ c #3D7EE0",
-"'+ c #B4B3C0",
-")+ c #5D5C7F",
-"!+ c #9D363D",
-"~+ c #D1D0B4",
-"{+ c #FFF856",
-"]+ c #A29E28",
-"^+ c #72727F",
-"/+ c #E5E2E1",
-"(+ c #94B7DB",
-"_+ c #97C2EF",
-":+ c #A3CBF7",
-"<+ c #A6CEFC",
-"[+ c #AAD0FF",
-"}+ c #ABD1FF",
-"|+ c #A1CAFF",
-"1+ c #94C4FF",
-"2+ c #8ABDFF",
-"3+ c #7EB6FF",
-"4+ c #6DACFF",
-"5+ c #559EFF",
-"6+ c #4195FF",
-"7+ c #2877EB",
-"8+ c #9DA6C2",
-"9+ c #767292",
-"0+ c #0E0E1C",
-"a+ c #9F3636",
-"b+ c #C7CED6",
-"c+ c #EBEDF5",
-"d+ c #BEBCAD",
-"e+ c #606061",
-"f+ c #D3CECE",
-"g+ c #9ABEE5",
-"h+ c #D5EBFF",
-"i+ c #EEF4FF",
-"j+ c #D2E5FF",
-"k+ c #BFDAFF",
-"l+ c #ACD0FF",
-"m+ c #9BC7FF",
-"n+ c #8FBFFF",
-"o+ c #7FB6FF",
-"p+ c #4F9BFF",
-"q+ c #2B84FD",
-"r+ c #1875F6",
-"s+ c #0E6AF1",
-"t+ c #075DE3",
-"u+ c #8498C5",
-"v+ c #8E89A3",
-"w+ c #161629",
-"x+ c #C8CFCE",
-"y+ c #E8EAEB",
-"z+ c #D1D1D7",
-"A+ c #5C5C5D",
-"B+ c #BBB7B7",
-"C+ c #A6C0DF",
-"D+ c #AAD1FD",
-"E+ c #DEECFF",
-"F+ c #C4DDFF",
-"G+ c #B4D4FF",
-"H+ c #A4CAFF",
-"I+ c #9AC5FF",
-"J+ c #76B1FF",
-"K+ c #2C89FF",
-"L+ c #016BFE",
-"M+ c #0064F8",
-"N+ c #005FEE",
-"O+ c #005AE5",
-"P+ c #0050DD",
-"Q+ c #6588C7",
-"R+ c #A09AB0",
-"S+ c #2A2A44",
-"T+ c #C9CFCF",
-"U+ c #E5E7E7",
-"V+ c #E0E0E0",
-"W+ c #676767",
-"X+ c #A3A1A1",
-"Y+ c #B8C4D9",
-"Z+ c #93BFF0",
-"`+ c #D6E9FF",
-" @ c #BDD9FF",
-".@ c #ACCFFF",
-"+@ c #A3CAFF",
-"@@ c #7BB5FF",
-"#@ c #2386FF",
-"$@ c #0472FF",
-"%@ c #006AFC",
-"&@ c #0065F4",
-"*@ c #005FEA",
-"=@ c #005AE3",
-"-@ c #004FDB",
-";@ c #4B78C9",
-">@ c #A5A0B1",
-",@ c #454569",
-"'@ c #E4E6E6",
-")@ c #E7E7E7",
-"!@ c #7D7D7E",
-"~@ c #898788",
-"{@ c #C7CAD5",
-"]@ c #89B6EA",
-"^@ c #C7E1FF",
-"/@ c #B6D5FF",
-"(@ c #ABCEFF",
-"_@ c #86BBFF",
-":@ c #2F8EFF",
-"<@ c #117BFF",
-"[@ c #0570FF",
-"}@ c #0068F8",
-"|@ c #0063F0",
-"1@ c #005DE7",
-"2@ c #0059DF",
-"3@ c #004CD6",
-"4@ c #3369CD",
-"5@ c #A3A2B4",
-"6@ c #585880",
-"7@ c #909090",
-"8@ c #717072",
-"9@ c #C6C4CB",
-"0@ c #84AFE7",
-"a@ c #B5D7FF",
-"b@ c #B5D4FF",
-"c@ c #96C4FF",
-"d@ c #3A96FF",
-"e@ c #1C82FF",
-"f@ c #0D77FF",
-"g@ c #006BFD",
-"h@ c #0066F4",
-"i@ c #0061EC",
-"j@ c #005BE4",
-"k@ c #0055DB",
-"l@ c #004ED3",
-"m@ c #0D51CB",
-"n@ c #9298B7",
-"o@ c #6B6A90",
-"p@ c #0B0B17",
-"q@ c #E5E6E6",
-"r@ c #E6E6E6",
-"s@ c #9F9F9F",
-"t@ c #636265",
-"u@ c #BFBABC",
-"v@ c #80AAE1",
-"w@ c #9FC9FF",
-"x@ c #A8CEFF",
-"y@ c #4EA1FF",
-"z@ c #2489FF",
-"A@ c #187EFF",
-"B@ c #0069FA",
-"C@ c #005EE8",
-"D@ c #0058DF",
-"E@ c #0052D7",
-"F@ c #004DCE",
-"G@ c #0047C8",
-"H@ c #7B8CBA",
-"I@ c #7E7B9B",
-"J@ c #1D1D34",
-"K@ c #E5E5E5",
-"L@ c #AAAAAB",
-"M@ c #5E5E60",
-"N@ c #B3ADAC",
-"O@ c #90ADDA",
-"P@ c #78B4FC",
-"Q@ c #61ADFF",
-"R@ c #2D90FF",
-"S@ c #2185FF",
-"T@ c #0E78FF",
-"U@ c #016CFE",
-"V@ c #0066F5",
-"W@ c #005CE4",
-"X@ c #0055DC",
-"Y@ c #0050D3",
-"Z@ c #004ACB",
-"`@ c #003AC2",
-" # c #617CC1",
-".# c #8C89A2",
-"+# c #2D2D4C",
-"@# c #E4E4E4",
-"## c #B5B5B5",
-"$# c #606062",
-"%# c #9D9A9B",
-"&# c #ABB6CF",
-"*# c #3D94F7",
-"=# c #3C9CFF",
-"-# c #2C8DFF",
-";# c #1A80FF",
-"># c #0772FF",
-",# c #0068FB",
-"'# c #0062F2",
-")# c #005BEA",
-"!# c #0053E2",
-"~# c #004FD9",
-"{# c #024BCF",
-"]# c #094DC7",
-"^# c #1950C0",
-"/# c #6681C0",
-"(# c #8987A0",
-"_# c #41416E",
-":# c #E3E3E3",
-"<# c #BCBCBC",
-"[# c #69696B",
-"}# c #858488",
-"|# c #BDBAC5",
-"1# c #3E8DEF",
-"2# c #3094FF",
-"3# c #1C84FF",
-"4# c #0473FF",
-"5# c #0069FD",
-"6# c #0364F2",
-"7# c #1464E5",
-"8# c #296AD7",
-"9# c #4A7ACB",
-"0# c #6281BF",
-"a# c #7B8CB9",
-"b# c #9098B4",
-"c# c #ABAAB7",
-"d# c #B4B2B9",
-"e# c #B8B7BD",
-"f# c #AAAAB9",
-"g# c #8080A3",
-"h# c #5B5B8F",
-"i# c #A03838",
-"j# c #E2E2E2",
-"k# c #727274",
-"l# c #727276",
-"m# c #BDB6BB",
-"n# c #508DE5",
-"o# c #1579F9",
-"p# c #347FE8",
-"q# c #5287D9",
-"r# c #6B8DCB",
-"s# c #8699C1",
-"t# c #9BA4BC",
-"u# c #BAB8C0",
-"v# c #CCC6C4",
-"w# c #D1CCC9",
-"x# c #D3D0CE",
-"y# c #D3D0D6",
-"z# c #D1D2E3",
-"A# c #D4D6EE",
-"B# c #DADBF6",
-"C# c #DCDEE9",
-"D# c #D4D4D4",
-"E# c #BFBFC4",
-"F# c #A6A6B9",
-"G# c #8686AD",
-"H# c #56568C",
-"I# c #3E3E79",
-"J# c #A13434",
-"K# c #CAD4D4",
-"L# c #7C7C7D",
-"M# c #67676A",
-"N# c #ACABB4",
-"O# c #AAB1CA",
-"P# c #AAB1C9",
-"Q# c #C5C2C7",
-"R# c #D3CCCA",
-"S# c #D7D1D0",
-"T# c #DAD7D8",
-"U# c #DEDCE0",
-"V# c #D8D9EA",
-"W# c #CCCFF1",
-"X# c #C5C8F6",
-"Y# c #C5C9FA",
-"Z# c #CACDFF",
-"`# c #D0D3FF",
-" $ c #D7DAFF",
-".$ c #E1E3FF",
-"+$ c #EAECFF",
-"@$ c #EDEEFD",
-"#$ c #E2E3E7",
-"$$ c #CBCBC7",
-"%$ c #C8C8C4",
-"&$ c #BDBDC0",
-"*$ c #9E9EAF",
-"=$ c #6A6A9D",
-"-$ c #840808",
-";$ c #C18B8B",
-">$ c #EBF3F3",
-",$ c #E8F0F0",
-"'$ c #BDC2C2",
-")$ c #878A8A",
-"!$ c #616367",
-"~$ c #B1B1B4",
-"{$ c #D0CECC",
-"]$ c #DEDBD8",
-"^$ c #E4E4E2",
-"/$ c #E6E6E5",
-"($ c #E7E8EA",
-"_$ c #D2D4F9",
-":$ c #B9BEFD",
-"<$ c #B0B5FF",
-"[$ c #B4B9FF",
-"}$ c #BFC3FF",
-"|$ c #C9CEFF",
-"1$ c #D5D8FF",
-"2$ c #DDDFFF",
-"3$ c #E4E7FC",
-"4$ c #E3E4EF",
-"5$ c #DADBDF",
-"6$ c #D1D1D2",
-"7$ c #C5C5C5",
-"8$ c #B1B1B1",
-"9$ c #959595",
-"0$ c #717170",
-"a$ c #606056",
-"b$ c #676782",
-"c$ c #17172F",
-"d$ c #5C0303",
-"e$ c #9E4545",
-"f$ c #C08787",
-"g$ c #B59F9F",
-"h$ c #8F8787",
-"i$ c #5D5C5F",
-"j$ c #777A7E",
-"k$ c #9DA0A4",
-"l$ c #B1B2B2",
-"m$ c #BCBBBB",
-"n$ c #C5C5C3",
-"o$ c #D3D3D3",
-"p$ c #E1E1E1",
-"q$ c #DDDDEA",
-"r$ c #D4D6F5",
-"s$ c #CED1FD",
-"t$ c #D4D6FD",
-"u$ c #DDDEF5",
-"v$ c #DBDCE7",
-"w$ c #D8D8DB",
-"x$ c #D0CFCF",
-"y$ c #C0C1BF",
-"z$ c #ACACAB",
-"A$ c #959594",
-"B$ c #82827F",
-"C$ c #737370",
-"D$ c #64646D",
-"E$ c #595973",
-"F$ c #565680",
-"G$ c #48487B",
-"H$ c #0D0D1B",
-"I$ c #2C0000",
-"J$ c #4B0E0E",
-"K$ c #541717",
-"L$ c #521516",
-"M$ c #430E10",
-"N$ c #442329",
-"O$ c #59535C",
-"P$ c #777882",
-"Q$ c #97979B",
-"R$ c #A7A7A8",
-"S$ c #AFAFAE",
-"T$ c #BABAB6",
-"U$ c #CBCAC6",
-"V$ c #D7D8D8",
-"W$ c #D9D9DB",
-"X$ c #D2D1CF",
-"Y$ c #C4C3C1",
-"Z$ c #B0AFAD",
-"`$ c #9B9B99",
-" % c #8B8B88",
-".% c #7E7E7D",
-"+% c #74747B",
-"@% c #66667E",
-"#% c #5A5A82",
-"$% c #44446F",
-"%% c #29294B",
-"&% c #131329",
-"*% c #06060E",
-"=% c #131319",
-"-% c #2C2C37",
-";% c #545463",
-">% c #757584",
-",% c #8D8D94",
-"'% c #989897",
-")% c #A1A19E",
-"!% c #A9A9A7",
-"~% c #A2A29F",
-"{% c #91918E",
-"]% c #848484",
-"^% c #7A7A85",
-"/% c #696983",
-"(% c #535376",
-"_% c #363659",
-":% c #1F1F3C",
-"<% c #0D0D1A",
-"[% c #12121C",
-"}% c #333345",
-"|% c #5A5A6F",
-"1% c #737385",
-"2% c #88888E",
-"3% c #7E7E89",
-"4% c #686882",
-"5% c #50506E",
-"6% c #30304C",
-"7% c #16162A",
-"8% c #080811",
-"9% c #1A1A29",
-"0% c #2E2E44",
-"a% c #26263C",
-"b% c #11111F",
-" ",
-" . + @ # $ ",
-" % & * = - ; > , ' ) ! ~ { ",
-" ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
-"6 7 8 9 0 a b c d e f g h i j k l ",
-"m n o p q r s t u v w x y z A B C ",
-"D E F G H I J K L M N O P Q R S T ",
-"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ",
-" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ",
-" [%}%|%1%2%3%4%5%6%7%8% ",
-" 9%0%a%b% ",
-" "};
diff --git a/ubuntu/precise/applications/tdepowersave/debian/manpages b/ubuntu/precise/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/manpages
+++ b/ubuntu/precise/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/precise/applications/tdepowersave/debian/menu b/ubuntu/precise/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/menu
+++ b/ubuntu/precise/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/precise/applications/tdepowersave/debian/rules b/ubuntu/precise/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/precise/applications/tdepowersave/debian/rules
+++ b/ubuntu/precise/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/precise/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options]
+.SH DESCRIPTION
+A TDE KPart Application
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v, \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS
+.SS TDE options:
+.TP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B \-\-config <filename>
+Use alternative configuration file
+.TP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B \-\-style <style>
+sets the application GUI style
+.TP
+.B \-\-geometry <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B \-\-nofork
+Don't run in the background.
+.SS Qt options:
+.TP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'
+.TP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn, \-\-font <fontname>
+defines the application font
+.TP
+.B \-\-bg, \-\-background <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg, \-\-foreground <color>
+sets the default foreground color
+.TP
+.B \-\-btn, \-\-button <color>
+sets the default button color
+.TP
+.B \-\-name <name>
+sets the application name
+.TP
+.B \-\-title <title>
+sets the application title (caption)
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B \-\-inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B \-\-im <XIM server>
+set XIM server
+.TP
+.B \-\-noxim
+disable XIM
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets
+.SS
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/ubuntu/precise/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_xpm[] = {
+"32 32 593 2",
+" c None",
+". c #6D2121",
+"+ c #783738",
+"@ c #743E40",
+"# c #5D2F30",
+"$ c #3E1618",
+"% c #8A0200",
+"& c #982306",
+"* c #A75C4B",
+"= c #D3B8BC",
+"- c #E9E0E1",
+"; c #E7E7ED",
+"> c #DDDFE7",
+", c #CCCBD7",
+"' c #B3ADBB",
+") c #827583",
+"! c #6A3227",
+"~ c #410B00",
+"{ c #080000",
+"] c #AE381A",
+"^ c #C79676",
+"/ c #D8C9B7",
+"( c #B3B7C2",
+"_ c #F2F8FF",
+": c #EBEDF4",
+"< c #D8D9E3",
+"[ c #CBCBD8",
+"} c #BEC0CF",
+"| c #B4B5C9",
+"1 c #A0A4BD",
+"2 c #9B90A1",
+"3 c #B08583",
+"4 c #8F493D",
+"5 c #340B02",
+"6 c #A71F09",
+"7 c #D5BEA2",
+"8 c #F1FFFF",
+"9 c #EEF2F6",
+"0 c #999AAD",
+"a c #C8C8D7",
+"b c #CFCFDB",
+"c c #C2C2D0",
+"d c #B6B6C6",
+"e c #A8A8BC",
+"f c #9B9BB1",
+"g c #8685A0",
+"h c #8D8EA6",
+"i c #AFB8CD",
+"j c #ABAFC6",
+"k c #9F534D",
+"l c #1C0000",
+"m c #B63F26",
+"n c #DAC1A4",
+"o c #DCD9DF",
+"p c #EEF3F6",
+"q c #B0B6C4",
+"r c #AEB0C4",
+"s c #BDBECF",
+"t c #B2B3C6",
+"u c #A6A7BB",
+"v c #9A9BB1",
+"w c #8C8EA5",
+"x c #797D94",
+"y c #98A0B4",
+"z c #B3BCD0",
+"A c #A99EAF",
+"B c #C46347",
+"C c #2B0C00",
+"D c #B63C1A",
+"E c #FED76A",
+"F c #E2BE8D",
+"G c #DCB4A6",
+"H c #D6BCBA",
+"I c #B3ABB9",
+"J c #A9A7B9",
+"K c #A4A5B7",
+"L c #9EA1B1",
+"M c #9798A9",
+"N c #9392A1",
+"O c #A2969F",
+"P c #C29994",
+"Q c #CD866F",
+"R c #DC6A3D",
+"S c #B42A0E",
+"T c #160101",
+"U c #B53817",
+"V c #FFDA34",
+"W c #FFF727",
+"X c #FCE43C",
+"Y c #F5B84C",
+"Z c #EDA45F",
+"` c #E79B6C",
+" . c #E39872",
+".. c #E2926F",
+"+. c #E08764",
+"@. c #E07853",
+"#. c #DF623C",
+"$. c #DA4925",
+"%. c #C83415",
+"&. c #B10E04",
+"*. c #900000",
+"=. c #180000",
+"-. c #B53918",
+";. c #FFD83B",
+">. c #FFF30F",
+",. c #FBED00",
+"'. c #F2BD00",
+"). c #EB8F02",
+"!. c #E4650D",
+"~. c #DE3B14",
+"{. c #D71E15",
+"]. c #CF180F",
+"^. c #C60D07",
+"/. c #BA0100",
+"(. c #B10000",
+"_. c #AA0000",
+":. c #AB0000",
+"<. c #980000",
+"[. c #170000",
+"}. c #FFF312",
+"|. c #FBEC00",
+"1. c #F2BA00",
+"2. c #EA8B00",
+"3. c #E45A00",
+"4. c #DE2200",
+"5. c #D40000",
+"6. c #CC0000",
+"7. c #C00000",
+"8. c #A20103",
+"9. c #8D0811",
+"0. c #7F1825",
+"a. c #6D293B",
+"b. c #474158",
+"c. c #60637E",
+"d. c #7D7D99",
+"e. c #9292AB",
+"f. c #77779C",
+"g. c #FDEE00",
+"h. c #F9BF00",
+"i. c #E68600",
+"j. c #CC5100",
+"k. c #AB260B",
+"l. c #95161A",
+"m. c #83232C",
+"n. c #803D48",
+"o. c #875E6B",
+"p. c #8D7C8A",
+"q. c #9698A7",
+"r. c #A5ABB8",
+"s. c #B7BCC6",
+"t. c #CBC7CD",
+"u. c #D0CBCF",
+"v. c #C7C4CC",
+"w. c #CAC9CF",
+"x. c #9F9FB8",
+"y. c #262641",
+"z. c #B63915",
+"A. c #FFD838",
+"B. c #FFF413",
+"C. c #F9EA00",
+"D. c #99822F",
+"E. c #8D7B67",
+"F. c #958B89",
+"G. c #A2A5A9",
+"H. c #B4BABD",
+"I. c #C6CDCE",
+"J. c #D2DADA",
+"K. c #D5DCE2",
+"L. c #CDD5DF",
+"M. c #BCC5D7",
+"N. c #A0B5D8",
+"O. c #83A5D9",
+"P. c #6B98DB",
+"Q. c #5A8FDE",
+"R. c #3C80E3",
+"S. c #5E8AD2",
+"T. c #B4B0BE",
+"U. c #3F3F61",
+"V. c #AA372A",
+"W. c #F9D742",
+"X. c #FFFC02",
+"Y. c #B1AB13",
+"Z. c #6F7184",
+"`. c #EDF1F8",
+" + c #EAECEF",
+".+ c #CBD4E0",
+"++ c #B2C6E0",
+"@+ c #97B7E0",
+"#+ c #84ADE2",
+"$+ c #79A8E5",
+"%+ c #6DA2E9",
+"&+ c #5E9CED",
+"*+ c #5299F8",
+"=+ c #509AFD",
+"-+ c #529BFE",
+";+ c #509CFF",
+">+ c #4094FF",
+",+ c #3D7EE0",
+"'+ c #B4B3C0",
+")+ c #5D5C7F",
+"!+ c #9D363D",
+"~+ c #D1D0B4",
+"{+ c #FFF856",
+"]+ c #A29E28",
+"^+ c #72727F",
+"/+ c #E5E2E1",
+"(+ c #94B7DB",
+"_+ c #97C2EF",
+":+ c #A3CBF7",
+"<+ c #A6CEFC",
+"[+ c #AAD0FF",
+"}+ c #ABD1FF",
+"|+ c #A1CAFF",
+"1+ c #94C4FF",
+"2+ c #8ABDFF",
+"3+ c #7EB6FF",
+"4+ c #6DACFF",
+"5+ c #559EFF",
+"6+ c #4195FF",
+"7+ c #2877EB",
+"8+ c #9DA6C2",
+"9+ c #767292",
+"0+ c #0E0E1C",
+"a+ c #9F3636",
+"b+ c #C7CED6",
+"c+ c #EBEDF5",
+"d+ c #BEBCAD",
+"e+ c #606061",
+"f+ c #D3CECE",
+"g+ c #9ABEE5",
+"h+ c #D5EBFF",
+"i+ c #EEF4FF",
+"j+ c #D2E5FF",
+"k+ c #BFDAFF",
+"l+ c #ACD0FF",
+"m+ c #9BC7FF",
+"n+ c #8FBFFF",
+"o+ c #7FB6FF",
+"p+ c #4F9BFF",
+"q+ c #2B84FD",
+"r+ c #1875F6",
+"s+ c #0E6AF1",
+"t+ c #075DE3",
+"u+ c #8498C5",
+"v+ c #8E89A3",
+"w+ c #161629",
+"x+ c #C8CFCE",
+"y+ c #E8EAEB",
+"z+ c #D1D1D7",
+"A+ c #5C5C5D",
+"B+ c #BBB7B7",
+"C+ c #A6C0DF",
+"D+ c #AAD1FD",
+"E+ c #DEECFF",
+"F+ c #C4DDFF",
+"G+ c #B4D4FF",
+"H+ c #A4CAFF",
+"I+ c #9AC5FF",
+"J+ c #76B1FF",
+"K+ c #2C89FF",
+"L+ c #016BFE",
+"M+ c #0064F8",
+"N+ c #005FEE",
+"O+ c #005AE5",
+"P+ c #0050DD",
+"Q+ c #6588C7",
+"R+ c #A09AB0",
+"S+ c #2A2A44",
+"T+ c #C9CFCF",
+"U+ c #E5E7E7",
+"V+ c #E0E0E0",
+"W+ c #676767",
+"X+ c #A3A1A1",
+"Y+ c #B8C4D9",
+"Z+ c #93BFF0",
+"`+ c #D6E9FF",
+" @ c #BDD9FF",
+".@ c #ACCFFF",
+"+@ c #A3CAFF",
+"@@ c #7BB5FF",
+"#@ c #2386FF",
+"$@ c #0472FF",
+"%@ c #006AFC",
+"&@ c #0065F4",
+"*@ c #005FEA",
+"=@ c #005AE3",
+"-@ c #004FDB",
+";@ c #4B78C9",
+">@ c #A5A0B1",
+",@ c #454569",
+"'@ c #E4E6E6",
+")@ c #E7E7E7",
+"!@ c #7D7D7E",
+"~@ c #898788",
+"{@ c #C7CAD5",
+"]@ c #89B6EA",
+"^@ c #C7E1FF",
+"/@ c #B6D5FF",
+"(@ c #ABCEFF",
+"_@ c #86BBFF",
+":@ c #2F8EFF",
+"<@ c #117BFF",
+"[@ c #0570FF",
+"}@ c #0068F8",
+"|@ c #0063F0",
+"1@ c #005DE7",
+"2@ c #0059DF",
+"3@ c #004CD6",
+"4@ c #3369CD",
+"5@ c #A3A2B4",
+"6@ c #585880",
+"7@ c #909090",
+"8@ c #717072",
+"9@ c #C6C4CB",
+"0@ c #84AFE7",
+"a@ c #B5D7FF",
+"b@ c #B5D4FF",
+"c@ c #96C4FF",
+"d@ c #3A96FF",
+"e@ c #1C82FF",
+"f@ c #0D77FF",
+"g@ c #006BFD",
+"h@ c #0066F4",
+"i@ c #0061EC",
+"j@ c #005BE4",
+"k@ c #0055DB",
+"l@ c #004ED3",
+"m@ c #0D51CB",
+"n@ c #9298B7",
+"o@ c #6B6A90",
+"p@ c #0B0B17",
+"q@ c #E5E6E6",
+"r@ c #E6E6E6",
+"s@ c #9F9F9F",
+"t@ c #636265",
+"u@ c #BFBABC",
+"v@ c #80AAE1",
+"w@ c #9FC9FF",
+"x@ c #A8CEFF",
+"y@ c #4EA1FF",
+"z@ c #2489FF",
+"A@ c #187EFF",
+"B@ c #0069FA",
+"C@ c #005EE8",
+"D@ c #0058DF",
+"E@ c #0052D7",
+"F@ c #004DCE",
+"G@ c #0047C8",
+"H@ c #7B8CBA",
+"I@ c #7E7B9B",
+"J@ c #1D1D34",
+"K@ c #E5E5E5",
+"L@ c #AAAAAB",
+"M@ c #5E5E60",
+"N@ c #B3ADAC",
+"O@ c #90ADDA",
+"P@ c #78B4FC",
+"Q@ c #61ADFF",
+"R@ c #2D90FF",
+"S@ c #2185FF",
+"T@ c #0E78FF",
+"U@ c #016CFE",
+"V@ c #0066F5",
+"W@ c #005CE4",
+"X@ c #0055DC",
+"Y@ c #0050D3",
+"Z@ c #004ACB",
+"`@ c #003AC2",
+" # c #617CC1",
+".# c #8C89A2",
+"+# c #2D2D4C",
+"@# c #E4E4E4",
+"## c #B5B5B5",
+"$# c #606062",
+"%# c #9D9A9B",
+"&# c #ABB6CF",
+"*# c #3D94F7",
+"=# c #3C9CFF",
+"-# c #2C8DFF",
+";# c #1A80FF",
+"># c #0772FF",
+",# c #0068FB",
+"'# c #0062F2",
+")# c #005BEA",
+"!# c #0053E2",
+"~# c #004FD9",
+"{# c #024BCF",
+"]# c #094DC7",
+"^# c #1950C0",
+"/# c #6681C0",
+"(# c #8987A0",
+"_# c #41416E",
+":# c #E3E3E3",
+"<# c #BCBCBC",
+"[# c #69696B",
+"}# c #858488",
+"|# c #BDBAC5",
+"1# c #3E8DEF",
+"2# c #3094FF",
+"3# c #1C84FF",
+"4# c #0473FF",
+"5# c #0069FD",
+"6# c #0364F2",
+"7# c #1464E5",
+"8# c #296AD7",
+"9# c #4A7ACB",
+"0# c #6281BF",
+"a# c #7B8CB9",
+"b# c #9098B4",
+"c# c #ABAAB7",
+"d# c #B4B2B9",
+"e# c #B8B7BD",
+"f# c #AAAAB9",
+"g# c #8080A3",
+"h# c #5B5B8F",
+"i# c #A03838",
+"j# c #E2E2E2",
+"k# c #727274",
+"l# c #727276",
+"m# c #BDB6BB",
+"n# c #508DE5",
+"o# c #1579F9",
+"p# c #347FE8",
+"q# c #5287D9",
+"r# c #6B8DCB",
+"s# c #8699C1",
+"t# c #9BA4BC",
+"u# c #BAB8C0",
+"v# c #CCC6C4",
+"w# c #D1CCC9",
+"x# c #D3D0CE",
+"y# c #D3D0D6",
+"z# c #D1D2E3",
+"A# c #D4D6EE",
+"B# c #DADBF6",
+"C# c #DCDEE9",
+"D# c #D4D4D4",
+"E# c #BFBFC4",
+"F# c #A6A6B9",
+"G# c #8686AD",
+"H# c #56568C",
+"I# c #3E3E79",
+"J# c #A13434",
+"K# c #CAD4D4",
+"L# c #7C7C7D",
+"M# c #67676A",
+"N# c #ACABB4",
+"O# c #AAB1CA",
+"P# c #AAB1C9",
+"Q# c #C5C2C7",
+"R# c #D3CCCA",
+"S# c #D7D1D0",
+"T# c #DAD7D8",
+"U# c #DEDCE0",
+"V# c #D8D9EA",
+"W# c #CCCFF1",
+"X# c #C5C8F6",
+"Y# c #C5C9FA",
+"Z# c #CACDFF",
+"`# c #D0D3FF",
+" $ c #D7DAFF",
+".$ c #E1E3FF",
+"+$ c #EAECFF",
+"@$ c #EDEEFD",
+"#$ c #E2E3E7",
+"$$ c #CBCBC7",
+"%$ c #C8C8C4",
+"&$ c #BDBDC0",
+"*$ c #9E9EAF",
+"=$ c #6A6A9D",
+"-$ c #840808",
+";$ c #C18B8B",
+">$ c #EBF3F3",
+",$ c #E8F0F0",
+"'$ c #BDC2C2",
+")$ c #878A8A",
+"!$ c #616367",
+"~$ c #B1B1B4",
+"{$ c #D0CECC",
+"]$ c #DEDBD8",
+"^$ c #E4E4E2",
+"/$ c #E6E6E5",
+"($ c #E7E8EA",
+"_$ c #D2D4F9",
+":$ c #B9BEFD",
+"<$ c #B0B5FF",
+"[$ c #B4B9FF",
+"}$ c #BFC3FF",
+"|$ c #C9CEFF",
+"1$ c #D5D8FF",
+"2$ c #DDDFFF",
+"3$ c #E4E7FC",
+"4$ c #E3E4EF",
+"5$ c #DADBDF",
+"6$ c #D1D1D2",
+"7$ c #C5C5C5",
+"8$ c #B1B1B1",
+"9$ c #959595",
+"0$ c #717170",
+"a$ c #606056",
+"b$ c #676782",
+"c$ c #17172F",
+"d$ c #5C0303",
+"e$ c #9E4545",
+"f$ c #C08787",
+"g$ c #B59F9F",
+"h$ c #8F8787",
+"i$ c #5D5C5F",
+"j$ c #777A7E",
+"k$ c #9DA0A4",
+"l$ c #B1B2B2",
+"m$ c #BCBBBB",
+"n$ c #C5C5C3",
+"o$ c #D3D3D3",
+"p$ c #E1E1E1",
+"q$ c #DDDDEA",
+"r$ c #D4D6F5",
+"s$ c #CED1FD",
+"t$ c #D4D6FD",
+"u$ c #DDDEF5",
+"v$ c #DBDCE7",
+"w$ c #D8D8DB",
+"x$ c #D0CFCF",
+"y$ c #C0C1BF",
+"z$ c #ACACAB",
+"A$ c #959594",
+"B$ c #82827F",
+"C$ c #737370",
+"D$ c #64646D",
+"E$ c #595973",
+"F$ c #565680",
+"G$ c #48487B",
+"H$ c #0D0D1B",
+"I$ c #2C0000",
+"J$ c #4B0E0E",
+"K$ c #541717",
+"L$ c #521516",
+"M$ c #430E10",
+"N$ c #442329",
+"O$ c #59535C",
+"P$ c #777882",
+"Q$ c #97979B",
+"R$ c #A7A7A8",
+"S$ c #AFAFAE",
+"T$ c #BABAB6",
+"U$ c #CBCAC6",
+"V$ c #D7D8D8",
+"W$ c #D9D9DB",
+"X$ c #D2D1CF",
+"Y$ c #C4C3C1",
+"Z$ c #B0AFAD",
+"`$ c #9B9B99",
+" % c #8B8B88",
+".% c #7E7E7D",
+"+% c #74747B",
+"@% c #66667E",
+"#% c #5A5A82",
+"$% c #44446F",
+"%% c #29294B",
+"&% c #131329",
+"*% c #06060E",
+"=% c #131319",
+"-% c #2C2C37",
+";% c #545463",
+">% c #757584",
+",% c #8D8D94",
+"'% c #989897",
+")% c #A1A19E",
+"!% c #A9A9A7",
+"~% c #A2A29F",
+"{% c #91918E",
+"]% c #848484",
+"^% c #7A7A85",
+"/% c #696983",
+"(% c #535376",
+"_% c #363659",
+":% c #1F1F3C",
+"<% c #0D0D1A",
+"[% c #12121C",
+"}% c #333345",
+"|% c #5A5A6F",
+"1% c #737385",
+"2% c #88888E",
+"3% c #7E7E89",
+"4% c #686882",
+"5% c #50506E",
+"6% c #30304C",
+"7% c #16162A",
+"8% c #080811",
+"9% c #1A1A29",
+"0% c #2E2E44",
+"a% c #26263C",
+"b% c #11111F",
+" ",
+" . + @ # $ ",
+" % & * = - ; > , ' ) ! ~ { ",
+" ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
+"6 7 8 9 0 a b c d e f g h i j k l ",
+"m n o p q r s t u v w x y z A B C ",
+"D E F G H I J K L M N O P Q R S T ",
+"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ",
+"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ",
+"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ",
+"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ",
+"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ",
+"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ",
+"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ",
+"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ",
+"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ",
+"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ",
+"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ",
+"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ",
+"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ",
+"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ",
+"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ",
+"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ",
+"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ",
+"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ",
+"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
+" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
+" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ",
+" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ",
+" [%}%|%1%2%3%4%5%6%7%8% ",
+" 9%0%a%b% ",
+" "};
diff --git a/ubuntu/precise/applications/tdepowersave/debian/watch b/ubuntu/precise/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/precise/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/ubuntu/precise/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/ubuntu/precise/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/precise/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/ubuntu/precise/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/precise/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/ubuntu/precise/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/precise/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/ubuntu/precise/applications/yakuake/debian/yakuake-trinity.menu
+++ b/ubuntu/precise/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
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/kdegraphics.automake/debian/kcoloredit-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kcoloredit-trinity.menu
index 73907fedd..24dc70519 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kcoloredit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorChooser"\
- icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
- icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcolorchooser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
command="/opt/trinity/bin/kcolorchooser"
?package(kcoloredit):\
@@ -12,8 +12,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorEdit"\
- icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
- icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcoloredit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcoloredit-16.xpm"\
command="/opt/trinity/bin/kcoloredit"
# Icon 22x22 kcoloredit/cr22-app-kcolorchooser.png kcolorchooser.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kdvi-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..f1bfa96a5 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kdvi-trinity.menu
@@ -1,10 +1,10 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
- icon32x32="/usr/share/pixmaps/kdvi.xpm"\
- icon16x16="/usr/share/pixmaps/kdvi-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
command="/opt/trinity/bin/kdvi"
# Icon 32x32 kdvi/pix/cr32-app-kdvi.png kdvi.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kfax-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kfax-trinity.menu
index 344e227f7..810a67ff6 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kfax-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFax"\
- icon32x32="/usr/share/pixmaps/kfax.xpm"\
- icon16x16="/usr/share/pixmaps/kfax-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfax.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfax-16.xpm"\
command="/opt/trinity/bin/kfax"
# Icon 32x32 kfax/cr32-app-kfax.png kfax.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kfaxview-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kfaxview-trinity.menu
index edc02c8d2..a44fcd5a1 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kfaxview-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFaxView"\
- icon32x32="/usr/share/pixmaps/kfaxview.xpm"\
- icon16x16="/usr/share/pixmaps/kfaxview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfaxview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfaxview-16.xpm"\
command="/opt/trinity/bin/kfaxview"
# Icon 32x32 kfaxview/hi32-app-kfaxview.png kfaxview.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..cd27c5660 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kghostview-trinity.menu
@@ -1,10 +1,10 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
- icon32x32="/usr/share/pixmaps/kghostview.xpm"\
- icon16x16="/usr/share/pixmaps/kghostview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
command="/opt/trinity/bin/kghostview"
# Icon 32x32 kghostview/cr32-app-kghostview.png kghostview.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kiconedit-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kiconedit-trinity.menu
index e8a17b104..7fb1d2a3b 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kiconedit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="TDEIconEdit"\
- icon32x32="/usr/share/pixmaps/kiconedit.xpm"\
- icon16x16="/usr/share/pixmaps/kiconedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
command="/opt/trinity/bin/kiconedit"
# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kolourpaint-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 53e88edba..9372e79f3 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kolourpaint-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KolourPaint"\
- icon32x32="/usr/share/pixmaps/kolourpaint.xpm"\
- icon16x16="/usr/share/pixmaps/kolourpaint-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kolourpaint.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolourpaint-16.xpm"\
command="/opt/trinity/bin/kolourpaint"
# Icon 32x32 kolourpaint/pics/hi32-app-kolourpaint.png kolourpaint.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kooka-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kooka-trinity.menu
index 63fcecea8..e922d7a70 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kooka-trinity.menu
@@ -3,9 +3,9 @@
section="Applications/Graphics"\
hints="TDE"\
title="Kooka"\
- icon32x32="/usr/share/pixmaps/kooka.xpm"\
- icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kooka.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kooka-16.xpm"\
command="/opt/trinity/bin/kooka"
-# Icon 32x32 /usr/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
-# Icon 16x16 /usr/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
+# Icon 32x32 /opt/trinity/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
+# Icon 16x16 /opt/trinity/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kpdf-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kpdf-trinity.menu
index 971b89101..da324176a 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kpdf-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KPDF"\
- icon32x32="/usr/share/pixmaps/kpdf.xpm"\
- icon16x16="/usr/share/pixmaps/kpdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpdf-16.xpm"\
command="/opt/trinity/bin/kpdf"
# Icon 32x32 kpdf/cr32-app-kpdf.png kpdf.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..3287726f7 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kpovmodeler-trinity.menu
@@ -1,10 +1,10 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
- icon32x32="/usr/share/pixmaps/kpovmodeler.xpm"\
- icon16x16="/usr/share/pixmaps/kpovmodeler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
command="/opt/trinity/bin/kpovmodeler"
# Icon 32x32 kpovmodeler/cr32-app-kpovmodeler.png kpovmodeler.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kruler-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kruler-trinity.menu
index 0f1e9c2c1..906bcae11 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kruler-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KRuler"\
- icon32x32="/usr/share/pixmaps/kruler.xpm"\
- icon16x16="/usr/share/pixmaps/kruler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kruler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kruler-16.xpm"\
command="/opt/trinity/bin/kruler"
# Icon 32x32 kruler/pics/cr32-app-kruler.png kruler.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/ksnapshot-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/ksnapshot-trinity.menu
index c490d6cf4..b82c77733 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/ksnapshot-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KSnapshot"\
- icon32x32="/usr/share/pixmaps/ksnapshot.xpm"\
- icon16x16="/usr/share/pixmaps/ksnapshot-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnapshot.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnapshot-16.xpm"\
command="/opt/trinity/bin/ksnapshot"
# Icon 32x32 ksnapshot/cr32-app-ksnapshot.png ksnapshot.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kuickshow-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kuickshow-trinity.menu
index 3e92e9147..ed69377fb 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.menu b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e40a31e43 100644
--- a/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.menu
+++ b/ubuntu/precise/kdegraphics.automake/debian/kview-trinity.menu
@@ -1,10 +1,10 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
- icon32x32="/usr/share/pixmaps/kview.xpm"\
- icon16x16="/usr/share/pixmaps/kview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
command="/opt/trinity/bin/kview"
# Icon 32x32 kview/cr32-app-kview.png kview.xpm
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/kdevelop.cmake/debian/kdevelop-trinity.menu b/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.menu
index 7f40efdc4..dbf27f386 100644
--- a/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.menu
+++ b/ubuntu/precise/kdevelop.cmake/debian/kdevelop-trinity.menu
@@ -1,8 +1,8 @@
-?package(kdevelop):\
+?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/kdevelop.xpm"\
- command="/opt/trinity/bin/kdevelop"
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
+ command="/opt/trinity/bin/tdevelop"
diff --git a/ubuntu/precise/metapackages/rename-meta/Makefile b/ubuntu/precise/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/Makefile
+++ b/ubuntu/precise/metapackages/rename-meta/Makefile
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/changelog b/ubuntu/precise/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/precise/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/compat b/ubuntu/precise/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/compat
+++ b/ubuntu/precise/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/dirs b/ubuntu/precise/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/precise/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst
deleted file mode 100644
index 8db089c93..000000000
--- a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# postinst script for kdm-kde3
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# debconf may not be available if some massive purging is going on
-HAVE_DEBCONF=
-if [ -e /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- HAVE_DEBCONF=yes
-fi
-
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
- if [ -n "$HAVE_DEBCONF" ]; then
- # disown this question
- db_unregister shared/default-x-display-manager || true
- # does the question still exist?
- if db_get shared/default-x-display-manager; then
- if db_metaget shared/default-x-display-manager owners; then
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #observe "X display managers now available are \"$OWNERS\""
- db_subst shared/default-x-display-manager choices "$RET"
- fi
- DEFAULT_DISPLAY_MANAGER=
- if db_get shared/default-x-display-manager; then
- DEFAULT_DISPLAY_MANAGER="$RET"
- fi
- # are we removing the currently selected display manager?
- if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
- if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then
- if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
- # does the display manager file reference the current default? if
- # so, remove it because it will now be wrong
- if [ -n "$RET" ]; then
- if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
- rm "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- fi
- fi
- # ask the user to choose a new default
- db_fset shared/default-x-display-manager seen false
- db_input critical shared/default-x-display-manager || true
- db_go
- # if the default display manager file doesn't exist, write it with
- # the path to the new default display manager
- if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- DEFAULT_DISPLAY_MANAGER=
- if db_get shared/default-x-display-manager; then
- DEFAULT_DISPLAY_MANAGER="$RET"
- fi
- if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #warn "new default display manager has been selected; please be" \
- # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
- # "is configured"
- DAEMON_NAME=
- if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
- DAEMON_NAME="$RET"
- fi
- if [ ! -n "$DAEMON_NAME" ]; then
- # if we were unable to determine the name of the selected daemon (for
- # instance, if the selected default display manager doesn't provide a
- # daemon_name question), guess
- DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
- if [ ! -n "$DAEMON_NAME" ]; then
- echo .
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #warn "unable to determine path to default X display manager" \
- # "$DEFAULT_DISPLAY_MANAGER; not updating" \
- # "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- if [ -n "$DAEMON_NAME" ]; then
- echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- fi
- fi
- fi
- fi
- fi
-
-exit 0
-
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst b/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst
new file mode 100644
index 000000000..e026f2bfe
--- /dev/null
+++ b/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -0,0 +1,89 @@
+#! /bin/sh
+# postinst script for kdm-trinity
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf may not be available if some massive purging is going on
+HAVE_DEBCONF=
+if [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ HAVE_DEBCONF=yes
+fi
+
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+ if [ -n "$HAVE_DEBCONF" ]; then
+ # disown this question
+ db_unregister shared/default-x-display-manager || true
+ # does the question still exist?
+ if db_get shared/default-x-display-manager; then
+ if db_metaget shared/default-x-display-manager owners; then
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #observe "X display managers now available are \"$OWNERS\""
+ db_subst shared/default-x-display-manager choices "$RET"
+ fi
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
+ # are we removing the currently selected display manager?
+ if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+ if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
+ # does the display manager file reference the current default? if
+ # so, remove it because it will now be wrong
+ if [ -n "$RET" ]; then
+ if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ fi
+ fi
+ # ask the user to choose a new default
+ db_fset shared/default-x-display-manager seen false
+ db_input critical shared/default-x-display-manager || true
+ db_go
+ # if the default display manager file doesn't exist, write it with
+ # the path to the new default display manager
+ if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
+ if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #warn "new default display manager has been selected; please be" \
+ # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
+ # "is configured"
+ DAEMON_NAME=
+ if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+ DAEMON_NAME="$RET"
+ fi
+ if [ ! -n "$DAEMON_NAME" ]; then
+ # if we were unable to determine the name of the selected daemon (for
+ # instance, if the selected default display manager doesn't provide a
+ # daemon_name question), guess
+ DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+ if [ ! -n "$DAEMON_NAME" ]; then
+ echo .
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #warn "unable to determine path to default X display manager" \
+ # "$DEFAULT_DISPLAY_MANAGER; not updating" \
+ # "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ if [ -n "$DAEMON_NAME" ]; then
+ echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+
+exit 0
+
diff --git a/ubuntu/precise/metapackages/trinity-livecd/debian/control b/ubuntu/precise/metapackages/trinity-livecd/debian/control
index a6e95b5b5..6adca2f1e 100644
--- a/ubuntu/precise/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/precise/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
Package: trinity-livecd
Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
Recommends:
kpresenter-trinity, kspread-trinity, kword-trinity,
tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,
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/tdeaccessibility/debian/control b/ubuntu/precise/tdeaccessibility/debian/control
index 3d7149dd4..efaba8305 100644
--- a/ubuntu/precise/tdeaccessibility/debian/control
+++ b/ubuntu/precise/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/ubuntu/precise/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/precise/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/ubuntu/precise/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/ubuntu/precise/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/ubuntu/precise/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/precise/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/ubuntu/precise/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/precise/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/ubuntu/precise/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/ubuntu/precise/tdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/ubuntu/precise/tdeadmin/debian/kdat-trinity.menu b/ubuntu/precise/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/ubuntu/precise/tdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/ubuntu/precise/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/precise/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/ubuntu/precise/tdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/ubuntu/precise/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/precise/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/ubuntu/precise/tdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/ubuntu/precise/tdeadmin/debian/kuser-trinity.menu b/ubuntu/precise/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/ubuntu/precise/tdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/precise/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/ubuntu/precise/tdeartwork/debian/control
index 09df752cf..ca1cdd6d6 100644
--- a/ubuntu/precise/tdeartwork/debian/control
+++ b/ubuntu/precise/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/ubuntu/precise/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/precise/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/precise/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/ubuntu/precise/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/ubuntu/precise/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/ubuntu/precise/tdebase/debian/kate-trinity.menu
+++ b/ubuntu/precise/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/ubuntu/precise/tdebase/debian/khelpcenter-trinity.menu
+++ b/ubuntu/precise/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/ubuntu/precise/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/ubuntu/precise/tdebase/debian/konqueror-trinity.menu
+++ b/ubuntu/precise/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/ubuntu/precise/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/ubuntu/precise/tdebase/debian/ksysguard-trinity.menu
+++ b/ubuntu/precise/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/ubuntu/precise/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/ubuntu/precise/tdebase/debian/tdeprint-trinity.menu
+++ b/ubuntu/precise/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/ubuntu/precise/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/ubuntu/precise/tdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/precise/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/ubuntu/precise/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/ubuntu/precise/tdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/ubuntu/precise/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/ubuntu/precise/tdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/ubuntu/precise/tdegames/debian/katomic-trinity.menu b/ubuntu/precise/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/ubuntu/precise/tdegames/debian/katomic-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/ubuntu/precise/tdegames/debian/kbackgammon-trinity.menu b/ubuntu/precise/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/ubuntu/precise/tdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/ubuntu/precise/tdegames/debian/kbattleship-trinity.menu b/ubuntu/precise/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/ubuntu/precise/tdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/ubuntu/precise/tdegames/debian/kblackbox-trinity.menu b/ubuntu/precise/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/ubuntu/precise/tdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/ubuntu/precise/tdegames/debian/kbounce-trinity.menu b/ubuntu/precise/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/ubuntu/precise/tdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/ubuntu/precise/tdegames/debian/kenolaba-trinity.menu b/ubuntu/precise/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/ubuntu/precise/tdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/ubuntu/precise/tdegames/debian/kfouleggs-trinity.menu b/ubuntu/precise/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/ubuntu/precise/tdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/ubuntu/precise/tdegames/debian/kgoldrunner-trinity.menu b/ubuntu/precise/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/ubuntu/precise/tdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/ubuntu/precise/tdegames/debian/kjumpingcube-trinity.menu b/ubuntu/precise/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/ubuntu/precise/tdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/ubuntu/precise/tdegames/debian/klickety-trinity.menu b/ubuntu/precise/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/ubuntu/precise/tdegames/debian/klickety-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/ubuntu/precise/tdegames/debian/klines-trinity.menu b/ubuntu/precise/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/ubuntu/precise/tdegames/debian/klines-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/ubuntu/precise/tdegames/debian/kmahjongg-trinity.menu b/ubuntu/precise/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/ubuntu/precise/tdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/ubuntu/precise/tdegames/debian/kmines-trinity.menu b/ubuntu/precise/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/ubuntu/precise/tdegames/debian/kmines-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/ubuntu/precise/tdegames/debian/knetwalk-trinity.menu b/ubuntu/precise/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/ubuntu/precise/tdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/ubuntu/precise/tdegames/debian/kolf-trinity.menu b/ubuntu/precise/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/ubuntu/precise/tdegames/debian/kolf-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/ubuntu/precise/tdegames/debian/konquest-trinity.menu b/ubuntu/precise/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/ubuntu/precise/tdegames/debian/konquest-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/ubuntu/precise/tdegames/debian/kpat-trinity.menu b/ubuntu/precise/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/ubuntu/precise/tdegames/debian/kpat-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/ubuntu/precise/tdegames/debian/kpoker-trinity.menu b/ubuntu/precise/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/ubuntu/precise/tdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/ubuntu/precise/tdegames/debian/kreversi-trinity.menu b/ubuntu/precise/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/ubuntu/precise/tdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/ubuntu/precise/tdegames/debian/ksame-trinity.menu b/ubuntu/precise/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/ubuntu/precise/tdegames/debian/ksame-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/ubuntu/precise/tdegames/debian/kshisen-trinity.menu b/ubuntu/precise/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/ubuntu/precise/tdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/ubuntu/precise/tdegames/debian/ksirtet-trinity.menu b/ubuntu/precise/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/ubuntu/precise/tdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/ubuntu/precise/tdegames/debian/ksmiletris-trinity.menu b/ubuntu/precise/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/ubuntu/precise/tdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/ubuntu/precise/tdegames/debian/ksnake-trinity.menu b/ubuntu/precise/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/ubuntu/precise/tdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/ubuntu/precise/tdegames/debian/ksokoban-trinity.menu b/ubuntu/precise/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/ubuntu/precise/tdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/ubuntu/precise/tdegames/debian/kspaceduel-trinity.menu b/ubuntu/precise/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/ubuntu/precise/tdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/ubuntu/precise/tdegames/debian/ktron-trinity.menu b/ubuntu/precise/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/ubuntu/precise/tdegames/debian/ktron-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/ubuntu/precise/tdegames/debian/ktuberling-trinity.menu b/ubuntu/precise/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/ubuntu/precise/tdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/ubuntu/precise/tdegames/debian/kwin4-trinity.menu b/ubuntu/precise/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/ubuntu/precise/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/ubuntu/precise/tdegames/debian/lskat-trinity.menu b/ubuntu/precise/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/ubuntu/precise/tdegames/debian/lskat-trinity.menu
+++ b/ubuntu/precise/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/ubuntu/precise/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/ubuntu/precise/tdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/precise/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/ubuntu/precise/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/ubuntu/precise/tdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/precise/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/precise/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/ubuntu/precise/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/ubuntu/precise/tdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/precise/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/ubuntu/precise/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/ubuntu/precise/tdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/precise/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/ubuntu/precise/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/ubuntu/precise/tdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/precise/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/ubuntu/precise/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/ubuntu/precise/tdepim/debian/akregator-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.menu b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/ubuntu/precise/tdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/ubuntu/precise/tdepim/debian/kalarm-trinity.menu b/ubuntu/precise/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/ubuntu/precise/tdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/ubuntu/precise/tdepim/debian/karm-trinity.menu b/ubuntu/precise/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/ubuntu/precise/tdepim/debian/karm-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/ubuntu/precise/tdepim/debian/kmail-trinity.menu b/ubuntu/precise/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/ubuntu/precise/tdepim/debian/kmail-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/ubuntu/precise/tdepim/debian/kmailcvt-trinity.menu b/ubuntu/precise/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/ubuntu/precise/tdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/ubuntu/precise/tdepim/debian/knode-trinity.menu b/ubuntu/precise/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/ubuntu/precise/tdepim/debian/knode-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/ubuntu/precise/tdepim/debian/knotes-trinity.menu b/ubuntu/precise/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/ubuntu/precise/tdepim/debian/knotes-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/ubuntu/precise/tdepim/debian/kontact-trinity.menu b/ubuntu/precise/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/ubuntu/precise/tdepim/debian/kontact-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/ubuntu/precise/tdepim/debian/korganizer-trinity.menu b/ubuntu/precise/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/ubuntu/precise/tdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/ubuntu/precise/tdepim/debian/korn-trinity.menu b/ubuntu/precise/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/ubuntu/precise/tdepim/debian/korn-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/ubuntu/precise/tdepim/debian/ktnef-trinity.menu b/ubuntu/precise/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/ubuntu/precise/tdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/ubuntu/precise/tdepim/debian/tdepim-wizards-trinity.menu b/ubuntu/precise/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/ubuntu/precise/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/ubuntu/precise/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/precise/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/ubuntu/precise/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/ubuntu/precise/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/ubuntu/precise/tdeutils/debian/control b/ubuntu/precise/tdeutils/debian/control
index d0556e97b..599a692dd 100644
--- a/ubuntu/precise/tdeutils/debian/control
+++ b/ubuntu/precise/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/ubuntu/precise/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/ubuntu/precise/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/precise/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/ubuntu/precise/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/precise/tdeutils/debian/kdf-trinity.menu b/ubuntu/precise/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/ubuntu/precise/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/ubuntu/precise/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/ubuntu/precise/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/precise/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/ubuntu/precise/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kgpg-trinity.menu b/ubuntu/precise/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/ubuntu/precise/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/ubuntu/precise/tdeutils/debian/khexedit-trinity.menu b/ubuntu/precise/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/ubuntu/precise/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kjots-trinity.menu b/ubuntu/precise/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/ubuntu/precise/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/precise/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/ubuntu/precise/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/ubuntu/precise/tdeutils/debian/ktimer-trinity.menu b/ubuntu/precise/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/ubuntu/precise/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/ubuntu/precise/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/precise/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/ubuntu/precise/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/precise/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/ubuntu/precise/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.install
diff --git a/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/ubuntu/precise/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/precise/tdeutils/debian/kdessh-trinity.install b/ubuntu/precise/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/ubuntu/precise/tdeutils/debian/kdessh-trinity.install
+++ b/ubuntu/precise/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/ubuntu/precise/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/ubuntu/precise/tdevelop/debian/tdevelop-trinity.menu
+++ b/ubuntu/precise/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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/abakus/debian/abakus-trinity.menu b/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu
+++ b/ubuntu/raring/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
title="AbaKus"\
command="/opt/trinity/bin/abakus"\
hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu b/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/ubuntu/raring/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
diff --git a/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu b/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu
+++ b/ubuntu/raring/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Sound"\
hints="TDE"\
title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
command="/opt/trinity/bin/amarok"
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/bibletime/debian/menu b/ubuntu/raring/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/ubuntu/raring/applications/bibletime/debian/menu
+++ b/ubuntu/raring/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
?package(bibletime):\
needs="X11"\
- hints="KDE,Bible"\
+ hints="TDE,Bible"\
section="Applications/Education"\
title="BibleTime"\
icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu b/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/raring/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="digikam"\
- icon32x32="/usr/share/pixmaps/digikam.xpm"\
- icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
command="/opt/trinity/bin/digikam"
diff --git a/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/raring/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
needs="X11"\
section="Applications/Viewers"\
title="showfoto"\
- icon32x32="/usr/share/pixmaps/showfoto.xpm"\
- icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
command="/opt/trinity/bin/showfoto"
diff --git a/ubuntu/raring/applications/filelight/debian/menu b/ubuntu/raring/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/ubuntu/raring/applications/filelight/debian/menu
+++ b/ubuntu/raring/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
?package(filelight):needs="X11" \
section="Apps/System" \
- hints="KDE, Monitoring, Files" \
+ hints="TDE, Monitoring, Files" \
command="/opt/trinity/bin/filelight" \
title="Filelight" \
longtitle="Filelight: disk usage as concentric rings"
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/menu b/ubuntu/raring/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/ubuntu/raring/applications/gwenview/debian/menu
+++ b/ubuntu/raring/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
?package(gwenview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="Gwenview"\
command="/opt/trinity/bin/gwenview"\
- icon="/usr/share/pixmaps/gwenview.xpm"
+ icon="/opt/trinity/share/pixmaps/gwenview.xpm"
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/k3b/debian/k3b-trinity.menu b/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/raring/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
section="Applications/File Management"\
title="K3b"\
command="/opt/trinity/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/raring/applications/k3b/debian/k3b.menu b/ubuntu/raring/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/ubuntu/raring/applications/k3b/debian/k3b.menu
+++ b/ubuntu/raring/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/File Management"\
title="K3b"\
- command="/usr/bin/k3b"\
- icon="/usr/share/pixmaps/k3b.xpm"
+ command="/opt/trinity/bin/k3b"\
+ icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/ubuntu/raring/applications/k9copy/debian/control b/ubuntu/raring/applications/k9copy/debian/control
index d9a4ccd4e..96101dafe 100644
--- a/ubuntu/raring/applications/k9copy/debian/control
+++ b/ubuntu/raring/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: k9copy-trinity
diff --git a/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..96001a6ad 100644
--- a/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/raring/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>k9copy</refname>
- <refpurpose>DVD copy tool for KDE</refpurpose>
+ <refpurpose>DVD copy tool for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- DVD copy tool for KDE.
+ DVD copy tool for TDE.
</para>
<para>
k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. k9copy has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/raring/applications/k9copy/debian/rules b/ubuntu/raring/applications/k9copy/debian/rules
index 8afe2157c..9d406d017 100755
--- a/ubuntu/raring/applications/k9copy/debian/rules
+++ b/ubuntu/raring/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/k9copy::
- dh_install src/k9copy.desktop opt/trinity/share/applications/tde
- dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+ dh_installman k9copy.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+ dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
-build/k9copy::
+build/k9copy-trinity::
docbook2x-man debian/k9copy.1.docbook
clean::
diff --git a/ubuntu/raring/applications/kaffeine/debian/menu b/ubuntu/raring/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/ubuntu/raring/applications/kaffeine/debian/menu
+++ b/ubuntu/raring/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
hints="TDE"\
title="Kaffeine"\
command="/opt/trinity/bin/kaffeine"\
- icon="/usr/share/pixmaps/kaffeine.xpm"
+ icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
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/kbarcode/debian/menu b/ubuntu/raring/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/ubuntu/raring/applications/kbarcode/debian/menu
+++ b/ubuntu/raring/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
?package(kbarcode):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Barcode"\
+ hints="TDE,Barcode"\
title="KBarcode"\
- command="/usr/bin/kbarcode"
+ command="/opt/trinity/bin/kbarcode"
diff --git a/ubuntu/raring/applications/kcpuload/debian/menu b/ubuntu/raring/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/ubuntu/raring/applications/kcpuload/debian/menu
+++ b/ubuntu/raring/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
kderemove="1"\
title="KCPULoad"\
command="/opt/trinity/bin/kcpuload"\
- icon="/usr/share/pixmaps/kcpuload.xpm"
+ icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/ubuntu/raring/applications/keep/debian/control b/ubuntu/raring/applications/keep/debian/control
index f3213cd45..17e87e581 100644
--- a/ubuntu/raring/applications/keep/debian/control
+++ b/ubuntu/raring/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 5), tdelibs4-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/ubuntu/raring/applications/keep/debian/keep.xml b/ubuntu/raring/applications/keep/debian/keep.xml
index 0f07da7f0..0e97d35b3 100644
--- a/ubuntu/raring/applications/keep/debian/keep.xml
+++ b/ubuntu/raring/applications/keep/debian/keep.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
<refname>keep</refname>
- <refpurpose>backup system for KDE</refpurpose>
+ <refpurpose>backup system for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -33,14 +33,14 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- backup system for KDE.
+ backup system for TDE.
</para>
<para>
The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
@@ -49,7 +49,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options. keep has no
application-specific options.
</para>
@@ -65,8 +65,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
diff --git a/ubuntu/raring/applications/keep/debian/rules b/ubuntu/raring/applications/keep/debian/rules
index 1b5054df6..c08262790 100755
--- a/ubuntu/raring/applications/keep/debian/rules
+++ b/ubuntu/raring/applications/keep/debian/rules
@@ -31,8 +31,13 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-build/keep::
+build/keep-trinity::
/usr/bin/docbook2x-man debian/keep.xml
+install/keep-trinity::
+ dh_installman keep.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+
clean::
+ rm -f debian/stamp-bootstrap
rm -f keep.1
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/kile/debian/menu b/ubuntu/raring/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/ubuntu/raring/applications/kile/debian/menu
+++ b/ubuntu/raring/applications/kile/debian/menu
@@ -4,4 +4,4 @@
title="Kile" \
longtitle="Kile (LaTeX development environment)" \
command="/opt/trinity/bin/kile" \
- icon="/usr/share/pixmaps/kile.xpm"
+ icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/ubuntu/raring/applications/kmatplot/debian/menu b/ubuntu/raring/applications/kmatplot/debian/menu
index 6cb3a60a8..31de047d3 100644
--- a/ubuntu/raring/applications/kmatplot/debian/menu
+++ b/ubuntu/raring/applications/kmatplot/debian/menu
@@ -1,2 +1,2 @@
?package(kmatplot):needs="X11" section="Apps/Math"\
- title="kmatplot" command="/usr/bin/kmatplot"
+ title="kmatplot" command="/opt/trinity/bin/kmatplot"
diff --git a/ubuntu/raring/applications/knetload/debian/menu b/ubuntu/raring/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/ubuntu/raring/applications/knetload/debian/menu
+++ b/ubuntu/raring/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
hints="TDE"\
title="KNetLoad"\
command="/opt/trinity/bin/knetload"\
- icon="/usr/share/pixmaps/knetload.xpm"
+ icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu b/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu
+++ b/ubuntu/raring/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
diff --git a/ubuntu/raring/applications/knetworkmanager8/debian/menu b/ubuntu/raring/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/ubuntu/raring/applications/knetworkmanager8/debian/menu
+++ b/ubuntu/raring/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
needs="X11" \
section="Applications/Network/Monitoring" \
title="KNetworkManager" \
- longtitle="A KDE frontend for NetworkManager" \
+ longtitle="A TDE frontend for NetworkManager" \
command="/opt/trinity/bin/knetworkmanager"
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/chalk-trinity.menu b/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
?package(chalk):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Bitmap"\
+ hints="TDE,Bitmap"\
title="Chalk"\
longtitle="Chalk (Image Manipulation)"\
icon="/opt/trinity/share/pixmaps/chalk.xpm"\
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/karbon-trinity.menu b/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
?package(karbon):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Karbon"\
longtitle="Karbon (Scalable Graphics)"\
icon="/opt/trinity/share/pixmaps/karbon.xpm"\
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/kchart-trinity.menu b/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
?package(kchart):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Graphs"\
+ hints="TDE,Graphs"\
title="KChart"\
longtitle="KChart (Charting)"\
icon="/opt/trinity/share/pixmaps/kchart.xpm"\
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/kivio-trinity.menu b/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
?package(kivio):\
needs="x11"\
section="Applications/Graphics"\
- hints="KDE,Vector"\
+ hints="TDE,Vector"\
title="Kivio"\
longtitle="Kivio (Flowchart and Diagram Editing)"\
icon="/opt/trinity/share/pixmaps/kivio.xpm"\
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/kpresenter-trinity.menu b/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
?package(kpresenter):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Presentation"\
+ hints="TDE,Presentation"\
title="KPresenter"\
longtitle="KPresenter (Slide Presentations)"\
icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
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/kspread-trinity.menu b/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
?package(kspread):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Spreadsheets"\
+ hints="TDE,Spreadsheets"\
title="KSpread"\
longtitle="KSpread (Spreadsheets)"\
icon="/opt/trinity/share/pixmaps/kspread.xpm"\
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/koffice/debian/kword-trinity.menu b/ubuntu/raring/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/ubuntu/raring/applications/koffice/debian/kword-trinity.menu
+++ b/ubuntu/raring/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
?package(kword):\
needs="x11"\
section="Applications/Office"\
- hints="KDE,Word processors"\
+ hints="TDE,Word processors"\
title="KWord"\
longtitle="KWord (Word Processing)"\
icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/ubuntu/raring/applications/konversation/debian/control b/ubuntu/raring/applications/konversation/debian/control
index 9728d2f8e..7d96a609e 100644
--- a/ubuntu/raring/applications/konversation/debian/control
+++ b/ubuntu/raring/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Homepage: http://konversation.kde.org/
diff --git a/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/raring/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu b/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/raring/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Communication"\
title="Konversation IRC Client"\
- hints="KDE,IRC Clients"\
- icon="/usr/share/pixmaps/konversation32x32.xpm"\
- icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
- icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+ hints="TDE,IRC Clients"\
+ icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
command="/opt/trinity/bin/konversation"
diff --git a/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/raring/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
</refmeta>
<refnamediv>
<refname>konversation</refname>
- <refpurpose>user friendly IRC client for KDE</refpurpose>
+ <refpurpose>user friendly IRC client for TDE</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -34,7 +34,7 @@
<option><replaceable>Qt-options</replaceable></option>
</arg>
<arg choice="opt">
- <option><replaceable>KDE-options</replaceable></option>
+ <option><replaceable>TDE-options</replaceable></option>
</arg>
<arg choice="opt">
<option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
<refsect1>
<title>OPTIONS</title>
<para>
- All <productname>KDE</productname> and <productname>Qt</productname>
+ All <productname>TDE</productname> and <productname>Qt</productname>
programs accept a some common command-line options.
</para>
<para>
@@ -72,8 +72,8 @@
<listitem> <para>Show Qt specific options</para> </listitem>
</varlistentry>
<varlistentry>
- <term> <option>--help-kde</option> </term>
- <listitem> <para>Show KDE specific options</para> </listitem>
+ <term> <option>--help-tde</option> </term>
+ <listitem> <para>Show TDE specific options</para> </listitem>
</varlistentry>
<varlistentry>
<term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
<refsect1>
<title>SCRIPTING</title>
<para>Konversation looks for scripts in <filename
- class="directory">/usr/share/apps/konversation/scripts</filename> and
+ class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
in <filename
- class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+ class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
To execute a script, use the <command>exec</command> command:</para>
<cmdsynopsis>
<command>/exec</command>
@@ -157,19 +157,19 @@
<para>
<variablelist>
<varlistentry>
- <term><filename>~/.kde/share/config/konversationrc</filename></term>
+ <term><filename>~/.trinity/share/config/konversationrc</filename></term>
<listitem><para>Main configuration</para></listitem>
</varlistentry>
<varlistentry>
<term>
- <filename>~/.kde/share/config/konversation.eventsrc</filename>
+ <filename>~/.trinity/share/config/konversation.eventsrc</filename>
</term>
<listitem><para>Notification settings</para></listitem>
</varlistentry>
<varlistentry>
<term>
<filename
- class="directory">~/.kde/share/apps/konversation/logs</filename>
+ class="directory">~/.trinity/share/apps/konversation/logs</filename>
</term>
<listitem><para>Directory containing channel log
files</para></listitem>
diff --git a/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/raring/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
connection to the specified IRC server in a running Konversation client.
</para>
<para>
- This program is registered with KDE as a handler for the irc URI scheme,
- and KDE applications will use this program to handle such URI.
+ This program is registered with TDE as a handler for the irc URI scheme,
+ and TDE applications will use this program to handle such URI.
(For example, it will be called if a user clicks on an irc:// link on a
web page in Konqueror.)
</para>
diff --git a/ubuntu/raring/applications/konversation/debian/rules b/ubuntu/raring/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/ubuntu/raring/applications/konversation/debian/rules
+++ b/ubuntu/raring/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
$(XP) $(DB2MAN) $<
GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
clean::
-rm -f $(GENERATED_MANPAGES)
-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
install/konversation-trinity::
install -D -m 644 konversation/scripts/README \
debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+ dh_installman debian/man/*.1
+ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
diff --git a/ubuntu/raring/applications/kpicosim/debian/menu b/ubuntu/raring/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/ubuntu/raring/applications/kpicosim/debian/menu
+++ b/ubuntu/raring/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
?package(kpicosim):needs="X11" section="Apps/Science"\
- title="kpicosim" command="/usr/bin/kpicosim"
+ title="kpicosim" command="/opt/trinity/bin/kpicosim"
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/menu b/ubuntu/raring/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/ubuntu/raring/applications/kpowersave.cmake/debian/menu
+++ b/ubuntu/raring/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
section="Applications/System/Monitoring"\
title="KPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
+ icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
command="/opt/trinity/bin/kpowersave"
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/menu b/ubuntu/raring/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/ubuntu/raring/applications/krusader/debian/menu
+++ b/ubuntu/raring/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
command="/opt/trinity/bin/krusader"
?package(krusader):\
@@ -12,6 +12,6 @@
section="Applications/Network/File Transfer"\
hints="TDE"\
title="krusader - root-mode (File Manager)"\
- icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
- icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
command="tdesu -c /opt/trinity/bin/krusader"
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/ktechlab/debian/menu b/ubuntu/raring/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/ubuntu/raring/applications/ktechlab/debian/menu
+++ b/ubuntu/raring/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
hints="TDE" \
title="KTechLab" \
command="/opt/trinity/bin/ktechlab" \
- icon="/usr/share/pixmaps/ktechlab.xpm"
+ icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
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/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/raring/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Graphics"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu b/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu
+++ b/ubuntu/raring/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
?package(potracegui):needs="X11" section="Apps/Graphics"\
title="potracegui" command="/opt/trinity/bin/potracegui"\
- hints="KDE frontend for tracing programs"
+ hints="TDE frontend for tracing programs"
diff --git a/ubuntu/raring/applications/smb4k/debian/menu b/ubuntu/raring/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/ubuntu/raring/applications/smb4k/debian/menu
+++ b/ubuntu/raring/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
section="Applications/Network"\
hints="TDE"\
kderemove="1"\
- title="SAMBA for KDE"\
+ title="SAMBA for TDE"\
longtitle="SAMBA Advanced Browser"\
command="/opt/trinity/bin/smb4k"
diff --git a/ubuntu/raring/applications/tdepowersave/debian/control b/ubuntu/raring/applications/tdepowersave/debian/control
index 3c3de5835..dcd5ab3f9 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/control
+++ b/ubuntu/raring/applications/tdepowersave/debian/control
@@ -13,7 +13,7 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: kpowersave-trinity, kpowersave-nohal-trinity
Description: Power management applet for Trinity
- KPowersave is a TDE systray applet which allows to control the power
+ TDEPowersave is a TDE systray applet which allows to control the power
management settings and policies of your computer.
It relies on the TDE hardware library to do the heavy lifting.
.
@@ -33,7 +33,7 @@ Description: Power management applet for Trinity
* KNotify support
* online help
* localisations for many languages
- KPowersave supports schemes with following configurable specific
+ TDEPowersave supports schemes with following configurable specific
settings for:
* screensaver
* DPMS
diff --git a/ubuntu/raring/applications/tdepowersave/debian/install b/ubuntu/raring/applications/tdepowersave/debian/install
index 4a1194bd1..8d2341734 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/install
+++ b/ubuntu/raring/applications/tdepowersave/debian/install
@@ -1 +1 @@
-debian/kpowersave.xpm usr/share/pixmaps
+debian/tdepowersave.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
deleted file mode 100644
index edff50852..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.lintian
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
deleted file mode 100644
index 0ab1d6f90..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "K Desktop Environment" "A KDE KPart Application"
-.SH NAME
-kpowersave
-\- A KDE KPart Application
-.SH SYNOPSIS
-kpowersave [Qt\-options] [KDE\-options]
-.SH DESCRIPTION
-A KDE KPart Application
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS KDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
deleted file mode 100644
index 99d178492..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave.xpm
+++ /dev/null
@@ -1,628 +0,0 @@
-/* XPM */
-static char * kpowersave_xpm[] = {
-"32 32 593 2",
-" c None",
-". c #6D2121",
-"+ c #783738",
-"@ c #743E40",
-"# c #5D2F30",
-"$ c #3E1618",
-"% c #8A0200",
-"& c #982306",
-"* c #A75C4B",
-"= c #D3B8BC",
-"- c #E9E0E1",
-"; c #E7E7ED",
-"> c #DDDFE7",
-", c #CCCBD7",
-"' c #B3ADBB",
-") c #827583",
-"! c #6A3227",
-"~ c #410B00",
-"{ c #080000",
-"] c #AE381A",
-"^ c #C79676",
-"/ c #D8C9B7",
-"( c #B3B7C2",
-"_ c #F2F8FF",
-": c #EBEDF4",
-"< c #D8D9E3",
-"[ c #CBCBD8",
-"} c #BEC0CF",
-"| c #B4B5C9",
-"1 c #A0A4BD",
-"2 c #9B90A1",
-"3 c #B08583",
-"4 c #8F493D",
-"5 c #340B02",
-"6 c #A71F09",
-"7 c #D5BEA2",
-"8 c #F1FFFF",
-"9 c #EEF2F6",
-"0 c #999AAD",
-"a c #C8C8D7",
-"b c #CFCFDB",
-"c c #C2C2D0",
-"d c #B6B6C6",
-"e c #A8A8BC",
-"f c #9B9BB1",
-"g c #8685A0",
-"h c #8D8EA6",
-"i c #AFB8CD",
-"j c #ABAFC6",
-"k c #9F534D",
-"l c #1C0000",
-"m c #B63F26",
-"n c #DAC1A4",
-"o c #DCD9DF",
-"p c #EEF3F6",
-"q c #B0B6C4",
-"r c #AEB0C4",
-"s c #BDBECF",
-"t c #B2B3C6",
-"u c #A6A7BB",
-"v c #9A9BB1",
-"w c #8C8EA5",
-"x c #797D94",
-"y c #98A0B4",
-"z c #B3BCD0",
-"A c #A99EAF",
-"B c #C46347",
-"C c #2B0C00",
-"D c #B63C1A",
-"E c #FED76A",
-"F c #E2BE8D",
-"G c #DCB4A6",
-"H c #D6BCBA",
-"I c #B3ABB9",
-"J c #A9A7B9",
-"K c #A4A5B7",
-"L c #9EA1B1",
-"M c #9798A9",
-"N c #9392A1",
-"O c #A2969F",
-"P c #C29994",
-"Q c #CD866F",
-"R c #DC6A3D",
-"S c #B42A0E",
-"T c #160101",
-"U c #B53817",
-"V c #FFDA34",
-"W c #FFF727",
-"X c #FCE43C",
-"Y c #F5B84C",
-"Z c #EDA45F",
-"` c #E79B6C",
-" . c #E39872",
-".. c #E2926F",
-"+. c #E08764",
-"@. c #E07853",
-"#. c #DF623C",
-"$. c #DA4925",
-"%. c #C83415",
-"&. c #B10E04",
-"*. c #900000",
-"=. c #180000",
-"-. c #B53918",
-";. c #FFD83B",
-">. c #FFF30F",
-",. c #FBED00",
-"'. c #F2BD00",
-"). c #EB8F02",
-"!. c #E4650D",
-"~. c #DE3B14",
-"{. c #D71E15",
-"]. c #CF180F",
-"^. c #C60D07",
-"/. c #BA0100",
-"(. c #B10000",
-"_. c #AA0000",
-":. c #AB0000",
-"<. c #980000",
-"[. c #170000",
-"}. c #FFF312",
-"|. c #FBEC00",
-"1. c #F2BA00",
-"2. c #EA8B00",
-"3. c #E45A00",
-"4. c #DE2200",
-"5. c #D40000",
-"6. c #CC0000",
-"7. c #C00000",
-"8. c #A20103",
-"9. c #8D0811",
-"0. c #7F1825",
-"a. c #6D293B",
-"b. c #474158",
-"c. c #60637E",
-"d. c #7D7D99",
-"e. c #9292AB",
-"f. c #77779C",
-"g. c #FDEE00",
-"h. c #F9BF00",
-"i. c #E68600",
-"j. c #CC5100",
-"k. c #AB260B",
-"l. c #95161A",
-"m. c #83232C",
-"n. c #803D48",
-"o. c #875E6B",
-"p. c #8D7C8A",
-"q. c #9698A7",
-"r. c #A5ABB8",
-"s. c #B7BCC6",
-"t. c #CBC7CD",
-"u. c #D0CBCF",
-"v. c #C7C4CC",
-"w. c #CAC9CF",
-"x. c #9F9FB8",
-"y. c #262641",
-"z. c #B63915",
-"A. c #FFD838",
-"B. c #FFF413",
-"C. c #F9EA00",
-"D. c #99822F",
-"E. c #8D7B67",
-"F. c #958B89",
-"G. c #A2A5A9",
-"H. c #B4BABD",
-"I. c #C6CDCE",
-"J. c #D2DADA",
-"K. c #D5DCE2",
-"L. c #CDD5DF",
-"M. c #BCC5D7",
-"N. c #A0B5D8",
-"O. c #83A5D9",
-"P. c #6B98DB",
-"Q. c #5A8FDE",
-"R. c #3C80E3",
-"S. c #5E8AD2",
-"T. c #B4B0BE",
-"U. c #3F3F61",
-"V. c #AA372A",
-"W. c #F9D742",
-"X. c #FFFC02",
-"Y. c #B1AB13",
-"Z. c #6F7184",
-"`. c #EDF1F8",
-" + c #EAECEF",
-".+ c #CBD4E0",
-"++ c #B2C6E0",
-"@+ c #97B7E0",
-"#+ c #84ADE2",
-"$+ c #79A8E5",
-"%+ c #6DA2E9",
-"&+ c #5E9CED",
-"*+ c #5299F8",
-"=+ c #509AFD",
-"-+ c #529BFE",
-";+ c #509CFF",
-">+ c #4094FF",
-",+ c #3D7EE0",
-"'+ c #B4B3C0",
-")+ c #5D5C7F",
-"!+ c #9D363D",
-"~+ c #D1D0B4",
-"{+ c #FFF856",
-"]+ c #A29E28",
-"^+ c #72727F",
-"/+ c #E5E2E1",
-"(+ c #94B7DB",
-"_+ c #97C2EF",
-":+ c #A3CBF7",
-"<+ c #A6CEFC",
-"[+ c #AAD0FF",
-"}+ c #ABD1FF",
-"|+ c #A1CAFF",
-"1+ c #94C4FF",
-"2+ c #8ABDFF",
-"3+ c #7EB6FF",
-"4+ c #6DACFF",
-"5+ c #559EFF",
-"6+ c #4195FF",
-"7+ c #2877EB",
-"8+ c #9DA6C2",
-"9+ c #767292",
-"0+ c #0E0E1C",
-"a+ c #9F3636",
-"b+ c #C7CED6",
-"c+ c #EBEDF5",
-"d+ c #BEBCAD",
-"e+ c #606061",
-"f+ c #D3CECE",
-"g+ c #9ABEE5",
-"h+ c #D5EBFF",
-"i+ c #EEF4FF",
-"j+ c #D2E5FF",
-"k+ c #BFDAFF",
-"l+ c #ACD0FF",
-"m+ c #9BC7FF",
-"n+ c #8FBFFF",
-"o+ c #7FB6FF",
-"p+ c #4F9BFF",
-"q+ c #2B84FD",
-"r+ c #1875F6",
-"s+ c #0E6AF1",
-"t+ c #075DE3",
-"u+ c #8498C5",
-"v+ c #8E89A3",
-"w+ c #161629",
-"x+ c #C8CFCE",
-"y+ c #E8EAEB",
-"z+ c #D1D1D7",
-"A+ c #5C5C5D",
-"B+ c #BBB7B7",
-"C+ c #A6C0DF",
-"D+ c #AAD1FD",
-"E+ c #DEECFF",
-"F+ c #C4DDFF",
-"G+ c #B4D4FF",
-"H+ c #A4CAFF",
-"I+ c #9AC5FF",
-"J+ c #76B1FF",
-"K+ c #2C89FF",
-"L+ c #016BFE",
-"M+ c #0064F8",
-"N+ c #005FEE",
-"O+ c #005AE5",
-"P+ c #0050DD",
-"Q+ c #6588C7",
-"R+ c #A09AB0",
-"S+ c #2A2A44",
-"T+ c #C9CFCF",
-"U+ c #E5E7E7",
-"V+ c #E0E0E0",
-"W+ c #676767",
-"X+ c #A3A1A1",
-"Y+ c #B8C4D9",
-"Z+ c #93BFF0",
-"`+ c #D6E9FF",
-" @ c #BDD9FF",
-".@ c #ACCFFF",
-"+@ c #A3CAFF",
-"@@ c #7BB5FF",
-"#@ c #2386FF",
-"$@ c #0472FF",
-"%@ c #006AFC",
-"&@ c #0065F4",
-"*@ c #005FEA",
-"=@ c #005AE3",
-"-@ c #004FDB",
-";@ c #4B78C9",
-">@ c #A5A0B1",
-",@ c #454569",
-"'@ c #E4E6E6",
-")@ c #E7E7E7",
-"!@ c #7D7D7E",
-"~@ c #898788",
-"{@ c #C7CAD5",
-"]@ c #89B6EA",
-"^@ c #C7E1FF",
-"/@ c #B6D5FF",
-"(@ c #ABCEFF",
-"_@ c #86BBFF",
-":@ c #2F8EFF",
-"<@ c #117BFF",
-"[@ c #0570FF",
-"}@ c #0068F8",
-"|@ c #0063F0",
-"1@ c #005DE7",
-"2@ c #0059DF",
-"3@ c #004CD6",
-"4@ c #3369CD",
-"5@ c #A3A2B4",
-"6@ c #585880",
-"7@ c #909090",
-"8@ c #717072",
-"9@ c #C6C4CB",
-"0@ c #84AFE7",
-"a@ c #B5D7FF",
-"b@ c #B5D4FF",
-"c@ c #96C4FF",
-"d@ c #3A96FF",
-"e@ c #1C82FF",
-"f@ c #0D77FF",
-"g@ c #006BFD",
-"h@ c #0066F4",
-"i@ c #0061EC",
-"j@ c #005BE4",
-"k@ c #0055DB",
-"l@ c #004ED3",
-"m@ c #0D51CB",
-"n@ c #9298B7",
-"o@ c #6B6A90",
-"p@ c #0B0B17",
-"q@ c #E5E6E6",
-"r@ c #E6E6E6",
-"s@ c #9F9F9F",
-"t@ c #636265",
-"u@ c #BFBABC",
-"v@ c #80AAE1",
-"w@ c #9FC9FF",
-"x@ c #A8CEFF",
-"y@ c #4EA1FF",
-"z@ c #2489FF",
-"A@ c #187EFF",
-"B@ c #0069FA",
-"C@ c #005EE8",
-"D@ c #0058DF",
-"E@ c #0052D7",
-"F@ c #004DCE",
-"G@ c #0047C8",
-"H@ c #7B8CBA",
-"I@ c #7E7B9B",
-"J@ c #1D1D34",
-"K@ c #E5E5E5",
-"L@ c #AAAAAB",
-"M@ c #5E5E60",
-"N@ c #B3ADAC",
-"O@ c #90ADDA",
-"P@ c #78B4FC",
-"Q@ c #61ADFF",
-"R@ c #2D90FF",
-"S@ c #2185FF",
-"T@ c #0E78FF",
-"U@ c #016CFE",
-"V@ c #0066F5",
-"W@ c #005CE4",
-"X@ c #0055DC",
-"Y@ c #0050D3",
-"Z@ c #004ACB",
-"`@ c #003AC2",
-" # c #617CC1",
-".# c #8C89A2",
-"+# c #2D2D4C",
-"@# c #E4E4E4",
-"## c #B5B5B5",
-"$# c #606062",
-"%# c #9D9A9B",
-"&# c #ABB6CF",
-"*# c #3D94F7",
-"=# c #3C9CFF",
-"-# c #2C8DFF",
-";# c #1A80FF",
-"># c #0772FF",
-",# c #0068FB",
-"'# c #0062F2",
-")# c #005BEA",
-"!# c #0053E2",
-"~# c #004FD9",
-"{# c #024BCF",
-"]# c #094DC7",
-"^# c #1950C0",
-"/# c #6681C0",
-"(# c #8987A0",
-"_# c #41416E",
-":# c #E3E3E3",
-"<# c #BCBCBC",
-"[# c #69696B",
-"}# c #858488",
-"|# c #BDBAC5",
-"1# c #3E8DEF",
-"2# c #3094FF",
-"3# c #1C84FF",
-"4# c #0473FF",
-"5# c #0069FD",
-"6# c #0364F2",
-"7# c #1464E5",
-"8# c #296AD7",
-"9# c #4A7ACB",
-"0# c #6281BF",
-"a# c #7B8CB9",
-"b# c #9098B4",
-"c# c #ABAAB7",
-"d# c #B4B2B9",
-"e# c #B8B7BD",
-"f# c #AAAAB9",
-"g# c #8080A3",
-"h# c #5B5B8F",
-"i# c #A03838",
-"j# c #E2E2E2",
-"k# c #727274",
-"l# c #727276",
-"m# c #BDB6BB",
-"n# c #508DE5",
-"o# c #1579F9",
-"p# c #347FE8",
-"q# c #5287D9",
-"r# c #6B8DCB",
-"s# c #8699C1",
-"t# c #9BA4BC",
-"u# c #BAB8C0",
-"v# c #CCC6C4",
-"w# c #D1CCC9",
-"x# c #D3D0CE",
-"y# c #D3D0D6",
-"z# c #D1D2E3",
-"A# c #D4D6EE",
-"B# c #DADBF6",
-"C# c #DCDEE9",
-"D# c #D4D4D4",
-"E# c #BFBFC4",
-"F# c #A6A6B9",
-"G# c #8686AD",
-"H# c #56568C",
-"I# c #3E3E79",
-"J# c #A13434",
-"K# c #CAD4D4",
-"L# c #7C7C7D",
-"M# c #67676A",
-"N# c #ACABB4",
-"O# c #AAB1CA",
-"P# c #AAB1C9",
-"Q# c #C5C2C7",
-"R# c #D3CCCA",
-"S# c #D7D1D0",
-"T# c #DAD7D8",
-"U# c #DEDCE0",
-"V# c #D8D9EA",
-"W# c #CCCFF1",
-"X# c #C5C8F6",
-"Y# c #C5C9FA",
-"Z# c #CACDFF",
-"`# c #D0D3FF",
-" $ c #D7DAFF",
-".$ c #E1E3FF",
-"+$ c #EAECFF",
-"@$ c #EDEEFD",
-"#$ c #E2E3E7",
-"$$ c #CBCBC7",
-"%$ c #C8C8C4",
-"&$ c #BDBDC0",
-"*$ c #9E9EAF",
-"=$ c #6A6A9D",
-"-$ c #840808",
-";$ c #C18B8B",
-">$ c #EBF3F3",
-",$ c #E8F0F0",
-"'$ c #BDC2C2",
-")$ c #878A8A",
-"!$ c #616367",
-"~$ c #B1B1B4",
-"{$ c #D0CECC",
-"]$ c #DEDBD8",
-"^$ c #E4E4E2",
-"/$ c #E6E6E5",
-"($ c #E7E8EA",
-"_$ c #D2D4F9",
-":$ c #B9BEFD",
-"<$ c #B0B5FF",
-"[$ c #B4B9FF",
-"}$ c #BFC3FF",
-"|$ c #C9CEFF",
-"1$ c #D5D8FF",
-"2$ c #DDDFFF",
-"3$ c #E4E7FC",
-"4$ c #E3E4EF",
-"5$ c #DADBDF",
-"6$ c #D1D1D2",
-"7$ c #C5C5C5",
-"8$ c #B1B1B1",
-"9$ c #959595",
-"0$ c #717170",
-"a$ c #606056",
-"b$ c #676782",
-"c$ c #17172F",
-"d$ c #5C0303",
-"e$ c #9E4545",
-"f$ c #C08787",
-"g$ c #B59F9F",
-"h$ c #8F8787",
-"i$ c #5D5C5F",
-"j$ c #777A7E",
-"k$ c #9DA0A4",
-"l$ c #B1B2B2",
-"m$ c #BCBBBB",
-"n$ c #C5C5C3",
-"o$ c #D3D3D3",
-"p$ c #E1E1E1",
-"q$ c #DDDDEA",
-"r$ c #D4D6F5",
-"s$ c #CED1FD",
-"t$ c #D4D6FD",
-"u$ c #DDDEF5",
-"v$ c #DBDCE7",
-"w$ c #D8D8DB",
-"x$ c #D0CFCF",
-"y$ c #C0C1BF",
-"z$ c #ACACAB",
-"A$ c #959594",
-"B$ c #82827F",
-"C$ c #737370",
-"D$ c #64646D",
-"E$ c #595973",
-"F$ c #565680",
-"G$ c #48487B",
-"H$ c #0D0D1B",
-"I$ c #2C0000",
-"J$ c #4B0E0E",
-"K$ c #541717",
-"L$ c #521516",
-"M$ c #430E10",
-"N$ c #442329",
-"O$ c #59535C",
-"P$ c #777882",
-"Q$ c #97979B",
-"R$ c #A7A7A8",
-"S$ c #AFAFAE",
-"T$ c #BABAB6",
-"U$ c #CBCAC6",
-"V$ c #D7D8D8",
-"W$ c #D9D9DB",
-"X$ c #D2D1CF",
-"Y$ c #C4C3C1",
-"Z$ c #B0AFAD",
-"`$ c #9B9B99",
-" % c #8B8B88",
-".% c #7E7E7D",
-"+% c #74747B",
-"@% c #66667E",
-"#% c #5A5A82",
-"$% c #44446F",
-"%% c #29294B",
-"&% c #131329",
-"*% c #06060E",
-"=% c #131319",
-"-% c #2C2C37",
-";% c #545463",
-">% c #757584",
-",% c #8D8D94",
-"'% c #989897",
-")% c #A1A19E",
-"!% c #A9A9A7",
-"~% c #A2A29F",
-"{% c #91918E",
-"]% c #848484",
-"^% c #7A7A85",
-"/% c #696983",
-"(% c #535376",
-"_% c #363659",
-":% c #1F1F3C",
-"<% c #0D0D1A",
-"[% c #12121C",
-"}% c #333345",
-"|% c #5A5A6F",
-"1% c #737385",
-"2% c #88888E",
-"3% c #7E7E89",
-"4% c #686882",
-"5% c #50506E",
-"6% c #30304C",
-"7% c #16162A",
-"8% c #080811",
-"9% c #1A1A29",
-"0% c #2E2E44",
-"a% c #26263C",
-"b% c #11111F",
-" ",
-" . + @ # $ ",
-" % & * = - ; > , ' ) ! ~ { ",
-" ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
-"6 7 8 9 0 a b c d e f g h i j k l ",
-"m n o p q r s t u v w x y z A B C ",
-"D E F G H I J K L M N O P Q R S T ",
-"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ",
-"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ",
-"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ",
-"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ",
-"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ",
-"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ",
-"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ",
-"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ",
-"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ",
-"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ",
-"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ",
-"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ",
-"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ",
-"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ",
-"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ",
-"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ",
-"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ",
-"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ",
-"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
-" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
-" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ",
-" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ",
-" [%}%|%1%2%3%4%5%6%7%8% ",
-" 9%0%a%b% ",
-" "};
diff --git a/ubuntu/raring/applications/tdepowersave/debian/manpages b/ubuntu/raring/applications/tdepowersave/debian/manpages
index c8fa7b85f..aff0f8470 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/manpages
+++ b/ubuntu/raring/applications/tdepowersave/debian/manpages
@@ -1 +1 @@
-debian/kpowersave.1
+debian/tdepowersave.1
diff --git a/ubuntu/raring/applications/tdepowersave/debian/menu b/ubuntu/raring/applications/tdepowersave/debian/menu
index 6ae0f9833..c2c6cc3d2 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/menu
+++ b/ubuntu/raring/applications/tdepowersave/debian/menu
@@ -1,7 +1,7 @@
-?package(kpowersave):\
+?package(tdepowersave):\
needs="X11"\
section="Applications/System/Monitoring"\
- title="KPowersave"\
+ title="TDEPowersave"\
longtitle="Battery monitor and general power management"\
- icon="/usr/share/pixmaps/kpowersave.xpm"\
- command="/opt/trinity/bin/kpowersave"
+ icon="/opt/trinity/share/pixmaps/tdepowersave.xpm"\
+ command="/opt/trinity/bin/tdepowersave"
diff --git a/ubuntu/raring/applications/tdepowersave/debian/rules b/ubuntu/raring/applications/tdepowersave/debian/rules
index 97acebf07..485481ef7 100755
--- a/ubuntu/raring/applications/tdepowersave/debian/rules
+++ b/ubuntu/raring/applications/tdepowersave/debian/rules
@@ -29,9 +29,9 @@ debian/stamp-bootstrap:
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
-install/kpowersave::
- install -p -D -m644 debian/tdepowersave-trinity.lintian debian/kpowersave/opt/trinity/share/lintian/overrides/kpowersave
- install -p -D -m644 debian/tdepowersave-trinity.linda debian/kpowersave/opt/trinity/share/linda/overrides/kpowersave
+install/tdepowersave-trinity::
+ install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
+ install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
clean::
find . -name Makefile.in | xargs rm -f
diff --git a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda
index ff5153632..ff5153632 100644
--- a/ubuntu/raring/applications/tdepowersave/debian/kpowersave-nohal-trinity.linda
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.linda
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian
new file mode 100644
index 000000000..e27c64261
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave-trinity.lintian
@@ -0,0 +1,5 @@
+tdepowersave-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: package-name-doesnt-match-sonames libtdeinit-tdepowersave
+tdepowersave-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+tdepowersave-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_tdepowersave.so
+
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1
new file mode 100644
index 000000000..d79cfd21d
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.1
@@ -0,0 +1,148 @@
+.\" This file was generated by kdemangen.pl
+.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
+.SH NAME
+tdepowersave
+\- A TDE KPart Application
+.SH SYNOPSIS
+tdepowersave [Qt\-options] [TDE\-options]
+.SH DESCRIPTION
+A TDE KPart Application
+.SH OPTIONS
+.SS Generic options:
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-tde
+Show TDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v, \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS
+.SS TDE options:
+.TP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B \-\-config <filename>
+Use alternative configuration file
+.TP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B \-\-style <style>
+sets the application GUI style
+.TP
+.B \-\-geometry <geometry>
+sets the client geometry of the main widget - see man X for the argument format
+.TP
+.B \-\-nofork
+Don't run in the background.
+.SS Qt options:
+.TP
+.B \-\-display <displayname>
+Use the X-server display 'displayname'
+.TP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn, \-\-font <fontname>
+defines the application font
+.TP
+.B \-\-bg, \-\-background <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg, \-\-foreground <color>
+sets the default foreground color
+.TP
+.B \-\-btn, \-\-button <color>
+sets the default button color
+.TP
+.B \-\-name <name>
+sets the application name
+.TP
+.B \-\-title <title>
+sets the application title (caption)
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B \-\-inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B \-\-im <XIM server>
+set XIM server
+.TP
+.B \-\-noxim
+disable XIM
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets
+.SS
+
+.SH SEE ALSO
+Full user documentation is available through the TDE Help Center. You can also enter the URL
+.BR help:/tdepowersave/
+directly into konqueror or you can run
+.BR "`khelpcenter help:/tdepowersave/'"
+from the command-line.
+.br
+.SH AUTHORS
+.nf
+Danny Kukawka <dkukawka@suse.de>
+.br
+Thomas Renninger <trenn@suse.de>
+.br
+
diff --git a/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm
new file mode 100644
index 000000000..a7b0f2e7c
--- /dev/null
+++ b/ubuntu/raring/applications/tdepowersave/debian/tdepowersave.xpm
@@ -0,0 +1,628 @@
+/* XPM */
+static char * tdepowersave_xpm[] = {
+"32 32 593 2",
+" c None",
+". c #6D2121",
+"+ c #783738",
+"@ c #743E40",
+"# c #5D2F30",
+"$ c #3E1618",
+"% c #8A0200",
+"& c #982306",
+"* c #A75C4B",
+"= c #D3B8BC",
+"- c #E9E0E1",
+"; c #E7E7ED",
+"> c #DDDFE7",
+", c #CCCBD7",
+"' c #B3ADBB",
+") c #827583",
+"! c #6A3227",
+"~ c #410B00",
+"{ c #080000",
+"] c #AE381A",
+"^ c #C79676",
+"/ c #D8C9B7",
+"( c #B3B7C2",
+"_ c #F2F8FF",
+": c #EBEDF4",
+"< c #D8D9E3",
+"[ c #CBCBD8",
+"} c #BEC0CF",
+"| c #B4B5C9",
+"1 c #A0A4BD",
+"2 c #9B90A1",
+"3 c #B08583",
+"4 c #8F493D",
+"5 c #340B02",
+"6 c #A71F09",
+"7 c #D5BEA2",
+"8 c #F1FFFF",
+"9 c #EEF2F6",
+"0 c #999AAD",
+"a c #C8C8D7",
+"b c #CFCFDB",
+"c c #C2C2D0",
+"d c #B6B6C6",
+"e c #A8A8BC",
+"f c #9B9BB1",
+"g c #8685A0",
+"h c #8D8EA6",
+"i c #AFB8CD",
+"j c #ABAFC6",
+"k c #9F534D",
+"l c #1C0000",
+"m c #B63F26",
+"n c #DAC1A4",
+"o c #DCD9DF",
+"p c #EEF3F6",
+"q c #B0B6C4",
+"r c #AEB0C4",
+"s c #BDBECF",
+"t c #B2B3C6",
+"u c #A6A7BB",
+"v c #9A9BB1",
+"w c #8C8EA5",
+"x c #797D94",
+"y c #98A0B4",
+"z c #B3BCD0",
+"A c #A99EAF",
+"B c #C46347",
+"C c #2B0C00",
+"D c #B63C1A",
+"E c #FED76A",
+"F c #E2BE8D",
+"G c #DCB4A6",
+"H c #D6BCBA",
+"I c #B3ABB9",
+"J c #A9A7B9",
+"K c #A4A5B7",
+"L c #9EA1B1",
+"M c #9798A9",
+"N c #9392A1",
+"O c #A2969F",
+"P c #C29994",
+"Q c #CD866F",
+"R c #DC6A3D",
+"S c #B42A0E",
+"T c #160101",
+"U c #B53817",
+"V c #FFDA34",
+"W c #FFF727",
+"X c #FCE43C",
+"Y c #F5B84C",
+"Z c #EDA45F",
+"` c #E79B6C",
+" . c #E39872",
+".. c #E2926F",
+"+. c #E08764",
+"@. c #E07853",
+"#. c #DF623C",
+"$. c #DA4925",
+"%. c #C83415",
+"&. c #B10E04",
+"*. c #900000",
+"=. c #180000",
+"-. c #B53918",
+";. c #FFD83B",
+">. c #FFF30F",
+",. c #FBED00",
+"'. c #F2BD00",
+"). c #EB8F02",
+"!. c #E4650D",
+"~. c #DE3B14",
+"{. c #D71E15",
+"]. c #CF180F",
+"^. c #C60D07",
+"/. c #BA0100",
+"(. c #B10000",
+"_. c #AA0000",
+":. c #AB0000",
+"<. c #980000",
+"[. c #170000",
+"}. c #FFF312",
+"|. c #FBEC00",
+"1. c #F2BA00",
+"2. c #EA8B00",
+"3. c #E45A00",
+"4. c #DE2200",
+"5. c #D40000",
+"6. c #CC0000",
+"7. c #C00000",
+"8. c #A20103",
+"9. c #8D0811",
+"0. c #7F1825",
+"a. c #6D293B",
+"b. c #474158",
+"c. c #60637E",
+"d. c #7D7D99",
+"e. c #9292AB",
+"f. c #77779C",
+"g. c #FDEE00",
+"h. c #F9BF00",
+"i. c #E68600",
+"j. c #CC5100",
+"k. c #AB260B",
+"l. c #95161A",
+"m. c #83232C",
+"n. c #803D48",
+"o. c #875E6B",
+"p. c #8D7C8A",
+"q. c #9698A7",
+"r. c #A5ABB8",
+"s. c #B7BCC6",
+"t. c #CBC7CD",
+"u. c #D0CBCF",
+"v. c #C7C4CC",
+"w. c #CAC9CF",
+"x. c #9F9FB8",
+"y. c #262641",
+"z. c #B63915",
+"A. c #FFD838",
+"B. c #FFF413",
+"C. c #F9EA00",
+"D. c #99822F",
+"E. c #8D7B67",
+"F. c #958B89",
+"G. c #A2A5A9",
+"H. c #B4BABD",
+"I. c #C6CDCE",
+"J. c #D2DADA",
+"K. c #D5DCE2",
+"L. c #CDD5DF",
+"M. c #BCC5D7",
+"N. c #A0B5D8",
+"O. c #83A5D9",
+"P. c #6B98DB",
+"Q. c #5A8FDE",
+"R. c #3C80E3",
+"S. c #5E8AD2",
+"T. c #B4B0BE",
+"U. c #3F3F61",
+"V. c #AA372A",
+"W. c #F9D742",
+"X. c #FFFC02",
+"Y. c #B1AB13",
+"Z. c #6F7184",
+"`. c #EDF1F8",
+" + c #EAECEF",
+".+ c #CBD4E0",
+"++ c #B2C6E0",
+"@+ c #97B7E0",
+"#+ c #84ADE2",
+"$+ c #79A8E5",
+"%+ c #6DA2E9",
+"&+ c #5E9CED",
+"*+ c #5299F8",
+"=+ c #509AFD",
+"-+ c #529BFE",
+";+ c #509CFF",
+">+ c #4094FF",
+",+ c #3D7EE0",
+"'+ c #B4B3C0",
+")+ c #5D5C7F",
+"!+ c #9D363D",
+"~+ c #D1D0B4",
+"{+ c #FFF856",
+"]+ c #A29E28",
+"^+ c #72727F",
+"/+ c #E5E2E1",
+"(+ c #94B7DB",
+"_+ c #97C2EF",
+":+ c #A3CBF7",
+"<+ c #A6CEFC",
+"[+ c #AAD0FF",
+"}+ c #ABD1FF",
+"|+ c #A1CAFF",
+"1+ c #94C4FF",
+"2+ c #8ABDFF",
+"3+ c #7EB6FF",
+"4+ c #6DACFF",
+"5+ c #559EFF",
+"6+ c #4195FF",
+"7+ c #2877EB",
+"8+ c #9DA6C2",
+"9+ c #767292",
+"0+ c #0E0E1C",
+"a+ c #9F3636",
+"b+ c #C7CED6",
+"c+ c #EBEDF5",
+"d+ c #BEBCAD",
+"e+ c #606061",
+"f+ c #D3CECE",
+"g+ c #9ABEE5",
+"h+ c #D5EBFF",
+"i+ c #EEF4FF",
+"j+ c #D2E5FF",
+"k+ c #BFDAFF",
+"l+ c #ACD0FF",
+"m+ c #9BC7FF",
+"n+ c #8FBFFF",
+"o+ c #7FB6FF",
+"p+ c #4F9BFF",
+"q+ c #2B84FD",
+"r+ c #1875F6",
+"s+ c #0E6AF1",
+"t+ c #075DE3",
+"u+ c #8498C5",
+"v+ c #8E89A3",
+"w+ c #161629",
+"x+ c #C8CFCE",
+"y+ c #E8EAEB",
+"z+ c #D1D1D7",
+"A+ c #5C5C5D",
+"B+ c #BBB7B7",
+"C+ c #A6C0DF",
+"D+ c #AAD1FD",
+"E+ c #DEECFF",
+"F+ c #C4DDFF",
+"G+ c #B4D4FF",
+"H+ c #A4CAFF",
+"I+ c #9AC5FF",
+"J+ c #76B1FF",
+"K+ c #2C89FF",
+"L+ c #016BFE",
+"M+ c #0064F8",
+"N+ c #005FEE",
+"O+ c #005AE5",
+"P+ c #0050DD",
+"Q+ c #6588C7",
+"R+ c #A09AB0",
+"S+ c #2A2A44",
+"T+ c #C9CFCF",
+"U+ c #E5E7E7",
+"V+ c #E0E0E0",
+"W+ c #676767",
+"X+ c #A3A1A1",
+"Y+ c #B8C4D9",
+"Z+ c #93BFF0",
+"`+ c #D6E9FF",
+" @ c #BDD9FF",
+".@ c #ACCFFF",
+"+@ c #A3CAFF",
+"@@ c #7BB5FF",
+"#@ c #2386FF",
+"$@ c #0472FF",
+"%@ c #006AFC",
+"&@ c #0065F4",
+"*@ c #005FEA",
+"=@ c #005AE3",
+"-@ c #004FDB",
+";@ c #4B78C9",
+">@ c #A5A0B1",
+",@ c #454569",
+"'@ c #E4E6E6",
+")@ c #E7E7E7",
+"!@ c #7D7D7E",
+"~@ c #898788",
+"{@ c #C7CAD5",
+"]@ c #89B6EA",
+"^@ c #C7E1FF",
+"/@ c #B6D5FF",
+"(@ c #ABCEFF",
+"_@ c #86BBFF",
+":@ c #2F8EFF",
+"<@ c #117BFF",
+"[@ c #0570FF",
+"}@ c #0068F8",
+"|@ c #0063F0",
+"1@ c #005DE7",
+"2@ c #0059DF",
+"3@ c #004CD6",
+"4@ c #3369CD",
+"5@ c #A3A2B4",
+"6@ c #585880",
+"7@ c #909090",
+"8@ c #717072",
+"9@ c #C6C4CB",
+"0@ c #84AFE7",
+"a@ c #B5D7FF",
+"b@ c #B5D4FF",
+"c@ c #96C4FF",
+"d@ c #3A96FF",
+"e@ c #1C82FF",
+"f@ c #0D77FF",
+"g@ c #006BFD",
+"h@ c #0066F4",
+"i@ c #0061EC",
+"j@ c #005BE4",
+"k@ c #0055DB",
+"l@ c #004ED3",
+"m@ c #0D51CB",
+"n@ c #9298B7",
+"o@ c #6B6A90",
+"p@ c #0B0B17",
+"q@ c #E5E6E6",
+"r@ c #E6E6E6",
+"s@ c #9F9F9F",
+"t@ c #636265",
+"u@ c #BFBABC",
+"v@ c #80AAE1",
+"w@ c #9FC9FF",
+"x@ c #A8CEFF",
+"y@ c #4EA1FF",
+"z@ c #2489FF",
+"A@ c #187EFF",
+"B@ c #0069FA",
+"C@ c #005EE8",
+"D@ c #0058DF",
+"E@ c #0052D7",
+"F@ c #004DCE",
+"G@ c #0047C8",
+"H@ c #7B8CBA",
+"I@ c #7E7B9B",
+"J@ c #1D1D34",
+"K@ c #E5E5E5",
+"L@ c #AAAAAB",
+"M@ c #5E5E60",
+"N@ c #B3ADAC",
+"O@ c #90ADDA",
+"P@ c #78B4FC",
+"Q@ c #61ADFF",
+"R@ c #2D90FF",
+"S@ c #2185FF",
+"T@ c #0E78FF",
+"U@ c #016CFE",
+"V@ c #0066F5",
+"W@ c #005CE4",
+"X@ c #0055DC",
+"Y@ c #0050D3",
+"Z@ c #004ACB",
+"`@ c #003AC2",
+" # c #617CC1",
+".# c #8C89A2",
+"+# c #2D2D4C",
+"@# c #E4E4E4",
+"## c #B5B5B5",
+"$# c #606062",
+"%# c #9D9A9B",
+"&# c #ABB6CF",
+"*# c #3D94F7",
+"=# c #3C9CFF",
+"-# c #2C8DFF",
+";# c #1A80FF",
+"># c #0772FF",
+",# c #0068FB",
+"'# c #0062F2",
+")# c #005BEA",
+"!# c #0053E2",
+"~# c #004FD9",
+"{# c #024BCF",
+"]# c #094DC7",
+"^# c #1950C0",
+"/# c #6681C0",
+"(# c #8987A0",
+"_# c #41416E",
+":# c #E3E3E3",
+"<# c #BCBCBC",
+"[# c #69696B",
+"}# c #858488",
+"|# c #BDBAC5",
+"1# c #3E8DEF",
+"2# c #3094FF",
+"3# c #1C84FF",
+"4# c #0473FF",
+"5# c #0069FD",
+"6# c #0364F2",
+"7# c #1464E5",
+"8# c #296AD7",
+"9# c #4A7ACB",
+"0# c #6281BF",
+"a# c #7B8CB9",
+"b# c #9098B4",
+"c# c #ABAAB7",
+"d# c #B4B2B9",
+"e# c #B8B7BD",
+"f# c #AAAAB9",
+"g# c #8080A3",
+"h# c #5B5B8F",
+"i# c #A03838",
+"j# c #E2E2E2",
+"k# c #727274",
+"l# c #727276",
+"m# c #BDB6BB",
+"n# c #508DE5",
+"o# c #1579F9",
+"p# c #347FE8",
+"q# c #5287D9",
+"r# c #6B8DCB",
+"s# c #8699C1",
+"t# c #9BA4BC",
+"u# c #BAB8C0",
+"v# c #CCC6C4",
+"w# c #D1CCC9",
+"x# c #D3D0CE",
+"y# c #D3D0D6",
+"z# c #D1D2E3",
+"A# c #D4D6EE",
+"B# c #DADBF6",
+"C# c #DCDEE9",
+"D# c #D4D4D4",
+"E# c #BFBFC4",
+"F# c #A6A6B9",
+"G# c #8686AD",
+"H# c #56568C",
+"I# c #3E3E79",
+"J# c #A13434",
+"K# c #CAD4D4",
+"L# c #7C7C7D",
+"M# c #67676A",
+"N# c #ACABB4",
+"O# c #AAB1CA",
+"P# c #AAB1C9",
+"Q# c #C5C2C7",
+"R# c #D3CCCA",
+"S# c #D7D1D0",
+"T# c #DAD7D8",
+"U# c #DEDCE0",
+"V# c #D8D9EA",
+"W# c #CCCFF1",
+"X# c #C5C8F6",
+"Y# c #C5C9FA",
+"Z# c #CACDFF",
+"`# c #D0D3FF",
+" $ c #D7DAFF",
+".$ c #E1E3FF",
+"+$ c #EAECFF",
+"@$ c #EDEEFD",
+"#$ c #E2E3E7",
+"$$ c #CBCBC7",
+"%$ c #C8C8C4",
+"&$ c #BDBDC0",
+"*$ c #9E9EAF",
+"=$ c #6A6A9D",
+"-$ c #840808",
+";$ c #C18B8B",
+">$ c #EBF3F3",
+",$ c #E8F0F0",
+"'$ c #BDC2C2",
+")$ c #878A8A",
+"!$ c #616367",
+"~$ c #B1B1B4",
+"{$ c #D0CECC",
+"]$ c #DEDBD8",
+"^$ c #E4E4E2",
+"/$ c #E6E6E5",
+"($ c #E7E8EA",
+"_$ c #D2D4F9",
+":$ c #B9BEFD",
+"<$ c #B0B5FF",
+"[$ c #B4B9FF",
+"}$ c #BFC3FF",
+"|$ c #C9CEFF",
+"1$ c #D5D8FF",
+"2$ c #DDDFFF",
+"3$ c #E4E7FC",
+"4$ c #E3E4EF",
+"5$ c #DADBDF",
+"6$ c #D1D1D2",
+"7$ c #C5C5C5",
+"8$ c #B1B1B1",
+"9$ c #959595",
+"0$ c #717170",
+"a$ c #606056",
+"b$ c #676782",
+"c$ c #17172F",
+"d$ c #5C0303",
+"e$ c #9E4545",
+"f$ c #C08787",
+"g$ c #B59F9F",
+"h$ c #8F8787",
+"i$ c #5D5C5F",
+"j$ c #777A7E",
+"k$ c #9DA0A4",
+"l$ c #B1B2B2",
+"m$ c #BCBBBB",
+"n$ c #C5C5C3",
+"o$ c #D3D3D3",
+"p$ c #E1E1E1",
+"q$ c #DDDDEA",
+"r$ c #D4D6F5",
+"s$ c #CED1FD",
+"t$ c #D4D6FD",
+"u$ c #DDDEF5",
+"v$ c #DBDCE7",
+"w$ c #D8D8DB",
+"x$ c #D0CFCF",
+"y$ c #C0C1BF",
+"z$ c #ACACAB",
+"A$ c #959594",
+"B$ c #82827F",
+"C$ c #737370",
+"D$ c #64646D",
+"E$ c #595973",
+"F$ c #565680",
+"G$ c #48487B",
+"H$ c #0D0D1B",
+"I$ c #2C0000",
+"J$ c #4B0E0E",
+"K$ c #541717",
+"L$ c #521516",
+"M$ c #430E10",
+"N$ c #442329",
+"O$ c #59535C",
+"P$ c #777882",
+"Q$ c #97979B",
+"R$ c #A7A7A8",
+"S$ c #AFAFAE",
+"T$ c #BABAB6",
+"U$ c #CBCAC6",
+"V$ c #D7D8D8",
+"W$ c #D9D9DB",
+"X$ c #D2D1CF",
+"Y$ c #C4C3C1",
+"Z$ c #B0AFAD",
+"`$ c #9B9B99",
+" % c #8B8B88",
+".% c #7E7E7D",
+"+% c #74747B",
+"@% c #66667E",
+"#% c #5A5A82",
+"$% c #44446F",
+"%% c #29294B",
+"&% c #131329",
+"*% c #06060E",
+"=% c #131319",
+"-% c #2C2C37",
+";% c #545463",
+">% c #757584",
+",% c #8D8D94",
+"'% c #989897",
+")% c #A1A19E",
+"!% c #A9A9A7",
+"~% c #A2A29F",
+"{% c #91918E",
+"]% c #848484",
+"^% c #7A7A85",
+"/% c #696983",
+"(% c #535376",
+"_% c #363659",
+":% c #1F1F3C",
+"<% c #0D0D1A",
+"[% c #12121C",
+"}% c #333345",
+"|% c #5A5A6F",
+"1% c #737385",
+"2% c #88888E",
+"3% c #7E7E89",
+"4% c #686882",
+"5% c #50506E",
+"6% c #30304C",
+"7% c #16162A",
+"8% c #080811",
+"9% c #1A1A29",
+"0% c #2E2E44",
+"a% c #26263C",
+"b% c #11111F",
+" ",
+" . + @ # $ ",
+" % & * = - ; > , ' ) ! ~ { ",
+" ] ^ / ( _ : < [ } | 1 2 3 4 5 ",
+"6 7 8 9 0 a b c d e f g h i j k l ",
+"m n o p q r s t u v w x y z A B C ",
+"D E F G H I J K L M N O P Q R S T ",
+"U V W X Y Z ` ...+.@.#.$.%.&.*.=. ",
+"-.;.>.,.'.).!.~.{.].^./.(._.:.<.[. ",
+"-.;.}.|.1.2.3.4.5.6.7.(.8.9.0.a.b.c.d.e.f. ",
+"-.;.}.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y. ",
+"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U. ",
+"V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+ ",
+"!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+ ",
+"a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+ ",
+"a+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+ ",
+"a+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@ ",
+"a+T+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@ ",
+"a+T+'@)@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@ ",
+"a+T+q@r@s@t@u@v@w@x@y@z@A@[@B@|@C@D@E@F@G@H@I@J@ ",
+"a+T+q@K@L@M@N@O@P@Q@R@S@T@U@V@i@W@X@Y@Z@`@ #.#+# ",
+"a+T+q@@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_# ",
+"a+T+q@:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h# ",
+"i#T+q@j#<#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I# ",
+"J#K#U+j#<#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$ ",
+"-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$",
+" d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$",
+" I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*% ",
+" =%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<% ",
+" [%}%|%1%2%3%4%5%6%7%8% ",
+" 9%0%a%b% ",
+" "};
diff --git a/ubuntu/raring/applications/tdepowersave/debian/watch b/ubuntu/raring/applications/tdepowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/raring/applications/tdepowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu b/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/ubuntu/raring/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
?package(tdesvn):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
- title="KDESvn"\
+ hints="TDE,Version control"\
+ title="TDESvn"\
longtitle="SVN client"\
- icon="/usr/share/pixmaps/tdesvn.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
command="/opt/trinity/bin/tdesvn"
diff --git a/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu b/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/ubuntu/raring/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
needs="X11"\
section="Applications/Network/Monitoring"\
hints="TDE"\
- icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
- icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
title="wlassistant"\
command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
diff --git a/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu b/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu
+++ b/ubuntu/raring/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Terminal Emulators"\
title="YaKuake"\
- icon32x32="/usr/share/pixmaps/yakuake.xpm"\
- icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
command="/opt/trinity/bin/yakuake"
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/kdegraphics.automake/debian/kcoloredit-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu
index 73907fedd..24dc70519 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kcoloredit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorChooser"\
- icon32x32="/usr/share/pixmaps/kcolorchooser.xpm"\
- icon16x16="/usr/share/pixmaps/kcolorchooser-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcolorchooser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcolorchooser-16.xpm"\
command="/opt/trinity/bin/kcolorchooser"
?package(kcoloredit):\
@@ -12,8 +12,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KColorEdit"\
- icon32x32="/usr/share/pixmaps/kcoloredit.xpm"\
- icon16x16="/usr/share/pixmaps/kcoloredit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcoloredit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcoloredit-16.xpm"\
command="/opt/trinity/bin/kcoloredit"
# Icon 22x22 kcoloredit/cr22-app-kcolorchooser.png kcolorchooser.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
index fd6a7d3be..f1bfa96a5 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kdvi-trinity.menu
@@ -1,10 +1,10 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
- icon32x32="/usr/share/pixmaps/kdvi.xpm"\
- icon16x16="/usr/share/pixmaps/kdvi-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
command="/opt/trinity/bin/kdvi"
# Icon 32x32 kdvi/pix/cr32-app-kdvi.png kdvi.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu
index 344e227f7..810a67ff6 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kfax-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFax"\
- icon32x32="/usr/share/pixmaps/kfax.xpm"\
- icon16x16="/usr/share/pixmaps/kfax-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfax.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfax-16.xpm"\
command="/opt/trinity/bin/kfax"
# Icon 32x32 kfax/cr32-app-kfax.png kfax.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu
index edc02c8d2..a44fcd5a1 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kfaxview-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KFaxView"\
- icon32x32="/usr/share/pixmaps/kfaxview.xpm"\
- icon16x16="/usr/share/pixmaps/kfaxview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfaxview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfaxview-16.xpm"\
command="/opt/trinity/bin/kfaxview"
# Icon 32x32 kfaxview/hi32-app-kfaxview.png kfaxview.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
index 70467d3f7..cd27c5660 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kghostview-trinity.menu
@@ -1,10 +1,10 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
- icon32x32="/usr/share/pixmaps/kghostview.xpm"\
- icon16x16="/usr/share/pixmaps/kghostview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
command="/opt/trinity/bin/kghostview"
# Icon 32x32 kghostview/cr32-app-kghostview.png kghostview.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
index e8a17b104..7fb1d2a3b 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kiconedit-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="TDEIconEdit"\
- icon32x32="/usr/share/pixmaps/kiconedit.xpm"\
- icon16x16="/usr/share/pixmaps/kiconedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kiconedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kiconedit-16.xpm"\
command="/opt/trinity/bin/kiconedit"
# Icon 32x32 kiconedit/pics/cr32-app-kiconedit.png kiconedit.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu
index 53e88edba..9372e79f3 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kolourpaint-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KolourPaint"\
- icon32x32="/usr/share/pixmaps/kolourpaint.xpm"\
- icon16x16="/usr/share/pixmaps/kolourpaint-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kolourpaint.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolourpaint-16.xpm"\
command="/opt/trinity/bin/kolourpaint"
# Icon 32x32 kolourpaint/pics/hi32-app-kolourpaint.png kolourpaint.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu
index 63fcecea8..e922d7a70 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kooka-trinity.menu
@@ -3,9 +3,9 @@
section="Applications/Graphics"\
hints="TDE"\
title="Kooka"\
- icon32x32="/usr/share/pixmaps/kooka.xpm"\
- icon16x16="/usr/share/pixmaps/kooka-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kooka.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kooka-16.xpm"\
command="/opt/trinity/bin/kooka"
-# Icon 32x32 /usr/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
-# Icon 16x16 /usr/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
+# Icon 32x32 /opt/trinity/share/icons/crystalsvg/32x32/devices/scanner.png kooka.xpm
+# Icon 16x16 /opt/trinity/share/icons/crystalsvg/16x16/devices/scanner.png kooka-16.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu
index 971b89101..da324176a 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kpdf-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KPDF"\
- icon32x32="/usr/share/pixmaps/kpdf.xpm"\
- icon16x16="/usr/share/pixmaps/kpdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpdf-16.xpm"\
command="/opt/trinity/bin/kpdf"
# Icon 32x32 kpdf/cr32-app-kpdf.png kpdf.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
index 2ac1d39a7..3287726f7 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kpovmodeler-trinity.menu
@@ -1,10 +1,10 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
- icon32x32="/usr/share/pixmaps/kpovmodeler.xpm"\
- icon16x16="/usr/share/pixmaps/kpovmodeler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
command="/opt/trinity/bin/kpovmodeler"
# Icon 32x32 kpovmodeler/cr32-app-kpovmodeler.png kpovmodeler.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu
index 0f1e9c2c1..906bcae11 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kruler-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="KRuler"\
- icon32x32="/usr/share/pixmaps/kruler.xpm"\
- icon16x16="/usr/share/pixmaps/kruler-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kruler.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kruler-16.xpm"\
command="/opt/trinity/bin/kruler"
# Icon 32x32 kruler/pics/cr32-app-kruler.png kruler.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu
index c490d6cf4..b82c77733 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/ksnapshot-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Graphics"\
hints="TDE"\
title="KSnapshot"\
- icon32x32="/usr/share/pixmaps/ksnapshot.xpm"\
- icon16x16="/usr/share/pixmaps/ksnapshot-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnapshot.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnapshot-16.xpm"\
command="/opt/trinity/bin/ksnapshot"
# Icon 32x32 ksnapshot/cr32-app-ksnapshot.png ksnapshot.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu
index 3e92e9147..ed69377fb 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
section="Applications/Viewers"\
hints="TDE"\
title="Kuickshow"\
- icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
- icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
command="/opt/trinity/bin/kuickshow"
# Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu b/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
index e0779319d..e40a31e43 100644
--- a/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
+++ b/ubuntu/raring/kdegraphics.automake/debian/kview-trinity.menu
@@ -1,10 +1,10 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
- icon32x32="/usr/share/pixmaps/kview.xpm"\
- icon16x16="/usr/share/pixmaps/kview-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
command="/opt/trinity/bin/kview"
# Icon 32x32 kview/cr32-app-kview.png kview.xpm
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/kdevelop.cmake/debian/kdevelop-trinity.menu b/ubuntu/raring/kdevelop.cmake/debian/kdevelop-trinity.menu
index 7f40efdc4..dbf27f386 100644
--- a/ubuntu/raring/kdevelop.cmake/debian/kdevelop-trinity.menu
+++ b/ubuntu/raring/kdevelop.cmake/debian/kdevelop-trinity.menu
@@ -1,8 +1,8 @@
-?package(kdevelop):\
+?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/kdevelop.xpm"\
- command="/opt/trinity/bin/kdevelop"
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
+ command="/opt/trinity/bin/tdevelop"
diff --git a/ubuntu/raring/metapackages/rename-meta/Makefile b/ubuntu/raring/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/ubuntu/raring/metapackages/rename-meta/Makefile
+++ b/ubuntu/raring/metapackages/rename-meta/Makefile
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/changelog b/ubuntu/raring/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/raring/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/compat b/ubuntu/raring/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/compat
+++ b/ubuntu/raring/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/control b/ubuntu/raring/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/control
+++ b/ubuntu/raring/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
Conflicts: kdeprint-trinity (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kwin-trinity
Architecture: all
Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kdeaddons-kfile-plugins-trinity
Architecture: all
Depends: tdeaddons-kfile-plugins-trinity
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/dirs b/ubuntu/raring/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/raring/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/raring/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst
deleted file mode 100644
index 8db089c93..000000000
--- a/ubuntu/raring/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /bin/sh
-# postinst script for kdm-kde3
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# debconf may not be available if some massive purging is going on
-HAVE_DEBCONF=
-if [ -e /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- HAVE_DEBCONF=yes
-fi
-
-DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
-
- if [ -n "$HAVE_DEBCONF" ]; then
- # disown this question
- db_unregister shared/default-x-display-manager || true
- # does the question still exist?
- if db_get shared/default-x-display-manager; then
- if db_metaget shared/default-x-display-manager owners; then
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #observe "X display managers now available are \"$OWNERS\""
- db_subst shared/default-x-display-manager choices "$RET"
- fi
- DEFAULT_DISPLAY_MANAGER=
- if db_get shared/default-x-display-manager; then
- DEFAULT_DISPLAY_MANAGER="$RET"
- fi
- # are we removing the currently selected display manager?
- if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
- if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then
- if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
- # does the display manager file reference the current default? if
- # so, remove it because it will now be wrong
- if [ -n "$RET" ]; then
- if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
- rm "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- fi
- fi
- # ask the user to choose a new default
- db_fset shared/default-x-display-manager seen false
- db_input critical shared/default-x-display-manager || true
- db_go
- # if the default display manager file doesn't exist, write it with
- # the path to the new default display manager
- if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- DEFAULT_DISPLAY_MANAGER=
- if db_get shared/default-x-display-manager; then
- DEFAULT_DISPLAY_MANAGER="$RET"
- fi
- if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #warn "new default display manager has been selected; please be" \
- # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
- # "is configured"
- DAEMON_NAME=
- if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
- DAEMON_NAME="$RET"
- fi
- if [ ! -n "$DAEMON_NAME" ]; then
- # if we were unable to determine the name of the selected daemon (for
- # instance, if the selected default display manager doesn't provide a
- # daemon_name question), guess
- DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
- if [ ! -n "$DAEMON_NAME" ]; then
- echo .
- # FIXME - redo this part uses shell-lib.sh from xfree86
- #warn "unable to determine path to default X display manager" \
- # "$DEFAULT_DISPLAY_MANAGER; not updating" \
- # "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- if [ -n "$DAEMON_NAME" ]; then
- echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
- fi
- fi
- fi
- fi
- fi
- fi
- fi
-
-exit 0
-
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst b/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst
new file mode 100644
index 000000000..e026f2bfe
--- /dev/null
+++ b/ubuntu/raring/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -0,0 +1,89 @@
+#! /bin/sh
+# postinst script for kdm-trinity
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# debconf may not be available if some massive purging is going on
+HAVE_DEBCONF=
+if [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ HAVE_DEBCONF=yes
+fi
+
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+ if [ -n "$HAVE_DEBCONF" ]; then
+ # disown this question
+ db_unregister shared/default-x-display-manager || true
+ # does the question still exist?
+ if db_get shared/default-x-display-manager; then
+ if db_metaget shared/default-x-display-manager owners; then
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #observe "X display managers now available are \"$OWNERS\""
+ db_subst shared/default-x-display-manager choices "$RET"
+ fi
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
+ # are we removing the currently selected display manager?
+ if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+ if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
+ # does the display manager file reference the current default? if
+ # so, remove it because it will now be wrong
+ if [ -n "$RET" ]; then
+ if [ "$(cat "$DEFAULT_DISPLAY_MANAGER_FILE")" = "$RET" ]; then
+ rm "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ fi
+ fi
+ # ask the user to choose a new default
+ db_fset shared/default-x-display-manager seen false
+ db_input critical shared/default-x-display-manager || true
+ db_go
+ # if the default display manager file doesn't exist, write it with
+ # the path to the new default display manager
+ if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ DEFAULT_DISPLAY_MANAGER=
+ if db_get shared/default-x-display-manager; then
+ DEFAULT_DISPLAY_MANAGER="$RET"
+ fi
+ if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #warn "new default display manager has been selected; please be" \
+ # "sure to run \"dpkg-reconfigure $RET\" to ensure that it" \
+ # "is configured"
+ DAEMON_NAME=
+ if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+ DAEMON_NAME="$RET"
+ fi
+ if [ ! -n "$DAEMON_NAME" ]; then
+ # if we were unable to determine the name of the selected daemon (for
+ # instance, if the selected default display manager doesn't provide a
+ # daemon_name question), guess
+ DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+ if [ ! -n "$DAEMON_NAME" ]; then
+ echo .
+ # FIXME - redo this part uses shell-lib.sh from xfree86
+ #warn "unable to determine path to default X display manager" \
+ # "$DEFAULT_DISPLAY_MANAGER; not updating" \
+ # "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ if [ -n "$DAEMON_NAME" ]; then
+ echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+
+exit 0
+
diff --git a/ubuntu/raring/metapackages/trinity-livecd/debian/control b/ubuntu/raring/metapackages/trinity-livecd/debian/control
index a6e95b5b5..6adca2f1e 100644
--- a/ubuntu/raring/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/raring/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
Package: trinity-livecd
Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
Recommends:
kpresenter-trinity, kspread-trinity, kword-trinity,
tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,
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/tdeaccessibility/debian/control b/ubuntu/raring/tdeaccessibility/debian/control
index 3d7149dd4..efaba8305 100644
--- a/ubuntu/raring/tdeaccessibility/debian/control
+++ b/ubuntu/raring/tdeaccessibility/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Replaces: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Breaks: kdeaccessibility-kde3 (<< 4:14.0.0), kdeaccessibility-trinity (<< 4:14.0.0)
Depends: kmag-trinity (>= ${Source-Version}), kmousetool-trinity (>= ${Source-Version}), kmouth-trinity (>= ${Source-Version}), kbstate-trinity (>= ${Source-Version}), ksayit-trinity (>= ${Source-Version}), kttsd-trinity (>= ${Source-Version})
-Recommends: kde-icons-mono-trinity (>= ${Source-Version})
+Recommends: tde-icons-mono-trinity (>= ${Source-Version})
Suggests: kttsd-contrib-plugins-trinity (>= ${Source-Version}), tdeaccessibility-trinity-doc-html (>= ${Source-Version})
Description: accessibility packages from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -46,7 +46,7 @@ Description: KDE accessibility documentation in HTML format
This package is part of Trinity, and a component of the KDE accessibility
module. See the 'kde-trinity' and 'tdeaccessibility-trinity' packages for more information.
-Package: kde-icons-mono-trinity
+Package: tde-icons-mono-trinity
Section: tde
Architecture: all
Replaces: kde-icons-mono-kde3 (<< 4:14.0.0), kde-icons-mono-trinity (<< 4:14.0.0)
diff --git a/ubuntu/raring/tdeaccessibility/debian/kde-icons-mono-trinity.install b/ubuntu/raring/tdeaccessibility/debian/tde-icons-mono-trinity.install
index 8c4265ceb..8c4265ceb 100644
--- a/ubuntu/raring/tdeaccessibility/debian/kde-icons-mono-trinity.install
+++ b/ubuntu/raring/tdeaccessibility/debian/tde-icons-mono-trinity.install
diff --git a/ubuntu/raring/tdeaddons/debian/atlantikdesigner-trinity.menu b/ubuntu/raring/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/ubuntu/raring/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/ubuntu/raring/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
?package(atlantikdesigner):needs="X11"\
section="Games/Tool"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik Designer"\
longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
command="/opt/trinity/bin/atlantikdesigner"\
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/kcron-trinity.menu b/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu
+++ b/ubuntu/raring/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE Task Scheduler"\
- icon32x32="/usr/share/pixmaps/kcron.xpm"\
- icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+ title="TDE Task Scheduler"\
+ icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
command="/opt/trinity/bin/kcron"
diff --git a/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu b/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu
+++ b/ubuntu/raring/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/System/Hardware"\
hints="TDE"\
title="KDat"\
- icon32x32="/usr/share/pixmaps/kdat.xpm"\
- icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
command="/opt/trinity/bin/kdat"
diff --git a/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu b/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu
+++ b/ubuntu/raring/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Package Management"\
hints="TDE"\
- title="KDE Package Manager"\
- icon32x32="/usr/share/pixmaps/kpackage.xpm"\
- icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+ title="TDE Package Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
command="/opt/trinity/bin/kpackage"
diff --git a/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu b/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu
+++ b/ubuntu/raring/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/Editors"\
hints="TDE"\
- title="KDE SysV-Init Editor"\
- icon32x32="/usr/share/pixmaps/ksysv.xpm"\
- icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+ title="TDE SysV-Init Editor"\
+ icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
command="/opt/trinity/bin/ksysv"
diff --git a/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu b/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu
+++ b/ubuntu/raring/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDE User Manager"\
- icon32x32="/usr/share/pixmaps/kuser.xpm"\
- icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+ title="TDE User Manager"\
+ icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
command="/opt/trinity/bin/kuser"
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/tdeartwork/debian/control b/ubuntu/raring/tdeartwork/debian/control
index 09df752cf..ca1cdd6d6 100644
--- a/ubuntu/raring/tdeartwork/debian/control
+++ b/ubuntu/raring/tdeartwork/debian/control
@@ -13,7 +13,7 @@ Architecture: all
Section: tde
Replaces: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
Breaks: kdeartwork-kde3 (<< 4:14.0.0), kdeartwork-trinity (<< 4:14.0.0)
-Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), kdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
+Depends: tdeartwork-misc-trinity (>= ${Source-Version}), tdeartwork-emoticons-trinity (>= ${Source-Version}), tdeartwork-style-trinity (>= ${Source-Version}), tdeartwork-theme-icon-trinity (>= ${Source-Version}), tdeartwork-theme-window-trinity (>= ${Source-Version}), tdewallpapers-trinity (>= ${Source-Version}), tdescreensaver-trinity (>= ${Source-Version})
Recommends: tdescreensaver-xsavers-trinity
Description: themes, styles and more from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -98,7 +98,7 @@ Description: window decoration themes released with Trinity
This package is part of Trinity, and a component of the KDE artwork module.
See the 'kde-trinity' and 'tdeartwork-trinity' packages for more information.
-Package: kdewallpapers-trinity
+Package: tdewallpapers-trinity
Architecture: all
Section: tde
Replaces: kdewallpapers-kde3 (<< 4:14.0.0), kdewallpapers-trinity (<< 4:14.0.0)
diff --git a/ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install b/ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install
index 681454953..681454953 100644
--- a/ubuntu/raring/tdeartwork/debian/kdewallpapers-trinity.install
+++ b/ubuntu/raring/tdeartwork/debian/tdewallpapers-trinity.install
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/kate-trinity.menu b/ubuntu/raring/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/ubuntu/raring/tdebase/debian/kate-trinity.menu
+++ b/ubuntu/raring/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="Kate"\
icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
?package(kate):\
needs="X11"\
section="Applications/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KWrite"\
icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
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/khelpcenter-trinity.menu b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu
+++ b/ubuntu/raring/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Help"\
hints="TDE"\
- title="KDE Help Center"\
+ title="TDE Help Center"\
icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
command="/opt/trinity/bin/khelpcenter"
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/konqueror-trinity.menu b/ubuntu/raring/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/ubuntu/raring/tdebase/debian/konqueror-trinity.menu
+++ b/ubuntu/raring/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/Network/Web Browsing"\
- hints="KDE,Web browsers"\
+ hints="TDE,Web browsers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
?package(konqueror):\
needs="X11"\
section="Applications/File Management"\
- hints="KDE,File managers"\
+ hints="TDE,File managers"\
title="Konqueror"\
icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
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/ksysguard-trinity.menu b/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu
+++ b/ubuntu/raring/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard"\
+ title="TDE System Guard"\
icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
needs="X11"\
section="Applications/System/Monitoring"\
hints="TDE"\
- title="KDE System Guard - Process Table"\
+ title="TDE System Guard - Process Table"\
command="/opt/trinity/bin/kpm"
# Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
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/tdeprint-trinity.menu b/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu
+++ b/ubuntu/raring/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
needs="X11"\
section="Applications/System/Administration"\
hints="TDE"\
- title="KDEPrintFax"\
+ title="TDEPrintFax"\
icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
command="/opt/trinity/bin/tdeprintfax"
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/tdebindings/debian/kjscmd-trinity.menu b/ubuntu/raring/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/ubuntu/raring/tdebindings/debian/kjscmd-trinity.menu
+++ b/ubuntu/raring/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
needs="X11"\
section="Applications/Programming"\
hints="TDE"\
- title="KDE JavaScript Console"\
+ title="TDE JavaScript Console"\
command="/opt/trinity/bin/kjscmd --console --exec"
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/atlantik-trinity.menu b/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
?package(atlantik):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Monopoly"\
+ hints="TDE,Monopoly"\
title="Atlantik"\
- icon32x32="/usr/share/pixmaps/atlantik.xpm"\
- icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
command="/opt/trinity/games/atlantik"
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/tdegames/debian/kasteroids-trinity.menu b/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KAsteroids"\
- icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
- icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
command="/opt/trinity/games/kasteroids"
diff --git a/ubuntu/raring/tdegames/debian/katomic-trinity.menu b/ubuntu/raring/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/ubuntu/raring/tdegames/debian/katomic-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Puzzles"\
hints="TDE"\
- title="KDE Atomic Entertainment"\
- icon32x32="/usr/share/pixmaps/katomic.xpm"\
- icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+ title="TDE Atomic Entertainment"\
+ icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
command="/opt/trinity/games/katomic"
diff --git a/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu b/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Backgammon"\
- icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
- icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+ title="TDE Backgammon"\
+ icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
command="/opt/trinity/games/kbackgammon"
diff --git a/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu b/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KBattleship"\
- icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
- icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
command="/opt/trinity/games/kbattleship"
diff --git a/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu b/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
?package(kblackbox):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,BlackBox"\
+ hints="TDE,BlackBox"\
title="KBlackBox"\
- icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
- icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
command="/opt/trinity/games/kblackbox"
diff --git a/ubuntu/raring/tdegames/debian/kbounce-trinity.menu b/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Bounce Ball Game"\
- icon32x32="/usr/share/pixmaps/kbounce.xpm"\
- icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+ title="TDE Bounce Ball Game"\
+ icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
command="/opt/trinity/games/kbounce"
diff --git a/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu b/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KEnolaba"\
- icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
- icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
command="/opt/trinity/games/kenolaba"
diff --git a/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu b/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Foul Eggs"\
- icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
- icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+ title="TDE Foul Eggs"\
+ icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
command="/opt/trinity/games/kfouleggs"
diff --git a/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu b/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Arcade"\
hints="TDE"\
title="KGoldrunner"\
- icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
- icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
command="/opt/trinity/games/kgoldrunner"
diff --git a/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu b/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="KJumpingCube"\
- icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
- icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
command="/opt/trinity/games/kjumpingcube"
diff --git a/ubuntu/raring/tdegames/debian/klickety-trinity.menu b/ubuntu/raring/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/ubuntu/raring/tdegames/debian/klickety-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Puzzles"\
hints="TDE"\
title="Klickety"\
- icon32x32="/usr/share/pixmaps/klickety.xpm"\
- icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
command="/opt/trinity/games/klickety"
diff --git a/ubuntu/raring/tdegames/debian/klines-trinity.menu b/ubuntu/raring/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/ubuntu/raring/tdegames/debian/klines-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
section="Games/Board"\
hints="TDE"\
title="KLines"\
- icon32x32="/usr/share/pixmaps/klines.xpm"\
- icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
command="/opt/trinity/games/klines"
diff --git a/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu b/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
?package(kmahjongg):\
needs="x11"\
section="Games/Board"\
- hints="KDE,Mahjongg"\
+ hints="TDE,Mahjongg"\
title="KMahjongg"\
- icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
- icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
command="/opt/trinity/games/kmahjongg"
diff --git a/ubuntu/raring/tdegames/debian/kmines-trinity.menu b/ubuntu/raring/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/ubuntu/raring/tdegames/debian/kmines-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
?package(kmines):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="Kmines"\
- icon32x32="/usr/share/pixmaps/kmines.xpm"\
- icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
command="/opt/trinity/games/kmines"
diff --git a/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu b/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
?package(knetwalk):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Mines"\
+ hints="TDE,Mines"\
title="KNetwalk"\
- icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
- icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
command="/opt/trinity/games/knetwalk"
diff --git a/ubuntu/raring/tdegames/debian/kolf-trinity.menu b/ubuntu/raring/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/ubuntu/raring/tdegames/debian/kolf-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Miniature Golf"\
- icon32x32="/usr/share/pixmaps/kolf.xpm"\
- icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+ title="TDE Miniature Golf"\
+ icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
command="/opt/trinity/games/kolf"
diff --git a/ubuntu/raring/tdegames/debian/konquest-trinity.menu b/ubuntu/raring/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/ubuntu/raring/tdegames/debian/konquest-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Strategy"\
hints="TDE"\
title="Konquest"\
- icon32x32="/usr/share/pixmaps/konquest.xpm"\
- icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
command="/opt/trinity/games/konquest"
diff --git a/ubuntu/raring/tdegames/debian/kpat-trinity.menu b/ubuntu/raring/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/ubuntu/raring/tdegames/debian/kpat-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Patience"\
- icon32x32="/usr/share/pixmaps/kpat.xpm"\
- icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+ title="TDE Patience"\
+ icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
command="/opt/trinity/games/kpat"
diff --git a/ubuntu/raring/tdegames/debian/kpoker-trinity.menu b/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Poker"\
- icon32x32="/usr/share/pixmaps/kpoker.xpm"\
- icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+ title="TDE Poker"\
+ icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
command="/opt/trinity/games/kpoker"
diff --git a/ubuntu/raring/tdegames/debian/kreversi-trinity.menu b/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Reversi"\
- icon32x32="/usr/share/pixmaps/kreversi.xpm"\
- icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+ title="TDE Reversi"\
+ icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
command="/opt/trinity/games/kreversi"
diff --git a/ubuntu/raring/tdegames/debian/ksame-trinity.menu b/ubuntu/raring/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/ubuntu/raring/tdegames/debian/ksame-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
?package(ksame):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,SameGame"\
- title="KDE SameGame"\
- icon32x32="/usr/share/pixmaps/ksame.xpm"\
- icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+ hints="TDE,SameGame"\
+ title="TDE SameGame"\
+ icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
command="/opt/trinity/games/ksame"
diff --git a/ubuntu/raring/tdegames/debian/kshisen-trinity.menu b/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Board"\
hints="TDE"\
- title="KDE Shisen-Sho"\
- icon32x32="/usr/share/pixmaps/kshisen.xpm"\
- icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+ title="TDE Shisen-Sho"\
+ icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
command="/opt/trinity/games/kshisen"
diff --git a/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu b/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Sirtet"\
- icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
- icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+ title="TDE Sirtet"\
+ icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
command="/opt/trinity/games/ksirtet"
diff --git a/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu b/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Tetris-like"\
hints="TDE"\
- title="KDE Smiletris"\
- icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
- icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+ title="TDE Smiletris"\
+ icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
command="/opt/trinity/games/ksmiletris"
diff --git a/ubuntu/raring/tdegames/debian/ksnake-trinity.menu b/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Snake Race"\
- icon32x32="/usr/share/pixmaps/ksnake.xpm"\
- icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+ title="TDE Snake Race"\
+ icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
command="/opt/trinity/games/ksnake"
diff --git a/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu b/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
?package(ksokoban):\
needs="x11"\
section="Games/Puzzles"\
- hints="KDE,Sokoban"\
- title="KDE Sokoban"\
- icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
- icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+ hints="TDE,Sokoban"\
+ title="TDE Sokoban"\
+ icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
command="/opt/trinity/games/ksokoban"
diff --git a/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu b/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE SpaceDuel"\
- icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
- icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+ title="TDE SpaceDuel"\
+ icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
command="/opt/trinity/games/kspaceduel"
diff --git a/ubuntu/raring/tdegames/debian/ktron-trinity.menu b/ubuntu/raring/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/ubuntu/raring/tdegames/debian/ktron-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Arcade"\
hints="TDE"\
- title="KDE Tron"\
- icon32x32="/usr/share/pixmaps/ktron.xpm"\
- icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+ title="TDE Tron"\
+ icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
command="/opt/trinity/games/ktron"
diff --git a/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu b/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Toys"\
hints="TDE"\
- title="KDE Potato Guy"\
- icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
- icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+ title="TDE Potato Guy"\
+ icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
command="/opt/trinity/games/ktuberling"
diff --git a/ubuntu/raring/tdegames/debian/kwin4-trinity.menu b/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
section="Games/Board"\
hints="TDE"\
title="KWin4"\
- icon32x32="/usr/share/pixmaps/twin4.xpm"\
- icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
command="/opt/trinity/games/twin4"
diff --git a/ubuntu/raring/tdegames/debian/lskat-trinity.menu b/ubuntu/raring/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/ubuntu/raring/tdegames/debian/lskat-trinity.menu
+++ b/ubuntu/raring/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
needs="x11"\
section="Games/Card"\
hints="TDE"\
- title="KDE Lieutnant Skat"\
- icon32x32="/usr/share/pixmaps/lskat.xpm"\
- icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+ title="TDE Lieutnant Skat"\
+ icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
command="/opt/trinity/games/lskat"
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/kdvi-trinity.menu b/ubuntu/raring/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/ubuntu/raring/tdegraphics/debian/kdvi-trinity.menu
+++ b/ubuntu/raring/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
?package(kdvi):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,DVI,Documents"\
+ hints="TDE,DVI,Documents"\
title="KDVI"\
icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
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/kghostview-trinity.menu b/ubuntu/raring/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/ubuntu/raring/tdegraphics/debian/kghostview-trinity.menu
+++ b/ubuntu/raring/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
?package(kghostview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Documents"\
+ hints="TDE,Documents"\
title="KGhostView"\
icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
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/kpovmodeler-trinity.menu b/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/ubuntu/raring/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
?package(kpovmodeler):\
needs="X11"\
section="Applications/Graphics"\
- hints="KDE,Modeler"\
+ hints="TDE,Modeler"\
title="KPovModeler"\
icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
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/kview-trinity.menu b/ubuntu/raring/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/ubuntu/raring/tdegraphics/debian/kview-trinity.menu
+++ b/ubuntu/raring/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
?package(kview):\
needs="X11"\
section="Applications/Viewers"\
- hints="KDE,Images"\
+ hints="TDE,Images"\
title="KView"\
icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
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/kopete-trinity.menu b/ubuntu/raring/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/ubuntu/raring/tdenetwork/debian/kopete-trinity.menu
+++ b/ubuntu/raring/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
?package(kopete):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IM"\
+ hints="TDE,IM"\
title="Kopete"\
icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
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/ksirc-trinity.menu b/ubuntu/raring/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/ubuntu/raring/tdenetwork/debian/ksirc-trinity.menu
+++ b/ubuntu/raring/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
?package(ksirc):\
needs="X11"\
section="Apps/Net"\
- hints="KDE,IRC"\
+ hints="TDE,IRC"\
title="KSirc"\
icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
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/tdepim/debian/akregator-trinity.menu b/ubuntu/raring/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/ubuntu/raring/tdepim/debian/akregator-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="aKregator"\
- icon32x32="/usr/share/pixmaps/akregator.xpm"\
- icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
command="/opt/trinity/bin/akregator"
diff --git a/ubuntu/raring/tdepim/debian/kaddressbook-trinity.menu b/ubuntu/raring/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/ubuntu/raring/tdepim/debian/kaddressbook-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAddressbook"\
- icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
- icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
command="/opt/trinity/bin/kaddressbook"
diff --git a/ubuntu/raring/tdepim/debian/kalarm-trinity.menu b/ubuntu/raring/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/ubuntu/raring/tdepim/debian/kalarm-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KAlarm"\
- icon32x32="/usr/share/pixmaps/kalarm.xpm"\
- icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
command="/opt/trinity/bin/kalarm"
diff --git a/ubuntu/raring/tdepim/debian/karm-trinity.menu b/ubuntu/raring/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/ubuntu/raring/tdepim/debian/karm-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KArm"\
- icon32x32="/usr/share/pixmaps/karm.xpm"\
- icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
command="/opt/trinity/bin/karm"
diff --git a/ubuntu/raring/tdepim/debian/kmail-trinity.menu b/ubuntu/raring/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/ubuntu/raring/tdepim/debian/kmail-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
?package(kmail):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail"\
- icon32x32="/usr/share/pixmaps/kmail.xpm"\
- icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
command="/opt/trinity/bin/kmail"
diff --git a/ubuntu/raring/tdepim/debian/kmailcvt-trinity.menu b/ubuntu/raring/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/ubuntu/raring/tdepim/debian/kmailcvt-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
?package(kmailcvt):\
needs="X11"\
section="Applications/Data Management"\
- hints="KDE,Mail"\
+ hints="TDE,Mail"\
title="KMail/KAB Import Tool"\
command="/opt/trinity/bin/kmailcvt"
diff --git a/ubuntu/raring/tdepim/debian/knode-trinity.menu b/ubuntu/raring/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/ubuntu/raring/tdepim/debian/knode-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
?package(knode):\
needs="X11"\
section="Applications/Network/Communication"\
- hints="KDE,News"\
+ hints="TDE,News"\
title="KNode"\
- icon32x32="/usr/share/pixmaps/knode.xpm"\
- icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
command="/opt/trinity/bin/knode"
diff --git a/ubuntu/raring/tdepim/debian/knotes-trinity.menu b/ubuntu/raring/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/ubuntu/raring/tdepim/debian/knotes-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KNotes"\
- icon32x32="/usr/share/pixmaps/knotes.xpm"\
- icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
command="/opt/trinity/bin/knotes"
diff --git a/ubuntu/raring/tdepim/debian/kontact-trinity.menu b/ubuntu/raring/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/ubuntu/raring/tdepim/debian/kontact-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="Kontact"\
- icon32x32="/usr/share/pixmaps/kontact.xpm"\
- icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
command="/opt/trinity/bin/kontact"
diff --git a/ubuntu/raring/tdepim/debian/korganizer-trinity.menu b/ubuntu/raring/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/ubuntu/raring/tdepim/debian/korganizer-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Data Management"\
hints="TDE"\
title="KOrganizer"\
- icon32x32="/usr/share/pixmaps/korganizer.xpm"\
- icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
command="/opt/trinity/bin/korganizer"
diff --git a/ubuntu/raring/tdepim/debian/korn-trinity.menu b/ubuntu/raring/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/ubuntu/raring/tdepim/debian/korn-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Network/Web News"\
hints="TDE"\
title="KOrn"\
- icon32x32="/usr/share/pixmaps/korn.xpm"\
- icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
command="/opt/trinity/bin/korn"
diff --git a/ubuntu/raring/tdepim/debian/ktnef-trinity.menu b/ubuntu/raring/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/ubuntu/raring/tdepim/debian/ktnef-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Viewers"\
hints="TDE"\
title="KTnef"\
- icon32x32="/usr/share/pixmaps/ktnef.xpm"\
- icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
command="/opt/trinity/bin/ktnef"
diff --git a/ubuntu/raring/tdepim/debian/tdepim-wizards-trinity.menu b/ubuntu/raring/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/ubuntu/raring/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/ubuntu/raring/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
needs="X11"\
section="Applications/Network/Communication"\
hints="TDE"\
- title="KDE Groupware Wizard"\
+ title="TDE Groupware Wizard"\
command="/opt/trinity/bin/groupwarewizard"
?package(tdepim-wizards):\
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/cervisia-trinity.menu b/ubuntu/raring/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/ubuntu/raring/tdesdk/debian/cervisia-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
?package(cervisia):\
needs="x11"\
section="Applications/Programming"\
- hints="KDE,Version control"\
+ hints="TDE,Version control"\
title="Cervisia"\
longtitle="Cervisia (CVS Frontend)"\
- icon="/usr/share/pixmaps/cervisia.xpm"\
+ icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
command="/opt/trinity/bin/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/kbabel-trinity.menu b/ubuntu/raring/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/ubuntu/raring/tdesdk/debian/kbabel-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel"\
longtitle="KBabel (Translation Tool)"\
- icon="/usr/share/pixmaps/kbabel.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
command="/opt/trinity/bin/kbabel"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Dictionary"\
longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
- icon="/usr/share/pixmaps/kbabeldict.xpm"\
+ icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
command="/opt/trinity/bin/kbabeldict"
?package(kbabel):\
needs="x11"\
section="Applications/Text"\
- hints="KDE,l10n"\
+ hints="TDE,l10n"\
title="KBabel Catalog Manager"\
longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
- icon="/usr/share/pixmaps/catalogmanager.xpm"\
+ icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
command="/opt/trinity/bin/catalogmanager"
diff --git a/ubuntu/raring/tdesdk/debian/kbugbuster-trinity.menu b/ubuntu/raring/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/ubuntu/raring/tdesdk/debian/kbugbuster-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
section="Applications/Project Management"\
hints="TDE"\
title="KBugBuster"\
- longtitle="KBugBuster (KDE Bug Management)"\
- icon="/usr/share/pixmaps/kbugbuster.xpm"\
+ longtitle="KBugBuster (TDE Bug Management)"\
+ icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
command="/opt/trinity/bin/kbugbuster"
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/kompare-trinity.menu b/ubuntu/raring/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/ubuntu/raring/tdesdk/debian/kompare-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Kompare"\
longtitle="Kompare (Diff/Patch Frontend)"\
- icon="/usr/share/pixmaps/kompare.xpm"\
+ icon="/opt/trinity/share/pixmaps/kompare.xpm"\
command="/opt/trinity/bin/kompare"
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/kuiviewer-trinity.menu b/ubuntu/raring/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/ubuntu/raring/tdesdk/debian/kuiviewer-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KUIViewer"\
longtitle="KUIViewer (Qt Designer UI File Viewer)"\
- icon="/usr/share/pixmaps/kuiviewer.xpm"\
+ icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
command="/opt/trinity/bin/kuiviewer"
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/tdecachegrind-trinity.menu b/ubuntu/raring/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/ubuntu/raring/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="KCachegrind"\
longtitle="KCachegrind (Profiler Frontend)"\
- icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
command="/opt/trinity/bin/tdecachegrind"
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/tdesdk/debian/umbrello-trinity.menu b/ubuntu/raring/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/ubuntu/raring/tdesdk/debian/umbrello-trinity.menu
+++ b/ubuntu/raring/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
hints="TDE"\
title="Umbrello"\
longtitle="Umbrello (UML Modeller)"\
- icon="/usr/share/pixmaps/umbrello.xpm"\
+ icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
command="/opt/trinity/bin/umbrello"
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/ark-trinity.menu b/ubuntu/raring/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/ubuntu/raring/tdeutils/debian/ark-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Ark"\
- icon32x32="/usr/share/pixmaps/ark.xpm"\
- icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
command="/opt/trinity/bin/ark"
# Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/ubuntu/raring/tdeutils/debian/control b/ubuntu/raring/tdeutils/debian/control
index d0556e97b..599a692dd 100644
--- a/ubuntu/raring/tdeutils/debian/control
+++ b/ubuntu/raring/tdeutils/debian/control
@@ -13,7 +13,7 @@ Section: tde
Architecture: all
Replaces: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
Breaks: kdeutils-kde3 (<< 4:14.0.0), kdeutils-trinity (<< 4:14.0.0)
-Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), kdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
+Depends: ark-trinity (>= ${Source-Version}), kcalc-trinity (>= ${Source-Version}), kcharselect-trinity (>= ${Source-Version}), tdelirc-trinity (>= ${Source-Version}), tdessh-trinity (>= ${Source-Version}), kdf-trinity (>= ${Source-Version}), kedit-trinity (>= ${Source-Version}), kfloppy-trinity (>= ${Source-Version}), kgpg-trinity (>= ${Source-Version}), khexedit-trinity (>= ${Source-Version}), kjots-trinity (>= ${Source-Version}), klaptopdaemon-trinity (>= ${Source-Version}) | kpowersave-trinity, kmilo-trinity (>= ${Source-Version}), kregexpeditor-trinity (>= ${Source-Version}), ksim-trinity (>= ${Source-Version}), ktimer-trinity (>= ${Source-Version}), tdewalletmanager-trinity (>= ${Source-Version}), superkaramba-trinity (>= ${Source-Version})
Suggests: tdeutils-trinity-doc-html (>= ${Source-Version})
Description: general purpose utilities from the official Trinity release
KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -61,7 +61,7 @@ Section: utils
Architecture: any
Replaces: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
Breaks: kdeutils-kde3-dev (<< 4:14.0.0), kdeutils-trinity-dev (<< 4:14.0.0)
-Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), kdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
+Depends: ark-trinity (= ${Source-Version}), kcalc-trinity (= ${Source-Version}), tdelirc-trinity (= ${Source-Version}), kedit-trinity (= ${Source-Version}), khexedit-trinity (= ${Source-Version}), klaptopdaemon-trinity (= ${Source-Version}), kmilo-trinity (= ${Source-Version}), kregexpeditor-trinity (= ${Source-Version}), ksim-trinity (= ${Source-Version}), tdelibs4-trinity-dev
Description: development files for the Trinity utilities module
This package contains development files needed to compile tdeutils
applications.
@@ -124,7 +124,7 @@ Description: character selector for Trinity
This package is part of Trinity, as a component of the KDE utilities module.
See the 'kde-trinity' and 'tdeutils-trinity' packages for more information.
-Package: kdelirc-trinity
+Package: tdelirc-trinity
Section: utils
Architecture: any
Replaces: kdelirc-kde3 (<< 4:14.0.0), kdelirc-trinity (<< 4:14.0.0)
@@ -140,8 +140,8 @@ Description: infrared control for Trinity
Package: tdessh-trinity
Section: tde
Architecture: any
-Replaces: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
-Breaks: tdessh-kde3 (<< 4:14.0.0), tdessh-trinity (<< 4:14.0.0)
+Replaces: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
+Breaks: kdessh-kde3 (<< 4:14.0.0), kdessh-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, openssh-client | ssh-client
Description: ssh frontend for Trinity
This package contains KDE's frontend for ssh.
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/kcalc-trinity.menu b/ubuntu/raring/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/ubuntu/raring/tdeutils/debian/kcalc-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
?package(kcalc):\
needs="X11"\
section="Apps/Math"\
- hints="KDE,Calculators"\
+ hints="TDE,Calculators"\
title="KCalc"\
- icon32x32="/usr/share/pixmaps/kcalc.xpm"\
- icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
command="/opt/trinity/bin/kcalc"
# Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kcharselect-trinity.menu b/ubuntu/raring/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/ubuntu/raring/tdeutils/debian/kcharselect-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
?package(kcharselect):\
needs="X11"\
section="Apps/Tools"\
- hints="KDE,Characters"\
+ hints="TDE,Characters"\
title="KCharSelect"\
- icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
- icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
command="/opt/trinity/bin/kcharselect"
# Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian b/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian
deleted file mode 100644
index 986b7f7d4..000000000
--- a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.lintian
+++ /dev/null
@@ -1,3 +0,0 @@
-kdelirc: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
-kdelirc: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/raring/tdeutils/debian/kdf-trinity.menu b/ubuntu/raring/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/ubuntu/raring/tdeutils/debian/kdf-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KDiskFree"\
- icon32x32="/usr/share/pixmaps/kdf.xpm"\
- icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
command="/opt/trinity/bin/kdf"
?package(kdf):\
@@ -12,8 +12,8 @@
section="Apps/System"\
hints="TDE"\
title="kwikdisk"\
- icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
- icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
command="/opt/trinity/bin/kwikdisk"
# Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
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/tdeutils/debian/kedit-trinity.menu b/ubuntu/raring/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/ubuntu/raring/tdeutils/debian/kedit-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
?package(kedit):\
needs="X11"\
section="Apps/Editors"\
- hints="KDE,Text"\
+ hints="TDE,Text"\
title="KEdit"\
- icon32x32="/usr/share/pixmaps/kedit.xpm"\
- icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
command="/opt/trinity/bin/kedit"
# Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kfloppy-trinity.menu b/ubuntu/raring/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/ubuntu/raring/tdeutils/debian/kfloppy-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/System"\
hints="TDE"\
title="KFloppy"\
- icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
- icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
command="/opt/trinity/bin/kfloppy"
# Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kgpg-trinity.menu b/ubuntu/raring/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/ubuntu/raring/tdeutils/debian/kgpg-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kgpg"\
- icon32x32="/usr/share/pixmaps/kgpg.xpm"\
- icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
command="/opt/trinity/bin/kgpg"
# Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/ubuntu/raring/tdeutils/debian/khexedit-trinity.menu b/ubuntu/raring/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/ubuntu/raring/tdeutils/debian/khexedit-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KHexEdit"\
- icon32x32="/usr/share/pixmaps/khexedit.xpm"\
- icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
command="/opt/trinity/bin/khexedit"
# Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kjots-trinity.menu b/ubuntu/raring/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/ubuntu/raring/tdeutils/debian/kjots-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KJots"\
- icon32x32="/usr/share/pixmaps/kjots.xpm"\
- icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
command="/opt/trinity/bin/kjots"
# Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kregexpeditor-trinity.menu b/ubuntu/raring/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/ubuntu/raring/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Kregexpeditor"\
- icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
- icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
command="/opt/trinity/bin/kregexpeditor"
# Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/ubuntu/raring/tdeutils/debian/ktimer-trinity.menu b/ubuntu/raring/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/ubuntu/raring/tdeutils/debian/ktimer-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="KTimer"\
- icon32x32="/usr/share/pixmaps/ktimer.xpm"\
- icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
command="/opt/trinity/bin/ktimer"
# Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/ubuntu/raring/tdeutils/debian/superkaramba-trinity.menu b/ubuntu/raring/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/ubuntu/raring/tdeutils/debian/superkaramba-trinity.menu
+++ b/ubuntu/raring/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
section="Apps/Tools"\
hints="TDE"\
title="Superkaramba"\
- icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
- icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+ icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+ icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
command="/opt/trinity/bin/superkaramba"
# Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.install b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.install
index 8570e2ffa..8570e2ffa 100644
--- a/ubuntu/raring/tdeutils/debian/kdelirc-trinity.install
+++ b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.install
diff --git a/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian
new file mode 100644
index 000000000..0c89583f3
--- /dev/null
+++ b/ubuntu/raring/tdeutils/debian/tdelirc-trinity.lintian
@@ -0,0 +1,3 @@
+tdelirc-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
+tdelirc-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_irkick.so
diff --git a/ubuntu/raring/tdeutils/debian/kdessh-trinity.install b/ubuntu/raring/tdeutils/debian/tdessh-trinity.install
index cf26ccd1d..cf26ccd1d 100644
--- a/ubuntu/raring/tdeutils/debian/kdessh-trinity.install
+++ b/ubuntu/raring/tdeutils/debian/tdessh-trinity.install
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/tdevelop/debian/tdevelop-trinity.menu b/ubuntu/raring/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/ubuntu/raring/tdevelop/debian/tdevelop-trinity.menu
+++ b/ubuntu/raring/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
?package(tdevelop):\
needs="X11"\
section="Applications/Programming"\
- hints="KDE,Development"\
+ hints="TDE,Development"\
title="KDevelop"\
longtitle="KDevelop (Development Environment)"\
- icon="/usr/share/pixmaps/tdevelop.xpm"\
+ icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
command="/opt/trinity/bin/tdevelop"
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