summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/adept/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/adept/debian/rules2
-rw-r--r--debian/lenny/applications/amarok/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/amarok/debian/rules2
-rwxr-xr-xdebian/lenny/applications/basket/debian/rules2
-rw-r--r--debian/lenny/applications/bibletime/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/bibletime/debian/rules2
-rw-r--r--debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/compizconfig-backend-kconfig/debian/rules4
-rwxr-xr-xdebian/lenny/applications/desktop-effects-tde/debian/rules2
-rw-r--r--debian/lenny/applications/digikam/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/applications/digikam/debian/digikam-trinity.install2
-rwxr-xr-xdebian/lenny/applications/digikam/debian/rules2
-rw-r--r--debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/filelight-l10n/debian/rules4
-rw-r--r--debian/lenny/applications/filelight/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/filelight/debian/rules2
-rw-r--r--debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/gtk-qt-engine/debian/rules4
-rw-r--r--debian/lenny/applications/gwenview/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/gwenview/debian/rules2
-rw-r--r--debian/lenny/applications/k3b/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/k3b/debian/rules2
-rw-r--r--debian/lenny/applications/k3b/debian/trinity.mk2
-rw-r--r--debian/lenny/applications/k9copy/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/k9copy/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kaffeine-mozilla/debian/rules2
-rw-r--r--debian/lenny/applications/kaffeine/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install2
-rwxr-xr-xdebian/lenny/applications/kaffeine/debian/rules2
-rw-r--r--debian/lenny/applications/katapult/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/katapult/debian/rules2
-rw-r--r--debian/lenny/applications/kbarcode/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kbarcode/debian/rules2
-rwxr-xr-xdebian/lenny/applications/kbfx/debian/rules6
-rw-r--r--debian/lenny/applications/kbookreader/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kbookreader/debian/rules4
-rw-r--r--debian/lenny/applications/kchmviewer/debian/debiandirs2
-rwxr-xr-xdebian/lenny/applications/kchmviewer/debian/rules4
-rw-r--r--debian/lenny/applications/kcpuload/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kcpuload/debian/rules4
-rw-r--r--debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kdbusnotification/debian/rules4
-rw-r--r--debian/lenny/applications/kdiff3/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kdiff3/debian/rules4
-rw-r--r--debian/lenny/applications/kdirstat/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kdirstat/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kdpkg/debian/rules2
-rw-r--r--debian/lenny/applications/keep/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/applications/keep/debian/rules4
-rw-r--r--debian/lenny/applications/kerry/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kerry/debian/rules2
-rw-r--r--debian/lenny/applications/kile/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kile/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kima/debian/rules2
-rw-r--r--debian/lenny/applications/kio-apt/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kio-apt/debian/rules4
-rw-r--r--debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kio-umountwrapper/debian/rules4
-rw-r--r--debian/lenny/applications/kmplayer/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kmplayer/debian/rules4
-rw-r--r--debian/lenny/applications/kmyfirewall/debian/debiandirs2
-rwxr-xr-xdebian/lenny/applications/kmyfirewall/debian/rules8
-rw-r--r--debian/lenny/applications/kmymoney/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xdebian/lenny/applications/kmymoney/debian/rules4
-rw-r--r--debian/lenny/applications/knemo/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/knemo/debian/rules4
-rwxr-xr-xdebian/lenny/applications/knetload/debian/rules4
-rw-r--r--debian/lenny/applications/knetstats/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/knetstats/debian/rules2
-rw-r--r--debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/knetworkmanager8/debian/rules2
-rw-r--r--debian/lenny/applications/knights/debian/debiandirs2
-rwxr-xr-xdebian/lenny/applications/knights/debian/rules4
-rwxr-xr-xdebian/lenny/applications/knowit/debian/rules2
-rwxr-xr-xdebian/lenny/applications/knutclient/debian/rules2
-rw-r--r--debian/lenny/applications/koffice/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/applications/koffice/debian/koffice-dev-trinity.install2
-rwxr-xr-xdebian/lenny/applications/koffice/debian/rules2
-rw-r--r--debian/lenny/applications/konversation/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/konversation/debian/rules4
-rw-r--r--debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kopete-otr/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kpicosim/debian/rules4
-rw-r--r--debian/lenny/applications/kpilot/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kpilot/debian/rules4
-rw-r--r--debian/lenny/applications/kpowersave/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kpowersave/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kradio/debian/rules2
-rwxr-xr-xdebian/lenny/applications/krename/debian/rules4
-rw-r--r--debian/lenny/applications/krusader/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/krusader/debian/rules4
-rw-r--r--debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs2
-rwxr-xr-xdebian/lenny/applications/ksplash-engine-moodin/debian/rules4
-rwxr-xr-xdebian/lenny/applications/ksquirrel/debian/rules2
-rwxr-xr-xdebian/lenny/applications/kstreamripper/debian/rules4
-rw-r--r--debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/ksystemlog/debian/rules4
-rw-r--r--debian/lenny/applications/ktechlab/debian/debiandirs2
-rwxr-xr-xdebian/lenny/applications/ktechlab/debian/rules10
-rw-r--r--debian/lenny/applications/ktorrent/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/ktorrent/debian/rules4
-rw-r--r--debian/lenny/applications/kuickshow/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kuickshow/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kvirc/debian/rules2
-rw-r--r--debian/lenny/applications/kvkbd/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/kvkbd/debian/rules4
-rwxr-xr-xdebian/lenny/applications/kvpnc/debian/rules4
-rwxr-xr-xdebian/lenny/applications/piklab/debian/rules4
-rwxr-xr-xdebian/lenny/applications/potracegui/debian/rules2
-rw-r--r--debian/lenny/applications/smb4k/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/smb4k/debian/rules2
-rw-r--r--debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/soundkonverter/debian/rules4
-rwxr-xr-xdebian/lenny/applications/tde-guidance/debian/rules2
-rwxr-xr-xdebian/lenny/applications/tde-style-lipstik/debian/rules4
-rw-r--r--debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/tde-systemsettings/debian/rules2
-rw-r--r--debian/lenny/applications/tdesudo/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/tdesudo/debian/rules4
-rw-r--r--debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/tdmtheme/debian/rules4
-rwxr-xr-xdebian/lenny/applications/tellico/debian/rules2
-rw-r--r--debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/twin-style-crystal/debian/rules2
-rw-r--r--debian/lenny/applications/yakuake/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/applications/yakuake/debian/rules2
-rwxr-xr-xdebian/lenny/dependencies/arts/debian/rules2
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/README.Debian45
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/README.fallback23
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/changelog29
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/compat1
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/control23
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/copyright13
-rwxr-xr-xdebian/lenny/dependencies/libcaldav/debian/rules105
-rw-r--r--debian/lenny/dependencies/libcaldav/debian/watch2
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/README.Debian45
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/README.fallback23
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/changelog17
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/compat1
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/control23
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/copyright14
-rwxr-xr-xdebian/lenny/dependencies/libcarddav/debian/rules105
-rw-r--r--debian/lenny/dependencies/libcarddav/debian/watch2
-rw-r--r--debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/libraries/kipi-plugins/debian/rules4
-rw-r--r--debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/libraries/libkdcraw/debian/rules2
-rw-r--r--debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/libraries/libkexiv2/debian/rules2
-rw-r--r--debian/lenny/libraries/libkipi/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/libraries/libkipi/debian/rules2
-rwxr-xr-xdebian/lenny/libraries/libksquirrel/debian/rules2
-rwxr-xr-xdebian/lenny/libraries/mlt++/debian/rules2
-rwxr-xr-xdebian/lenny/libraries/mlt/debian/rules10
-rw-r--r--debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rwxr-xr-xdebian/lenny/libraries/pytdeextensions/debian/rules8
-rw-r--r--debian/lenny/tde-i18n/debian/debiandirs2
-rwxr-xr-xdebian/lenny/tde-i18n/debian/rules2
-rw-r--r--debian/lenny/tdeaccessibility/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdeaccessibility/debian/ksayit-trinity.install2
-rw-r--r--debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdeaccessibility/debian/rules2
-rw-r--r--debian/lenny/tdeaddons/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdeaddons/debian/rules2
-rw-r--r--debian/lenny/tdeadmin/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdeadmin/debian/rules2
-rw-r--r--debian/lenny/tdeartwork/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/lenny/tdeartwork/debian/rules2
-rw-r--r--debian/lenny/tdebase/debian/control2
-rw-r--r--debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff6
-rwxr-xr-xdebian/lenny/tdebase/debian/rules2
-rw-r--r--debian/lenny/tdebase/debian/tdebase-trinity-bin.install1
-rw-r--r--debian/lenny/tdebase/debian/twin-trinity.install1
-rw-r--r--debian/lenny/tdebindings/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install2
-rw-r--r--debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install2
-rw-r--r--debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdebindings/debian/rules2
-rw-r--r--debian/lenny/tdeedu/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdeedu/debian/kstars-trinity.install4
-rw-r--r--debian/lenny/tdeedu/debian/libkiten-dev-trinity.install2
-rw-r--r--debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install2
-rw-r--r--debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdeedu/debian/rules4
-rw-r--r--debian/lenny/tdegames/debian/atlantik-trinity-dev.install4
-rw-r--r--debian/lenny/tdegames/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdegames/debian/kolf-trinity-dev.install2
-rw-r--r--debian/lenny/tdegames/debian/libtdegames-trinity-dev.install4
-rw-r--r--debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdegames/debian/rules2
-rw-r--r--debian/lenny/tdegraphics/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install6
-rw-r--r--debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff2
-rw-r--r--debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install362
-rw-r--r--debian/lenny/tdelibs/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml4
-rwxr-xr-xdebian/lenny/tdelibs/debian/rules2
-rw-r--r--debian/lenny/tdemultimedia/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdemultimedia/debian/rules6
-rw-r--r--debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install268
-rw-r--r--debian/lenny/tdenetwork/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdenetwork/debian/kopete-trinity.install8
-rw-r--r--debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdenetwork/debian/rules2
-rw-r--r--debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install128
-rw-r--r--debian/lenny/tdepim/debian/changelog2
-rw-r--r--debian/lenny/tdepim/debian/libindex0-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/libkcal2-trinity-dev.install4
-rw-r--r--debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install6
-rw-r--r--debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install4
-rw-r--r--debian/lenny/tdepim/debian/libksieve0-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/libktnef1-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install2
-rw-r--r--debian/lenny/tdepim/debian/tdepim-trinity-dev.install26
-rw-r--r--debian/lenny/tdesdk/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdesdk/debian/changelog2
-rw-r--r--debian/lenny/tdesdk/debian/kbabel-trinity-dev.install42
-rw-r--r--debian/lenny/tdesdk/debian/kmtrace-trinity.install2
-rw-r--r--debian/lenny/tdesdk/debian/kspy-trinity.install2
-rw-r--r--debian/lenny/tdesdk/debian/kunittest-trinity.install2
-rw-r--r--debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install6
-rw-r--r--debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdesdk/debian/rules2
-rw-r--r--debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install2
-rw-r--r--debian/lenny/tdetoys/debian/amor-trinity.install2
-rw-r--r--debian/lenny/tdetoys/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdetoys/debian/changelog2
-rw-r--r--debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdetoys/debian/rules4
-rw-r--r--debian/lenny/tdeutils/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdeutils/debian/rules2
-rw-r--r--debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install30
-rw-r--r--debian/lenny/tdevelop/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdevelop/debian/rules2
-rw-r--r--debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install2
-rw-r--r--debian/lenny/tdewebdev/debian/cdbs/kde.mk2
-rw-r--r--debian/lenny/tdewebdev/debian/kommander-trinity-dev.install4
-rw-r--r--debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/lenny/tdewebdev/debian/rules2
-rw-r--r--debian/squeeze/applications/adept/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/adept/debian/rules2
-rw-r--r--debian/squeeze/applications/amarok/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/amarok/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/basket/debian/rules2
-rw-r--r--debian/squeeze/applications/bibletime/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/bibletime/debian/rules2
-rw-r--r--debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/compizconfig-backend-kconfig/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/desktop-effects-tde/debian/rules2
-rw-r--r--debian/squeeze/applications/digikam/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/applications/digikam/debian/digikam-trinity.install2
-rwxr-xr-xdebian/squeeze/applications/digikam/debian/rules2
-rw-r--r--debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/filelight-l10n/debian/rules4
-rw-r--r--debian/squeeze/applications/filelight/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/filelight/debian/rules2
-rw-r--r--debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/gtk-qt-engine/debian/rules4
-rw-r--r--debian/squeeze/applications/gwenview/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/gwenview/debian/rules2
-rw-r--r--debian/squeeze/applications/k3b/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/k3b/debian/rules2
-rw-r--r--debian/squeeze/applications/k3b/debian/trinity.mk2
-rw-r--r--debian/squeeze/applications/k9copy/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/k9copy/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kaffeine-mozilla/debian/rules2
-rw-r--r--debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install2
-rwxr-xr-xdebian/squeeze/applications/kaffeine/debian/rules2
-rw-r--r--debian/squeeze/applications/katapult/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/katapult/debian/rules2
-rw-r--r--debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kbarcode/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/kbfx/debian/rules6
-rw-r--r--debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kbookreader/debian/rules4
-rw-r--r--debian/squeeze/applications/kchmviewer/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/applications/kchmviewer/debian/rules4
-rw-r--r--debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kcpuload/debian/rules4
-rw-r--r--debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kdbusnotification/debian/rules4
-rw-r--r--debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kdiff3/debian/rules4
-rw-r--r--debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kdirstat/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kdpkg/debian/rules2
-rw-r--r--debian/squeeze/applications/keep/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/applications/keep/debian/rules4
-rw-r--r--debian/squeeze/applications/kerry/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kerry/debian/rules2
-rw-r--r--debian/squeeze/applications/kile/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kile/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kima/debian/rules2
-rw-r--r--debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kio-apt/debian/rules4
-rw-r--r--debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kio-umountwrapper/debian/rules4
-rw-r--r--debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kmplayer/debian/rules4
-rw-r--r--debian/squeeze/applications/kmyfirewall/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/applications/kmyfirewall/debian/rules8
-rw-r--r--debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xdebian/squeeze/applications/kmymoney/debian/rules4
-rw-r--r--debian/squeeze/applications/knemo/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/knemo/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/knetload/debian/rules4
-rw-r--r--debian/squeeze/applications/knetstats/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/knetstats/debian/rules2
-rw-r--r--debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/knetworkmanager8/debian/rules2
-rw-r--r--debian/squeeze/applications/knights/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/applications/knights/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/knowit/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/knutclient/debian/rules2
-rw-r--r--debian/squeeze/applications/koffice/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install2
-rwxr-xr-xdebian/squeeze/applications/koffice/debian/rules2
-rw-r--r--debian/squeeze/applications/konversation/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/konversation/debian/rules4
-rw-r--r--debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kopete-otr/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kpicosim/debian/rules4
-rw-r--r--debian/squeeze/applications/kpilot/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kpilot/debian/rules4
-rw-r--r--debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kpowersave/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kradio/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/krename/debian/rules4
-rw-r--r--debian/squeeze/applications/krusader/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/krusader/debian/rules4
-rw-r--r--debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/applications/ksplash-engine-moodin/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/ksquirrel/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/kstreamripper/debian/rules4
-rw-r--r--debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/ksystemlog/debian/rules4
-rw-r--r--debian/squeeze/applications/ktechlab/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/applications/ktechlab/debian/rules10
-rw-r--r--debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/ktorrent/debian/rules4
-rw-r--r--debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kuickshow/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kvirc/debian/rules2
-rw-r--r--debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/kvkbd/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/kvpnc/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/piklab/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/potracegui/debian/rules2
-rw-r--r--debian/squeeze/applications/smb4k/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/smb4k/debian/rules2
-rw-r--r--debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/soundkonverter/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/tde-guidance/debian/rules2
-rwxr-xr-xdebian/squeeze/applications/tde-style-lipstik/debian/rules4
-rw-r--r--debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/tde-systemsettings/debian/rules2
-rw-r--r--debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/tdesudo/debian/rules4
-rw-r--r--debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/tdmtheme/debian/rules4
-rwxr-xr-xdebian/squeeze/applications/tellico/debian/rules2
-rw-r--r--debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/twin-style-crystal/debian/rules2
-rw-r--r--debian/squeeze/applications/yakuake/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/applications/yakuake/debian/rules2
-rwxr-xr-xdebian/squeeze/dependencies/arts/debian/rules2
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/README.Debian45
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/README.fallback23
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/changelog29
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/compat1
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/control23
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/copyright13
-rwxr-xr-xdebian/squeeze/dependencies/libcaldav/debian/rules105
-rw-r--r--debian/squeeze/dependencies/libcaldav/debian/watch2
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/README.Debian45
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/README.fallback23
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/changelog17
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/compat1
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/control23
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/copyright14
-rwxr-xr-xdebian/squeeze/dependencies/libcarddav/debian/rules105
-rw-r--r--debian/squeeze/dependencies/libcarddav/debian/watch2
-rw-r--r--debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/libraries/kipi-plugins/debian/rules4
-rw-r--r--debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/libraries/libkdcraw/debian/rules2
-rw-r--r--debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/libraries/libkexiv2/debian/rules2
-rw-r--r--debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/libraries/libkipi/debian/rules2
-rwxr-xr-xdebian/squeeze/libraries/libksquirrel/debian/rules2
-rwxr-xr-xdebian/squeeze/libraries/mlt++/debian/rules2
-rwxr-xr-xdebian/squeeze/libraries/mlt/debian/rules10
-rw-r--r--debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install2
-rwxr-xr-xdebian/squeeze/libraries/pytdeextensions/debian/rules8
-rw-r--r--debian/squeeze/tde-i18n/debian/debiandirs2
-rwxr-xr-xdebian/squeeze/tde-i18n/debian/rules2
-rw-r--r--debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install2
-rw-r--r--debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdeaccessibility/debian/rules2
-rw-r--r--debian/squeeze/tdeaddons/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdeaddons/debian/rules2
-rw-r--r--debian/squeeze/tdeadmin/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdeadmin/debian/rules2
-rw-r--r--debian/squeeze/tdeartwork/debian/cdbs/kde.mk2
-rwxr-xr-xdebian/squeeze/tdeartwork/debian/rules2
-rw-r--r--debian/squeeze/tdebase/debian/control2
-rw-r--r--debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff6
-rwxr-xr-xdebian/squeeze/tdebase/debian/rules2
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-trinity-bin.install1
-rw-r--r--debian/squeeze/tdebase/debian/twin-trinity.install1
-rw-r--r--debian/squeeze/tdebindings/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install2
-rw-r--r--debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install2
-rw-r--r--debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdebindings/debian/rules2
-rw-r--r--debian/squeeze/tdeedu/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdeedu/debian/kstars-trinity.install4
-rw-r--r--debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install2
-rw-r--r--debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install2
-rw-r--r--debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdeedu/debian/rules4
-rw-r--r--debian/squeeze/tdegames/debian/atlantik-trinity-dev.install4
-rw-r--r--debian/squeeze/tdegames/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdegames/debian/kolf-trinity-dev.install2
-rw-r--r--debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install4
-rw-r--r--debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdegames/debian/rules2
-rw-r--r--debian/squeeze/tdegraphics/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install6
-rw-r--r--debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff2
-rw-r--r--debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install362
-rw-r--r--debian/squeeze/tdelibs/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml4
-rwxr-xr-xdebian/squeeze/tdelibs/debian/rules2
-rw-r--r--debian/squeeze/tdemultimedia/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdemultimedia/debian/rules6
-rw-r--r--debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install268
-rw-r--r--debian/squeeze/tdenetwork/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdenetwork/debian/kopete-trinity.install8
-rw-r--r--debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdenetwork/debian/rules2
-rw-r--r--debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install128
-rw-r--r--debian/squeeze/tdepim/debian/changelog2
-rw-r--r--debian/squeeze/tdepim/debian/libindex0-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install4
-rw-r--r--debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install6
-rw-r--r--debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install4
-rw-r--r--debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install2
-rw-r--r--debian/squeeze/tdepim/debian/tdepim-trinity-dev.install26
-rw-r--r--debian/squeeze/tdesdk/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdesdk/debian/changelog2
-rw-r--r--debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install42
-rw-r--r--debian/squeeze/tdesdk/debian/kmtrace-trinity.install2
-rw-r--r--debian/squeeze/tdesdk/debian/kspy-trinity.install2
-rw-r--r--debian/squeeze/tdesdk/debian/kunittest-trinity.install2
-rw-r--r--debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install6
-rw-r--r--debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdesdk/debian/rules2
-rw-r--r--debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install2
-rw-r--r--debian/squeeze/tdetoys/debian/amor-trinity.install2
-rw-r--r--debian/squeeze/tdetoys/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdetoys/debian/changelog2
-rw-r--r--debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdetoys/debian/rules4
-rw-r--r--debian/squeeze/tdeutils/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdeutils/debian/rules2
-rw-r--r--debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install30
-rw-r--r--debian/squeeze/tdevelop/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdevelop/debian/rules2
-rw-r--r--debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install2
-rw-r--r--debian/squeeze/tdewebdev/debian/cdbs/kde.mk2
-rw-r--r--debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install4
-rw-r--r--debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xdebian/squeeze/tdewebdev/debian/rules2
498 files changed, 2406 insertions, 1460 deletions
diff --git a/debian/lenny/applications/adept/debian/cdbs/kde.mk b/debian/lenny/applications/adept/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/adept/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/adept/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/adept/debian/rules b/debian/lenny/applications/adept/debian/rules
index 9c80b51c7..ee86e8e4f 100755
--- a/debian/lenny/applications/adept/debian/rules
+++ b/debian/lenny/applications/adept/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/amarok/debian/cdbs/kde.mk b/debian/lenny/applications/amarok/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/amarok/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/amarok/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/amarok/debian/rules b/debian/lenny/applications/amarok/debian/rules
index 1e2caae64..deb43ebf7 100755
--- a/debian/lenny/applications/amarok/debian/rules
+++ b/debian/lenny/applications/amarok/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index 5af81349e..0e699603a 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/bibletime/debian/cdbs/kde.mk b/debian/lenny/applications/bibletime/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/bibletime/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/bibletime/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules
index 1ef64a83d..ea4b62326 100755
--- a/debian/lenny/applications/bibletime/debian/rules
+++ b/debian/lenny/applications/bibletime/debian/rules
@@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian
DEB_BUILDDIR = $(DEB_SRCDIR)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
index 820ba5a3b..c5dd59ccb 100755
--- a/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/lenny/applications/compizconfig-backend-kconfig/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/desktop-effects-tde/debian/rules b/debian/lenny/applications/desktop-effects-tde/debian/rules
index 7bdd258a5..7bf3e3306 100755
--- a/debian/lenny/applications/desktop-effects-tde/debian/rules
+++ b/debian/lenny/applications/desktop-effects-tde/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/digikam/debian/cdbs/kde.mk b/debian/lenny/applications/digikam/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/digikam/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/digikam/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.install b/debian/lenny/applications/digikam/debian/digikam-trinity.install
index 87c7fe33f..49fc16b82 100644
--- a/debian/lenny/applications/digikam/debian/digikam-trinity.install
+++ b/debian/lenny/applications/digikam/debian/digikam-trinity.install
@@ -1,5 +1,5 @@
opt/trinity/bin/digi*
-/opt/trinity/include/kde
+/opt/trinity/include/tde
opt/trinity/lib
/opt/trinity/share/apps/digikam
/opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop
diff --git a/debian/lenny/applications/digikam/debian/rules b/debian/lenny/applications/digikam/debian/rules
index d4b31de95..18181fd83 100755
--- a/debian/lenny/applications/digikam/debian/rules
+++ b/debian/lenny/applications/digikam/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk b/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/filelight-l10n/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/filelight-l10n/debian/rules b/debian/lenny/applications/filelight-l10n/debian/rules
index 7eea2f6e2..9255102ce 100755
--- a/debian/lenny/applications/filelight-l10n/debian/rules
+++ b/debian/lenny/applications/filelight-l10n/debian/rules
@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
#DEB_PATCHDIRS := debian/patches/common debian/patches
#DEB_INSTALL_DOCS_ALL :=
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/filelight/debian/cdbs/kde.mk b/debian/lenny/applications/filelight/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/filelight/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/filelight/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/filelight/debian/rules b/debian/lenny/applications/filelight/debian/rules
index a7c79577a..838448085 100755
--- a/debian/lenny/applications/filelight/debian/rules
+++ b/debian/lenny/applications/filelight/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk b/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/gtk-qt-engine/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/rules b/debian/lenny/applications/gtk-qt-engine/debian/rules
index f2ac92c96..0247f6ef3 100755
--- a/debian/lenny/applications/gtk-qt-engine/debian/rules
+++ b/debian/lenny/applications/gtk-qt-engine/debian/rules
@@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
binary-install/gtk-qt-engine-trinity::
mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
diff --git a/debian/lenny/applications/gwenview/debian/cdbs/kde.mk b/debian/lenny/applications/gwenview/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/gwenview/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/gwenview/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/gwenview/debian/rules b/debian/lenny/applications/gwenview/debian/rules
index c231b336f..81fd87521 100755
--- a/debian/lenny/applications/gwenview/debian/rules
+++ b/debian/lenny/applications/gwenview/debian/rules
@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/k3b/debian/cdbs/kde.mk b/debian/lenny/applications/k3b/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/k3b/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/k3b/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/k3b/debian/rules b/debian/lenny/applications/k3b/debian/rules
index fa308829e..3a19a0ec8 100755
--- a/debian/lenny/applications/k3b/debian/rules
+++ b/debian/lenny/applications/k3b/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde"
+DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde"
DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
diff --git a/debian/lenny/applications/k3b/debian/trinity.mk b/debian/lenny/applications/k3b/debian/trinity.mk
index c48d5d5af..cd71193a1 100644
--- a/debian/lenny/applications/k3b/debian/trinity.mk
+++ b/debian/lenny/applications/k3b/debian/trinity.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/k9copy/debian/cdbs/kde.mk b/debian/lenny/applications/k9copy/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/k9copy/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/k9copy/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 860ee9e84..7f17e00f5 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kaffeine-mozilla/debian/rules b/debian/lenny/applications/kaffeine-mozilla/debian/rules
index 86b977b3f..80fe9807b 100755
--- a/debian/lenny/applications/kaffeine-mozilla/debian/rules
+++ b/debian/lenny/applications/kaffeine-mozilla/debian/rules
@@ -14,7 +14,7 @@ export DH_OPTIONS
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk b/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kaffeine/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
index 825837cba..4777ef63c 100644
--- a/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/lenny/applications/kaffeine/debian/kaffeine-trinity.install
@@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/
debian/tmp/opt/trinity/share/icons/
debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
debian/tmp/opt/trinity/share/locale/
-debian/tmp/opt/trinity/include/kde/kaffeine/*h
+debian/tmp/opt/trinity/include/tde/kaffeine/*h
debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so
diff --git a/debian/lenny/applications/kaffeine/debian/rules b/debian/lenny/applications/kaffeine/debian/rules
index efff35a86..43e1e0d24 100755
--- a/debian/lenny/applications/kaffeine/debian/rules
+++ b/debian/lenny/applications/kaffeine/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/katapult/debian/cdbs/kde.mk b/debian/lenny/applications/katapult/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/katapult/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/katapult/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/katapult/debian/rules b/debian/lenny/applications/katapult/debian/rules
index f29a6a564..e48ac244a 100755
--- a/debian/lenny/applications/katapult/debian/rules
+++ b/debian/lenny/applications/katapult/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk b/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kbarcode/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kbarcode/debian/rules b/debian/lenny/applications/kbarcode/debian/rules
index bb554f410..35a033bc7 100755
--- a/debian/lenny/applications/kbarcode/debian/rules
+++ b/debian/lenny/applications/kbarcode/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kbfx/debian/rules b/debian/lenny/applications/kbfx/debian/rules
index 5ea2ffc62..9d710b00d 100755
--- a/debian/lenny/applications/kbfx/debian/rules
+++ b/debian/lenny/applications/kbfx/debian/rules
@@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
#CMAKE_LIBRARY_PATH := /opt/trinity/lib
-#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde
+#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde
include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
get-orig-source:
@@dh_testdir
diff --git a/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk b/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kbookreader/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kbookreader/debian/rules b/debian/lenny/applications/kbookreader/debian/rules
index 4ceef7d99..b3b57fdb9 100755
--- a/debian/lenny/applications/kbookreader/debian/rules
+++ b/debian/lenny/applications/kbookreader/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kchmviewer/debian/debiandirs b/debian/lenny/applications/kchmviewer/debian/debiandirs
index cb33e0ee3..893052e08 100644
--- a/debian/lenny/applications/kchmviewer/debian/debiandirs
+++ b/debian/lenny/applications/kchmviewer/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index 0466e25ea..72c3fd5bb 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
CONFIGURE_OPTIONS_KDE = \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
- --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \
+ --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \
--with-qt-dir=$(qtdir) \
--sysconfdir=$(sysconfdir) \
--infodir=/opt/trinity/share/info \
diff --git a/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk b/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kcpuload/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules
index 2ab783f6d..fae495f36 100755
--- a/debian/lenny/applications/kcpuload/debian/rules
+++ b/debian/lenny/applications/kcpuload/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -79,7 +79,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
touch configure-stamp
diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
index 3fbf27bb0..d47788b3a 100755
--- a/debian/lenny/applications/kdbusnotification/debian/rules
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -78,7 +78,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
touch configure-stamp
diff --git a/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk b/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdiff3/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kdiff3/debian/rules b/debian/lenny/applications/kdiff3/debian/rules
index 90b33c108..e76778235 100755
--- a/debian/lenny/applications/kdiff3/debian/rules
+++ b/debian/lenny/applications/kdiff3/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -37,7 +37,7 @@ config.status:
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
- CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
diff --git a/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk b/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdirstat/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kdirstat/debian/rules b/debian/lenny/applications/kdirstat/debian/rules
index cf2a8db06..b15f5a9a5 100755
--- a/debian/lenny/applications/kdirstat/debian/rules
+++ b/debian/lenny/applications/kdirstat/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS += -Wl,--as-needed
diff --git a/debian/lenny/applications/kdpkg/debian/rules b/debian/lenny/applications/kdpkg/debian/rules
index 59fc3d5a5..b2822c5b3 100755
--- a/debian/lenny/applications/kdpkg/debian/rules
+++ b/debian/lenny/applications/kdpkg/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/keep/debian/cdbs/kde.mk b/debian/lenny/applications/keep/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/keep/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/keep/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..de663438c 100644
--- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff
@@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/applications/keep/debian/rules b/debian/lenny/applications/keep/debian/rules
index 49dc42fae..b6eae04ee 100755
--- a/debian/lenny/applications/keep/debian/rules
+++ b/debian/lenny/applications/keep/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_keep := keep.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kerry/debian/cdbs/kde.mk b/debian/lenny/applications/kerry/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kerry/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kerry/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kerry/debian/rules b/debian/lenny/applications/kerry/debian/rules
index 0d08e83f9..7dc0fbe23 100755
--- a/debian/lenny/applications/kerry/debian/rules
+++ b/debian/lenny/applications/kerry/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
# include /usr/share/cdbs/1/class/kde.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kile/debian/cdbs/kde.mk b/debian/lenny/applications/kile/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kile/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kile/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kile/debian/rules b/debian/lenny/applications/kile/debian/rules
index 2d31b63e0..3e19a08ea 100755
--- a/debian/lenny/applications/kile/debian/rules
+++ b/debian/lenny/applications/kile/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kima/debian/rules b/debian/lenny/applications/kima/debian/rules
index a353777b4..519575104 100755
--- a/debian/lenny/applications/kima/debian/rules
+++ b/debian/lenny/applications/kima/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk b/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kio-apt/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kio-apt/debian/rules b/debian/lenny/applications/kio-apt/debian/rules
index a6d8c580a..9b82c21ad 100755
--- a/debian/lenny/applications/kio-apt/debian/rules
+++ b/debian/lenny/applications/kio-apt/debian/rules
@@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kio-umountwrapper/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kio-umountwrapper/debian/rules b/debian/lenny/applications/kio-umountwrapper/debian/rules
index ce61aac65..ae8903f41 100755
--- a/debian/lenny/applications/kio-umountwrapper/debian/rules
+++ b/debian/lenny/applications/kio-umountwrapper/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk b/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kmplayer/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kmplayer/debian/rules b/debian/lenny/applications/kmplayer/debian/rules
index b23d91457..63bf848d1 100755
--- a/debian/lenny/applications/kmplayer/debian/rules
+++ b/debian/lenny/applications/kmplayer/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3)
CXX = g++ -fpermissive
endif
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
diff --git a/debian/lenny/applications/kmyfirewall/debian/debiandirs b/debian/lenny/applications/kmyfirewall/debian/debiandirs
index 959f97f68..8b51d74fa 100644
--- a/debian/lenny/applications/kmyfirewall/debian/debiandirs
+++ b/debian/lenny/applications/kmyfirewall/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 1993e3bfe..a8d1312d8 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -56,7 +56,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
@@ -65,7 +65,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
@@ -94,7 +94,7 @@ install: build
dh_clean -k
# Add here commands to install the package into debian/kmyfirewall.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so
chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so
diff --git a/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk b/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kmymoney/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install
index 4c3b73990..f8c5dc4e3 100644
--- a/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/lenny/applications/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/kde/kmymoney/*
+opt/trinity/include/tde/kmymoney/*
opt/trinity/lib/lib*.la
opt/trinity/lib/lib*.so
diff --git a/debian/lenny/applications/kmymoney/debian/rules b/debian/lenny/applications/kmymoney/debian/rules
index efb7a96ea..1bb4dc1bf 100755
--- a/debian/lenny/applications/kmymoney/debian/rules
+++ b/debian/lenny/applications/kmymoney/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3
LDFLAGS += -Wl,--as-needed
diff --git a/debian/lenny/applications/knemo/debian/cdbs/kde.mk b/debian/lenny/applications/knemo/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/knemo/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/knemo/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/knemo/debian/rules b/debian/lenny/applications/knemo/debian/rules
index 143b4cd5e..fd71fe17f 100755
--- a/debian/lenny/applications/knemo/debian/rules
+++ b/debian/lenny/applications/knemo/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_DOCS_knemo = -XNEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/knetload/debian/rules b/debian/lenny/applications/knetload/debian/rules
index c0beba707..843a04ceb 100755
--- a/debian/lenny/applications/knetload/debian/rules
+++ b/debian/lenny/applications/knetload/debian/rules
@@ -2,7 +2,7 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -74,7 +74,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
touch configure-stamp
diff --git a/debian/lenny/applications/knetstats/debian/cdbs/kde.mk b/debian/lenny/applications/knetstats/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/knetstats/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/knetstats/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/knetstats/debian/rules b/debian/lenny/applications/knetstats/debian/rules
index 9d3414239..62349e5af 100755
--- a/debian/lenny/applications/knetstats/debian/rules
+++ b/debian/lenny/applications/knetstats/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/knetworkmanager8/debian/rules b/debian/lenny/applications/knetworkmanager8/debian/rules
index 97955e38b..e2e99d9d9 100755
--- a/debian/lenny/applications/knetworkmanager8/debian/rules
+++ b/debian/lenny/applications/knetworkmanager8/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/knights/debian/debiandirs b/debian/lenny/applications/knights/debian/debiandirs
index d341195a1..ba70ea3fb 100644
--- a/debian/lenny/applications/knights/debian/debiandirs
+++ b/debian/lenny/applications/knights/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules
index d7e8330c7..fc447c09a 100755
--- a/debian/lenny/applications/knights/debian/rules
+++ b/debian/lenny/applications/knights/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -51,7 +51,7 @@ config.status: configure patch
if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
build: build-stamp
diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules
index bd6992a4a..5af8a0aa8 100755
--- a/debian/lenny/applications/knowit/debian/rules
+++ b/debian/lenny/applications/knowit/debian/rules
@@ -7,7 +7,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/knutclient/debian/rules b/debian/lenny/applications/knutclient/debian/rules
index 7e8adfc25..a7655e11e 100755
--- a/debian/lenny/applications/knutclient/debian/rules
+++ b/debian/lenny/applications/knutclient/debian/rules
@@ -11,7 +11,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/koffice/debian/cdbs/kde.mk b/debian/lenny/applications/koffice/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/koffice/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/koffice/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
index 936153c99..4b80b83ec 100644
--- a/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/lenny/applications/koffice/debian/koffice-dev-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
debian/tmp/opt/trinity/lib/libkarboncommon.la
debian/tmp/opt/trinity/lib/libkarboncommon.so
debian/tmp/opt/trinity/lib/libkchartcommon.la
diff --git a/debian/lenny/applications/koffice/debian/rules b/debian/lenny/applications/koffice/debian/rules
index 9bc0b9c76..0c94bbdc9 100755
--- a/debian/lenny/applications/koffice/debian/rules
+++ b/debian/lenny/applications/koffice/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/konversation/debian/cdbs/kde.mk b/debian/lenny/applications/konversation/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/konversation/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/konversation/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/konversation/debian/rules b/debian/lenny/applications/konversation/debian/rules
index 67bc3bb74..359d5f809 100755
--- a/debian/lenny/applications/konversation/debian/rules
+++ b/debian/lenny/applications/konversation/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg
DEB_INSTALL_DOCS_ALL =
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk b/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kopete-otr/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kopete-otr/debian/rules b/debian/lenny/applications/kopete-otr/debian/rules
index 8b49a1a4b..abfd36cfc 100755
--- a/debian/lenny/applications/kopete-otr/debian/rules
+++ b/debian/lenny/applications/kopete-otr/debian/rules
@@ -3,14 +3,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kpicosim/debian/rules b/debian/lenny/applications/kpicosim/debian/rules
index 3541dc742..8d66d9609 100755
--- a/debian/lenny/applications/kpicosim/debian/rules
+++ b/debian/lenny/applications/kpicosim/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -52,7 +52,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
#docbook-to-man debian/kpicosim.sgml > kpicosim.1
touch build-stamp
diff --git a/debian/lenny/applications/kpilot/debian/cdbs/kde.mk b/debian/lenny/applications/kpilot/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kpilot/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kpilot/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kpilot/debian/rules b/debian/lenny/applications/kpilot/debian/rules
index 8b49a1a4b..abfd36cfc 100755
--- a/debian/lenny/applications/kpilot/debian/rules
+++ b/debian/lenny/applications/kpilot/debian/rules
@@ -3,14 +3,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk b/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kpowersave/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kpowersave/debian/rules b/debian/lenny/applications/kpowersave/debian/rules
index 2c4fb87d0..49718160e 100755
--- a/debian/lenny/applications/kpowersave/debian/rules
+++ b/debian/lenny/applications/kpowersave/debian/rules
@@ -4,7 +4,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kradio/debian/rules b/debian/lenny/applications/kradio/debian/rules
index a55c7fd87..4ec00e4dc 100755
--- a/debian/lenny/applications/kradio/debian/rules
+++ b/debian/lenny/applications/kradio/debian/rules
@@ -9,7 +9,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/krename/debian/rules b/debian/lenny/applications/krename/debian/rules
index ece39aee4..86f185efb 100755
--- a/debian/lenny/applications/krename/debian/rules
+++ b/debian/lenny/applications/krename/debian/rules
@@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
### Libtool and Automake updates
post-patches:: debian/stamp-autothings-update
diff --git a/debian/lenny/applications/krusader/debian/cdbs/kde.mk b/debian/lenny/applications/krusader/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/krusader/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/krusader/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/krusader/debian/rules b/debian/lenny/applications/krusader/debian/rules
index 9ff5fba71..139132dbb 100755
--- a/debian/lenny/applications/krusader/debian/rules
+++ b/debian/lenny/applications/krusader/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs b/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs
index 304c32ae4..58237d430 100644
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/debian/lenny/applications/ksplash-engine-moodin/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/opt/trinity
export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export infodir=/opt/trinity/share/info
export mandir=/opt/trinity/share/man
export qtdir=/opt/trinity/share/qt3
diff --git a/debian/lenny/applications/ksplash-engine-moodin/debian/rules b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
index 2b5a4f326..047b8ca76 100755
--- a/debian/lenny/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/lenny/applications/ksplash-engine-moodin/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -49,7 +49,7 @@ patch: patch-stamp
config.status: configure patch
dh_testdir
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
diff --git a/debian/lenny/applications/ksquirrel/debian/rules b/debian/lenny/applications/ksquirrel/debian/rules
index aeeceb417..8f8161523 100755
--- a/debian/lenny/applications/ksquirrel/debian/rules
+++ b/debian/lenny/applications/ksquirrel/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kstreamripper/debian/rules b/debian/lenny/applications/kstreamripper/debian/rules
index 319fe9f4a..27cc7e874 100755
--- a/debian/lenny/applications/kstreamripper/debian/rules
+++ b/debian/lenny/applications/kstreamripper/debian/rules
@@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1
build/kstreamripper::
- env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
install/kstreamripper::
- env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install
+ env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
install -m 644 ./src/hi32-app-kstreamripper.png \
diff --git a/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk b/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/ksystemlog/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/ksystemlog/debian/rules b/debian/lenny/applications/ksystemlog/debian/rules
index 115c9a97e..6571b56cb 100755
--- a/debian/lenny/applications/ksystemlog/debian/rules
+++ b/debian/lenny/applications/ksystemlog/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/ktechlab/debian/debiandirs b/debian/lenny/applications/ktechlab/debian/debiandirs
index d35ab77aa..dfe8aa8ab 100644
--- a/debian/lenny/applications/ktechlab/debian/debiandirs
+++ b/debian/lenny/applications/ktechlab/debian/debiandirs
@@ -1,7 +1,7 @@
export kde_confdir=/etc/trinity
export kde_prefix=/opt/trinity
export kde_bindir=/opt/trinity/bin
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export kde_libdir=/opt/trinity/lib
export kde_cgidir=/opt/trinity/lib/cgi-bin
export kde_moduledir=/opt/trinity/lib/trinity
diff --git a/debian/lenny/applications/ktechlab/debian/rules b/debian/lenny/applications/ktechlab/debian/rules
index cadc4e546..1e1e53c9c 100755
--- a/debian/lenny/applications/ktechlab/debian/rules
+++ b/debian/lenny/applications/ktechlab/debian/rules
@@ -5,7 +5,7 @@
-include debian/debiandirs
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -45,7 +45,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
+ PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
build: build-stamp debian/ktechlab.xpm
@@ -55,7 +55,7 @@ build-stamp: config.status
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
clean:
@@ -85,8 +85,8 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm
chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab
chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe
diff --git a/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk b/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/ktorrent/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/ktorrent/debian/rules b/debian/lenny/applications/ktorrent/debian/rules
index 46a8b920a..5590816c2 100755
--- a/debian/lenny/applications/ktorrent/debian/rules
+++ b/debian/lenny/applications/ktorrent/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build/ktorrent-trinity::
docbook2x-man debian/ktorrent.1.docbook
diff --git a/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk b/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kuickshow/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kuickshow/debian/rules b/debian/lenny/applications/kuickshow/debian/rules
index 6b1798055..191172fdc 100755
--- a/debian/lenny/applications/kuickshow/debian/rules
+++ b/debian/lenny/applications/kuickshow/debian/rules
@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/kvirc/debian/rules b/debian/lenny/applications/kvirc/debian/rules
index a0130f2ac..bd103aecd 100755
--- a/debian/lenny/applications/kvirc/debian/rules
+++ b/debian/lenny/applications/kvirc/debian/rules
@@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk b/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kvkbd/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kvkbd/debian/rules b/debian/lenny/applications/kvkbd/debian/rules
index 2aabc75db..305c1e4df 100755
--- a/debian/lenny/applications/kvkbd/debian/rules
+++ b/debian/lenny/applications/kvkbd/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
makebuilddir/kvkbd-trinity::
make -f Makefile.cvs
diff --git a/debian/lenny/applications/kvpnc/debian/rules b/debian/lenny/applications/kvpnc/debian/rules
index 8e7f6fc6f..00d853fcc 100755
--- a/debian/lenny/applications/kvpnc/debian/rules
+++ b/debian/lenny/applications/kvpnc/debian/rules
@@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
makebuilddir/kvpnc-trinity::
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
diff --git a/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules
index ba5677a64..e0a25dd7f 100755
--- a/debian/lenny/applications/piklab/debian/rules
+++ b/debian/lenny/applications/piklab/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -48,7 +48,7 @@ endif
./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
- --with-extra-includes=/opt/trinity/include/kde \
+ --with-extra-includes=/opt/trinity/include/tde \
--mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath
touch $@
diff --git a/debian/lenny/applications/potracegui/debian/rules b/debian/lenny/applications/potracegui/debian/rules
index 4eeace3c8..6be58cd48 100755
--- a/debian/lenny/applications/potracegui/debian/rules
+++ b/debian/lenny/applications/potracegui/debian/rules
@@ -11,7 +11,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/smb4k/debian/cdbs/kde.mk b/debian/lenny/applications/smb4k/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/smb4k/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/smb4k/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/smb4k/debian/rules b/debian/lenny/applications/smb4k/debian/rules
index a7f5808ef..db6aa90dd 100755
--- a/debian/lenny/applications/smb4k/debian/rules
+++ b/debian/lenny/applications/smb4k/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk b/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/soundkonverter/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/soundkonverter/debian/rules b/debian/lenny/applications/soundkonverter/debian/rules
index 16846b152..831240224 100755
--- a/debian/lenny/applications/soundkonverter/debian/rules
+++ b/debian/lenny/applications/soundkonverter/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules
index f3f46453f..e21db2b6b 100755
--- a/debian/lenny/applications/tde-guidance/debian/rules
+++ b/debian/lenny/applications/tde-guidance/debian/rules
@@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
install/tde-guidance-trinity::
diff --git a/debian/lenny/applications/tde-style-lipstik/debian/rules b/debian/lenny/applications/tde-style-lipstik/debian/rules
index c25c8d5bd..b20ff9228 100755
--- a/debian/lenny/applications/tde-style-lipstik/debian/rules
+++ b/debian/lenny/applications/tde-style-lipstik/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -37,7 +37,7 @@ config.status: patch configure
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--disable-debug --enable-final \
- --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
# --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/
build: build-stamp
diff --git a/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk b/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/tde-systemsettings/debian/rules b/debian/lenny/applications/tde-systemsettings/debian/rules
index 82d5c2429..588264407 100755
--- a/debian/lenny/applications/tde-systemsettings/debian/rules
+++ b/debian/lenny/applications/tde-systemsettings/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk b/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdesudo/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/tdesudo/debian/rules b/debian/lenny/applications/tdesudo/debian/rules
index f3b2afb13..5a63a69a9 100755
--- a/debian/lenny/applications/tdesudo/debian/rules
+++ b/debian/lenny/applications/tdesudo/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1
diff --git a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/tdmtheme/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/tdmtheme/debian/rules b/debian/lenny/applications/tdmtheme/debian/rules
index 0eb4fad95..8e74fc2cb 100755
--- a/debian/lenny/applications/tdmtheme/debian/rules
+++ b/debian/lenny/applications/tdmtheme/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/lenny/applications/tellico/debian/rules b/debian/lenny/applications/tellico/debian/rules
index e22c0c6f2..b21fb6bd9 100755
--- a/debian/lenny/applications/tellico/debian/rules
+++ b/debian/lenny/applications/tellico/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk b/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/twin-style-crystal/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/twin-style-crystal/debian/rules b/debian/lenny/applications/twin-style-crystal/debian/rules
index 5e522ca06..8cda3384a 100755
--- a/debian/lenny/applications/twin-style-crystal/debian/rules
+++ b/debian/lenny/applications/twin-style-crystal/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/applications/yakuake/debian/cdbs/kde.mk b/debian/lenny/applications/yakuake/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/applications/yakuake/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/yakuake/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/yakuake/debian/rules b/debian/lenny/applications/yakuake/debian/rules
index 176f45bc3..f5bd922f5 100755
--- a/debian/lenny/applications/yakuake/debian/rules
+++ b/debian/lenny/applications/yakuake/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules
index c6720ab40..95cd29258 100755
--- a/debian/lenny/dependencies/arts/debian/rules
+++ b/debian/lenny/dependencies/arts/debian/rules
@@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
+DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/lenny/dependencies/libcaldav/debian/README.Debian b/debian/lenny/dependencies/libcaldav/debian/README.Debian
new file mode 100644
index 000000000..9adebeacc
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/README.Debian
@@ -0,0 +1,45 @@
+ Imlib Version 11
+ ----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3. This is
+in accordance with the practice of Redhat. The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+ libpng warning: Application was compiled with png.h from libpng-1.2.1
+ libpng warning: Application is running with png.c from libpng-1.0.12
+ libpng error: Incompatible libpng version in application and library
+
+
+
+ Imlib Version 1
+ ---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+ The Palette File
+ ----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'. This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file. To
+correct this problem, the "PaletteFile" entry should look like:
+
+ PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003
diff --git a/debian/lenny/dependencies/libcaldav/debian/README.fallback b/debian/lenny/dependencies/libcaldav/debian/README.fallback
new file mode 100644
index 000000000..1b41c225f
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/README.fallback
@@ -0,0 +1,23 @@
+ Imlib Image Conversion
+ ----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.
+
+
+
+ "All fallbacks failed."
+ -----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png". Then
+you'll have to fix up the application to use the new filename instead.
diff --git a/debian/lenny/dependencies/libcaldav/debian/changelog b/debian/lenny/dependencies/libcaldav/debian/changelog
new file mode 100644
index 000000000..13d81ef1d
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/changelog
@@ -0,0 +1,29 @@
+libcaldav (0.6.5-2debian2) maverick; urgency=low
+
+ * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 28 Aug 2010 16:34:00 -0600
+
+libcaldav (0.6.4-0debian0) lenny; urgency=low
+
+ * Added VTODO support
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 27 Aug 2010 18:53:00 -0600
+
+libcaldav (0.6.3-0debian1) lenny; urgency=low
+
+ * Multiple VEVENT blocks in a single CardDAV response are now returned correctly
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 26 Aug 2010 15:40:00 -0600
+
+libcaldav (0.6.2-0debian0) lenny; urgency=low
+
+ * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Jul 2010 15:29:00 -0600
+
+libcaldav (0.6.1-1debian0) lenny; urgency=low
+
+ * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 31 May 2010 01:55:00 -0600
diff --git a/debian/lenny/dependencies/libcaldav/debian/compat b/debian/lenny/dependencies/libcaldav/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/lenny/dependencies/libcaldav/debian/control b/debian/lenny/dependencies/libcaldav/debian/control
new file mode 100644
index 000000000..6051e6de1
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/control
@@ -0,0 +1,23 @@
+Source: libcaldav
+Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.3
+
+Package: libcaldav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description:
+ libcaldav provides a C interface for caldav PIM clients
+
+Package: libcaldav-dev
+Architecture: any
+Section: libdevel
+Depends: libcaldav (= ${binary:Version})
+Description:
+ libcaldav provides a C interface for caldav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcaldav.
diff --git a/debian/lenny/dependencies/libcaldav/debian/copyright b/debian/lenny/dependencies/libcaldav/debian/copyright
new file mode 100644
index 000000000..a0ce37b8b
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/copyright
@@ -0,0 +1,13 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was downloaded from http://sourceforge.net/projects/libcaldav/
+
+Copyright:
+
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3). The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).
diff --git a/debian/lenny/dependencies/libcaldav/debian/rules b/debian/lenny/dependencies/libcaldav/debian/rules
new file mode 100755
index 000000000..e9afd40a5
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/rules
@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+ AUTOCONF="`pwd`/missing autoconf" \
+ AUTOMAKE="`pwd`/missing automake" \
+ AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+ dh_testdir
+ ./autogen.sh
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man
+ $(MAKE) $(make_flags)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+ dh_movefiles
+
+ # Library package
+ dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so*
+
+ # Developer package
+ mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/*
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs -A debian/README.Debian
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_strip
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/lenny/dependencies/libcaldav/debian/watch b/debian/lenny/dependencies/libcaldav/debian/watch
new file mode 100644
index 000000000..8cea7d35f
--- /dev/null
+++ b/debian/lenny/dependencies/libcaldav/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz
diff --git a/debian/lenny/dependencies/libcarddav/debian/README.Debian b/debian/lenny/dependencies/libcarddav/debian/README.Debian
new file mode 100644
index 000000000..9adebeacc
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/README.Debian
@@ -0,0 +1,45 @@
+ Imlib Version 11
+ ----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3. This is
+in accordance with the practice of Redhat. The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+ libpng warning: Application was compiled with png.h from libpng-1.2.1
+ libpng warning: Application is running with png.c from libpng-1.0.12
+ libpng error: Incompatible libpng version in application and library
+
+
+
+ Imlib Version 1
+ ---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+ The Palette File
+ ----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'. This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file. To
+correct this problem, the "PaletteFile" entry should look like:
+
+ PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003
diff --git a/debian/lenny/dependencies/libcarddav/debian/README.fallback b/debian/lenny/dependencies/libcarddav/debian/README.fallback
new file mode 100644
index 000000000..1b41c225f
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/README.fallback
@@ -0,0 +1,23 @@
+ Imlib Image Conversion
+ ----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.
+
+
+
+ "All fallbacks failed."
+ -----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png". Then
+you'll have to fix up the application to use the new filename instead.
diff --git a/debian/lenny/dependencies/libcarddav/debian/changelog b/debian/lenny/dependencies/libcarddav/debian/changelog
new file mode 100644
index 000000000..4dfba942d
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/changelog
@@ -0,0 +1,17 @@
+libcarddav (0.6.2-2debian2) maverick; urgency=low
+
+ * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 21 Jul 2010 02:55:00 -0600
+
+libcarddav (0.6.2-0debian1) lenny; urgency=low
+
+ * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Jul 2010 15:29:00 -0600
+
+libcarddav (0.6.2-0debian0) lenny; urgency=low
+
+ * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 31 May 2010 01:55:00 -0600
diff --git a/debian/lenny/dependencies/libcarddav/debian/compat b/debian/lenny/dependencies/libcarddav/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/lenny/dependencies/libcarddav/debian/control b/debian/lenny/dependencies/libcarddav/debian/control
new file mode 100644
index 000000000..7bf8ff1dc
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/control
@@ -0,0 +1,23 @@
+Source: libcarddav
+Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.4
+
+Package: libcarddav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description:
+ libcarddav provides a C interface for carddav PIM clients
+
+Package: libcarddav-dev
+Architecture: any
+Section: libdevel
+Depends: libcarddav (= ${binary:Version})
+Description:
+ libcarddav provides a C interface for carddav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcarddav.
diff --git a/debian/lenny/dependencies/libcarddav/debian/copyright b/debian/lenny/dependencies/libcarddav/debian/copyright
new file mode 100644
index 000000000..916e3fd34
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/copyright
@@ -0,0 +1,14 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was created from unreleased sources derived from libcaldav
+
+Copyright:
+
+Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3). The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).
diff --git a/debian/lenny/dependencies/libcarddav/debian/rules b/debian/lenny/dependencies/libcarddav/debian/rules
new file mode 100755
index 000000000..69c8a53d7
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/rules
@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+ AUTOCONF="`pwd`/missing autoconf" \
+ AUTOMAKE="`pwd`/missing automake" \
+ AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+ dh_testdir
+ ./autogen.sh
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man
+ $(MAKE) $(make_flags)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+ dh_movefiles
+
+ # Library package
+ dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so*
+
+ # Developer package
+ mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/*
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs -A debian/README.Debian
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_strip
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/lenny/dependencies/libcarddav/debian/watch b/debian/lenny/dependencies/libcarddav/debian/watch
new file mode 100644
index 000000000..8cea7d35f
--- /dev/null
+++ b/debian/lenny/dependencies/libcarddav/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz
diff --git a/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk b/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/debian/lenny/libraries/kipi-plugins/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/libraries/kipi-plugins/debian/rules b/debian/lenny/libraries/kipi-plugins/debian/rules
index ec3d9a4a3..e277fb614 100755
--- a/debian/lenny/libraries/kipi-plugins/debian/rules
+++ b/debian/lenny/libraries/kipi-plugins/debian/rules
@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
clean ::
rm -f po/*/*.gmo
diff --git a/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk b/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/debian/lenny/libraries/libkdcraw/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/libraries/libkdcraw/debian/rules b/debian/lenny/libraries/libkdcraw/debian/rules
index 0606b98a9..7785e4bcc 100755
--- a/debian/lenny/libraries/libkdcraw/debian/rules
+++ b/debian/lenny/libraries/libkdcraw/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk b/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/debian/lenny/libraries/libkexiv2/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/libraries/libkexiv2/debian/rules b/debian/lenny/libraries/libkexiv2/debian/rules
index dc80327f0..28a1c06e8 100755
--- a/debian/lenny/libraries/libkexiv2/debian/rules
+++ b/debian/lenny/libraries/libkexiv2/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk b/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk
+++ b/debian/lenny/libraries/libkipi/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/libraries/libkipi/debian/rules b/debian/lenny/libraries/libkipi/debian/rules
index 903f7c7b1..94eb41df3 100755
--- a/debian/lenny/libraries/libkipi/debian/rules
+++ b/debian/lenny/libraries/libkipi/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/libraries/libksquirrel/debian/rules b/debian/lenny/libraries/libksquirrel/debian/rules
index fa3c9c335..fa07f7f8c 100755
--- a/debian/lenny/libraries/libksquirrel/debian/rules
+++ b/debian/lenny/libraries/libksquirrel/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/libraries/mlt++/debian/rules b/debian/lenny/libraries/mlt++/debian/rules
index cf8cb1984..0232c83be 100755
--- a/debian/lenny/libraries/mlt++/debian/rules
+++ b/debian/lenny/libraries/mlt++/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/libraries/mlt/debian/rules b/debian/lenny/libraries/mlt/debian/rules
index 771793fff..3889b6a3a 100755
--- a/debian/lenny/libraries/mlt/debian/rules
+++ b/debian/lenny/libraries/mlt/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -47,10 +47,10 @@ configure-stamp:
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \
+ CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \
--luma-compress --disable-mmx $(CONFIGURE_OPTS) \
--avformat-shared=/usr --avformat-swscale \
- --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
touch configure-stamp
@@ -58,7 +58,7 @@ build: configure-stamp build-stamp
build-stamp:
dh_testdir
- env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS)
+ env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS)
touch build-stamp
@@ -81,7 +81,7 @@ install: build
dh_clean -k
dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5
- env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# mkdir debian/tmp/opt/trinity
# mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/
diff --git a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index f50fc4e15..d7e5bd651 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/lenny/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/kde/pythonize.h
+opt/trinity/include/tde/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/debian/lenny/libraries/pytdeextensions/debian/rules b/debian/lenny/libraries/pytdeextensions/debian/rules
index 1acb32f7d..4dcfaaae8 100755
--- a/debian/lenny/libraries/pytdeextensions/debian/rules
+++ b/debian/lenny/libraries/pytdeextensions/debian/rules
@@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
@@ -45,8 +45,8 @@ install/libpythonize0-trinity::
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
# fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/kde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde
+ mkdir -p debian/tmp/opt/trinity/include/tde
+ mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/debian/lenny/tde-i18n/debian/debiandirs b/debian/lenny/tde-i18n/debian/debiandirs
index ba667b86e..2d0da0c80 100644
--- a/debian/lenny/tde-i18n/debian/debiandirs
+++ b/debian/lenny/tde-i18n/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/opt/trinity
export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export infodir=/opt/trinity/share/info
export mandir=/opt/trinity/share/man
export qtdir=/opt/trinity/share/qt3
diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules
index f49804687..e275e35df 100755
--- a/debian/lenny/tde-i18n/debian/rules
+++ b/debian/lenny/tde-i18n/debian/rules
@@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
-include debian/debiandirs
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk b/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeaccessibility/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
index 2f5be2460..f4a7297c0 100644
--- a/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/lenny/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdeaccessibility/debian/rules b/debian/lenny/tdeaccessibility/debian/rules
index 0f40f42e0..ce879ebd4 100755
--- a/debian/lenny/tdeaccessibility/debian/rules
+++ b/debian/lenny/tdeaccessibility/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeaddons/debian/cdbs/kde.mk b/debian/lenny/tdeaddons/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeaddons/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeaddons/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdeaddons/debian/rules b/debian/lenny/tdeaddons/debian/rules
index c872980f3..5d337bfab 100755
--- a/debian/lenny/tdeaddons/debian/rules
+++ b/debian/lenny/tdeaddons/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeadmin/debian/cdbs/kde.mk b/debian/lenny/tdeadmin/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeadmin/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeadmin/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdeadmin/debian/rules b/debian/lenny/tdeadmin/debian/rules
index 19e9ac01b..9c9ccadda 100755
--- a/debian/lenny/tdeadmin/debian/rules
+++ b/debian/lenny/tdeadmin/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeartwork/debian/cdbs/kde.mk b/debian/lenny/tdeartwork/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeartwork/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeartwork/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules
index 3e16d1ff2..82a71627a 100755
--- a/debian/lenny/tdeartwork/debian/rules
+++ b/debian/lenny/tdeartwork/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdebase/debian/control b/debian/lenny/tdebase/debian/control
index 6664c5d52..ff1f7475a 100644
--- a/debian/lenny/tdebase/debian/control
+++ b/debian/lenny/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 21011fbd5..00cc8ca37 100644
--- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,12 +1,12 @@
--- starttde
+++ starttde
-@@ -184,17 +184,17 @@
+@@ -228,17 +228,17 @@
. $tdehome/share/config/startupconfig
fi
-# Make sure a default wallpaper is set.
-if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
+- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$tdehome/share/config/kdesktoprc <<EOF
-[Desktop0]
@@ -17,7 +17,7 @@
-fi
+## Make sure a default wallpaper is set.
+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
++# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$tdehome/share/config/kdesktoprc <<EOF
+#[Desktop0]
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 145594f4e..aee72896e 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
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" -DWITH_GCC_VISIBILITY="ON" \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
index 8549b03b9..b90f777a8 100644
--- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install
@@ -1,4 +1,5 @@
debian/tmp/opt/trinity/bin/krootbacking
+debian/tmp/opt/trinity/bin/tdeinit_phase1
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/kdebugdialog
diff --git a/debian/lenny/tdebase/debian/twin-trinity.install b/debian/lenny/tdebase/debian/twin-trinity.install
index 62d42f166..242592b17 100644
--- a/debian/lenny/tdebase/debian/twin-trinity.install
+++ b/debian/lenny/tdebase/debian/twin-trinity.install
@@ -1,6 +1,7 @@
debian/tmp/opt/trinity/bin/kompmgr
debian/tmp/opt/trinity/bin/twin
debian/tmp/opt/trinity/bin/twin_killer_helper
+debian/tmp/opt/trinity/bin/twin_resumer_helper
debian/tmp/opt/trinity/bin/twin_rules_dialog
debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings
diff --git a/debian/lenny/tdebindings/debian/cdbs/kde.mk b/debian/lenny/tdebindings/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdebindings/debian/cdbs/kde.mk
+++ b/debian/lenny/tdebindings/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install b/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install
index 62a36de6e..540ad0ca2 100644
--- a/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install
+++ b/debian/lenny/tdebindings/debian/libkjsembed-trinity-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kjsembed/*
+debian/tmp/opt/trinity/include/tde/kjsembed/*
debian/tmp/opt/trinity/lib/libkjsembed.so
debian/tmp/opt/trinity/lib/libkjsembed.la
diff --git a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install
index 2904a6815..99a21c1de 100644
--- a/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ b/debian/lenny/tdebindings/debian/libsmokeqt-trinity-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/smoke.h
+debian/tmp/opt/trinity/include/tde/smoke.h
debian/tmp/opt/trinity/lib/libsmokeqt.so
debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules
index 6c5a7ddad..6498e0a4d 100755
--- a/debian/lenny/tdebindings/debian/rules
+++ b/debian/lenny/tdebindings/debian/rules
@@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeedu/debian/cdbs/kde.mk b/debian/lenny/tdeedu/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeedu/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeedu/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeedu/debian/kstars-trinity.install b/debian/lenny/tdeedu/debian/kstars-trinity.install
index 4db6bf7e7..61544b793 100644
--- a/debian/lenny/tdeedu/debian/kstars-trinity.install
+++ b/debian/lenny/tdeedu/debian/kstars-trinity.install
@@ -1,7 +1,7 @@
etc/trinity/kstarsrc
opt/trinity/bin/kstars
-/opt/trinity/include/kde/kstarsinterface.h
-/opt/trinity/include/kde/simclockinterface.h
+/opt/trinity/include/tde/kstarsinterface.h
+/opt/trinity/include/tde/simclockinterface.h
/opt/trinity/share/applications/kde/kstars.desktop
/opt/trinity/share/config.kcfg/kstars.kcfg
/opt/trinity/share/doc/kde/HTML/en/kstars/common
diff --git a/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install b/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install
index ca0848fd9..e64535480 100644
--- a/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install
+++ b/debian/lenny/tdeedu/debian/libkiten-dev-trinity.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/libkiten
+/opt/trinity/include/tde/libkiten
opt/trinity/lib/libkiten.la
opt/trinity/lib/libkiten.so
diff --git a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install
index be3af1e7b..1695e3cf1 100644
--- a/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install
+++ b/debian/lenny/tdeedu/debian/libtdeedu-dev-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/libtdeedu
+/opt/trinity/include/tde/libtdeedu
opt/trinity/lib/libextdate.la
opt/trinity/lib/libextdate.so
opt/trinity/lib/libtdeeducore.la
diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdeedu/debian/rules b/debian/lenny/tdeedu/debian/rules
index b19d3d32f..059005f50 100755
--- a/debian/lenny/tdeedu/debian/rules
+++ b/debian/lenny/tdeedu/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
# Ensure that kig's python scripting built successfully.
common-build-arch::
diff --git a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install
index b9052ce9a..b7dea632a 100644
--- a/debian/lenny/tdegames/debian/atlantik-trinity-dev.install
+++ b/debian/lenny/tdegames/debian/atlantik-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/atlantik
-/opt/trinity/include/kde/atlantic
+/opt/trinity/include/tde/atlantik
+/opt/trinity/include/tde/atlantic
/opt/trinity/lib/libatlantic.so
/opt/trinity/lib/libatlantikclient.so
/opt/trinity/lib/libatlantikui.so
diff --git a/debian/lenny/tdegames/debian/cdbs/kde.mk b/debian/lenny/tdegames/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdegames/debian/cdbs/kde.mk
+++ b/debian/lenny/tdegames/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdegames/debian/kolf-trinity-dev.install b/debian/lenny/tdegames/debian/kolf-trinity-dev.install
index 4da86d1b2..ff0a2b177 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity-dev.install
+++ b/debian/lenny/tdegames/debian/kolf-trinity-dev.install
@@ -1,2 +1,2 @@
-/opt/trinity/include/kde/kolf
+/opt/trinity/include/tde/kolf
/opt/trinity/lib/libkolf.so
diff --git a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install
index 354fa3840..eca00d487 100644
--- a/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install
+++ b/debian/lenny/tdegames/debian/libtdegames-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/*.h
-/opt/trinity/include/kde/kgame
+/opt/trinity/include/tde/*.h
+/opt/trinity/include/tde/kgame
/opt/trinity/lib/libtdegames.so
/opt/trinity/lib/libtdegames.la
diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdegames/debian/rules b/debian/lenny/tdegames/debian/rules
index 0ba5f21cb..5a24cd5ae 100755
--- a/debian/lenny/tdegames/debian/rules
+++ b/debian/lenny/tdegames/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk
export kde_bindir = /opt/trinity/games
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdegraphics/debian/cdbs/kde.mk b/debian/lenny/tdegraphics/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdegraphics/debian/cdbs/kde.mk
+++ b/debian/lenny/tdegraphics/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install
index 57d9ec1d0..7e7ce35c8 100644
--- a/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/debian/lenny/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h
-debian/tmp/opt/trinity/include/kde/poppler-page-transition.h
-debian/tmp/opt/trinity/include/kde/poppler-qt.h
+debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h
+debian/tmp/opt/trinity/include/tde/poppler-page-transition.h
+debian/tmp/opt/trinity/include/tde/poppler-qt.h
diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
index 608149acc..4d50b4fc5 100644
--- a/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/debian/lenny/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -1,184 +1,184 @@
-debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGException.h
-debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTests.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h
-debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h
-debian/tmp/opt/trinity/include/kde/kfaximage.h
-debian/tmp/opt/trinity/include/kde/kmultipageInterface.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h
-debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h
-debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h
-debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h
-debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h
-debian/tmp/opt/trinity/include/kde/kviewshell/history.h
-debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h
-debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/length.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h
-debian/tmp/opt/trinity/include/kde/kviewshell/selection.h
-debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGException.h
+debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTests.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h
+debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h
+debian/tmp/opt/trinity/include/tde/kfaximage.h
+debian/tmp/opt/trinity/include/tde/kmultipageInterface.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h
+debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h
+debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h
+debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h
+debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h
+debian/tmp/opt/trinity/include/tde/kviewshell/history.h
+debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h
+debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/length.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h
+debian/tmp/opt/trinity/include/tde/kviewshell/selection.h
+debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h
debian/tmp/opt/trinity/lib/libtdeinit_kview.la
debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
debian/tmp/opt/trinity/lib/libkghostviewlib.la
diff --git a/debian/lenny/tdelibs/debian/cdbs/kde.mk b/debian/lenny/tdelibs/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdelibs/debian/cdbs/kde.mk
+++ b/debian/lenny/tdelibs/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
index 1ab3ff715..2332768a6 100644
--- a/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/lenny/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -93,8 +93,8 @@ manpage.1: manpage.sgml
<para><command>&dhpackage;</command> will create the first two
resources in directories under <filename>/tmp</filename> (or
- <envar>KDETMP</envar> if defined in the environment) and will use
- <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if
+ <envar>TDETMP</envar> if defined in the environment) and will use
+ <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if
defined in the environment) for the <emphasis>cache</emphasis>
resource (in order to survive system reboots). The temporary
directories created for resources are usually of the form
diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules
index 24b56bf2a..2e2bdf3ee 100755
--- a/debian/lenny/tdelibs/debian/rules
+++ b/debian/lenny/tdelibs/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
diff --git a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
+++ b/debian/lenny/tdemultimedia/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdemultimedia/debian/rules b/debian/lenny/tdemultimedia/debian/rules
index abe114b59..aff6738b2 100755
--- a/debian/lenny/tdemultimedia/debian/rules
+++ b/debian/lenny/tdemultimedia/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := \
--with-alsa --with-arts-alsa \
- --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \
+ --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
- # The include/kde/arts one should be temporary. See
+ # The include/tde/arts one should be temporary. See
# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
DOC_HTML_PRUNE := kcontrol-trinity
diff --git a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index a6b4265bd..4edb170bf 100644
--- a/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/lenny/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/kde/arts/artsgui.h
-debian/tmp/opt/trinity/include/kde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/kde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/kde/audiocdencoder.h
-debian/tmp/opt/trinity/include/kde/cmodule.h
-debian/tmp/opt/trinity/include/kde/effectview.h
-debian/tmp/opt/trinity/include/kde/equalizerview.h
-debian/tmp/opt/trinity/include/kde/ksaver.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/kde/libkcddb/client.h
-debian/tmp/opt/trinity/include/kde/libkcddb/config.h
-debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/kde/mimetypetree.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/kde/noatun/app.h
-debian/tmp/opt/trinity/include/kde/noatun/controls.h
-debian/tmp/opt/trinity/include/kde/noatun/conversion.h
-debian/tmp/opt/trinity/include/kde/noatun/downloader.h
-debian/tmp/opt/trinity/include/kde/noatun/effects.h
-debian/tmp/opt/trinity/include/kde/noatun/engine.h
-debian/tmp/opt/trinity/include/kde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/kde/noatun/player.h
-debian/tmp/opt/trinity/include/kde/noatun/playlist.h
-debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/kde/noatun/plugin.h
-debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/kde/noatun/pref.h
-debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/kde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/kde/noatun/tags.h
-debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/video.h
-debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/kde/plugin_deps.h
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/tde/arts/artsgui.h
+debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
+debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/tde/audiocdencoder.h
+debian/tmp/opt/trinity/include/tde/cmodule.h
+debian/tmp/opt/trinity/include/tde/effectview.h
+debian/tmp/opt/trinity/include/tde/equalizerview.h
+debian/tmp/opt/trinity/include/tde/ksaver.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/tde/libkcddb/client.h
+debian/tmp/opt/trinity/include/tde/libkcddb/config.h
+debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/tde/mimetypetree.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/tde/noatun/app.h
+debian/tmp/opt/trinity/include/tde/noatun/controls.h
+debian/tmp/opt/trinity/include/tde/noatun/conversion.h
+debian/tmp/opt/trinity/include/tde/noatun/downloader.h
+debian/tmp/opt/trinity/include/tde/noatun/effects.h
+debian/tmp/opt/trinity/include/tde/noatun/engine.h
+debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/tde/noatun/player.h
+debian/tmp/opt/trinity/include/tde/noatun/playlist.h
+debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/tde/noatun/plugin.h
+debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/tde/noatun/pref.h
+debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
+debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/tde/noatun/tags.h
+debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/video.h
+debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/tde/plugin_deps.h
debian/tmp/opt/trinity/lib/libarts_mpeglib.so
debian/tmp/opt/trinity/lib/libarts_splay.so
debian/tmp/opt/trinity/lib/libartsbuilder.so
diff --git a/debian/lenny/tdenetwork/debian/cdbs/kde.mk b/debian/lenny/tdenetwork/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdenetwork/debian/cdbs/kde.mk
+++ b/debian/lenny/tdenetwork/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.install b/debian/lenny/tdenetwork/debian/kopete-trinity.install
index c4a342dc5..1901f005e 100644
--- a/debian/lenny/tdenetwork/debian/kopete-trinity.install
+++ b/debian/lenny/tdenetwork/debian/kopete-trinity.install
@@ -1,9 +1,9 @@
debian/tmp/opt/trinity/bin/kopete
debian/tmp/opt/trinity/bin/kopete_latexconvert.sh
-debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules
index 90babf808..71afe376c 100755
--- a/debian/lenny/tdenetwork/debian/rules
+++ b/debian/lenny/tdenetwork/debian/rules
@@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
index cc69d4cba..4915aaa12 100644
--- a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -1,66 +1,66 @@
-debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h
-debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h
-debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h
-debian/tmp/opt/trinity/include/kde/rss/article.h
-debian/tmp/opt/trinity/include/kde/rss/document.h
-debian/tmp/opt/trinity/include/kde/rss/global.h
-debian/tmp/opt/trinity/include/kde/rss/image.h
-debian/tmp/opt/trinity/include/kde/rss/librss.h
-debian/tmp/opt/trinity/include/kde/rss/loader.h
-debian/tmp/opt/trinity/include/kde/rss/textinput.h
+debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h
+debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h
+debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h
+debian/tmp/opt/trinity/include/tde/rss/article.h
+debian/tmp/opt/trinity/include/tde/rss/document.h
+debian/tmp/opt/trinity/include/tde/rss/global.h
+debian/tmp/opt/trinity/include/tde/rss/image.h
+debian/tmp/opt/trinity/include/tde/rss/librss.h
+debian/tmp/opt/trinity/include/tde/rss/loader.h
+debian/tmp/opt/trinity/include/tde/rss/textinput.h
debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
debian/tmp/opt/trinity/lib/libkopete.la
@@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la
debian/tmp/opt/trinity/lib/libkopete_videodevice.so
debian/tmp/opt/trinity/lib/librss.la
debian/tmp/opt/trinity/lib/librss.so
-debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h
diff --git a/debian/lenny/tdepim/debian/changelog b/debian/lenny/tdepim/debian/changelog
index 24807570c..53b6c5851 100644
--- a/debian/lenny/tdepim/debian/changelog
+++ b/debian/lenny/tdepim/debian/changelog
@@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
- Activates networkstatus support for kmail (patch from SuSE)
* debian/control:
- New package networkstatus-dev
- * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h
+ * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h
-- Anthony Mercatante <tonio@ubuntu.com> Fri, 02 Feb 2007 15:37:42 +0100
diff --git a/debian/lenny/tdepim/debian/libindex0-trinity-dev.install b/debian/lenny/tdepim/debian/libindex0-trinity-dev.install
index acbb26191..8c2903ede 100644
--- a/debian/lenny/tdepim/debian/libindex0-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libindex0-trinity-dev.install
@@ -1,4 +1,4 @@
/opt/trinity/bin/indexlib-config
-/opt/trinity/include/kde/index
+/opt/trinity/include/tde/index
/opt/trinity/lib/libindex.la
/opt/trinity/lib/libindex.so
diff --git a/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install b/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install
index 7dcc98ca7..75a5523ca 100644
--- a/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libkcal2-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/libemailfunctions/idmapper.h
-/opt/trinity/include/kde/libkcal
+/opt/trinity/include/tde/libemailfunctions/idmapper.h
+/opt/trinity/include/tde/libkcal
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
diff --git a/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install b/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install
index c386be142..290f743b7 100644
--- a/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libkgantt0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/kgantt
+/opt/trinity/include/tde/kgantt
/opt/trinity/lib/libkgantt.la
/opt/trinity/lib/libkgantt.so
diff --git a/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install b/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install
index cab0f039e..6015f5c08 100644
--- a/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libkleopatra1-trinity-dev.install
@@ -1,6 +1,6 @@
-/opt/trinity/include/kde/gpgme++
-/opt/trinity/include/kde/kleo
-/opt/trinity/include/kde/qgpgme
+/opt/trinity/include/tde/gpgme++
+/opt/trinity/include/tde/kleo
+/opt/trinity/include/tde/qgpgme
/opt/trinity/lib/libgpgme++.la
/opt/trinity/lib/libgpgme++.so
/opt/trinity/lib/libkleopatra.la
diff --git a/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install b/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install
index 8bf3b312e..ed8bb8407 100644
--- a/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libkpimexchange1-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/tdepim/exchangeaccount.h
-/opt/trinity/include/kde/tdepim/exchangeclient.h
+/opt/trinity/include/tde/tdepim/exchangeaccount.h
+/opt/trinity/include/tde/tdepim/exchangeclient.h
/opt/trinity/lib/libkpimexchange.la
/opt/trinity/lib/libkpimexchange.so
diff --git a/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install b/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install
index 08cf59222..32aa3d12d 100644
--- a/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libksieve0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ksieve
+/opt/trinity/include/tde/ksieve
/opt/trinity/lib/libksieve.la
/opt/trinity/lib/libksieve.so
diff --git a/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install b/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install
index 5c74d9348..1cea927e9 100644
--- a/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libktnef1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ktnef
+/opt/trinity/include/tde/ktnef
/opt/trinity/lib/libktnef.la
/opt/trinity/lib/libktnef.so
diff --git a/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install b/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install
index c5092b6a9..3a5428f6e 100644
--- a/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libmimelib1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/mimelib
+/opt/trinity/include/tde/mimelib
/opt/trinity/lib/libmimelib.la
/opt/trinity/lib/libmimelib.so
diff --git a/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install b/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install
index 4f6d52f46..56ca2ebc8 100644
--- a/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/libtdepim1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/tdepimmacros.h
+/opt/trinity/include/tde/tdepimmacros.h
/opt/trinity/lib/libtdepim.la
/opt/trinity/lib/libtdepim.so
diff --git a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
index 848758727..b94111037 100644
--- a/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
+++ b/debian/lenny/tdepim/debian/tdepim-trinity-dev.install
@@ -1,15 +1,15 @@
-/opt/trinity/include/kde/KNotesAppIface.h
-/opt/trinity/include/kde/KNotesIface.h
-/opt/trinity/include/kde/akregator
-/opt/trinity/include/kde/calendar
-/opt/trinity/include/kde/kabc
-/opt/trinity/include/kde/kaddressbook
-/opt/trinity/include/kde/kmail
-/opt/trinity/include/kde/kmailIface.h
-/opt/trinity/include/kde/kmailicalIface.h
-/opt/trinity/include/kde/kmailpartIface.h
-/opt/trinity/include/kde/kontact
-/opt/trinity/include/kde/korganizer
+/opt/trinity/include/tde/KNotesAppIface.h
+/opt/trinity/include/tde/KNotesIface.h
+/opt/trinity/include/tde/akregator
+/opt/trinity/include/tde/calendar
+/opt/trinity/include/tde/kabc
+/opt/trinity/include/tde/kaddressbook
+/opt/trinity/include/tde/kmail
+/opt/trinity/include/tde/kmailIface.h
+/opt/trinity/include/tde/kmailicalIface.h
+/opt/trinity/include/tde/kmailpartIface.h
+/opt/trinity/include/tde/kontact
+/opt/trinity/include/tde/korganizer
/opt/trinity/lib/libkabckolab.la
/opt/trinity/lib/libkabckolab.so
/opt/trinity/lib/libkabcscalix.la
@@ -81,4 +81,4 @@
/opt/trinity/lib/libgwsoap.la
/opt/trinity/lib/libgwsoap.so
-/opt/trinity/include/kde/kpimprefs.h
+/opt/trinity/include/tde/kpimprefs.h
diff --git a/debian/lenny/tdesdk/debian/cdbs/kde.mk b/debian/lenny/tdesdk/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdesdk/debian/cdbs/kde.mk
+++ b/debian/lenny/tdesdk/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdesdk/debian/changelog b/debian/lenny/tdesdk/debian/changelog
index 276fb1d78..1bbe6e2e4 100644
--- a/debian/lenny/tdesdk/debian/changelog
+++ b/debian/lenny/tdesdk/debian/changelog
@@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low
tdesdk (2.2.2-2) unstable; urgency=low
- * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
+ * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449).
-- Ben Burton <benb@acm.org> Thu, 6 Dec 2001 09:50:47 -0600
diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install b/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install
index a792b2b6d..ace31ea6a 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity-dev.install
@@ -1,24 +1,24 @@
-debian/tmp/opt/trinity/include/kde/kbabel/catalog.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h
-debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h
-debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h
-debian/tmp/opt/trinity/include/kde/kbabel/itempart.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h
-debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h
-debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h
-debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h
-debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h
-debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalog.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h
+debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h
+debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h
+debian/tmp/opt/trinity/include/tde/kbabel/itempart.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h
+debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h
+debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h
+debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h
+debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h
debian/tmp/opt/trinity/lib/libkbabelcommon.la
debian/tmp/opt/trinity/lib/libkbabelcommon.so
debian/tmp/opt/trinity/lib/libkbabeldictplugin.la
diff --git a/debian/lenny/tdesdk/debian/kmtrace-trinity.install b/debian/lenny/tdesdk/debian/kmtrace-trinity.install
index 119b5196d..35b5af1a5 100644
--- a/debian/lenny/tdesdk/debian/kmtrace-trinity.install
+++ b/debian/lenny/tdesdk/debian/kmtrace-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle
debian/tmp/opt/trinity/bin/kminspector
debian/tmp/opt/trinity/bin/kmmatch
debian/tmp/opt/trinity/bin/kmtrace
-debian/tmp/opt/trinity/include/kde/ktrace.h
+debian/tmp/opt/trinity/include/tde/ktrace.h
debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
diff --git a/debian/lenny/tdesdk/debian/kspy-trinity.install b/debian/lenny/tdesdk/debian/kspy-trinity.install
index 3b7d6d778..fc17ede2c 100644
--- a/debian/lenny/tdesdk/debian/kspy-trinity.install
+++ b/debian/lenny/tdesdk/debian/kspy-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kspy.h
+debian/tmp/opt/trinity/include/tde/kspy.h
debian/tmp/opt/trinity/lib/libkspy.la
debian/tmp/opt/trinity/lib/libkspy.so
debian/tmp/opt/trinity/lib/libkspy.so.1
diff --git a/debian/lenny/tdesdk/debian/kunittest-trinity.install b/debian/lenny/tdesdk/debian/kunittest-trinity.install
index f002cd796..e183f0e74 100644
--- a/debian/lenny/tdesdk/debian/kunittest-trinity.install
+++ b/debian/lenny/tdesdk/debian/kunittest-trinity.install
@@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la
debian/tmp/opt/trinity/lib/libkunittestgui.so
debian/tmp/opt/trinity/lib/libkunittestgui.so.0
debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h
+debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h
diff --git a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
index ac87e6efb..566e0b7a1 100644
--- a/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/lenny/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/kde/cvsjob_stub.h
-debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
-debian/tmp/opt/trinity/include/kde/repository_stub.h
+debian/tmp/opt/trinity/include/tde/cvsjob_stub.h
+debian/tmp/opt/trinity/include/tde/cvsservice_stub.h
+debian/tmp/opt/trinity/include/tde/repository_stub.h
debian/tmp/opt/trinity/lib/libcvsservice.la
debian/tmp/opt/trinity/lib/libcvsservice.so
debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
diff --git a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules
index e7b228f2b..d63a59865 100755
--- a/debian/lenny/tdesdk/debian/rules
+++ b/debian/lenny/tdesdk/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
index cc229ce19..4b2589f6c 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kprofilemethod.h
+debian/tmp/opt/trinity/include/tde/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
diff --git a/debian/lenny/tdetoys/debian/amor-trinity.install b/debian/lenny/tdetoys/debian/amor-trinity.install
index b616db701..56a51c1b0 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.install
+++ b/debian/lenny/tdetoys/debian/amor-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/amor
-debian/tmp/opt/trinity/include/kde/AmorIface.h
+debian/tmp/opt/trinity/include/tde/AmorIface.h
debian/tmp/opt/trinity/share/apps/amor
debian/tmp/opt/trinity/share/applications/kde/amor.desktop
debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2
diff --git a/debian/lenny/tdetoys/debian/cdbs/kde.mk b/debian/lenny/tdetoys/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdetoys/debian/cdbs/kde.mk
+++ b/debian/lenny/tdetoys/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdetoys/debian/changelog b/debian/lenny/tdetoys/debian/changelog
index 5406c86c9..232db2401 100644
--- a/debian/lenny/tdetoys/debian/changelog
+++ b/debian/lenny/tdetoys/debian/changelog
@@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low
tdetoys (4:2.2.2-2) unstable; urgency=low
- * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447).
+ * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447).
-- Ben Burton <benb@acm.org> Sun, 9 Dec 2001 09:07:02 -0600
diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdetoys/debian/rules b/debian/lenny/tdetoys/debian/rules
index 29a5978c3..57c3cf2c9 100755
--- a/debian/lenny/tdetoys/debian/rules
+++ b/debian/lenny/tdetoys/debian/rules
@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg
diff --git a/debian/lenny/tdeutils/debian/cdbs/kde.mk b/debian/lenny/tdeutils/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdeutils/debian/cdbs/kde.mk
+++ b/debian/lenny/tdeutils/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules
index f7cd135a4..a83c83fdf 100755
--- a/debian/lenny/tdeutils/debian/rules
+++ b/debian/lenny/tdeutils/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
index a3c425a38..ca7081194 100644
--- a/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/debian/lenny/tdeutils/debian/tdeutils-trinity-dev.install
@@ -1,18 +1,18 @@
-debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h
-debian/tmp/opt/trinity/include/kde/ksim/chart.h
-debian/tmp/opt/trinity/include/kde/ksim/common.h
-debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h
-debian/tmp/opt/trinity/include/kde/ksim/label.h
-debian/tmp/opt/trinity/include/kde/ksim/led.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h
-debian/tmp/opt/trinity/include/kde/ksim/progress.h
-debian/tmp/opt/trinity/include/kde/ksim/themeloader.h
-debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
-debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h
+debian/tmp/opt/trinity/include/tde/ksim/chart.h
+debian/tmp/opt/trinity/include/tde/ksim/common.h
+debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h
+debian/tmp/opt/trinity/include/tde/ksim/label.h
+debian/tmp/opt/trinity/include/tde/ksim/led.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h
+debian/tmp/opt/trinity/include/tde/ksim/progress.h
+debian/tmp/opt/trinity/include/tde/ksim/themeloader.h
+debian/tmp/opt/trinity/include/tde/ksim/themetypes.h
+debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h
debian/tmp/opt/trinity/lib/libkcmlaptop.la
debian/tmp/opt/trinity/lib/libkcmlaptop.so
debian/tmp/opt/trinity/lib/libtdeinit_ark.la
diff --git a/debian/lenny/tdevelop/debian/cdbs/kde.mk b/debian/lenny/tdevelop/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdevelop/debian/cdbs/kde.mk
+++ b/debian/lenny/tdevelop/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index f5bce32b3..21f2c166a 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/tdevelop/debian/rules
@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install b/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install
index 5c24ba5bb..f9f8c82ab 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
debian/tmp/opt/trinity/lib/lib*.so
debian/tmp/opt/trinity/lib/lib*.la
diff --git a/debian/lenny/tdewebdev/debian/cdbs/kde.mk b/debian/lenny/tdewebdev/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdewebdev/debian/cdbs/kde.mk
+++ b/debian/lenny/tdewebdev/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install b/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install
index 54d904432..8d8db707b 100644
--- a/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install
+++ b/debian/lenny/tdewebdev/debian/kommander-trinity-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/include/kde/kommander*
+debian/tmp/opt/trinity/include/tde/kommander*
debian/tmp/opt/trinity/lib/libkommanderplugin.la
debian/tmp/opt/trinity/lib/libkommanderplugin.so
debian/tmp/opt/trinity/lib/libkommanderwidget.la
debian/tmp/opt/trinity/lib/libkommanderwidget.so
debian/tmp/opt/trinity/lib/libkommanderwidgets.so
-debian/tmp/opt/trinity/include/kde/specials.h
+debian/tmp/opt/trinity/include/tde/specials.h
diff --git a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 1f825f642..aca9df12a 100644
--- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/lenny/tdewebdev/debian/rules b/debian/lenny/tdewebdev/debian/rules
index 2dcf9658d..888f66bcf 100755
--- a/debian/lenny/tdewebdev/debian/rules
+++ b/debian/lenny/tdewebdev/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/adept/debian/cdbs/kde.mk b/debian/squeeze/applications/adept/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/adept/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/adept/debian/rules b/debian/squeeze/applications/adept/debian/rules
index 9c80b51c7..ee86e8e4f 100755
--- a/debian/squeeze/applications/adept/debian/rules
+++ b/debian/squeeze/applications/adept/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk b/debian/squeeze/applications/amarok/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/amarok/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/amarok/debian/rules b/debian/squeeze/applications/amarok/debian/rules
index 1e2caae64..deb43ebf7 100755
--- a/debian/squeeze/applications/amarok/debian/rules
+++ b/debian/squeeze/applications/amarok/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index 5af81349e..0e699603a 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/applications/basket/debian/rules
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk b/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/bibletime/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules
index 1ef64a83d..ea4b62326 100755
--- a/debian/squeeze/applications/bibletime/debian/rules
+++ b/debian/squeeze/applications/bibletime/debian/rules
@@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian
DEB_BUILDDIR = $(DEB_SRCDIR)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
index 820ba5a3b..c5dd59ccb 100755
--- a/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
+++ b/debian/squeeze/applications/compizconfig-backend-kconfig/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/desktop-effects-tde/debian/rules b/debian/squeeze/applications/desktop-effects-tde/debian/rules
index 7bdd258a5..7bf3e3306 100755
--- a/debian/squeeze/applications/desktop-effects-tde/debian/rules
+++ b/debian/squeeze/applications/desktop-effects-tde/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk b/debian/squeeze/applications/digikam/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/digikam/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.install b/debian/squeeze/applications/digikam/debian/digikam-trinity.install
index 87c7fe33f..49fc16b82 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.install
+++ b/debian/squeeze/applications/digikam/debian/digikam-trinity.install
@@ -1,5 +1,5 @@
opt/trinity/bin/digi*
-/opt/trinity/include/kde
+/opt/trinity/include/tde
opt/trinity/lib
/opt/trinity/share/apps/digikam
/opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop
diff --git a/debian/squeeze/applications/digikam/debian/rules b/debian/squeeze/applications/digikam/debian/rules
index d4b31de95..18181fd83 100755
--- a/debian/squeeze/applications/digikam/debian/rules
+++ b/debian/squeeze/applications/digikam/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk b/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/filelight-l10n/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/filelight-l10n/debian/rules b/debian/squeeze/applications/filelight-l10n/debian/rules
index 7eea2f6e2..9255102ce 100755
--- a/debian/squeeze/applications/filelight-l10n/debian/rules
+++ b/debian/squeeze/applications/filelight-l10n/debian/rules
@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
#DEB_PATCHDIRS := debian/patches/common debian/patches
#DEB_INSTALL_DOCS_ALL :=
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk b/debian/squeeze/applications/filelight/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/filelight/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/filelight/debian/rules b/debian/squeeze/applications/filelight/debian/rules
index a7c79577a..838448085 100755
--- a/debian/squeeze/applications/filelight/debian/rules
+++ b/debian/squeeze/applications/filelight/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/rules b/debian/squeeze/applications/gtk-qt-engine/debian/rules
index f2ac92c96..0247f6ef3 100755
--- a/debian/squeeze/applications/gtk-qt-engine/debian/rules
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/rules
@@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
binary-install/gtk-qt-engine-trinity::
mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk b/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/gwenview/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/gwenview/debian/rules b/debian/squeeze/applications/gwenview/debian/rules
index c231b336f..81fd87521 100755
--- a/debian/squeeze/applications/gwenview/debian/rules
+++ b/debian/squeeze/applications/gwenview/debian/rules
@@ -7,7 +7,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/k3b/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/k3b/debian/rules b/debian/squeeze/applications/k3b/debian/rules
index fa308829e..3a19a0ec8 100755
--- a/debian/squeeze/applications/k3b/debian/rules
+++ b/debian/squeeze/applications/k3b/debian/rules
@@ -11,7 +11,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde"
+DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde"
DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
diff --git a/debian/squeeze/applications/k3b/debian/trinity.mk b/debian/squeeze/applications/k3b/debian/trinity.mk
index c48d5d5af..cd71193a1 100644
--- a/debian/squeeze/applications/k3b/debian/trinity.mk
+++ b/debian/squeeze/applications/k3b/debian/trinity.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk b/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/k9copy/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules
index 860ee9e84..7f17e00f5 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/squeeze/applications/k9copy/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kaffeine-mozilla/debian/rules b/debian/squeeze/applications/kaffeine-mozilla/debian/rules
index 86b977b3f..80fe9807b 100755
--- a/debian/squeeze/applications/kaffeine-mozilla/debian/rules
+++ b/debian/squeeze/applications/kaffeine-mozilla/debian/rules
@@ -14,7 +14,7 @@ export DH_OPTIONS
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk b/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kaffeine/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
index 825837cba..4777ef63c 100644
--- a/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
+++ b/debian/squeeze/applications/kaffeine/debian/kaffeine-trinity.install
@@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/
debian/tmp/opt/trinity/share/icons/
debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop
debian/tmp/opt/trinity/share/locale/
-debian/tmp/opt/trinity/include/kde/kaffeine/*h
+debian/tmp/opt/trinity/include/tde/kaffeine/*h
debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop
debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la
debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so
diff --git a/debian/squeeze/applications/kaffeine/debian/rules b/debian/squeeze/applications/kaffeine/debian/rules
index efff35a86..43e1e0d24 100755
--- a/debian/squeeze/applications/kaffeine/debian/rules
+++ b/debian/squeeze/applications/kaffeine/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/katapult/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/katapult/debian/rules b/debian/squeeze/applications/katapult/debian/rules
index f29a6a564..e48ac244a 100755
--- a/debian/squeeze/applications/katapult/debian/rules
+++ b/debian/squeeze/applications/katapult/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk b/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kbarcode/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kbarcode/debian/rules b/debian/squeeze/applications/kbarcode/debian/rules
index bb554f410..35a033bc7 100755
--- a/debian/squeeze/applications/kbarcode/debian/rules
+++ b/debian/squeeze/applications/kbarcode/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kbfx/debian/rules b/debian/squeeze/applications/kbfx/debian/rules
index 5ea2ffc62..9d710b00d 100755
--- a/debian/squeeze/applications/kbfx/debian/rules
+++ b/debian/squeeze/applications/kbfx/debian/rules
@@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME)
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
#CMAKE_LIBRARY_PATH := /opt/trinity/lib
-#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde
+#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde
include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/"
get-orig-source:
@@dh_testdir
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk b/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kbookreader/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kbookreader/debian/rules b/debian/squeeze/applications/kbookreader/debian/rules
index 4ceef7d99..b3b57fdb9 100755
--- a/debian/squeeze/applications/kbookreader/debian/rules
+++ b/debian/squeeze/applications/kbookreader/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kchmviewer/debian/debiandirs b/debian/squeeze/applications/kchmviewer/debian/debiandirs
index cb33e0ee3..893052e08 100644
--- a/debian/squeeze/applications/kchmviewer/debian/debiandirs
+++ b/debian/squeeze/applications/kchmviewer/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules
index 0466e25ea..72c3fd5bb 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/squeeze/applications/kchmviewer/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
CONFIGURE_OPTIONS_KDE = \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
- --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \
+ --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \
--with-qt-dir=$(qtdir) \
--sysconfdir=$(sysconfdir) \
--infodir=/opt/trinity/share/info \
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk b/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kcpuload/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules
index 2ab783f6d..fae495f36 100755
--- a/debian/squeeze/applications/kcpuload/debian/rules
+++ b/debian/squeeze/applications/kcpuload/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -79,7 +79,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
touch configure-stamp
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules
index 3fbf27bb0..d47788b3a 100755
--- a/debian/squeeze/applications/kdbusnotification/debian/rules
+++ b/debian/squeeze/applications/kdbusnotification/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -78,7 +78,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
touch configure-stamp
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk b/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdiff3/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kdiff3/debian/rules b/debian/squeeze/applications/kdiff3/debian/rules
index 90b33c108..e76778235 100755
--- a/debian/squeeze/applications/kdiff3/debian/rules
+++ b/debian/squeeze/applications/kdiff3/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -37,7 +37,7 @@ config.status:
cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
make -f admin/Makefile.common cvs
- CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk b/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdirstat/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kdirstat/debian/rules b/debian/squeeze/applications/kdirstat/debian/rules
index cf2a8db06..b15f5a9a5 100755
--- a/debian/squeeze/applications/kdirstat/debian/rules
+++ b/debian/squeeze/applications/kdirstat/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS += -Wl,--as-needed
diff --git a/debian/squeeze/applications/kdpkg/debian/rules b/debian/squeeze/applications/kdpkg/debian/rules
index 59fc3d5a5..b2822c5b3 100755
--- a/debian/squeeze/applications/kdpkg/debian/rules
+++ b/debian/squeeze/applications/kdpkg/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/keep/debian/cdbs/kde.mk b/debian/squeeze/applications/keep/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/keep/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..de663438c 100644
--- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff
@@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/applications/keep/debian/rules b/debian/squeeze/applications/keep/debian/rules
index 49dc42fae..b6eae04ee 100755
--- a/debian/squeeze/applications/keep/debian/rules
+++ b/debian/squeeze/applications/keep/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_keep := keep.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kerry/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kerry/debian/rules b/debian/squeeze/applications/kerry/debian/rules
index 0d08e83f9..7dc0fbe23 100755
--- a/debian/squeeze/applications/kerry/debian/rules
+++ b/debian/squeeze/applications/kerry/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
# include /usr/share/cdbs/1/class/kde.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kile/debian/cdbs/kde.mk b/debian/squeeze/applications/kile/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kile/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kile/debian/rules b/debian/squeeze/applications/kile/debian/rules
index 2d31b63e0..3e19a08ea 100755
--- a/debian/squeeze/applications/kile/debian/rules
+++ b/debian/squeeze/applications/kile/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
DEB_INSTALL_MANPAGES_kile := debian/kile.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kima/debian/rules b/debian/squeeze/applications/kima/debian/rules
index a353777b4..519575104 100755
--- a/debian/squeeze/applications/kima/debian/rules
+++ b/debian/squeeze/applications/kima/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk b/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kio-apt/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kio-apt/debian/rules b/debian/squeeze/applications/kio-apt/debian/rules
index a6d8c580a..9b82c21ad 100755
--- a/debian/squeeze/applications/kio-apt/debian/rules
+++ b/debian/squeeze/applications/kio-apt/debian/rules
@@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk b/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kio-umountwrapper/debian/rules b/debian/squeeze/applications/kio-umountwrapper/debian/rules
index ce61aac65..ae8903f41 100755
--- a/debian/squeeze/applications/kio-umountwrapper/debian/rules
+++ b/debian/squeeze/applications/kio-umountwrapper/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk b/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kmplayer/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kmplayer/debian/rules b/debian/squeeze/applications/kmplayer/debian/rules
index b23d91457..63bf848d1 100755
--- a/debian/squeeze/applications/kmplayer/debian/rules
+++ b/debian/squeeze/applications/kmplayer/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3)
CXX = g++ -fpermissive
endif
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
diff --git a/debian/squeeze/applications/kmyfirewall/debian/debiandirs b/debian/squeeze/applications/kmyfirewall/debian/debiandirs
index 959f97f68..8b51d74fa 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/debiandirs
+++ b/debian/squeeze/applications/kmyfirewall/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/squeeze/applications/kmyfirewall/debian/rules b/debian/squeeze/applications/kmyfirewall/debian/rules
index 1993e3bfe..a8d1312d8 100755
--- a/debian/squeeze/applications/kmyfirewall/debian/rules
+++ b/debian/squeeze/applications/kmyfirewall/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -56,7 +56,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
@@ -65,7 +65,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
@@ -94,7 +94,7 @@ install: build
dh_clean -k
# Add here commands to install the package into debian/kmyfirewall.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity
rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so
chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk b/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kmymoney/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install
index 4c3b73990..f8c5dc4e3 100644
--- a/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/squeeze/applications/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/kde/kmymoney/*
+opt/trinity/include/tde/kmymoney/*
opt/trinity/lib/lib*.la
opt/trinity/lib/lib*.so
diff --git a/debian/squeeze/applications/kmymoney/debian/rules b/debian/squeeze/applications/kmymoney/debian/rules
index efb7a96ea..1bb4dc1bf 100755
--- a/debian/squeeze/applications/kmymoney/debian/rules
+++ b/debian/squeeze/applications/kmymoney/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3
LDFLAGS += -Wl,--as-needed
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk b/debian/squeeze/applications/knemo/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/knemo/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/knemo/debian/rules b/debian/squeeze/applications/knemo/debian/rules
index 143b4cd5e..fd71fe17f 100755
--- a/debian/squeeze/applications/knemo/debian/rules
+++ b/debian/squeeze/applications/knemo/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_DOCS_knemo = -XNEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules
index c0beba707..843a04ceb 100755
--- a/debian/squeeze/applications/knetload/debian/rules
+++ b/debian/squeeze/applications/knetload/debian/rules
@@ -2,7 +2,7 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -74,7 +74,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
touch configure-stamp
diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk b/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/knetstats/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/knetstats/debian/rules b/debian/squeeze/applications/knetstats/debian/rules
index 9d3414239..62349e5af 100755
--- a/debian/squeeze/applications/knetstats/debian/rules
+++ b/debian/squeeze/applications/knetstats/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/rules b/debian/squeeze/applications/knetworkmanager8/debian/rules
index 97955e38b..e2e99d9d9 100755
--- a/debian/squeeze/applications/knetworkmanager8/debian/rules
+++ b/debian/squeeze/applications/knetworkmanager8/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/knights/debian/debiandirs b/debian/squeeze/applications/knights/debian/debiandirs
index d341195a1..ba70ea3fb 100644
--- a/debian/squeeze/applications/knights/debian/debiandirs
+++ b/debian/squeeze/applications/knights/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/usr
export sysconfdir=/etc
-export kde_includedir=/usr/include/kde
+export kde_includedir=/usr/include/tde
export infodir=/usr/share/info
export mandir=/usr/share/man
export qtdir=/usr/share/qt3
diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules
index d7e8330c7..fc447c09a 100755
--- a/debian/squeeze/applications/knights/debian/rules
+++ b/debian/squeeze/applications/knights/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -51,7 +51,7 @@ config.status: configure patch
if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+ --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
build: build-stamp
diff --git a/debian/squeeze/applications/knowit/debian/rules b/debian/squeeze/applications/knowit/debian/rules
index bd6992a4a..5af8a0aa8 100755
--- a/debian/squeeze/applications/knowit/debian/rules
+++ b/debian/squeeze/applications/knowit/debian/rules
@@ -7,7 +7,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/knutclient/debian/rules b/debian/squeeze/applications/knutclient/debian/rules
index 7e8adfc25..a7655e11e 100755
--- a/debian/squeeze/applications/knutclient/debian/rules
+++ b/debian/squeeze/applications/knutclient/debian/rules
@@ -11,7 +11,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk b/debian/squeeze/applications/koffice/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/koffice/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
index 936153c99..4b80b83ec 100644
--- a/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
+++ b/debian/squeeze/applications/koffice/debian/koffice-dev-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
debian/tmp/opt/trinity/lib/libkarboncommon.la
debian/tmp/opt/trinity/lib/libkarboncommon.so
debian/tmp/opt/trinity/lib/libkchartcommon.la
diff --git a/debian/squeeze/applications/koffice/debian/rules b/debian/squeeze/applications/koffice/debian/rules
index 9bc0b9c76..0c94bbdc9 100755
--- a/debian/squeeze/applications/koffice/debian/rules
+++ b/debian/squeeze/applications/koffice/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk b/debian/squeeze/applications/konversation/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/konversation/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/konversation/debian/rules b/debian/squeeze/applications/konversation/debian/rules
index 67bc3bb74..359d5f809 100755
--- a/debian/squeeze/applications/konversation/debian/rules
+++ b/debian/squeeze/applications/konversation/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg
DEB_INSTALL_DOCS_ALL =
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk b/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kopete-otr/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kopete-otr/debian/rules b/debian/squeeze/applications/kopete-otr/debian/rules
index 8b49a1a4b..abfd36cfc 100755
--- a/debian/squeeze/applications/kopete-otr/debian/rules
+++ b/debian/squeeze/applications/kopete-otr/debian/rules
@@ -3,14 +3,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kpicosim/debian/rules b/debian/squeeze/applications/kpicosim/debian/rules
index 3541dc742..8d66d9609 100755
--- a/debian/squeeze/applications/kpicosim/debian/rules
+++ b/debian/squeeze/applications/kpicosim/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -52,7 +52,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
#docbook-to-man debian/kpicosim.sgml > kpicosim.1
touch build-stamp
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk b/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kpilot/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kpilot/debian/rules b/debian/squeeze/applications/kpilot/debian/rules
index 8b49a1a4b..abfd36cfc 100755
--- a/debian/squeeze/applications/kpilot/debian/rules
+++ b/debian/squeeze/applications/kpilot/debian/rules
@@ -3,14 +3,14 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk b/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kpowersave/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kpowersave/debian/rules b/debian/squeeze/applications/kpowersave/debian/rules
index 2c4fb87d0..49718160e 100755
--- a/debian/squeeze/applications/kpowersave/debian/rules
+++ b/debian/squeeze/applications/kpowersave/debian/rules
@@ -4,7 +4,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_INSTALL_DOCS_ALL := AUTHORS NEWS
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kradio/debian/rules b/debian/squeeze/applications/kradio/debian/rules
index a55c7fd87..4ec00e4dc 100755
--- a/debian/squeeze/applications/kradio/debian/rules
+++ b/debian/squeeze/applications/kradio/debian/rules
@@ -9,7 +9,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/krename/debian/rules b/debian/squeeze/applications/krename/debian/rules
index ece39aee4..86f185efb 100755
--- a/debian/squeeze/applications/krename/debian/rules
+++ b/debian/squeeze/applications/krename/debian/rules
@@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
### Libtool and Automake updates
post-patches:: debian/stamp-autothings-update
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk b/debian/squeeze/applications/krusader/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/krusader/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/krusader/debian/rules b/debian/squeeze/applications/krusader/debian/rules
index 9ff5fba71..139132dbb 100755
--- a/debian/squeeze/applications/krusader/debian/rules
+++ b/debian/squeeze/applications/krusader/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs b/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs
index 304c32ae4..58237d430 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/opt/trinity
export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export infodir=/opt/trinity/share/info
export mandir=/opt/trinity/share/man
export qtdir=/opt/trinity/share/qt3
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
index 2b5a4f326..047b8ca76 100755
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -49,7 +49,7 @@ patch: patch-stamp
config.status: configure patch
dh_testdir
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build: build-stamp
diff --git a/debian/squeeze/applications/ksquirrel/debian/rules b/debian/squeeze/applications/ksquirrel/debian/rules
index aeeceb417..8f8161523 100755
--- a/debian/squeeze/applications/ksquirrel/debian/rules
+++ b/debian/squeeze/applications/ksquirrel/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kstreamripper/debian/rules b/debian/squeeze/applications/kstreamripper/debian/rules
index 319fe9f4a..27cc7e874 100755
--- a/debian/squeeze/applications/kstreamripper/debian/rules
+++ b/debian/squeeze/applications/kstreamripper/debian/rules
@@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1
build/kstreamripper::
- env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE)
install/kstreamripper::
- env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install
+ env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/
mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/
install -m 644 ./src/hi32-app-kstreamripper.png \
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk b/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/ksystemlog/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/ksystemlog/debian/rules b/debian/squeeze/applications/ksystemlog/debian/rules
index 115c9a97e..6571b56cb 100755
--- a/debian/squeeze/applications/ksystemlog/debian/rules
+++ b/debian/squeeze/applications/ksystemlog/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/ktechlab/debian/debiandirs b/debian/squeeze/applications/ktechlab/debian/debiandirs
index d35ab77aa..dfe8aa8ab 100644
--- a/debian/squeeze/applications/ktechlab/debian/debiandirs
+++ b/debian/squeeze/applications/ktechlab/debian/debiandirs
@@ -1,7 +1,7 @@
export kde_confdir=/etc/trinity
export kde_prefix=/opt/trinity
export kde_bindir=/opt/trinity/bin
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export kde_libdir=/opt/trinity/lib
export kde_cgidir=/opt/trinity/lib/cgi-bin
export kde_moduledir=/opt/trinity/lib/trinity
diff --git a/debian/squeeze/applications/ktechlab/debian/rules b/debian/squeeze/applications/ktechlab/debian/rules
index cadc4e546..1e1e53c9c 100755
--- a/debian/squeeze/applications/ktechlab/debian/rules
+++ b/debian/squeeze/applications/ktechlab/debian/rules
@@ -5,7 +5,7 @@
-include debian/debiandirs
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -45,7 +45,7 @@ endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
+ PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity
build: build-stamp debian/ktechlab.xpm
@@ -55,7 +55,7 @@ build-stamp: config.status
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE)
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE)
touch build-stamp
clean:
@@ -85,8 +85,8 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
- env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
+ env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity
install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm
chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab
chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/ktorrent/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/ktorrent/debian/rules b/debian/squeeze/applications/ktorrent/debian/rules
index 46a8b920a..5590816c2 100755
--- a/debian/squeeze/applications/ktorrent/debian/rules
+++ b/debian/squeeze/applications/ktorrent/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
build/ktorrent-trinity::
docbook2x-man debian/ktorrent.1.docbook
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk b/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kuickshow/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kuickshow/debian/rules b/debian/squeeze/applications/kuickshow/debian/rules
index 6b1798055..191172fdc 100755
--- a/debian/squeeze/applications/kuickshow/debian/rules
+++ b/debian/squeeze/applications/kuickshow/debian/rules
@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/kvirc/debian/rules b/debian/squeeze/applications/kvirc/debian/rules
index a0130f2ac..bd103aecd 100755
--- a/debian/squeeze/applications/kvirc/debian/rules
+++ b/debian/squeeze/applications/kvirc/debian/rules
@@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk b/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kvkbd/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kvkbd/debian/rules b/debian/squeeze/applications/kvkbd/debian/rules
index 2aabc75db..305c1e4df 100755
--- a/debian/squeeze/applications/kvkbd/debian/rules
+++ b/debian/squeeze/applications/kvkbd/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
makebuilddir/kvkbd-trinity::
make -f Makefile.cvs
diff --git a/debian/squeeze/applications/kvpnc/debian/rules b/debian/squeeze/applications/kvpnc/debian/rules
index 8e7f6fc6f..00d853fcc 100755
--- a/debian/squeeze/applications/kvpnc/debian/rules
+++ b/debian/squeeze/applications/kvpnc/debian/rules
@@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
makebuilddir/kvpnc-trinity::
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
diff --git a/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules
index ba5677a64..e0a25dd7f 100755
--- a/debian/squeeze/applications/piklab/debian/rules
+++ b/debian/squeeze/applications/piklab/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -48,7 +48,7 @@ endif
./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
- --with-extra-includes=/opt/trinity/include/kde \
+ --with-extra-includes=/opt/trinity/include/tde \
--mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath
touch $@
diff --git a/debian/squeeze/applications/potracegui/debian/rules b/debian/squeeze/applications/potracegui/debian/rules
index 4eeace3c8..6be58cd48 100755
--- a/debian/squeeze/applications/potracegui/debian/rules
+++ b/debian/squeeze/applications/potracegui/debian/rules
@@ -11,7 +11,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk b/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/smb4k/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/smb4k/debian/rules b/debian/squeeze/applications/smb4k/debian/rules
index a7f5808ef..db6aa90dd 100755
--- a/debian/squeeze/applications/smb4k/debian/rules
+++ b/debian/squeeze/applications/smb4k/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk b/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/soundkonverter/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/soundkonverter/debian/rules b/debian/squeeze/applications/soundkonverter/debian/rules
index 16846b152..831240224 100755
--- a/debian/squeeze/applications/soundkonverter/debian/rules
+++ b/debian/squeeze/applications/soundkonverter/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules
index f3f46453f..e21db2b6b 100755
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
LDFLAGS_APPEND := -L/opt/trinity/lib
install/tde-guidance-trinity::
diff --git a/debian/squeeze/applications/tde-style-lipstik/debian/rules b/debian/squeeze/applications/tde-style-lipstik/debian/rules
index c25c8d5bd..b20ff9228 100755
--- a/debian/squeeze/applications/tde-style-lipstik/debian/rules
+++ b/debian/squeeze/applications/tde-style-lipstik/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -37,7 +37,7 @@ config.status: patch configure
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--disable-debug --enable-final \
- --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
# --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/
build: build-stamp
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/rules b/debian/squeeze/applications/tde-systemsettings/debian/rules
index 82d5c2429..588264407 100755
--- a/debian/squeeze/applications/tde-systemsettings/debian/rules
+++ b/debian/squeeze/applications/tde-systemsettings/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk b/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdesudo/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/tdesudo/debian/rules b/debian/squeeze/applications/tdesudo/debian/rules
index f3b2afb13..5a63a69a9 100755
--- a/debian/squeeze/applications/tdesudo/debian/rules
+++ b/debian/squeeze/applications/tdesudo/debian/rules
@@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1
diff --git a/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk b/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/tdmtheme/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/tdmtheme/debian/rules b/debian/squeeze/applications/tdmtheme/debian/rules
index 0eb4fad95..8e74fc2cb 100755
--- a/debian/squeeze/applications/tdmtheme/debian/rules
+++ b/debian/squeeze/applications/tdmtheme/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/tellico/debian/rules b/debian/squeeze/applications/tellico/debian/rules
index e22c0c6f2..b21fb6bd9 100755
--- a/debian/squeeze/applications/tellico/debian/rules
+++ b/debian/squeeze/applications/tellico/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/rules b/debian/squeeze/applications/twin-style-crystal/debian/rules
index 5e522ca06..8cda3384a 100755
--- a/debian/squeeze/applications/twin-style-crystal/debian/rules
+++ b/debian/squeeze/applications/twin-style-crystal/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/yakuake/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/yakuake/debian/rules b/debian/squeeze/applications/yakuake/debian/rules
index 176f45bc3..f5bd922f5 100755
--- a/debian/squeeze/applications/yakuake/debian/rules
+++ b/debian/squeeze/applications/yakuake/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/kde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/dependencies/arts/debian/rules b/debian/squeeze/dependencies/arts/debian/rules
index c6720ab40..95cd29258 100755
--- a/debian/squeeze/dependencies/arts/debian/rules
+++ b/debian/squeeze/dependencies/arts/debian/rules
@@ -14,7 +14,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include debian/cdbs/debian-qt-kde.mk
-DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
+DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/squeeze/dependencies/libcaldav/debian/README.Debian b/debian/squeeze/dependencies/libcaldav/debian/README.Debian
new file mode 100644
index 000000000..9adebeacc
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/README.Debian
@@ -0,0 +1,45 @@
+ Imlib Version 11
+ ----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3. This is
+in accordance with the practice of Redhat. The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+ libpng warning: Application was compiled with png.h from libpng-1.2.1
+ libpng warning: Application is running with png.c from libpng-1.0.12
+ libpng error: Incompatible libpng version in application and library
+
+
+
+ Imlib Version 1
+ ---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+ The Palette File
+ ----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'. This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file. To
+correct this problem, the "PaletteFile" entry should look like:
+
+ PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003
diff --git a/debian/squeeze/dependencies/libcaldav/debian/README.fallback b/debian/squeeze/dependencies/libcaldav/debian/README.fallback
new file mode 100644
index 000000000..1b41c225f
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/README.fallback
@@ -0,0 +1,23 @@
+ Imlib Image Conversion
+ ----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.
+
+
+
+ "All fallbacks failed."
+ -----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png". Then
+you'll have to fix up the application to use the new filename instead.
diff --git a/debian/squeeze/dependencies/libcaldav/debian/changelog b/debian/squeeze/dependencies/libcaldav/debian/changelog
new file mode 100644
index 000000000..13d81ef1d
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/changelog
@@ -0,0 +1,29 @@
+libcaldav (0.6.5-2debian2) maverick; urgency=low
+
+ * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 28 Aug 2010 16:34:00 -0600
+
+libcaldav (0.6.4-0debian0) lenny; urgency=low
+
+ * Added VTODO support
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 27 Aug 2010 18:53:00 -0600
+
+libcaldav (0.6.3-0debian1) lenny; urgency=low
+
+ * Multiple VEVENT blocks in a single CardDAV response are now returned correctly
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 26 Aug 2010 15:40:00 -0600
+
+libcaldav (0.6.2-0debian0) lenny; urgency=low
+
+ * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Jul 2010 15:29:00 -0600
+
+libcaldav (0.6.1-1debian0) lenny; urgency=low
+
+ * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 31 May 2010 01:55:00 -0600
diff --git a/debian/squeeze/dependencies/libcaldav/debian/compat b/debian/squeeze/dependencies/libcaldav/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/squeeze/dependencies/libcaldav/debian/control b/debian/squeeze/dependencies/libcaldav/debian/control
new file mode 100644
index 000000000..6051e6de1
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/control
@@ -0,0 +1,23 @@
+Source: libcaldav
+Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.3
+
+Package: libcaldav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description:
+ libcaldav provides a C interface for caldav PIM clients
+
+Package: libcaldav-dev
+Architecture: any
+Section: libdevel
+Depends: libcaldav (= ${binary:Version})
+Description:
+ libcaldav provides a C interface for caldav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcaldav.
diff --git a/debian/squeeze/dependencies/libcaldav/debian/copyright b/debian/squeeze/dependencies/libcaldav/debian/copyright
new file mode 100644
index 000000000..a0ce37b8b
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/copyright
@@ -0,0 +1,13 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was downloaded from http://sourceforge.net/projects/libcaldav/
+
+Copyright:
+
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3). The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).
diff --git a/debian/squeeze/dependencies/libcaldav/debian/rules b/debian/squeeze/dependencies/libcaldav/debian/rules
new file mode 100755
index 000000000..e9afd40a5
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/rules
@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+ AUTOCONF="`pwd`/missing autoconf" \
+ AUTOMAKE="`pwd`/missing automake" \
+ AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+ dh_testdir
+ ./autogen.sh
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man
+ $(MAKE) $(make_flags)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+ dh_movefiles
+
+ # Library package
+ dh_install -plibcaldav --autodest debian/tmp/usr/lib/libcaldav.so*
+
+ # Developer package
+ mv debian/tmp/usr/include/libcaldav* debian/tmp/usr/include/libcaldav
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/libcaldav.la
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/include/libcaldav/*
+ dh_install -plibcaldav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs -A debian/README.Debian
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_strip
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/squeeze/dependencies/libcaldav/debian/watch b/debian/squeeze/dependencies/libcaldav/debian/watch
new file mode 100644
index 000000000..8cea7d35f
--- /dev/null
+++ b/debian/squeeze/dependencies/libcaldav/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz
diff --git a/debian/squeeze/dependencies/libcarddav/debian/README.Debian b/debian/squeeze/dependencies/libcarddav/debian/README.Debian
new file mode 100644
index 000000000..9adebeacc
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/README.Debian
@@ -0,0 +1,45 @@
+ Imlib Version 11
+ ----------------
+
+Imlib11 is linked with libpng12, which began life as libpng3. This is
+in accordance with the practice of Redhat. The GDK version of imlib,
+being part of GNOME 1, has remained linked with libpng2.
+
+No library that links with this version of Imlib may also link with
+libpng2.
+
+No application that links with this version of Imlib may link with
+libpng2, neither directly nor through a third library.
+
+If you accidentally link an application with imlib and libpng2, the
+application may behave in unpredictible ways, possibly crashing,
+possibly emitting warnings similar to the following:
+
+ libpng warning: Application was compiled with png.h from libpng-1.2.1
+ libpng warning: Application is running with png.c from libpng-1.0.12
+ libpng error: Incompatible libpng version in application and library
+
+
+
+ Imlib Version 1
+ ---------------
+
+Imlib1 and gdk-imlib1 are compiled against libpng2. If you need to
+build with libpng2, install the package imlib1-dev or gdk-imlib1-dev
+as appropriate.
+
+
+ The Palette File
+ ----------------
+
+The system Imlib/Gdk-Imlib palette file was moved from the directory
+`/etc/im' to `/etc/imlib'. This move may cause problems for users who
+have a `.imrc' file in their home directory since that file may
+contain a reference to the old location of the palette file. To
+correct this problem, the "PaletteFile" entry should look like:
+
+ PaletteFile /etc/imlib/im_palette.pal
+
+I believe this changed happened in late 1999.
+
+ -- Steve M. Robbins <smr@debian.org>, Sun Oct 19 15:11:42 2003
diff --git a/debian/squeeze/dependencies/libcarddav/debian/README.fallback b/debian/squeeze/dependencies/libcarddav/debian/README.fallback
new file mode 100644
index 000000000..1b41c225f
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/README.fallback
@@ -0,0 +1,23 @@
+ Imlib Image Conversion
+ ----------------------
+
+The imlib and gdk-imlib libraries have a number of built-in image
+conversion routines, and are capable of loading or saving in *at
+least* the following formats: GIF, JPEG, PNG, TIFF, PS, BMP, XPM, and
+PPM.
+
+Prior to version 1.9.13, imlib and gdk-imlib could use an external
+program, such as Imagemagick's "convert", to load or save images
+in formats not handled internally to Imlib.
+
+
+
+ "All fallbacks failed."
+ -----------------------
+
+This message indicates that the file you wished to load is not handled
+by Imlib.
+
+The remedy is to convert the image file by hand using, for example,
+Imagemagick's "convert" command: "convert foo.rgb foo.png". Then
+you'll have to fix up the application to use the new filename instead.
diff --git a/debian/squeeze/dependencies/libcarddav/debian/changelog b/debian/squeeze/dependencies/libcarddav/debian/changelog
new file mode 100644
index 000000000..4dfba942d
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/changelog
@@ -0,0 +1,17 @@
+libcarddav (0.6.2-2debian2) maverick; urgency=low
+
+ * Modified contact list grabber to first execute a WebDAV directory list, then use the results to get only the contact files in that directory.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 21 Jul 2010 02:55:00 -0600
+
+libcarddav (0.6.2-0debian1) lenny; urgency=low
+
+ * Added "Connection: close" to the list of headers sent, so that server keep-alive (which causes long delays) is disabled.
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sun, 18 Jul 2010 15:29:00 -0600
+
+libcarddav (0.6.2-0debian0) lenny; urgency=low
+
+ * Initial Lenny build
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Mon, 31 May 2010 01:55:00 -0600
diff --git a/debian/squeeze/dependencies/libcarddav/debian/compat b/debian/squeeze/dependencies/libcarddav/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/squeeze/dependencies/libcarddav/debian/control b/debian/squeeze/dependencies/libcarddav/debian/control
new file mode 100644
index 000000000..7bf8ff1dc
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/control
@@ -0,0 +1,23 @@
+Source: libcarddav
+Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev
+Section: graphics
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Standards-Version: 3.8.4
+
+Package: libcarddav
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description:
+ libcarddav provides a C interface for carddav PIM clients
+
+Package: libcarddav-dev
+Architecture: any
+Section: libdevel
+Depends: libcarddav (= ${binary:Version})
+Description:
+ libcarddav provides a C interface for carddav PIM clients
+ .
+ This is the development package containing header files and link
+ libraries for libcarddav.
diff --git a/debian/squeeze/dependencies/libcarddav/debian/copyright b/debian/squeeze/dependencies/libcarddav/debian/copyright
new file mode 100644
index 000000000..916e3fd34
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/copyright
@@ -0,0 +1,14 @@
+This package was debianized by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+
+It was created from unreleased sources derived from libcaldav
+
+Copyright:
+
+Copyright 2010 by Timothy Pearson (kb9vqf@pearsoncomputing.net)
+Copyright 2008 by Michael Rasmussen (mir@datanom.net)
+
+License:
+
+All libraries in this package are released under the GPL
+(/usr/share/common-licenses/GPL-3). The programs and examples are
+under the GPL (/usr/share/common-licenses/GPL).
diff --git a/debian/squeeze/dependencies/libcarddav/debian/rules b/debian/squeeze/dependencies/libcarddav/debian/rules
new file mode 100755
index 000000000..69c8a53d7
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/rules
@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export CFLAGS = -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O3
+endif
+
+# Suppress accidental execution of the auto-* tools, c.f.
+# http://lists.debian.org/debian-devel/2001/debian-devel-200111/msg01416.html
+no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \
+ AUTOCONF="`pwd`/missing autoconf" \
+ AUTOMAKE="`pwd`/missing automake" \
+ AUTOHEADER="`pwd`/missing autoheader"
+
+make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools)
+
+build: $(QUILT_STAMPFN) build-stamp
+build-stamp:
+ dh_testdir
+ ./autogen.sh
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man
+ $(MAKE) $(make_flags)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) $(make_flags) DESTDIR=`pwd`/debian/tmp install
+
+ dh_movefiles
+
+ # Library package
+ dh_install -plibcarddav --autodest debian/tmp/usr/lib/libcarddav.so*
+
+ # Developer package
+ mv debian/tmp/usr/include/libcarddav* debian/tmp/usr/include/libcarddav
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/libcarddav.la
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/include/libcarddav/*
+ dh_install -plibcarddav-dev --autodest debian/tmp/usr/lib/pkgconfig/*
+
+# This single target is used to build all the packages, all at once, or
+# one at a time. So keep in mind: any options passed to commands here will
+# affect _all_ packages. Anything you want to only affect one package
+# should be put in another target, such as the install target.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs -A debian/README.Debian
+ dh_installexamples
+ dh_installmenu
+ dh_installcron
+ dh_installinfo
+ dh_installchangelogs ChangeLog
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_strip
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Any other binary targets build just one binary package at a time.
+binary-%: build install
+ make -f debian/rules binary-common DH_OPTIONS=-p$*
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/squeeze/dependencies/libcarddav/debian/watch b/debian/squeeze/dependencies/libcarddav/debian/watch
new file mode 100644
index 000000000..8cea7d35f
--- /dev/null
+++ b/debian/squeeze/dependencies/libcarddav/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/imlib-(.*)\.tar\.gz
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/debian/squeeze/libraries/kipi-plugins/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/rules b/debian/squeeze/libraries/kipi-plugins/debian/rules
index ec3d9a4a3..e277fb614 100755
--- a/debian/squeeze/libraries/kipi-plugins/debian/rules
+++ b/debian/squeeze/libraries/kipi-plugins/debian/rules
@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
clean ::
rm -f po/*/*.gmo
diff --git a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/debian/squeeze/libraries/libkdcraw/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/libraries/libkdcraw/debian/rules b/debian/squeeze/libraries/libkdcraw/debian/rules
index 0606b98a9..7785e4bcc 100755
--- a/debian/squeeze/libraries/libkdcraw/debian/rules
+++ b/debian/squeeze/libraries/libkdcraw/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/debian/squeeze/libraries/libkexiv2/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/libraries/libkexiv2/debian/rules b/debian/squeeze/libraries/libkexiv2/debian/rules
index dc80327f0..28a1c06e8 100755
--- a/debian/squeeze/libraries/libkexiv2/debian/rules
+++ b/debian/squeeze/libraries/libkexiv2/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk b/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk
+++ b/debian/squeeze/libraries/libkipi/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/libraries/libkipi/debian/rules b/debian/squeeze/libraries/libkipi/debian/rules
index 903f7c7b1..94eb41df3 100755
--- a/debian/squeeze/libraries/libkipi/debian/rules
+++ b/debian/squeeze/libraries/libkipi/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/libraries/libksquirrel/debian/rules b/debian/squeeze/libraries/libksquirrel/debian/rules
index fa3c9c335..fa07f7f8c 100755
--- a/debian/squeeze/libraries/libksquirrel/debian/rules
+++ b/debian/squeeze/libraries/libksquirrel/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/libraries/mlt++/debian/rules b/debian/squeeze/libraries/mlt++/debian/rules
index cf8cb1984..0232c83be 100755
--- a/debian/squeeze/libraries/mlt++/debian/rules
+++ b/debian/squeeze/libraries/mlt++/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules
index 771793fff..3889b6a3a 100755
--- a/debian/squeeze/libraries/mlt/debian/rules
+++ b/debian/squeeze/libraries/mlt/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -47,10 +47,10 @@ configure-stamp:
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \
+ CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \
--luma-compress --disable-mmx $(CONFIGURE_OPTS) \
--avformat-shared=/usr --avformat-swscale \
- --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
touch configure-stamp
@@ -58,7 +58,7 @@ build: configure-stamp build-stamp
build-stamp:
dh_testdir
- env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS)
+ env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS)
touch build-stamp
@@ -81,7 +81,7 @@ install: build
dh_clean -k
dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5
- env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# mkdir debian/tmp/opt/trinity
# mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
index f50fc4e15..d7e5bd651 100644
--- a/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
+++ b/debian/squeeze/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install
@@ -1,4 +1,4 @@
-opt/trinity/include/kde/pythonize.h
+opt/trinity/include/tde/pythonize.h
opt/trinity/lib/libpythonize.a
opt/trinity/lib/libpythonize.la
opt/trinity/lib/libpythonize.so
diff --git a/debian/squeeze/libraries/pytdeextensions/debian/rules b/debian/squeeze/libraries/pytdeextensions/debian/rules
index 1acb32f7d..4dcfaaae8 100755
--- a/debian/squeeze/libraries/pytdeextensions/debian/rules
+++ b/debian/squeeze/libraries/pytdeextensions/debian/rules
@@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
@@ -45,8 +45,8 @@ install/libpythonize0-trinity::
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.*
# fix include directory location
- mkdir -p debian/tmp/opt/trinity/include/kde
- mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde
+ mkdir -p debian/tmp/opt/trinity/include/tde
+ mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde
clean::
rm -rf build
diff --git a/debian/squeeze/tde-i18n/debian/debiandirs b/debian/squeeze/tde-i18n/debian/debiandirs
index ba667b86e..2d0da0c80 100644
--- a/debian/squeeze/tde-i18n/debian/debiandirs
+++ b/debian/squeeze/tde-i18n/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/opt/trinity
export sysconfdir=/etc
-export kde_includedir=/opt/trinity/include/kde
+export kde_includedir=/opt/trinity/include/tde
export infodir=/opt/trinity/share/info
export mandir=/opt/trinity/share/man
export qtdir=/opt/trinity/share/qt3
diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules
index f49804687..e275e35df 100755
--- a/debian/squeeze/tde-i18n/debian/rules
+++ b/debian/squeeze/tde-i18n/debian/rules
@@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS))
-include debian/debiandirs
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk b/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeaccessibility/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install b/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install
index 2f5be2460..f4a7297c0 100644
--- a/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install
+++ b/debian/squeeze/tdeaccessibility/debian/ksayit-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/ksayit
-debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h
+debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la
debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so
debian/tmp/opt/trinity/lib/libKTTSD_Lib.la
diff --git a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdeaccessibility/debian/rules b/debian/squeeze/tdeaccessibility/debian/rules
index 0f40f42e0..ce879ebd4 100755
--- a/debian/squeeze/tdeaccessibility/debian/rules
+++ b/debian/squeeze/tdeaccessibility/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeaddons/debian/cdbs/kde.mk b/debian/squeeze/tdeaddons/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeaddons/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeaddons/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdeaddons/debian/rules b/debian/squeeze/tdeaddons/debian/rules
index c872980f3..5d337bfab 100755
--- a/debian/squeeze/tdeaddons/debian/rules
+++ b/debian/squeeze/tdeaddons/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeadmin/debian/cdbs/kde.mk b/debian/squeeze/tdeadmin/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeadmin/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeadmin/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdeadmin/debian/rules b/debian/squeeze/tdeadmin/debian/rules
index 19e9ac01b..9c9ccadda 100755
--- a/debian/squeeze/tdeadmin/debian/rules
+++ b/debian/squeeze/tdeadmin/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeartwork/debian/cdbs/kde.mk b/debian/squeeze/tdeartwork/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeartwork/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeartwork/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeartwork/debian/rules b/debian/squeeze/tdeartwork/debian/rules
index 3e16d1ff2..82a71627a 100755
--- a/debian/squeeze/tdeartwork/debian/rules
+++ b/debian/squeeze/tdeartwork/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdebase/debian/control b/debian/squeeze/tdebase/debian/control
index 929a5df8b..0e55ce1cf 100644
--- a/debian/squeeze/tdebase/debian/control
+++ b/debian/squeeze/tdebase/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libtool, libltdl-dev, cmake
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, tdelibs4c2a-trinity, libogg-dev, libogg-dev-la, libdbus-tqt-1-dev, libavahi-tqt-dev, libudev-dev, libdbus-1-tqt-dev, libtool, libltdl-dev, cmake
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
index 21011fbd5..00cc8ca37 100644
--- a/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
+++ b/debian/squeeze/tdebase/debian/patches/disable_starttde_wallpaper.diff
@@ -1,12 +1,12 @@
--- starttde
+++ starttde
-@@ -184,17 +184,17 @@
+@@ -228,17 +228,17 @@
. $tdehome/share/config/startupconfig
fi
-# Make sure a default wallpaper is set.
-if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-- # With Trinity KDE this file should exist, but test first.
+- # With Trinity this file should exist, but test first.
- if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$tdehome/share/config/kdesktoprc <<EOF
-[Desktop0]
@@ -17,7 +17,7 @@
-fi
+## Make sure a default wallpaper is set.
+#if [ ! -e $tdehome/share/config/kdesktoprc ]; then
-+# # With Trinity KDE this file should exist, but test first.
++# # With Trinity this file should exist, but test first.
+# if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
+#cat >$tdehome/share/config/kdesktoprc <<EOF
+#[Desktop0]
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 145594f4e..aee72896e 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -21,7 +21,7 @@ CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -
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" -DWITH_GCC_VISIBILITY="ON" \
-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \
--DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON"
+-DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" -DWITH_UPOWER="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
index 8549b03b9..b90f777a8 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
@@ -1,4 +1,5 @@
debian/tmp/opt/trinity/bin/krootbacking
+debian/tmp/opt/trinity/bin/tdeinit_phase1
debian/tmp/opt/trinity/bin/tdmtsak
debian/tmp/opt/trinity/bin/tsak
debian/tmp/opt/trinity/bin/kdebugdialog
diff --git a/debian/squeeze/tdebase/debian/twin-trinity.install b/debian/squeeze/tdebase/debian/twin-trinity.install
index 62d42f166..242592b17 100644
--- a/debian/squeeze/tdebase/debian/twin-trinity.install
+++ b/debian/squeeze/tdebase/debian/twin-trinity.install
@@ -1,6 +1,7 @@
debian/tmp/opt/trinity/bin/kompmgr
debian/tmp/opt/trinity/bin/twin
debian/tmp/opt/trinity/bin/twin_killer_helper
+debian/tmp/opt/trinity/bin/twin_resumer_helper
debian/tmp/opt/trinity/bin/twin_rules_dialog
debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_default_rules
debian/tmp/opt/trinity/lib/kconf_update_bin/twin_update_window_settings
diff --git a/debian/squeeze/tdebindings/debian/cdbs/kde.mk b/debian/squeeze/tdebindings/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdebindings/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdebindings/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install b/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install
index 62a36de6e..540ad0ca2 100644
--- a/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install
+++ b/debian/squeeze/tdebindings/debian/libkjsembed-trinity-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kjsembed/*
+debian/tmp/opt/trinity/include/tde/kjsembed/*
debian/tmp/opt/trinity/lib/libkjsembed.so
debian/tmp/opt/trinity/lib/libkjsembed.la
diff --git a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install
index 2904a6815..99a21c1de 100644
--- a/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install
+++ b/debian/squeeze/tdebindings/debian/libsmokeqt-trinity-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/smoke.h
+debian/tmp/opt/trinity/include/tde/smoke.h
debian/tmp/opt/trinity/lib/libsmokeqt.so
debian/tmp/opt/trinity/lib/libsmokeqt.la
diff --git a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdebindings/debian/rules b/debian/squeeze/tdebindings/debian/rules
index 6c5a7ddad..6498e0a4d 100755
--- a/debian/squeeze/tdebindings/debian/rules
+++ b/debian/squeeze/tdebindings/debian/rules
@@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeedu/debian/cdbs/kde.mk b/debian/squeeze/tdeedu/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeedu/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeedu/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeedu/debian/kstars-trinity.install b/debian/squeeze/tdeedu/debian/kstars-trinity.install
index 4db6bf7e7..61544b793 100644
--- a/debian/squeeze/tdeedu/debian/kstars-trinity.install
+++ b/debian/squeeze/tdeedu/debian/kstars-trinity.install
@@ -1,7 +1,7 @@
etc/trinity/kstarsrc
opt/trinity/bin/kstars
-/opt/trinity/include/kde/kstarsinterface.h
-/opt/trinity/include/kde/simclockinterface.h
+/opt/trinity/include/tde/kstarsinterface.h
+/opt/trinity/include/tde/simclockinterface.h
/opt/trinity/share/applications/kde/kstars.desktop
/opt/trinity/share/config.kcfg/kstars.kcfg
/opt/trinity/share/doc/kde/HTML/en/kstars/common
diff --git a/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install b/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install
index ca0848fd9..e64535480 100644
--- a/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install
+++ b/debian/squeeze/tdeedu/debian/libkiten-dev-trinity.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/libkiten
+/opt/trinity/include/tde/libkiten
opt/trinity/lib/libkiten.la
opt/trinity/lib/libkiten.so
diff --git a/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install b/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install
index be3af1e7b..1695e3cf1 100644
--- a/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install
+++ b/debian/squeeze/tdeedu/debian/libtdeedu-dev-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/libtdeedu
+/opt/trinity/include/tde/libtdeedu
opt/trinity/lib/libextdate.la
opt/trinity/lib/libextdate.so
opt/trinity/lib/libtdeeducore.la
diff --git a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdeedu/debian/rules b/debian/squeeze/tdeedu/debian/rules
index b19d3d32f..059005f50 100755
--- a/debian/squeeze/tdeedu/debian/rules
+++ b/debian/squeeze/tdeedu/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
# Ensure that kig's python scripting built successfully.
common-build-arch::
diff --git a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install
index b9052ce9a..b7dea632a 100644
--- a/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install
+++ b/debian/squeeze/tdegames/debian/atlantik-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/atlantik
-/opt/trinity/include/kde/atlantic
+/opt/trinity/include/tde/atlantik
+/opt/trinity/include/tde/atlantic
/opt/trinity/lib/libatlantic.so
/opt/trinity/lib/libatlantikclient.so
/opt/trinity/lib/libatlantikui.so
diff --git a/debian/squeeze/tdegames/debian/cdbs/kde.mk b/debian/squeeze/tdegames/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdegames/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdegames/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install
index 4da86d1b2..ff0a2b177 100644
--- a/debian/squeeze/tdegames/debian/kolf-trinity-dev.install
+++ b/debian/squeeze/tdegames/debian/kolf-trinity-dev.install
@@ -1,2 +1,2 @@
-/opt/trinity/include/kde/kolf
+/opt/trinity/include/tde/kolf
/opt/trinity/lib/libkolf.so
diff --git a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install
index 354fa3840..eca00d487 100644
--- a/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install
+++ b/debian/squeeze/tdegames/debian/libtdegames-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/*.h
-/opt/trinity/include/kde/kgame
+/opt/trinity/include/tde/*.h
+/opt/trinity/include/tde/kgame
/opt/trinity/lib/libtdegames.so
/opt/trinity/lib/libtdegames.la
diff --git a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdegames/debian/rules b/debian/squeeze/tdegames/debian/rules
index 0ba5f21cb..5a24cd5ae 100755
--- a/debian/squeeze/tdegames/debian/rules
+++ b/debian/squeeze/tdegames/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk
export kde_bindir = /opt/trinity/games
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdegraphics/debian/cdbs/kde.mk b/debian/squeeze/tdegraphics/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdegraphics/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdegraphics/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install
index 57d9ec1d0..7e7ce35c8 100644
--- a/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install
+++ b/debian/squeeze/tdegraphics/debian/libpoppler-tqt-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h
-debian/tmp/opt/trinity/include/kde/poppler-page-transition.h
-debian/tmp/opt/trinity/include/kde/poppler-qt.h
+debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h
+debian/tmp/opt/trinity/include/tde/poppler-page-transition.h
+debian/tmp/opt/trinity/include/tde/poppler-qt.h
diff --git a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
index 608149acc..4d50b4fc5 100644
--- a/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/tdegraphics-dev-trinity.install
@@ -1,184 +1,184 @@
-debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h
-debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h
-debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGException.h
-debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h
-debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLength.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h
-debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRect.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTests.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h
-debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h
-debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h
-debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h
-debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h
-debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h
-debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h
-debian/tmp/opt/trinity/include/kde/kfaximage.h
-debian/tmp/opt/trinity/include/kde/kmultipageInterface.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h
-debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h
-debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h
-debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h
-debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h
-debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h
-debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h
-debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h
-debian/tmp/opt/trinity/include/kde/kviewshell/history.h
-debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h
-debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/length.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h
-debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h
-debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h
-debian/tmp/opt/trinity/include/kde/kviewshell/selection.h
-debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h
-debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h
-debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h
-debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h
+debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h
+debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGException.h
+debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h
+debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLength.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h
+debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRect.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTests.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h
+debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h
+debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h
+debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h
+debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h
+debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h
+debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h
+debian/tmp/opt/trinity/include/tde/kfaximage.h
+debian/tmp/opt/trinity/include/tde/kmultipageInterface.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h
+debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h
+debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h
+debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h
+debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h
+debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h
+debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h
+debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h
+debian/tmp/opt/trinity/include/tde/kviewshell/history.h
+debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h
+debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/length.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h
+debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h
+debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h
+debian/tmp/opt/trinity/include/tde/kviewshell/selection.h
+debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h
+debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h
+debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h
+debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h
debian/tmp/opt/trinity/lib/libtdeinit_kview.la
debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la
debian/tmp/opt/trinity/lib/libkghostviewlib.la
diff --git a/debian/squeeze/tdelibs/debian/cdbs/kde.mk b/debian/squeeze/tdelibs/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdelibs/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdelibs/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
index 1ab3ff715..2332768a6 100644
--- a/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
+++ b/debian/squeeze/tdelibs/debian/man/lnusertemp-trinity.sgml
@@ -93,8 +93,8 @@ manpage.1: manpage.sgml
<para><command>&dhpackage;</command> will create the first two
resources in directories under <filename>/tmp</filename> (or
- <envar>KDETMP</envar> if defined in the environment) and will use
- <filename>/var/tmp</filename> (or <envar>KDEVARTMP</envar> if
+ <envar>TDETMP</envar> if defined in the environment) and will use
+ <filename>/var/tmp</filename> (or <envar>TDEVARTMP</envar> if
defined in the environment) for the <emphasis>cache</emphasis>
resource (in order to survive system reboots). The temporary
directories created for resources are usually of the form
diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 24b56bf2a..2e2bdf3ee 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/tdelibs/debian/rules
@@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes
version=Debian Package $(DEB_VERSION)
DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON"
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
diff --git a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdemultimedia/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdemultimedia/debian/rules b/debian/squeeze/tdemultimedia/debian/rules
index abe114b59..aff6738b2 100755
--- a/debian/squeeze/tdemultimedia/debian/rules
+++ b/debian/squeeze/tdemultimedia/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := \
--with-alsa --with-arts-alsa \
- --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \
+ --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \
--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
- # The include/kde/arts one should be temporary. See
+ # The include/tde/arts one should be temporary. See
# "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk.
DOC_HTML_PRUNE := kcontrol-trinity
diff --git a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
index a6b4265bd..4edb170bf 100644
--- a/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
+++ b/debian/squeeze/tdemultimedia/debian/tdemultimedia-trinity-dev.install
@@ -1,137 +1,137 @@
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h
-debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl
-debian/tmp/opt/trinity/include/kde/arts/artsgui.h
-debian/tmp/opt/trinity/include/kde/arts/artsgui.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.h
-debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h
-debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h
-debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl
-debian/tmp/opt/trinity/include/kde/arts/kartswidget.h
-debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h
-debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h
-debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h
-debian/tmp/opt/trinity/include/kde/audiocdencoder.h
-debian/tmp/opt/trinity/include/kde/cmodule.h
-debian/tmp/opt/trinity/include/kde/effectview.h
-debian/tmp/opt/trinity/include/kde/equalizerview.h
-debian/tmp/opt/trinity/include/kde/ksaver.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cache.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h
-debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h
-debian/tmp/opt/trinity/include/kde/libkcddb/client.h
-debian/tmp/opt/trinity/include/kde/libkcddb/config.h
-debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h
-debian/tmp/opt/trinity/include/kde/mimetypetree.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h
-debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
-debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl
-debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h
-debian/tmp/opt/trinity/include/kde/noatun/app.h
-debian/tmp/opt/trinity/include/kde/noatun/controls.h
-debian/tmp/opt/trinity/include/kde/noatun/conversion.h
-debian/tmp/opt/trinity/include/kde/noatun/downloader.h
-debian/tmp/opt/trinity/include/kde/noatun/effects.h
-debian/tmp/opt/trinity/include/kde/noatun/engine.h
-debian/tmp/opt/trinity/include/kde/noatun/equalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h
-debian/tmp/opt/trinity/include/kde/noatun/player.h
-debian/tmp/opt/trinity/include/kde/noatun/playlist.h
-debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h
-debian/tmp/opt/trinity/include/kde/noatun/plugin.h
-debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h
-debian/tmp/opt/trinity/include/kde/noatun/pref.h
-debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h
-debian/tmp/opt/trinity/include/kde/noatun/stdaction.h
-debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h
-debian/tmp/opt/trinity/include/kde/noatun/tags.h
-debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h
-debian/tmp/opt/trinity/include/kde/noatun/video.h
-debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h
-debian/tmp/opt/trinity/include/kde/plugin_deps.h
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h
+debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl
+debian/tmp/opt/trinity/include/tde/arts/artsgui.h
+debian/tmp/opt/trinity/include/tde/arts/artsgui.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.h
+debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h
+debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h
+debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl
+debian/tmp/opt/trinity/include/tde/arts/kartswidget.h
+debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h
+debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h
+debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h
+debian/tmp/opt/trinity/include/tde/audiocdencoder.h
+debian/tmp/opt/trinity/include/tde/cmodule.h
+debian/tmp/opt/trinity/include/tde/effectview.h
+debian/tmp/opt/trinity/include/tde/equalizerview.h
+debian/tmp/opt/trinity/include/tde/ksaver.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cache.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h
+debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h
+debian/tmp/opt/trinity/include/tde/libkcddb/client.h
+debian/tmp/opt/trinity/include/tde/libkcddb/config.h
+debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h
+debian/tmp/opt/trinity/include/tde/mimetypetree.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h
+debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h
+debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl
+debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h
+debian/tmp/opt/trinity/include/tde/noatun/app.h
+debian/tmp/opt/trinity/include/tde/noatun/controls.h
+debian/tmp/opt/trinity/include/tde/noatun/conversion.h
+debian/tmp/opt/trinity/include/tde/noatun/downloader.h
+debian/tmp/opt/trinity/include/tde/noatun/effects.h
+debian/tmp/opt/trinity/include/tde/noatun/engine.h
+debian/tmp/opt/trinity/include/tde/noatun/equalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h
+debian/tmp/opt/trinity/include/tde/noatun/player.h
+debian/tmp/opt/trinity/include/tde/noatun/playlist.h
+debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h
+debian/tmp/opt/trinity/include/tde/noatun/plugin.h
+debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h
+debian/tmp/opt/trinity/include/tde/noatun/pref.h
+debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h
+debian/tmp/opt/trinity/include/tde/noatun/stdaction.h
+debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h
+debian/tmp/opt/trinity/include/tde/noatun/tags.h
+debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h
+debian/tmp/opt/trinity/include/tde/noatun/video.h
+debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h
+debian/tmp/opt/trinity/include/tde/plugin_deps.h
debian/tmp/opt/trinity/lib/libarts_mpeglib.so
debian/tmp/opt/trinity/lib/libarts_splay.so
debian/tmp/opt/trinity/lib/libartsbuilder.so
diff --git a/debian/squeeze/tdenetwork/debian/cdbs/kde.mk b/debian/squeeze/tdenetwork/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdenetwork/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdenetwork/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdenetwork/debian/kopete-trinity.install b/debian/squeeze/tdenetwork/debian/kopete-trinity.install
index c4a342dc5..1901f005e 100644
--- a/debian/squeeze/tdenetwork/debian/kopete-trinity.install
+++ b/debian/squeeze/tdenetwork/debian/kopete-trinity.install
@@ -1,9 +1,9 @@
debian/tmp/opt/trinity/bin/kopete
debian/tmp/opt/trinity/bin/kopete_latexconvert.sh
-debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update
debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
diff --git a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules
index 90babf808..71afe376c 100755
--- a/debian/squeeze/tdenetwork/debian/rules
+++ b/debian/squeeze/tdenetwork/debian/rules
@@ -17,7 +17,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
index cc69d4cba..4915aaa12 100644
--- a/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
+++ b/debian/squeeze/tdenetwork/debian/tdenetwork-trinity-dev.install
@@ -1,66 +1,66 @@
-debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h
-debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h
-debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h
-debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h
-debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h
-debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h
-debian/tmp/opt/trinity/include/kde/rss/article.h
-debian/tmp/opt/trinity/include/kde/rss/document.h
-debian/tmp/opt/trinity/include/kde/rss/global.h
-debian/tmp/opt/trinity/include/kde/rss/image.h
-debian/tmp/opt/trinity/include/kde/rss/librss.h
-debian/tmp/opt/trinity/include/kde/rss/loader.h
-debian/tmp/opt/trinity/include/kde/rss/textinput.h
+debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h
+debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h
+debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h
+debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h
+debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h
+debian/tmp/opt/trinity/include/tde/rss/article.h
+debian/tmp/opt/trinity/include/tde/rss/document.h
+debian/tmp/opt/trinity/include/tde/rss/global.h
+debian/tmp/opt/trinity/include/tde/rss/image.h
+debian/tmp/opt/trinity/include/tde/rss/librss.h
+debian/tmp/opt/trinity/include/tde/rss/loader.h
+debian/tmp/opt/trinity/include/tde/rss/textinput.h
debian/tmp/opt/trinity/lib/libtdeinit_kdict.la
debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la
debian/tmp/opt/trinity/lib/libkopete.la
@@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la
debian/tmp/opt/trinity/lib/libkopete_videodevice.so
debian/tmp/opt/trinity/lib/librss.la
debian/tmp/opt/trinity/lib/librss.so
-debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h
+debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h
diff --git a/debian/squeeze/tdepim/debian/changelog b/debian/squeeze/tdepim/debian/changelog
index 24807570c..53b6c5851 100644
--- a/debian/squeeze/tdepim/debian/changelog
+++ b/debian/squeeze/tdepim/debian/changelog
@@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
- Activates networkstatus support for kmail (patch from SuSE)
* debian/control:
- New package networkstatus-dev
- * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h
+ * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h
-- Anthony Mercatante <tonio@ubuntu.com> Fri, 02 Feb 2007 15:37:42 +0100
diff --git a/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install b/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install
index acbb26191..8c2903ede 100644
--- a/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libindex0-trinity-dev.install
@@ -1,4 +1,4 @@
/opt/trinity/bin/indexlib-config
-/opt/trinity/include/kde/index
+/opt/trinity/include/tde/index
/opt/trinity/lib/libindex.la
/opt/trinity/lib/libindex.so
diff --git a/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install b/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install
index 7dcc98ca7..75a5523ca 100644
--- a/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libkcal2-trinity-dev.install
@@ -1,5 +1,5 @@
-/opt/trinity/include/kde/libemailfunctions/idmapper.h
-/opt/trinity/include/kde/libkcal
+/opt/trinity/include/tde/libemailfunctions/idmapper.h
+/opt/trinity/include/tde/libkcal
/opt/trinity/lib/libkcal.la
/opt/trinity/lib/libkcal.so
/opt/trinity/lib/libkcal_resourceremote.la
diff --git a/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install b/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install
index c386be142..290f743b7 100644
--- a/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libkgantt0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/kgantt
+/opt/trinity/include/tde/kgantt
/opt/trinity/lib/libkgantt.la
/opt/trinity/lib/libkgantt.so
diff --git a/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install b/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install
index cab0f039e..6015f5c08 100644
--- a/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libkleopatra1-trinity-dev.install
@@ -1,6 +1,6 @@
-/opt/trinity/include/kde/gpgme++
-/opt/trinity/include/kde/kleo
-/opt/trinity/include/kde/qgpgme
+/opt/trinity/include/tde/gpgme++
+/opt/trinity/include/tde/kleo
+/opt/trinity/include/tde/qgpgme
/opt/trinity/lib/libgpgme++.la
/opt/trinity/lib/libgpgme++.so
/opt/trinity/lib/libkleopatra.la
diff --git a/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install b/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install
index 8bf3b312e..ed8bb8407 100644
--- a/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libkpimexchange1-trinity-dev.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/kde/tdepim/exchangeaccount.h
-/opt/trinity/include/kde/tdepim/exchangeclient.h
+/opt/trinity/include/tde/tdepim/exchangeaccount.h
+/opt/trinity/include/tde/tdepim/exchangeclient.h
/opt/trinity/lib/libkpimexchange.la
/opt/trinity/lib/libkpimexchange.so
diff --git a/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install b/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install
index 08cf59222..32aa3d12d 100644
--- a/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libksieve0-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ksieve
+/opt/trinity/include/tde/ksieve
/opt/trinity/lib/libksieve.la
/opt/trinity/lib/libksieve.so
diff --git a/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install b/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install
index 5c74d9348..1cea927e9 100644
--- a/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libktnef1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/ktnef
+/opt/trinity/include/tde/ktnef
/opt/trinity/lib/libktnef.la
/opt/trinity/lib/libktnef.so
diff --git a/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install b/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install
index c5092b6a9..3a5428f6e 100644
--- a/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libmimelib1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/mimelib
+/opt/trinity/include/tde/mimelib
/opt/trinity/lib/libmimelib.la
/opt/trinity/lib/libmimelib.so
diff --git a/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install b/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install
index 4f6d52f46..56ca2ebc8 100644
--- a/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/libtdepim1-trinity-dev.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/kde/tdepimmacros.h
+/opt/trinity/include/tde/tdepimmacros.h
/opt/trinity/lib/libtdepim.la
/opt/trinity/lib/libtdepim.so
diff --git a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
index 848758727..b94111037 100644
--- a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
+++ b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install
@@ -1,15 +1,15 @@
-/opt/trinity/include/kde/KNotesAppIface.h
-/opt/trinity/include/kde/KNotesIface.h
-/opt/trinity/include/kde/akregator
-/opt/trinity/include/kde/calendar
-/opt/trinity/include/kde/kabc
-/opt/trinity/include/kde/kaddressbook
-/opt/trinity/include/kde/kmail
-/opt/trinity/include/kde/kmailIface.h
-/opt/trinity/include/kde/kmailicalIface.h
-/opt/trinity/include/kde/kmailpartIface.h
-/opt/trinity/include/kde/kontact
-/opt/trinity/include/kde/korganizer
+/opt/trinity/include/tde/KNotesAppIface.h
+/opt/trinity/include/tde/KNotesIface.h
+/opt/trinity/include/tde/akregator
+/opt/trinity/include/tde/calendar
+/opt/trinity/include/tde/kabc
+/opt/trinity/include/tde/kaddressbook
+/opt/trinity/include/tde/kmail
+/opt/trinity/include/tde/kmailIface.h
+/opt/trinity/include/tde/kmailicalIface.h
+/opt/trinity/include/tde/kmailpartIface.h
+/opt/trinity/include/tde/kontact
+/opt/trinity/include/tde/korganizer
/opt/trinity/lib/libkabckolab.la
/opt/trinity/lib/libkabckolab.so
/opt/trinity/lib/libkabcscalix.la
@@ -81,4 +81,4 @@
/opt/trinity/lib/libgwsoap.la
/opt/trinity/lib/libgwsoap.so
-/opt/trinity/include/kde/kpimprefs.h
+/opt/trinity/include/tde/kpimprefs.h
diff --git a/debian/squeeze/tdesdk/debian/cdbs/kde.mk b/debian/squeeze/tdesdk/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdesdk/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdesdk/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog
index 276fb1d78..1bbe6e2e4 100644
--- a/debian/squeeze/tdesdk/debian/changelog
+++ b/debian/squeeze/tdesdk/debian/changelog
@@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low
tdesdk (2.2.2-2) unstable; urgency=low
- * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449).
+ * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449).
-- Ben Burton <benb@acm.org> Thu, 6 Dec 2001 09:50:47 -0600
diff --git a/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install b/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install
index a792b2b6d..ace31ea6a 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install
+++ b/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install
@@ -1,24 +1,24 @@
-debian/tmp/opt/trinity/include/kde/kbabel/catalog.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h
-debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h
-debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h
-debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h
-debian/tmp/opt/trinity/include/kde/kbabel/itempart.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h
-debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h
-debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h
-debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h
-debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h
-debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h
-debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h
-debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalog.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h
+debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h
+debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h
+debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h
+debian/tmp/opt/trinity/include/tde/kbabel/itempart.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h
+debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h
+debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h
+debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h
+debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h
+debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h
+debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h
+debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h
debian/tmp/opt/trinity/lib/libkbabelcommon.la
debian/tmp/opt/trinity/lib/libkbabelcommon.so
debian/tmp/opt/trinity/lib/libkbabeldictplugin.la
diff --git a/debian/squeeze/tdesdk/debian/kmtrace-trinity.install b/debian/squeeze/tdesdk/debian/kmtrace-trinity.install
index 119b5196d..35b5af1a5 100644
--- a/debian/squeeze/tdesdk/debian/kmtrace-trinity.install
+++ b/debian/squeeze/tdesdk/debian/kmtrace-trinity.install
@@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle
debian/tmp/opt/trinity/bin/kminspector
debian/tmp/opt/trinity/bin/kmmatch
debian/tmp/opt/trinity/bin/kmtrace
-debian/tmp/opt/trinity/include/kde/ktrace.h
+debian/tmp/opt/trinity/include/tde/ktrace.h
debian/tmp/opt/trinity/lib/kmtrace/libktrace.la
debian/tmp/opt/trinity/lib/kmtrace/libktrace.so
debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a
diff --git a/debian/squeeze/tdesdk/debian/kspy-trinity.install b/debian/squeeze/tdesdk/debian/kspy-trinity.install
index 3b7d6d778..fc17ede2c 100644
--- a/debian/squeeze/tdesdk/debian/kspy-trinity.install
+++ b/debian/squeeze/tdesdk/debian/kspy-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kspy.h
+debian/tmp/opt/trinity/include/tde/kspy.h
debian/tmp/opt/trinity/lib/libkspy.la
debian/tmp/opt/trinity/lib/libkspy.so
debian/tmp/opt/trinity/lib/libkspy.so.1
diff --git a/debian/squeeze/tdesdk/debian/kunittest-trinity.install b/debian/squeeze/tdesdk/debian/kunittest-trinity.install
index f002cd796..e183f0e74 100644
--- a/debian/squeeze/tdesdk/debian/kunittest-trinity.install
+++ b/debian/squeeze/tdesdk/debian/kunittest-trinity.install
@@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la
debian/tmp/opt/trinity/lib/libkunittestgui.so
debian/tmp/opt/trinity/lib/libkunittestgui.so.0
debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h
+debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h
diff --git a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
index ac87e6efb..566e0b7a1 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/trinity/include/kde/cvsjob_stub.h
-debian/tmp/opt/trinity/include/kde/cvsservice_stub.h
-debian/tmp/opt/trinity/include/kde/repository_stub.h
+debian/tmp/opt/trinity/include/tde/cvsjob_stub.h
+debian/tmp/opt/trinity/include/tde/cvsservice_stub.h
+debian/tmp/opt/trinity/include/tde/repository_stub.h
debian/tmp/opt/trinity/lib/libcvsservice.la
debian/tmp/opt/trinity/lib/libcvsservice.so
debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la
diff --git a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules
index e7b228f2b..d63a59865 100755
--- a/debian/squeeze/tdesdk/debian/rules
+++ b/debian/squeeze/tdesdk/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
index cc229ce19..4b2589f6c 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde/kprofilemethod.h
+debian/tmp/opt/trinity/include/tde/kprofilemethod.h
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la
debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
diff --git a/debian/squeeze/tdetoys/debian/amor-trinity.install b/debian/squeeze/tdetoys/debian/amor-trinity.install
index b616db701..56a51c1b0 100644
--- a/debian/squeeze/tdetoys/debian/amor-trinity.install
+++ b/debian/squeeze/tdetoys/debian/amor-trinity.install
@@ -1,5 +1,5 @@
debian/tmp/opt/trinity/bin/amor
-debian/tmp/opt/trinity/include/kde/AmorIface.h
+debian/tmp/opt/trinity/include/tde/AmorIface.h
debian/tmp/opt/trinity/share/apps/amor
debian/tmp/opt/trinity/share/applications/kde/amor.desktop
debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2
diff --git a/debian/squeeze/tdetoys/debian/cdbs/kde.mk b/debian/squeeze/tdetoys/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdetoys/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdetoys/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdetoys/debian/changelog b/debian/squeeze/tdetoys/debian/changelog
index 5406c86c9..232db2401 100644
--- a/debian/squeeze/tdetoys/debian/changelog
+++ b/debian/squeeze/tdetoys/debian/changelog
@@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low
tdetoys (4:2.2.2-2) unstable; urgency=low
- * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447).
+ * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447).
-- Ben Burton <benb@acm.org> Sun, 9 Dec 2001 09:07:02 -0600
diff --git a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdetoys/debian/rules b/debian/squeeze/tdetoys/debian/rules
index 29a5978c3..57c3cf2c9 100755
--- a/debian/squeeze/tdetoys/debian/rules
+++ b/debian/squeeze/tdetoys/debian/rules
@@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg
diff --git a/debian/squeeze/tdeutils/debian/cdbs/kde.mk b/debian/squeeze/tdeutils/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdeutils/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdeutils/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules
index f7cd135a4..a83c83fdf 100755
--- a/debian/squeeze/tdeutils/debian/rules
+++ b/debian/squeeze/tdeutils/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
index a3c425a38..ca7081194 100644
--- a/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
+++ b/debian/squeeze/tdeutils/debian/tdeutils-trinity-dev.install
@@ -1,18 +1,18 @@
-debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h
-debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h
-debian/tmp/opt/trinity/include/kde/ksim/chart.h
-debian/tmp/opt/trinity/include/kde/ksim/common.h
-debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h
-debian/tmp/opt/trinity/include/kde/ksim/label.h
-debian/tmp/opt/trinity/include/kde/ksim/led.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h
-debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h
-debian/tmp/opt/trinity/include/kde/ksim/progress.h
-debian/tmp/opt/trinity/include/kde/ksim/themeloader.h
-debian/tmp/opt/trinity/include/kde/ksim/themetypes.h
-debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h
+debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h
+debian/tmp/opt/trinity/include/tde/ksim/chart.h
+debian/tmp/opt/trinity/include/tde/ksim/common.h
+debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h
+debian/tmp/opt/trinity/include/tde/ksim/label.h
+debian/tmp/opt/trinity/include/tde/ksim/led.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h
+debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h
+debian/tmp/opt/trinity/include/tde/ksim/progress.h
+debian/tmp/opt/trinity/include/tde/ksim/themeloader.h
+debian/tmp/opt/trinity/include/tde/ksim/themetypes.h
+debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h
debian/tmp/opt/trinity/lib/libkcmlaptop.la
debian/tmp/opt/trinity/lib/libkcmlaptop.so
debian/tmp/opt/trinity/lib/libtdeinit_ark.la
diff --git a/debian/squeeze/tdevelop/debian/cdbs/kde.mk b/debian/squeeze/tdevelop/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdevelop/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdevelop/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..e154eb334 100644
--- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/opt/trinity/include/kde/kde.pot
++kdepotpath=/opt/trinity/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules
index f5bce32b3..21f2c166a 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/tdevelop/debian/rules
@@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install b/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install
index 5c24ba5bb..f9f8c82ab 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
debian/tmp/opt/trinity/lib/lib*.so
debian/tmp/opt/trinity/lib/lib*.la
diff --git a/debian/squeeze/tdewebdev/debian/cdbs/kde.mk b/debian/squeeze/tdewebdev/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdewebdev/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdewebdev/debian/cdbs/kde.mk
@@ -59,7 +59,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install b/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install
index 54d904432..8d8db707b 100644
--- a/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install
+++ b/debian/squeeze/tdewebdev/debian/kommander-trinity-dev.install
@@ -1,7 +1,7 @@
-debian/tmp/opt/trinity/include/kde/kommander*
+debian/tmp/opt/trinity/include/tde/kommander*
debian/tmp/opt/trinity/lib/libkommanderplugin.la
debian/tmp/opt/trinity/lib/libkommanderplugin.so
debian/tmp/opt/trinity/lib/libkommanderwidget.la
debian/tmp/opt/trinity/lib/libkommanderwidget.so
debian/tmp/opt/trinity/lib/libkommanderwidgets.so
-debian/tmp/opt/trinity/include/kde/specials.h
+debian/tmp/opt/trinity/include/tde/specials.h
diff --git a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
index 1f825f642..aca9df12a 100644
--- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
-+kdepotpath=/usr/include/kde/kde.pot
++kdepotpath=/usr/include/tde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
diff --git a/debian/squeeze/tdewebdev/debian/rules b/debian/squeeze/tdewebdev/debian/rules
index 2dcf9658d..888f66bcf 100755
--- a/debian/squeeze/tdewebdev/debian/rules
+++ b/debian/squeeze/tdewebdev/debian/rules
@@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info