summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick_automake/applications
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick_automake/applications')
-rwxr-xr-xubuntu/maverick_automake/applications/abakus/debian/rules10
-rw-r--r--ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/adept/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/amarok/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/basket/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/bibletime/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install2
-rwxr-xr-xubuntu/maverick_automake/applications/digikam/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/dolphin/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/filelight-l10n/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/filelight/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/gwenview/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/applications/k3b/debian/kde3.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/k3b/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/k9copy/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install2
-rwxr-xr-xubuntu/maverick_automake/applications/kaffeine/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/katapult/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kbarcode/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/kbfx/debian/rules6
-rw-r--r--ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs2
-rwxr-xr-xubuntu/maverick_automake/applications/kchmviewer/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kcpuload/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kde-guidance/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kde-systemsettings/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kdesudo/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install2
-rwxr-xr-xubuntu/maverick_automake/applications/kdesvn/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kdiff3/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kdirstat/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kdpkg/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff2
-rwxr-xr-xubuntu/maverick_automake/applications/keep/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kerry/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kgtk-qt3/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kile/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kima/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kio-apt/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kio-locate/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kmplayer/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs2
-rwxr-xr-xubuntu/maverick_automake/applications/kmyfirewall/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/knemo/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/knetload/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/knetstats/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/knetworkmanager/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/knights/debian/debiandirs2
-rwxr-xr-xubuntu/maverick_automake/applications/knights/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/knowit/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/knutclient/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install2
-rwxr-xr-xubuntu/maverick_automake/applications/koffice/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/konversation/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kopete-otr/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kpicosim/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kpilot/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kpowersave/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kradio/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/krename/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/krusader/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs2
-rwxr-xr-xubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/ksquirrel/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/ksystemlog/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs2
-rwxr-xr-xubuntu/maverick_automake/applications/ktechlab/debian/rules10
-rw-r--r--ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/ktorrent/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kuickshow/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/kvirc/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kvkbd/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/piklab/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/potracegui/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/rosegarden/debian/rules8
-rw-r--r--ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/smb4k/debian/rules2
-rw-r--r--ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/soundkonverter/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/tdmtheme/debian/rules4
-rwxr-xr-xubuntu/maverick_automake/applications/tellico/debian/rules2
-rwxr-xr-xubuntu/maverick_automake/applications/wlassistant/debian/rules4
-rw-r--r--ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk2
-rwxr-xr-xubuntu/maverick_automake/applications/yakuake/debian/rules2
130 files changed, 192 insertions, 192 deletions
diff --git a/ubuntu/maverick_automake/applications/abakus/debian/rules b/ubuntu/maverick_automake/applications/abakus/debian/rules
index b4b19e7d1..c5622a9ec 100755
--- a/ubuntu/maverick_automake/applications/abakus/debian/rules
+++ b/ubuntu/maverick_automake/applications/abakus/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/langcore.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -19,18 +19,18 @@ debian/abakus.xpm: src/hi64-app-abakus.png
common-build-arch:: build-stamp
build-stamp: debian/abakus.xpm
- env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3
- env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS)
+ env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) configure prefix=$(DEB_DESTDIR)/opt/kde3
+ env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS)
touch build-stamp
common-install-arch::
- env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) install
+ env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) install
install -D -m 644 debian/abakus.xpm debian/abakus-kde3/opt/kde3/share/pixmaps/abakus.xpm
chrpath -d debian/abakus-kde3/opt/kde3/bin/abakus
dh_icons -pabakus
clean::
- #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(SCONS) --clean
+ #env PATH=/opt/kde3/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(SCONS) --clean
rm -f debian/abakus.xpm
rm -rf cache
rm -rf .sconf_temp
diff --git a/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/adept/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/adept/debian/rules b/ubuntu/maverick_automake/applications/adept/debian/rules
index 13770997f..6b550c841 100755
--- a/ubuntu/maverick_automake/applications/adept/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/amarok/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/amarok/debian/rules b/ubuntu/maverick_automake/applications/amarok/debian/rules
index 476020719..25c96653a 100755
--- a/ubuntu/maverick_automake/applications/amarok/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/basket/debian/rules b/ubuntu/maverick_automake/applications/basket/debian/rules
index 24b31b701..95af63da6 100755
--- a/ubuntu/maverick_automake/applications/basket/debian/rules
+++ b/ubuntu/maverick_automake/applications/basket/debian/rules
@@ -3,7 +3,7 @@
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/bibletime/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/bibletime/debian/rules b/ubuntu/maverick_automake/applications/bibletime/debian/rules
index 2225129be..977f3da4a 100755
--- a/ubuntu/maverick_automake/applications/bibletime/debian/rules
+++ b/ubuntu/maverick_automake/applications/bibletime/debian/rules
@@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian
DEB_BUILDDIR = $(DEB_SRCDIR)
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules
index 0e85996b0..4aacc890d 100755
--- a/ubuntu/maverick_automake/applications/compizconfig-backend-kconfig/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules b/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules
index cc2cc1242..630c17e4d 100755
--- a/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules
+++ b/ubuntu/maverick_automake/applications/desktop-effects-kde/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/digikam/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install b/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install
index 299a95917..f0a354851 100644
--- a/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install
+++ b/ubuntu/maverick_automake/applications/digikam/debian/digikam-kde3.install
@@ -1,5 +1,5 @@
opt/kde3/bin/digi*
-/opt/kde3/include/kde
+/opt/kde3/include/tde
opt/kde3/lib
/opt/kde3/share/apps/digikam
/opt/kde3/share/apps/konqueror/servicemenus/digikam*.desktop
diff --git a/ubuntu/maverick_automake/applications/digikam/debian/rules b/ubuntu/maverick_automake/applications/digikam/debian/rules
index 6d17f8853..4490608ea 100755
--- a/ubuntu/maverick_automake/applications/digikam/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/dolphin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/dolphin/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/ubuntu/maverick_automake/applications/dolphin/debian/rules b/ubuntu/maverick_automake/applications/dolphin/debian/rules
index 7eb2c2c66..ede258ac2 100755
--- a/ubuntu/maverick_automake/applications/dolphin/debian/rules
+++ b/ubuntu/maverick_automake/applications/dolphin/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-qt-kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules b/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules
index 5fd4108c5..95a17eb35 100755
--- a/ubuntu/maverick_automake/applications/filelight-l10n/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/usr/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/filelight/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/filelight/debian/rules b/ubuntu/maverick_automake/applications/filelight/debian/rules
index 0d73ddc4d..4f3418cfc 100755
--- a/ubuntu/maverick_automake/applications/filelight/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules
index 56eb66129..a8e9a7f73 100755
--- a/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules
+++ b/ubuntu/maverick_automake/applications/gtk-qt-engine/debian/rules
@@ -9,7 +9,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -19,13 +19,13 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
configure/gtk-qt-engine-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 .
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 .
build/gtk-qt-engine-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE)
install/gtk-qt-engine-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/gtk-qt-engine-kde3
mkdir -p $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/
cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/
cp -Rp $(CURDIR)/debian/.gtkrc-2.0-kde-kde4 $(CURDIR)/debian/gtk-qt-engine-kde3/opt/kde3/share/kgtk/
diff --git a/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/gwenview/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/gwenview/debian/rules b/ubuntu/maverick_automake/applications/gwenview/debian/rules
index 9abe0f2a9..68310c09f 100755
--- a/ubuntu/maverick_automake/applications/gwenview/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/k3b/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk b/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk
index e0bcb2308..0d41a4441 100644
--- a/ubuntu/maverick_automake/applications/k3b/debian/kde3.mk
+++ b/ubuntu/maverick_automake/applications/k3b/debian/kde3.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/kde3/include/kde"
+DEB_CONFIGURE_INCLUDEDIR = "/opt/kde3/include/tde"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick_automake/applications/k3b/debian/rules b/ubuntu/maverick_automake/applications/k3b/debian/rules
index 4a0edb003..fe5e3c0ab 100755
--- a/ubuntu/maverick_automake/applications/k3b/debian/rules
+++ b/ubuntu/maverick_automake/applications/k3b/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/kde3/include/kde5
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde5
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/lib --includedir="/opt/kde3/include/kde"
+DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde"
DEB_INSTALL_MANPAGES_k3b = debian/k3b.1
diff --git a/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/k9copy/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/k9copy/debian/rules b/ubuntu/maverick_automake/applications/k9copy/debian/rules
index 4fbc09fd4..57fc8996d 100755
--- a/ubuntu/maverick_automake/applications/k9copy/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_k9copy = k9copy-kde3.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info"
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules
index 3969b2d3a..5531403d1 100755
--- a/ubuntu/maverick_automake/applications/kaffeine-mozilla/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kaffeine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install b/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install
index c15880d49..a9bc9a8a7 100644
--- a/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install
+++ b/ubuntu/maverick_automake/applications/kaffeine/debian/kaffeine-kde3.install
@@ -13,7 +13,7 @@ debian/tmp/opt/kde3/share/doc/
debian/tmp/opt/kde3/share/icons/
debian/tmp/opt/kde3/share/mimelnk/application/x-kaffeine.desktop
debian/tmp/opt/kde3/share/locale/
-debian/tmp/opt/kde3/include/kde/kaffeine/*h
+debian/tmp/opt/kde3/include/tde/kaffeine/*h
debian/tmp/opt/kde3/share/services/kaffeineoggvorbis.desktop
debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.la
debian/tmp/opt/kde3/lib/kde3/libkaffeineoggvorbis.so
diff --git a/ubuntu/maverick_automake/applications/kaffeine/debian/rules b/ubuntu/maverick_automake/applications/kaffeine/debian/rules
index 8200dd0cd..df6abf852 100755
--- a/ubuntu/maverick_automake/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/katapult/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/katapult/debian/rules b/ubuntu/maverick_automake/applications/katapult/debian/rules
index 4b40fd262..0d819995a 100755
--- a/ubuntu/maverick_automake/applications/katapult/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kbarcode/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kbarcode/debian/rules b/ubuntu/maverick_automake/applications/kbarcode/debian/rules
index 75ea19eb3..fecd78311 100755
--- a/ubuntu/maverick_automake/applications/kbarcode/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kbfx/debian/rules b/ubuntu/maverick_automake/applications/kbfx/debian/rules
index 4bdcaeca3..f7455fa2d 100755
--- a/ubuntu/maverick_automake/applications/kbfx/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3 --with-extra-libs=/opt/kde3/lib
#CMAKE_LIBRARY_PATH := /opt/kde3/lib
-#CMAKE_INCLUDE_PATH := /opt/kde3/include/kde
+#CMAKE_INCLUDE_PATH := /opt/kde3/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/"
+DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/kde3/"
get-orig-source:
@@dh_testdir
diff --git a/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs
index a0aa0550c..1efd0b6bb 100644
--- a/ubuntu/maverick_automake/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kchmviewer/debian/rules b/ubuntu/maverick_automake/applications/kchmviewer/debian/rules
index 4adaf88da..b28da52db 100755
--- a/ubuntu/maverick_automake/applications/kchmviewer/debian/rules
+++ b/ubuntu/maverick_automake/applications/kchmviewer/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -27,7 +27,7 @@ CFLAGS = -Wall -g
CONFIGURE_OPTIONS_KDE = \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib \
- --includedir=/opt/kde3/include/kde --mandir=/opt/kde3/share/man \
+ --includedir=/opt/kde3/include/tde --mandir=/opt/kde3/share/man \
--with-qt-dir=$(qtdir) \
--sysconfdir=$(sysconfdir) \
--infodir=/opt/kde3/share/info \
diff --git a/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kcpuload/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kcpuload/debian/rules b/ubuntu/maverick_automake/applications/kcpuload/debian/rules
index abd1a1b0c..ecfe01330 100755
--- a/ubuntu/maverick_automake/applications/kcpuload/debian/rules
+++ b/ubuntu/maverick_automake/applications/kcpuload/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -79,7 +79,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
+ ../configure --disable-debug --enable-final --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
touch configure-stamp
diff --git a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules
index 6de018978..aa04e3439 100755
--- a/ubuntu/maverick_automake/applications/kde-guidance/debian/rules
+++ b/ubuntu/maverick_automake/applications/kde-guidance/debian/rules
@@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_kde-guidance-kde3 := debian/displayconfig-kde3.1 debian/mountconfig-kde3.1 debian/serviceconfig-kde3.1 debian/userconfig-kde3.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/kde3/share/python-support
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
LDFLAGS_APPEND := -L/opt/kde3/lib
install/kde-guidance-kde3::
diff --git a/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules b/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules
index dd1616d51..7fca75e60 100755
--- a/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules
+++ b/ubuntu/maverick_automake/applications/kde-style-lipstik/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--disable-debug --enable-final \
- --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+ --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
# --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/
build: build-stamp
diff --git a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules
index 66599ff61..4e41fdf0f 100755
--- a/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick_automake/applications/kde-style-qtcurve/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -41,7 +41,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
mkdir build
- cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake ..
+ cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake ..
touch config.status
build: build-stamp
@@ -50,7 +50,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE)
#docbook-to-man debian/kde-style-qtcurve.sgml > kde-style-qtcurve.1
touch $@
@@ -74,7 +74,7 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/kde-style-qtcurve-kde3.
- cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install
+ cd build; env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) DESTDIR=$(CURDIR)/debian/kde-style-qtcurve-kde3 install
# Build architecture-independent files here.
diff --git a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/kde-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/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules b/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules
index edce0b70e..edf857fe8 100755
--- a/ubuntu/maverick_automake/applications/kde-systemsettings/debian/rules
+++ b/ubuntu/maverick_automake/applications/kde-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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/kdesudo/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/ubuntu/maverick_automake/applications/kdesudo/debian/rules b/ubuntu/maverick_automake/applications/kdesudo/debian/rules
index 7a35701f7..d103095b0 100755
--- a/ubuntu/maverick_automake/applications/kdesudo/debian/rules
+++ b/ubuntu/maverick_automake/applications/kdesudo/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
DEB_INSTALL_MANPAGES_kdesudo-kde3 = kdesudo-kde3.1
diff --git a/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install b/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
index a0adce2e6..15c878d0f 100644
--- a/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
+++ b/ubuntu/maverick_automake/applications/kdesvn/debian/libsvnqt-kde3-dev.install
@@ -1,2 +1,2 @@
debian/tmp/opt/kde3/lib*/*.so
-debian/tmp/opt/kde3/include/kde/svnqt/
+debian/tmp/opt/kde3/include/tde/svnqt/
diff --git a/ubuntu/maverick_automake/applications/kdesvn/debian/rules b/ubuntu/maverick_automake/applications/kdesvn/debian/rules
index f7ce7d21e..3ca36df63 100755
--- a/ubuntu/maverick_automake/applications/kdesvn/debian/rules
+++ b/ubuntu/maverick_automake/applications/kdesvn/debian/rules
@@ -7,14 +7,14 @@ include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el
@@ -25,7 +25,7 @@ DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/kde3/lib
common-install-impl::
mkdir -p debian/tmp/opt/kde3
- mkdir -p debian/tmp/opt/kde3/include/kde
+ mkdir -p debian/tmp/opt/kde3/include/tde
mkdir -p debian/tmp/usr/lib
mkdir -p debian/tmp/opt/kde3/lib
mkdir -p debian/tmp/usr/lib/kde3
@@ -40,7 +40,7 @@ common-install-impl::
cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/kde3/lib/
cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/kde3/lib/
cp -Rp debian/tmp/usr/share debian/tmp/opt/kde3/
- cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/kde/
+ cp -Rp debian/tmp/usr/include/* debian/tmp/opt/kde3/include/tde/
rm -rf debian/tmp/usr/bin
rm -rf debian/tmp/usr/lib/kde3
rm -rf debian/tmp/usr/lib64/kde3
diff --git a/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kdiff3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kdiff3/debian/rules b/ubuntu/maverick_automake/applications/kdiff3/debian/rules
index 47c04654d..9f888108b 100755
--- a/ubuntu/maverick_automake/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick_automake/applications/kdiff3/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+ CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/kde3 --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
build: build-stamp
diff --git a/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kdirstat/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kdirstat/debian/rules b/ubuntu/maverick_automake/applications/kdirstat/debian/rules
index 0fc2239be..94480096a 100755
--- a/ubuntu/maverick_automake/applications/kdirstat/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
LDFLAGS += -Wl,--as-needed
diff --git a/ubuntu/maverick_automake/applications/kdpkg/debian/rules b/ubuntu/maverick_automake/applications/kdpkg/debian/rules
index a28235e24..523c190f9 100755
--- a/ubuntu/maverick_automake/applications/kdpkg/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/keep/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff
index 55238c41a..de663438c 100644
--- a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/keep/debian/rules b/ubuntu/maverick_automake/applications/keep/debian/rules
index 56e2ebe81..97c2a8db1 100755
--- a/ubuntu/maverick_automake/applications/keep/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kerry/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kerry/debian/rules b/ubuntu/maverick_automake/applications/kerry/debian/rules
index da887ee76..2ea562d2d 100755
--- a/ubuntu/maverick_automake/applications/kerry/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/kgtk-qt3/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/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules
index 8abf4e1bb..06af1d1f6 100755
--- a/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/maverick_automake/applications/kgtk-qt3/debian/rules
@@ -9,7 +9,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -20,12 +20,12 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
configure/kgtk-qt3-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 .
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde cmake -D CMAKE_INSTALL_PREFIX=/opt/kde3 .
build/kgtk-qt3-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE)
install/kgtk-qt3-kde3::
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kgtk-qt3-kde3
mkdir -p $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/
cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-kde3/opt/kde3/share/kgtk/
diff --git a/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kile/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kile/debian/rules b/ubuntu/maverick_automake/applications/kile/debian/rules
index 6ec0fe0ce..812129d56 100755
--- a/ubuntu/maverick_automake/applications/kile/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kima/debian/rules b/ubuntu/maverick_automake/applications/kima/debian/rules
index 28d982425..8ca5c7a4b 100755
--- a/ubuntu/maverick_automake/applications/kima/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kio-apt/debian/rules b/ubuntu/maverick_automake/applications/kio-apt/debian/rules
index c0da898ed..4519af06b 100755
--- a/ubuntu/maverick_automake/applications/kio-apt/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kio-locate/debian/rules b/ubuntu/maverick_automake/applications/kio-locate/debian/rules
index b0cae30c5..feca774bb 100755
--- a/ubuntu/maverick_automake/applications/kio-locate/debian/rules
+++ b/ubuntu/maverick_automake/applications/kio-locate/debian/rules
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules
index c29c730f8..b1fb26a87 100755
--- a/ubuntu/maverick_automake/applications/kio-umountwrapper/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kmplayer/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kmplayer/debian/rules b/ubuntu/maverick_automake/applications/kmplayer/debian/rules
index 7f45f88c3..627d1d6b3 100755
--- a/ubuntu/maverick_automake/applications/kmplayer/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3)
CXX = g++ -fpermissive
endif
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1
diff --git a/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs
index 0fb38ea11..3f7ee894a 100644
--- a/ubuntu/maverick_automake/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules b/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules
index e0333883c..61ad9e5cb 100755
--- a/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules
+++ b/ubuntu/maverick_automake/applications/kmyfirewall/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+ CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/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/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/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/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-kde3
rm -f debian/kmyfirewall-kde3/opt/kde3/lib/*.so
chrpath -d debian/kmyfirewall-kde3/opt/kde3/bin/kmyfirewall debian/kmyfirewall-kde3/opt/kde3/lib/*.so.* debian/kmyfirewall-kde3/opt/kde3/lib/kde3/*.so
diff --git a/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/knemo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/knemo/debian/rules b/ubuntu/maverick_automake/applications/knemo/debian/rules
index ebd1b1375..ad411b75e 100755
--- a/ubuntu/maverick_automake/applications/knemo/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/knetload/debian/rules b/ubuntu/maverick_automake/applications/knetload/debian/rules
index 717d830b4..3f76befc1 100755
--- a/ubuntu/maverick_automake/applications/knetload/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -74,7 +74,7 @@ configure-stamp:
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+ ../configure $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
touch configure-stamp
diff --git a/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/knetstats/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/knetstats/debian/rules b/ubuntu/maverick_automake/applications/knetstats/debian/rules
index c2b268692..ebd2e2c1e 100755
--- a/ubuntu/maverick_automake/applications/knetstats/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/knetworkmanager/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/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules b/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules
index 802c24008..95f9fb7ba 100755
--- a/ubuntu/maverick_automake/applications/knetworkmanager/debian/rules
+++ b/ubuntu/maverick_automake/applications/knetworkmanager/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/knights/debian/debiandirs b/ubuntu/maverick_automake/applications/knights/debian/debiandirs
index 62b4b368a..3310385b4 100644
--- a/ubuntu/maverick_automake/applications/knights/debian/debiandirs
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/knights/debian/rules b/ubuntu/maverick_automake/applications/knights/debian/rules
index 29ea724f0..78daf9b03 100755
--- a/ubuntu/maverick_automake/applications/knights/debian/rules
+++ b/ubuntu/maverick_automake/applications/knights/debian/rules
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/include/kde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
+ --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/kde3/include/tde --infodir=/opt/kde3/share/info --mandir=/opt/kde3/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib
build: build-stamp
diff --git a/ubuntu/maverick_automake/applications/knowit/debian/rules b/ubuntu/maverick_automake/applications/knowit/debian/rules
index 14ca8b2c8..4df8d63e7 100755
--- a/ubuntu/maverick_automake/applications/knowit/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/knutclient/debian/rules b/ubuntu/maverick_automake/applications/knutclient/debian/rules
index d6a7e77ec..f80dda84c 100755
--- a/ubuntu/maverick_automake/applications/knutclient/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install b/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install
index c16c93985..479cc82aa 100644
--- a/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install
+++ b/ubuntu/maverick_automake/applications/koffice/debian/koffice-dev-kde3.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/kde3/include/kde
+debian/tmp/opt/kde3/include/tde
debian/tmp/opt/kde3/lib/libkarboncommon.la
debian/tmp/opt/kde3/lib/libkarboncommon.so
debian/tmp/opt/kde3/lib/libkchartcommon.la
diff --git a/ubuntu/maverick_automake/applications/koffice/debian/rules b/ubuntu/maverick_automake/applications/koffice/debian/rules
index 4ac1792e5..e8e6bfd40 100755
--- a/ubuntu/maverick_automake/applications/koffice/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/konversation/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/konversation/debian/rules b/ubuntu/maverick_automake/applications/konversation/debian/rules
index d6b5c064e..74c8823fc 100755
--- a/ubuntu/maverick_automake/applications/konversation/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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-kde3-dbg
DEB_INSTALL_DOCS_ALL =
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kopete-otr/debian/rules b/ubuntu/maverick_automake/applications/kopete-otr/debian/rules
index 8df8fc911..0e26fd9c8 100755
--- a/ubuntu/maverick_automake/applications/kopete-otr/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kpicosim/debian/rules b/ubuntu/maverick_automake/applications/kpicosim/debian/rules
index b210dc942..a1949f79e 100755
--- a/ubuntu/maverick_automake/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick_automake/applications/kpicosim/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -52,7 +52,7 @@ build-stamp: config.status
dh_testdir
# Add here commands to compile the package.
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE)
#docbook-to-man debian/kpicosim.sgml > kpicosim.1
touch build-stamp
diff --git a/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/ubuntu/maverick_automake/applications/kpilot/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kpilot/debian/rules b/ubuntu/maverick_automake/applications/kpilot/debian/rules
index 8b49a1a4b..abfd36cfc 100755
--- a/ubuntu/maverick_automake/applications/kpilot/debian/rules
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kpowersave/debian/rules b/ubuntu/maverick_automake/applications/kpowersave/debian/rules
index 135ce2862..25f0708df 100755
--- a/ubuntu/maverick_automake/applications/kpowersave/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -12,7 +12,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kradio/debian/rules b/ubuntu/maverick_automake/applications/kradio/debian/rules
index d9a2241b4..71ffdf9b0 100755
--- a/ubuntu/maverick_automake/applications/kradio/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/krename/debian/rules b/ubuntu/maverick_automake/applications/krename/debian/rules
index f8aeeb92b..332f8a71f 100755
--- a/ubuntu/maverick_automake/applications/krename/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
### Libtool and Automake updates
post-patches:: debian/stamp-autothings-update
diff --git a/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/krusader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/krusader/debian/rules b/ubuntu/maverick_automake/applications/krusader/debian/rules
index fded0c074..5ddb5ac8b 100755
--- a/ubuntu/maverick_automake/applications/krusader/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_DESTDIR = $(CURDIR)/debian/krusader-kde3/
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs
index fab210452..e760e0339 100644
--- a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/debiandirs
@@ -1,6 +1,6 @@
export kde_prefix=/opt/kde3
export sysconfdir=/etc
-export kde_includedir=/opt/kde3/include/kde
+export kde_includedir=/opt/kde3/include/tde
export infodir=/opt/kde3/share/info
export mandir=/opt/kde3/share/man
export qtdir=/opt/kde3/share/qt3
diff --git a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules
index e99736549..bc9ab21dc 100755
--- a/ubuntu/maverick_automake/applications/ksplash-engine-moodin/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
build: build-stamp
diff --git a/ubuntu/maverick_automake/applications/ksquirrel/debian/rules b/ubuntu/maverick_automake/applications/ksquirrel/debian/rules
index ab60b519d..9d05b71b2 100755
--- a/ubuntu/maverick_automake/applications/ksquirrel/debian/rules
+++ b/ubuntu/maverick_automake/applications/ksquirrel/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/ksystemlog/debian/rules b/ubuntu/maverick_automake/applications/ksystemlog/debian/rules
index 7d54a2353..52740d44f 100755
--- a/ubuntu/maverick_automake/applications/ksystemlog/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
DEB_INSTALL_MANPAGES_ksystemlog-kde3 := ksystemlog.1
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs
index 22305506e..c43770893 100644
--- a/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/maverick_automake/applications/ktechlab/debian/debiandirs
@@ -1,7 +1,7 @@
export kde_confdir=/etc/kde3
export kde_prefix=/opt/kde3
export kde_bindir=/opt/kde3/bin
-export kde_includedir=/opt/kde3/include/kde
+export kde_includedir=/opt/kde3/include/tde
export kde_libdir=/opt/kde3/lib
export kde_cgidir=/opt/kde3/lib/cgi-bin
export kde_moduledir=/opt/kde3/lib/kde3
diff --git a/ubuntu/maverick_automake/applications/ktechlab/debian/rules b/ubuntu/maverick_automake/applications/ktechlab/debian/rules
index 6a006f9b9..148f5d807 100755
--- a/ubuntu/maverick_automake/applications/ktechlab/debian/rules
+++ b/ubuntu/maverick_automake/applications/ktechlab/debian/rules
@@ -5,7 +5,7 @@
-include debian/debiandirs
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3
+ PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/kde3
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/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE)
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE)
touch build-stamp
clean:
@@ -85,8 +85,8 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-kde3
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-kde3
install -D -m 644 debian/ktechlab.xpm debian/ktechlab-kde3/opt/kde3/share/pixmaps/ktechlab.xpm
chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/ktechlab
chrpath -d $(CURDIR)/debian/ktechlab-kde3/opt/kde3/bin/microbe
diff --git a/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/ktorrent/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/ktorrent/debian/rules b/ubuntu/maverick_automake/applications/ktorrent/debian/rules
index dd1796ce0..901fd1ba9 100755
--- a/ubuntu/maverick_automake/applications/ktorrent/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
build/ktorrent-kde3::
docbook2x-man debian/ktorrent.1.docbook
diff --git a/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kuickshow/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kuickshow/debian/rules b/ubuntu/maverick_automake/applications/kuickshow/debian/rules
index b4456db14..e2ada6f11 100755
--- a/ubuntu/maverick_automake/applications/kuickshow/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/kvirc/debian/rules b/ubuntu/maverick_automake/applications/kvirc/debian/rules
index 99cd63353..c4c197f5f 100755
--- a/ubuntu/maverick_automake/applications/kvirc/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kvkbd/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/kvkbd/debian/rules b/ubuntu/maverick_automake/applications/kvkbd/debian/rules
index 4a7760310..00815e27a 100755
--- a/ubuntu/maverick_automake/applications/kvkbd/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
makebuilddir/kvkbd-kde3::
make -f Makefile.cvs
diff --git a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/applications/kwin-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/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules b/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules
index 78792cee1..2d8c7040b 100755
--- a/ubuntu/maverick_automake/applications/kwin-style-crystal/debian/rules
+++ b/ubuntu/maverick_automake/applications/kwin-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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/piklab/debian/rules b/ubuntu/maverick_automake/applications/piklab/debian/rules
index 1ded36029..374483481 100755
--- a/ubuntu/maverick_automake/applications/piklab/debian/rules
+++ b/ubuntu/maverick_automake/applications/piklab/debian/rules
@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib \
- --with-extra-includes=/opt/kde3/include/kde \
+ --with-extra-includes=/opt/kde3/include/tde \
--mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --enable-rpath
touch $@
diff --git a/ubuntu/maverick_automake/applications/potracegui/debian/rules b/ubuntu/maverick_automake/applications/potracegui/debian/rules
index 9da36fbe6..1cf0e0262 100755
--- a/ubuntu/maverick_automake/applications/potracegui/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/rosegarden/debian/rules b/ubuntu/maverick_automake/applications/rosegarden/debian/rules
index a871ea6a6..538b8d2b7 100755
--- a/ubuntu/maverick_automake/applications/rosegarden/debian/rules
+++ b/ubuntu/maverick_automake/applications/rosegarden/debian/rules
@@ -7,7 +7,7 @@
include /usr/share/dpatch/dpatch.make
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -35,14 +35,14 @@ configure: configure-stamp
configure-stamp:
dh_testdir
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde CMAKE_INSTALL_PREFIX=/usr cmake .
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde CMAKE_INSTALL_PREFIX=/usr cmake .
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp patch-stamp
dh_testdir
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make
touch build-stamp
clean: unpatch
@@ -64,7 +64,7 @@ install: build
dh_clean -k
dh_installdirs
- env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde make install DESTDIR=`pwd`/debian/tmp
+ env PATH=/opt/kde3/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde make install DESTDIR=`pwd`/debian/tmp
find debian/tmp/opt/kde3/share -type f -exec chmod 664 {} \;
# Build architecture-independent files here.
diff --git a/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/smb4k/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/smb4k/debian/rules b/ubuntu/maverick_automake/applications/smb4k/debian/rules
index a264124c9..14e052547 100755
--- a/ubuntu/maverick_automake/applications/smb4k/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/soundkonverter/debian/rules b/ubuntu/maverick_automake/applications/soundkonverter/debian/rules
index a045cdcf5..0589244d1 100755
--- a/ubuntu/maverick_automake/applications/soundkonverter/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/tdmtheme/debian/rules b/ubuntu/maverick_automake/applications/tdmtheme/debian/rules
index bcd40a219..4dd552400 100755
--- a/ubuntu/maverick_automake/applications/tdmtheme/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -13,7 +13,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
post-patches:: debian/stamp-bootstrap
diff --git a/ubuntu/maverick_automake/applications/tellico/debian/rules b/ubuntu/maverick_automake/applications/tellico/debian/rules
index e747c841f..c52d68960 100755
--- a/ubuntu/maverick_automake/applications/tellico/debian/rules
+++ b/ubuntu/maverick_automake/applications/tellico/debian/rules
@@ -5,7 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/maverick_automake/applications/wlassistant/debian/rules b/ubuntu/maverick_automake/applications/wlassistant/debian/rules
index 8c38dc51c..921c27cf2 100755
--- a/ubuntu/maverick_automake/applications/wlassistant/debian/rules
+++ b/ubuntu/maverick_automake/applications/wlassistant/debian/rules
@@ -7,7 +7,7 @@ URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME)
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -18,7 +18,7 @@ PATH := /opt/kde3/bin:${PATH}
DEB_SCONS_PREFIX=/opt/kde3
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
SCONS_CMD=scons
diff --git a/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/applications/yakuake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/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/ubuntu/maverick_automake/applications/yakuake/debian/rules b/ubuntu/maverick_automake/applications/yakuake/debian/rules
index 095defb87..bc8076b0e 100755
--- a/ubuntu/maverick_automake/applications/yakuake/debian/rules
+++ b/ubuntu/maverick_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
DEB_CONFIGURE_PREFIX := /opt/kde3
DEB_CONFIGURE_INFODIR := /opt/kde3/share/info