Rename all references to kde/HTML to tde/HTML in the Debian and Ubuntu packaging files

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-04-16 08:50:40 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-04-16 08:50:40 -0500
commit: 1d05dfa51ea2699e67b7b7b48339cc0baf4e249d (patch)
tree: 86ba1ea4a3b68f7118ad45291c21648ebf5c3766 /ubuntu/maverick/applications
parent: 2246bcd2933678a54e2290f2ce3b492e16d6cb9a (diff)
download: tde-packaging-1d05dfa51ea2699e67b7b7b48339cc0baf4e249d.tar.gz
tde-packaging-1d05dfa51ea2699e67b7b7b48339cc0baf4e249d.zip
192 files changed, 885 insertions, 885 deletions
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok.cmake/debian/changelog b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
index c2bf1ae55..1d7f087f0 100644
--- a/ubuntu/maverick/applications/amarok.cmake/debian/changelog
+++ b/ubuntu/maverick/applications/amarok.cmake/debian/changelog
@@ -1444,8 +1444,8 @@ amarok (1.1.1-1) unstable; urgency=low
 
 amarok (1.1.0-2) unstable; urgency=low
 
-  * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not
-    kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
+  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
+    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
 
  -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
 
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/amarok/debian/changelog b/ubuntu/maverick/applications/amarok/debian/changelog
index c2bf1ae55..1d7f087f0 100644
--- a/ubuntu/maverick/applications/amarok/debian/changelog
+++ b/ubuntu/maverick/applications/amarok/debian/changelog
@@ -1444,8 +1444,8 @@ amarok (1.1.1-1) unstable; urgency=low
 
 amarok (1.1.0-2) unstable; urgency=low
 
-  * Fix the location of translated amaroK handbook: kde/HTML/$LANG/amarok, not
-    kde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
+  * Fix the location of translated amaroK handbook: tde/HTML/$LANG/amarok, not
+    tde/HTML/$LANG directly. [debian/patches/proper-otherlang-handbook-path.patch]
 
  -- Adeodato Simó <asp16@alu.ua.es>  Mon, 27 Sep 2004 14:02:30 +0200
 
diff --git a/ubuntu/maverick/applications/basket/debian/basket-trinity.install b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
index 2b7a2867b..a24d7e924 100644
--- a/ubuntu/maverick/applications/basket/debian/basket-trinity.install
+++ b/ubuntu/maverick/applications/basket/debian/basket-trinity.install
@@ -121,8 +121,8 @@ opt/trinity/share/locale/nn/LC_MESSAGES/basket.mo
 opt/trinity/share/locale/it/LC_MESSAGES/basket.mo
 opt/trinity/share/locale/nl/LC_MESSAGES/basket.mo
 opt/trinity/share/config/magic/basket.magic
-opt/trinity/share/doc/kde/HTML/en/basket/index.cache.bz2
-opt/trinity/share/doc/kde/HTML/en/basket/index.docbook
+opt/trinity/share/doc/tde/HTML/en/basket/index.cache.bz2
+opt/trinity/share/doc/tde/HTML/en/basket/index.docbook
 opt/trinity/bin/basket
 opt/trinity/lib/trinity/basketthumbcreator.la
 opt/trinity/lib/trinity/libbasketpart.so
diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index 0e699603a..0527d1198 100755
--- a/ubuntu/maverick/applications/basket/debian/rules
+++ b/ubuntu/maverick/applications/basket/debian/rules
@@ -43,7 +43,7 @@ config.status: $(QUILT_STAMPFN)
 		--with-qt-libraries=/usr/share/qt3/lib \
 		--mandir=/opt/trinity/share/man \
 		--infodir=/opt/trinity/share/info \
-		--disable-debug kde_htmldir=/opt/trinity/share/doc/kde/HTML \
+		--disable-debug kde_htmldir=/opt/trinity/share/doc/tde/HTML \
 		--with-extra-libs=/opt/trinity/lib
 
 
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base b/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
index 1557d9d08..9efaff358 100644
--- a/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
+++ b/ubuntu/maverick/applications/gwenview/debian/gwenview.doc-base
@@ -5,5 +5,5 @@ Abstract: Gwenview is an image viewer for KDE.
 Section: Viewers
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/gwenview/index.html
-Files: /usr/share/doc/kde/HTML/en/gwenview/*.html
+Index: /usr/share/doc/tde/HTML/en/gwenview/index.html
+Files: /usr/share/doc/tde/HTML/en/gwenview/*.html
diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules
index 81fd87521..447938cef 100755
--- a/ubuntu/maverick/applications/gwenview/debian/rules
+++ b/ubuntu/maverick/applications/gwenview/debian/rules
@@ -37,5 +37,5 @@ install/gwenview-trinity::
 	install -p -D -m644 debian/gwenview.xpm debian/gwenview/opt/trinity/share/pixmaps/gwenview.xpm
 	install -p -D -m644 debian/gwenview.lintian debian/gwenview/opt/trinity/share/lintian/overrides/gwenview
 	
-	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/kde/HTML/en/gwenview; \
-	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/gwenview/index.docbook
+	cd $(CURDIR)/debian/gwenview/opt/trinity/share/doc/tde/HTML/en/gwenview; \
+	/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/gwenview/index.docbook
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k3b/debian/trinity.mk b/ubuntu/maverick/applications/k3b/debian/trinity.mk
index cd71193a1..17d35ae2c 100644
--- a/ubuntu/maverick/applications/k3b/debian/trinity.mk
+++ b/ubuntu/maverick/applications/k3b/debian/trinity.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 7f17e00f5..7a79ae048 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/applications/k9copy/debian/rules
@@ -29,7 +29,7 @@ debian/stamp-bootstrap:
 
 install/k9copy::
 	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
-	dh_link usr/share/doc/kde/HTML/en/k9copy usr/share/doc/k9copy/html
+	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
 
 build/k9copy::
 	docbook2x-man debian/k9copy.1.docbook
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kaffeine/debian/changelog b/ubuntu/maverick/applications/kaffeine/debian/changelog
index be405ad6c..2441c46c2 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/changelog
+++ b/ubuntu/maverick/applications/kaffeine/debian/changelog
@@ -152,7 +152,7 @@ kaffeine (0.8.4-2) unstable; urgency=low
 
   * Remove CMakeLists.txt
     - Problem during upgrade: trying to overwrite
-    `/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
+    `/usr/share/doc/tde/HTML/en/doc/CMakeLists.txt' (Closes: #419477)
 
  -- Mark Purcell <msp@debian.org>  Thu, 19 Apr 2007 05:50:00 +1000
 
@@ -772,7 +772,7 @@ kaffeine (0.4.2-1.1) unstable; urgency=low
 
   * NMU.
   * debian dir redone with permission of maintainer.
-  * Install docs into /usr/share/doc/kde/HTML. (Closes: #245062)
+  * Install docs into /usr/share/doc/tde/HTML. (Closes: #245062)
 
  -- Christopher L Cheney <ccheney@debian.org>  Thu, 22 Apr 2004 00:30:00 -0500
 
diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules
index 43e1e0d24..9dc73fe0f 100755
--- a/ubuntu/maverick/applications/kaffeine/debian/rules
+++ b/ubuntu/maverick/applications/kaffeine/debian/rules
@@ -44,7 +44,7 @@ install/kaffeine-trinity::
 	# file shipped by tdelibs
 	rm -f debian/kaffeine/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 	# Bogus, shouldn't be shipped..
-	rm -f debian/kaffeine/opt/trinity/share/doc/kde/HTML/en/doc/CMakeLists.txt
+	rm -f debian/kaffeine/opt/trinity/share/doc/tde/HTML/en/doc/CMakeLists.txt
 
 get-orig-source:
 	 @@dh_testdir
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1 b/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
index f69e8544d..8598644e6 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/ubuntu/maverick/applications/kchmviewer/debian/additions/kchmviewer.1
@@ -24,7 +24,7 @@ kchmviewer
 makes it possible to browse native Windows CHM files under KDE.
 .PP
 Complete documentation can be found in docbook format in
-/usr/share/doc/kde/HTML/<lang>/kchmviewer/ on this system.
+/usr/share/doc/tde/HTML/<lang>/kchmviewer/ on this system.
 .SH AUTHOR
  George Yunaev <gyunaev@ulduzsoft.com>
 .PP
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
index 893052e08..4ef41159b 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
+++ b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs
@@ -6,4 +6,4 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kcpuload/debian/changelog b/ubuntu/maverick/applications/kcpuload/debian/changelog
index a5b5f833f..44a891850 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/changelog
+++ b/ubuntu/maverick/applications/kcpuload/debian/changelog
@@ -242,7 +242,7 @@ kcpuload (1.90-1) unstable; urgency=low
   * Added a man page.
   * Added an icon in /usr/share/pixmaps/.
   * Moved HTML documentation from /usr/share/apps/kcpuload/docs/ to
-    /usr/share/doc/kde/HTML/en/kcpuload/ so that dwww can access it.
+    /usr/share/doc/tde/HTML/en/kcpuload/ so that dwww can access it.
 
  -- Ben Burton <benb@acm.org>  Wed, 21 Feb 2001 12:08:01 -0600
 
diff --git a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1 b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
index 62ac5317a..0eb630559 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
+++ b/ubuntu/maverick/applications/kcpuload/debian/kcpuload.1
@@ -51,7 +51,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kcpuload/\fP.
+\fI/usr/share/doc/tde/HTML/en/kcpuload/\fP.
 .SH AUTHOR
 KCPULoad was written by Markus Gustavsson <mighty@fragzone.se> and
 Ben Burton <bab@debian.org>
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules
index fae495f36..0e89a75fa 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/maverick/applications/kcpuload/debian/rules
@@ -147,8 +147,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules
index d47788b3a..2acd9ab0f 100755
--- a/ubuntu/maverick/applications/kdbusnotification/debian/rules
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules
@@ -146,8 +146,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
index 46c236af4..e3fbe7781 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links
@@ -1,97 +1,97 @@
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/da/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/da/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/da/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/da/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/da/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/da/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/da/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/da/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/da/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/de/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/de/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/de/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/de/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/de/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/de/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/de/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/de/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/de/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/et/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/et/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/et/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/et/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/et/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/et/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/et/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/et/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/et/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/fr/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/fr/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/fr/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/fr/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/fr/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/fr/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/fr/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/fr/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/fr/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/it/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/it/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/it/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/it/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/it/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/it/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/it/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/it/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/it/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/pt/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/pt/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/pt/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/pt/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/pt/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/pt/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/pt/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/pt/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/pt/kdiff3/white_space.png
 
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kde/HTML/sv/kdiff3/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kde/HTML/sv/kdiff3/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kde/HTML/sv/kdiff3/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kde/HTML/sv/kdiff3/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kde/HTML/sv/kdiff3/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/tde/HTML/sv/kdiff3/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/tde/HTML/sv/kdiff3/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/tde/HTML/sv/kdiff3/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/tde/HTML/sv/kdiff3/white_space.png
 
 
-/opt/trinity/share/doc/kde/HTML/en/common						/opt/trinity/share/doc/kdiff3-doc/html/common
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3-doc/html/new.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
-/opt/trinity/share/doc/kde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3-doc/html/white_space.png
+/opt/trinity/share/doc/tde/HTML/en/common						/opt/trinity/share/doc/kdiff3-doc/html/common
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3-doc/html/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3-doc/html/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3-doc/html/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3-doc/html/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3-doc/html/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3-doc/html/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3-doc/html/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3-doc/html/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3-doc/html/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3-doc/html/white_space.png
diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules
index e76778235..ef9215c19 100755
--- a/ubuntu/maverick/applications/kdiff3/debian/rules
+++ b/ubuntu/maverick/applications/kdiff3/debian/rules
@@ -72,13 +72,13 @@ install: build
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-		kde_htmldir=/opt/trinity/share/doc/kde/HTML
-	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/kdiff3
+		kde_htmldir=/opt/trinity/share/doc/tde/HTML
+	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/kdiff3
 	# that's not where we want to have a man page
-	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdiff3/kdiff3.1
+	rm -rf $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/kdiff3.1
 	# move HTML help /opt/trinity/share/doc/kdiff3/html/
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
-	mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
+	mv $(CURDIR)/debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
 	# move kdiff3.desktop to freedesktop.org conforming place
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
 	mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/kde/
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kdirstat/debian/changelog b/ubuntu/maverick/applications/kdirstat/debian/changelog
index 32917f933..e039356ea 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/changelog
+++ b/ubuntu/maverick/applications/kdirstat/debian/changelog
@@ -111,7 +111,7 @@ kdirstat (2.0.1-1) unstable; urgency=low
   * Added --disable-rpath to configure in rules.
   * Added check for noopt in DEBIAN_BUILD_OPTIONS in rules.
   * Changed doc/en/Makefile.in:95 to set kde_htmldir to
-    /share/doc/kde/HTML explicity. configure seems to pick up
+    /share/doc/tde/HTML explicity. configure seems to pick up
     /share/doc/HTML instead.
 
  -- Mike Schacht <mschacht@alumni.washington.edu>  Sat, 16 Nov 2002 17:56:14 -0600
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
index cae625265..d135c4257 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.install b/ubuntu/maverick/applications/kile/debian/kile-trinity.install
index 3dcddde6e..3d82db5d5 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.install
+++ b/ubuntu/maverick/applications/kile/debian/kile-trinity.install
@@ -3,6 +3,6 @@ opt/trinity/bin/kile
 /opt/trinity/share/apps/kconf_update
 /opt/trinity/share/apps/kile
 /opt/trinity/share/config.kcfg/kile.kcfg
-/opt/trinity/share/doc/kde/HTML/en/kile
+/opt/trinity/share/doc/tde/HTML/en/kile
 /opt/trinity/share/icons
 /opt/trinity/share/mimelnk/text/x-kilepr.desktop
diff --git a/ubuntu/maverick/applications/kile/debian/kile-trinity.links b/ubuntu/maverick/applications/kile/debian/kile-trinity.links
index fddb46448..ebafda14f 100644
--- a/ubuntu/maverick/applications/kile/debian/kile-trinity.links
+++ b/ubuntu/maverick/applications/kile/debian/kile-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kile /opt/trinity/share/apps/kile/doc
+/opt/trinity/share/doc/tde/HTML/en/kile /opt/trinity/share/apps/kile/doc
diff --git a/ubuntu/maverick/applications/kile/debian/kile.1 b/ubuntu/maverick/applications/kile/debian/kile.1
index aecbc7a62..bbcde5836 100644
--- a/ubuntu/maverick/applications/kile/debian/kile.1
+++ b/ubuntu/maverick/applications/kile/debian/kile.1
@@ -54,7 +54,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kile/\fP.
+\fI/usr/share/doc/tde/HTML/en/kile/\fP.
 .SH AUTHOR
 Kile was written by Pascal Brachet <pascal.brachet_at_club-internet.fr> and
 Jeroen Wijnhout <Jeroen.Wijnhout_at_kdemail.net> with contributions from
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-locate/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kmatplot/debian/debianrules b/ubuntu/maverick/applications/kmatplot/debian/debianrules
index 7cfb17bd9..5976c6894 100644
--- a/ubuntu/maverick/applications/kmatplot/debian/debianrules
+++ b/ubuntu/maverick/applications/kmatplot/debian/debianrules
@@ -23,7 +23,7 @@ exit;
 
 $TQTDIR="/usr/share/tqt3";
 $tde_prefix="/opt/trinity";
-$tde_htmldir="$tde_prefix/share/doc/kde/HTML";
+$tde_htmldir="$tde_prefix/share/doc/tde/HTML";
 $tde_icondir="$tde_prefix/share/icons";
 $tde_sounddir="$tde_prefix/share/sounds";
 $tde_datadir="$tde_prefix/share/apps";
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kmplayer/debian/changelog b/ubuntu/maverick/applications/kmplayer/debian/changelog
index 00d0559a0..26a6aed53 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/changelog
+++ b/ubuntu/maverick/applications/kmplayer/debian/changelog
@@ -19,7 +19,7 @@ kmplayer-trinity (1:0.10.0c-0ubuntu1) intrepid; urgency=low
 
 kmplayer (1:0.10.0c-0ubuntu3) hardy; urgency=low
 
-  * Drop /usr/share/doc/kde/HTML from kmplayer, as it's already in
+  * Drop /usr/share/doc/tde/HTML from kmplayer, as it's already in
     kmplayer-doc (LP: #210443).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Apr 2008 02:22:14 +0100
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
index 8b51d74fa..289b430dc 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
 configkde=--disable-debug --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/dirs b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
index d1b90caf8..48362f5e4 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/dirs
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/dirs
@@ -1,2 +1,2 @@
 usr/trinity/bin
-usr/share/doc/kde/HTML/en
+usr/share/doc/tde/HTML/en
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetload/debian/changelog b/ubuntu/maverick/applications/knetload/debian/changelog
index d8577dc0d..d2a0d2a80 100644
--- a/ubuntu/maverick/applications/knetload/debian/changelog
+++ b/ubuntu/maverick/applications/knetload/debian/changelog
@@ -235,7 +235,7 @@ knetload (1.91-1) unstable; urgency=low
   * Added a man page.
   * Added an icon in /usr/share/pixmaps/.
   * Moved HTML documentation from /usr/share/apps/knetload/docs/ to
-    /usr/share/doc/kde/HTML/en/knetload/ so that dwww can access it.
+    /usr/share/doc/tde/HTML/en/knetload/ so that dwww can access it.
 
  -- Ben Burton <benb@acm.org>  Wed, 21 Feb 2001 12:08:16 -0600
 
diff --git a/ubuntu/maverick/applications/knetload/debian/knetload.1 b/ubuntu/maverick/applications/knetload/debian/knetload.1
index 389c46593..30b6c4e4d 100644
--- a/ubuntu/maverick/applications/knetload/debian/knetload.1
+++ b/ubuntu/maverick/applications/knetload/debian/knetload.1
@@ -50,7 +50,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can
 read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/knetload/\fP.
+\fI/usr/share/doc/tde/HTML/en/knetload/\fP.
 .SH AUTHOR
 KNetLoad was written by Flameeyes <dgp85@users.sourceforge.net>, 
 Markus Gustavsson <mighty@fragzone.se> and Ben Burton <bab@debian.org>.
diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules
index 843a04ceb..c420d1160 100755
--- a/ubuntu/maverick/applications/knetload/debian/rules
+++ b/ubuntu/maverick/applications/knetload/debian/rules
@@ -148,8 +148,8 @@ install: build
 
 	# Install standard documentation links.
 	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	      opt/trinity/share/doc/$$pkg/html; \
 	  fi; \
 	done
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs
index ba70ea3fb..be2d7b174 100644
--- a/ubuntu/maverick/applications/knights/debian/debiandirs
+++ b/ubuntu/maverick/applications/knights/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/usr/share/man
 export qtdir=/usr/share/qt3
 export kde_cgidir=/usr/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/kde/HTML
+export kde_htmldir=/usr/share/doc/tde/HTML
 configkde=--disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir)
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
index d09854f82..53c516a66 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
index e0960957d..a37b11ace 100644
--- a/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/chalk-data-trinity.install
@@ -36,267 +36,267 @@ debian/tmp/opt/trinity/share/apps/chalkplugins/substrate.rc
 debian/tmp/opt/trinity/share/apps/chalkplugins/wetplugin.rc
 debian/tmp/opt/trinity/share/apps/chalk/scripts
 debian/tmp/opt/trinity/share/apps/chalk/templates
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-dialogs.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-menus.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-palettes.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/commands-toolbars.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/createdocument.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/credits.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-autocontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-blur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-brightnesscontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-bumpmap.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-coloradjustment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-colortoalpha.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-customconvolution.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-desaturate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgebottom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgeleft.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-edgeright.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embossall.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embosshorvert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-embossvariable.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-gaussianblur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-gaussiannoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-invert.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-lenscorrection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-maximizechannel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-meanremoval.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-minimizechannel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-oilpaint.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-pixelize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-raindrops.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-randomnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-randompick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-roundcorners.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-sharpen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-smalltiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-sobel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-topedge.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/crocusses-wave.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers-plugins.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/developers-scripting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-addpalette.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-blur.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-brightnesscontrast.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-bumpmap.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-coloradjustment.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colorrange.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortoalpha.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-colortransfer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-convertimagetype.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-convertlayertype.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-cubism.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-customconvolution.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-documentinformation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-dropshadow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-emboss.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-filtersgallery.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-gaussiannoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-histogram.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imageproperties.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imagerestoration.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-imagesize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-layerproperties.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-layersize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-lenscorrection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-newadjustmentlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-newlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-oilpaint.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-pixelize.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-raindrops.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-randomnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-randompick.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-rotateimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-rotatelayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-roundcorners.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-separateimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-shearimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-shearlayer.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-smalltiles.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-sobel.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-substrate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-unsharpmask.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-waveletnoise.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/dialogs-wave.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/faq.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/installation.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/introduction.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mainscreen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-burn.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-burn.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-color.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-darken.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-darken.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-divide.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-dodge.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-hue.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-hue.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-lighten.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-multiply.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-multiply.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-normal.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-original.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-overlay.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-saturation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-screen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-screen.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-value.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/mountains-value.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/newimage.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-gray.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-hsv.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-palettes.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-rgb.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-colors-watercolors.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-colorpicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-contiguousfill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-crop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-fill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-gradient.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-histogram.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-overview.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-paintwithfilters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectcontiguous.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectmagnetic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-select.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-selectsimilar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-star.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-controlbox-transform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-layers-layers.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/palettes-layers-scriptsmanager.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-color.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-display.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-general.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-grid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-performance.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-sidebar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/preferences-tablet.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/README.SCREENSHOTS
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/README.SCREENSHOTS
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/settings.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushesandstuff.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-autobrush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-custombrush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-brushshapes-predefined.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-gradients.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-patterns-custompattern.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-brushes-patterns.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-edit.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-file.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-chalk.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-navigation.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomin.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomin.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbars-button-zoomout.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/toolbar-transformationtools.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-bezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-brush.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-colorpicker.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-contiguousfill.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-crop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-duplicate.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-ellipse.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-eraseselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-gradient.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-line.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-move.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintselection.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintwithfilters-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-paintwithfilters.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-pan.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivegrid.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivetransform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-perspectivetransform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-polygon.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-polyline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-rectangle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectbezier.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectcontiguous.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectelliptical.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectmagnetic.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectoutline.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectpolygonal.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectrectangular.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-selectsimilar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-star.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-text.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-transform.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tool-zoom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-quick-starts.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-11.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-12.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-13.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-select-layer-sample.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-starting.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/tutorial-tablet.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-colorspaces.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-filters.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-images.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-layers.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections-6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-selections.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/chalk/using-views.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-dialogs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-palettes.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/commands-toolbars.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/createdocument.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/credits.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-autocontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-blur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-brightnesscontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-bumpmap.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-coloradjustment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-colortoalpha.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-customconvolution.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-desaturate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgebottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgeleft.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-edgeright.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embossall.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embosshorvert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-embossvariable.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-gaussianblur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-gaussiannoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-invert.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-lenscorrection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-maximizechannel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-meanremoval.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-minimizechannel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-oilpaint.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-pixelize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-raindrops.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-randomnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-randompick.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-roundcorners.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-sharpen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-smalltiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-sobel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-topedge.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/crocusses-wave.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers-plugins.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/developers-scripting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-addpalette.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-blur.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-brightnesscontrast.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-bumpmap.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-coloradjustment.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colorrange.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortoalpha.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-colortransfer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-convertimagetype.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-convertlayertype.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-cubism.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-customconvolution.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-documentinformation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-dropshadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-emboss.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-filtersgallery.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-gaussiannoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-histogram.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imageproperties.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imagerestoration.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-imagesize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-layerproperties.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-layersize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-lenscorrection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-newadjustmentlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-newlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-oilpaint.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-pixelize.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-raindrops.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-randomnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-randompick.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-rotateimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-rotatelayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-roundcorners.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-separateimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-shearimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-shearlayer.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-smalltiles.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-sobel.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-substrate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-unsharpmask.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-waveletnoise.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/dialogs-wave.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/faq.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/installation.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/introduction.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mainscreen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-burn.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-burn.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-darken.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-darken.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-divide.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-dodge.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-hue.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-hue.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-lighten.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-multiply.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-multiply.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-normal.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-original.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-overlay.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-saturation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-screen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-screen.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-value.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/mountains-value.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/newimage.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-gray.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-hsv.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-palettes.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-rgb.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-colors-watercolors.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-colorpicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-contiguousfill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-crop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-fill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-gradient.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-histogram.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-overview.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-paintwithfilters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectcontiguous.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectmagnetic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-select.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-selectsimilar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-star.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-controlbox-transform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-layers-layers.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/palettes-layers-scriptsmanager.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-color.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-display.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-general.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-grid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-performance.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-sidebar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/preferences-tablet.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/README.SCREENSHOTS
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/README.SCREENSHOTS
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/settings.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushesandstuff.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-autobrush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-custombrush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-brushshapes-predefined.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-gradients.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-patterns-custompattern.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-brushes-patterns.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-edit.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-file.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-chalk.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-navigation.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomin.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomin.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbars-button-zoomout.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/toolbar-transformationtools.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-bezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-brush.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-colorpicker.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-contiguousfill.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-crop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-duplicate.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-ellipse.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-eraseselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-gradient.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-line.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-move.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintselection.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintwithfilters-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-paintwithfilters.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-pan.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivegrid.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivetransform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-perspectivetransform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-polygon.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-polyline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-rectangle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectbezier.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectcontiguous.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectelliptical.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectmagnetic.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectoutline.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectpolygonal.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectrectangular.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-selectsimilar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-star.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-text.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-transform.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tool-zoom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts12.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-quick-starts.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-11.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-12.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-13.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-select-layer-sample.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-starting.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/tutorial-tablet.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-colorspaces.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-filters.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-images.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-layers.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections-6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-selections.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/chalk/using-views.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/chalk.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/chalk.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/chalk.png
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index 4aba97f07..e2147ded3 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -51,8 +51,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kword/.
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kword/.
  .
  This package is part of the KDE Office Suite.
 
diff --git a/ubuntu/maverick/applications/koffice/debian/control.in b/ubuntu/maverick/applications/koffice/debian/control.in
index 6977987da..620c2dacb 100644
--- a/ubuntu/maverick/applications/koffice/debian/control.in
+++ b/ubuntu/maverick/applications/koffice/debian/control.in
@@ -45,8 +45,8 @@ Description: KDE Office Suite documentation in HTML format [Trinity]
  format so it can be read with any web browser.
  .
  The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/kword/.
+ /usr/share/doc/tde/HTML/<language>/<app>/, for instance
+ /usr/share/doc/tde/HTML/en/kword/.
  .
  This package is part of the KDE Office Suite.
 
diff --git a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
index 653f730e0..a3649c378 100644
--- a/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/karbon-trinity.install
@@ -49,9 +49,9 @@ debian/tmp/opt/trinity/lib/libtdeinit_karbon.so
 debian/tmp/opt/trinity/share/applications/kde/karbon.desktop
 debian/tmp/opt/trinity/share/apps/karbon
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/karbon_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/karbon/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/karbon/*.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
index 443a6acbf..90c1a6824 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kchart-trinity.install
@@ -25,10 +25,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_kchart.so
 debian/tmp/opt/trinity/share/applications/kde/kchart.desktop
 debian/tmp/opt/trinity/share/apps/kchart
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kchart_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kchart/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kchart.1 b/ubuntu/maverick/applications/koffice/debian/kchart.1
index 412727577..0b2c8a4c3 100644
--- a/ubuntu/maverick/applications/koffice/debian/kchart.1
+++ b/ubuntu/maverick/applications/koffice/debian/kchart.1
@@ -43,7 +43,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kchart/\fP.
+\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
 .SH AUTHOR
 KChart was written by Kalle Dalheimer <kalle@kde.org>,
 Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
diff --git a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
index a0b259950..3ff92c525 100644
--- a/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kexi-trinity.install
@@ -244,22 +244,22 @@ debian/tmp/opt/trinity/share/apps/kexi/scripts/importxhtml/ImportXHTML.rc
 debian/tmp/opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py
 debian/tmp/opt/trinity/share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kexi_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/basics.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/building.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/comparing.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/configuration.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/contact-example.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/credits.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/database.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/designingforms.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/enteringdataintotables.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/enteringdatausingforms.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/intro.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/menus.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kexi/querydesigning.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/basics.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/building.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/comparing.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/configuration.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/contact-example.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/credits.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/database.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/designingforms.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/enteringdataintotables.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/enteringdatausingforms.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/intro.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/menus.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kexi/querydesigning.docbook
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite2.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kexiproject_shortcut.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
index 7c09d82a4..1339cfb67 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kformula-trinity.install
@@ -10,10 +10,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_kformula.so
 debian/tmp/opt/trinity/share/applications/kde/kformula.desktop
 debian/tmp/opt/trinity/share/apps/kformula
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kformula_konqi.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kformula/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kformula/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kformula.1 b/ubuntu/maverick/applications/koffice/debian/kformula.1
index 6f9dc87b6..801df0727 100644
--- a/ubuntu/maverick/applications/koffice/debian/kformula.1
+++ b/ubuntu/maverick/applications/koffice/debian/kformula.1
@@ -64,7 +64,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kformula/\fP.
+\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
 .SH AUTHOR
 KFormula was written by Andrea Rizzi <rizzi@kde.org>,
 Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
index 020e92d24..02f3c0322 100644
--- a/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kivio-data-trinity.install
@@ -3,9 +3,9 @@ debian/tmp/opt/trinity/share/applications/kde/kivio.desktop
 debian/tmp/opt/trinity/share/apps/kivio
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kivio_konqi.desktop
 debian/tmp/opt/trinity/share/config.kcfg/kivio.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kivio/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kivio/*.docbook
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kivio.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kivio.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kivio.png
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
index 422bb81b2..2f17354e2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.install
@@ -2,11 +2,11 @@ debian/tmp/opt/trinity/share/applications/kde/koffice.desktop
 debian/tmp/opt/trinity/share/apps/koffice
 debian/tmp/opt/trinity/share/apps/kofficewidgets
 debian/tmp/opt/trinity/share/apps/xsltfilter
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/CookBook.odt
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice/TODO
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/CookBook.odt
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice/TODO
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/abs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/brackets.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/frac.png
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
index 2767d3063..f85e205f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-data-trinity.links
@@ -1 +1 @@
-opt/trinity/share/doc/kde/HTML/en/koffice opt/trinity/share/doc/koffice-data/html
+opt/trinity/share/doc/tde/HTML/en/koffice opt/trinity/share/doc/koffice-data/html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
index 7a42a3655..b0df87ed7 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-libs-trinity.links
@@ -1 +1 @@
-opt/trinity/share/doc/kde/HTML/en/koffice opt/trinity/share/doc/koffice-libs/html
+opt/trinity/share/doc/tde/HTML/en/koffice opt/trinity/share/doc/koffice-libs/html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
index 73ebae1c4..bedc6cae9 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kchart
@@ -7,6 +7,6 @@ Abstract: KChart is an application for drawing bar graphs, pie charts
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kchart/index.html
-Files: /usr/share/doc/kde/HTML/en/kchart/*.html
+Index: /usr/share/doc/tde/HTML/en/kchart/index.html
+Files: /usr/share/doc/tde/HTML/en/kchart/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
index 313188210..65271eda0 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kformula
@@ -5,5 +5,5 @@ Abstract: KFormula is used to layout formulas.
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kformula/index.html
-Files: /usr/share/doc/kde/HTML/en/kformula/*.html
+Index: /usr/share/doc/tde/HTML/en/kformula/index.html
+Files: /usr/share/doc/tde/HTML/en/kformula/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
index ebee90002..0b6a7dbaa 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kivio
@@ -5,6 +5,6 @@ Abstract: Kivio is the KOffice flowchart and diagram creation tool.
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kivio/index.html
-Files: /usr/share/doc/kde/HTML/en/kivio/*.html
+Index: /usr/share/doc/tde/HTML/en/kivio/index.html
+Files: /usr/share/doc/tde/HTML/en/kivio/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
index b14560532..f6b06085b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.koffice
@@ -6,6 +6,6 @@ Abstract: KOffice is an integrated office suite for the K Desktop
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/koffice/index.html
-Files: /usr/share/doc/kde/HTML/en/koffice/*.html
+Index: /usr/share/doc/tde/HTML/en/koffice/index.html
+Files: /usr/share/doc/tde/HTML/en/koffice/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
index 6fe07417b..561d95388 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kpresenter
@@ -6,5 +6,5 @@ Abstract: KPresenter is the presentations program in the KOffice suite of
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kpresenter/index.html
-Files: /usr/share/doc/kde/HTML/en/kpresenter/*.html
+Index: /usr/share/doc/tde/HTML/en/kpresenter/index.html
+Files: /usr/share/doc/tde/HTML/en/kpresenter/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
index 5c93daab5..1e5b4ef84 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kspread
@@ -5,5 +5,5 @@ Abstract: KSpread is a full featured spreadsheet program.
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kspread/index.html
-Files: /usr/share/doc/kde/HTML/en/kspread/*.html
+Index: /usr/share/doc/tde/HTML/en/kspread/index.html
+Files: /usr/share/doc/tde/HTML/en/kspread/*.html
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
index ef1a05cd8..4d4e5727b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kugar
@@ -7,6 +7,6 @@ Abstract: Kugar is a template-based XML report engine.  Kugar Report
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kugar/index.html
-Files: /usr/share/doc/kde/HTML/en/kugar/*.html
+Index: /usr/share/doc/tde/HTML/en/kugar/index.html
+Files: /usr/share/doc/tde/HTML/en/kugar/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
index d68ad856d..09953babd 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.kword
@@ -6,6 +6,6 @@ Abstract: KWord is a complete word-processing and simple desktop
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/kword/index.html
-Files: /usr/share/doc/kde/HTML/en/kword/*.html
+Index: /usr/share/doc/tde/HTML/en/kword/index.html
+Files: /usr/share/doc/tde/HTML/en/kword/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
index 0eaa05928..9e168a19f 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc-html.doc-base.thesaurus
@@ -7,6 +7,6 @@ Abstract: KThesaurus lists words related to a search term and offers a
 Section: Office
 
 Format: HTML
-Index: /usr/share/doc/kde/HTML/en/thesaurus/index.html
-Files: /usr/share/doc/kde/HTML/en/thesaurus/*.html
+Index: /usr/share/doc/tde/HTML/en/thesaurus/index.html
+Files: /usr/share/doc/tde/HTML/en/thesaurus/*.html
 
diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
index 5103d1ea6..a3aaf470b 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koffice-apidocs/*	/opt/trinity/share/doc/kde/HTML/en/koffice-apidocs
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koffice-apidocs/*	/opt/trinity/share/doc/tde/HTML/en/koffice-apidocs
diff --git a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
index c0399020b..165f4a36c 100644
--- a/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koshell-trinity.install
@@ -6,10 +6,10 @@ debian/tmp/opt/trinity/lib/libtdeinit_koshell.so
 debian/tmp/opt/trinity/share/applications/kde/koshell.desktop
 debian/tmp/opt/trinity/share/apps/koshell/koshellui.rc
 debian/tmp/opt/trinity/share/config.kcfg/koshell.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/koshell/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/koshell/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/koshell.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
index d9667f9c6..ba215cc43 100644
--- a/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kplato-trinity.install
@@ -30,32 +30,32 @@ debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.directory
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/Plain.desktop
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.source/8HourDay-40HourWeek.kplatot
 debian/tmp/opt/trinity/share/apps/kplato/templates/Simple/.source/Plain.kplatot
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/commands.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure2.1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/configure-wbs.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/definitions.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-accounts1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-accounts.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-calendar.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-resources1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-resources.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/edit-worktime.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/index.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/mainwindow1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/mainwindow.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/options.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/project-settings.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kplato/wbs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/commands.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure2.1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/configure-wbs.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/definitions.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-accounts1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-accounts.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-calendar.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-resources1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-resources.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/edit-worktime.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/mainwindow1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/mainwindow.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/options.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/project-settings.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kplato/wbs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kplato.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kplato.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kplato.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
index de1c92750..3322113fc 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter-data-trinity.install
@@ -2,10 +2,10 @@ debian/kpresenter.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/share/applications/kde/kpresenter.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kpresenter_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kpresenter
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kpresenter/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kpresenter/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kpresenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kpresenter.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kpresenter.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kpresenter.1 b/ubuntu/maverick/applications/koffice/debian/kpresenter.1
index 2fdde662c..7eb96d7f2 100644
--- a/ubuntu/maverick/applications/koffice/debian/kpresenter.1
+++ b/ubuntu/maverick/applications/koffice/debian/kpresenter.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kpresenter/\fP.
+\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
 .SH AUTHOR
 KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
 Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
index 6a7228fd3..5988b97be 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kspread-trinity.install
@@ -41,10 +41,10 @@ debian/tmp/opt/trinity/lib/libkspreadcommon.so.*
 debian/tmp/opt/trinity/share/applications/kde/kspread.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kspread_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kspread
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspread/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspread/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kspread.1 b/ubuntu/maverick/applications/koffice/debian/kspread.1
index 4dd1bb8a0..3ae324559 100644
--- a/ubuntu/maverick/applications/koffice/debian/kspread.1
+++ b/ubuntu/maverick/applications/koffice/debian/kspread.1
@@ -46,7 +46,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kspread/\fP.
+\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
 .SH AUTHOR
 KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
 <montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
index d0e29dd5c..1ce19b21c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus-trinity.install
@@ -5,8 +5,8 @@ debian/tmp/opt/trinity/lib/trinity/libthesaurustool.so
 debian/tmp/opt/trinity/lib/libtdeinit_kthesaurus.so
 debian/tmp/opt/trinity/share/applnk/Office/KThesaurus.desktop
 debian/tmp/opt/trinity/share/apps/thesaurus
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1 b/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
index ec74f549b..f5fba2153 100644
--- a/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
+++ b/ubuntu/maverick/applications/koffice/debian/kthesaurus.1
@@ -44,7 +44,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/thesaurus/\fP.
+\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
 .SH AUTHOR
 KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
 .br
diff --git a/ubuntu/maverick/applications/koffice/debian/kudesigner.1 b/ubuntu/maverick/applications/koffice/debian/kudesigner.1
index 5b65e0431..b293d0016 100644
--- a/ubuntu/maverick/applications/koffice/debian/kudesigner.1
+++ b/ubuntu/maverick/applications/koffice/debian/kudesigner.1
@@ -47,7 +47,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kugar/\fP.
+\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
 KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
 Joseph Wenninger <jowenn@jowenn.at>.
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
index c12230725..8dd8860bb 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kugar-trinity.install
@@ -20,10 +20,10 @@ debian/tmp/opt/trinity/share/applications/kde/kudesigner.desktop
 debian/tmp/opt/trinity/share/applications/kde/kugar.desktop
 debian/tmp/opt/trinity/share/apps/kudesigner
 debian/tmp/opt/trinity/share/apps/kugar
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kugar/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kugar/*.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/mimetypes/kugardata.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/mimetypes/kugardata.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kugar.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kugar.1 b/ubuntu/maverick/applications/koffice/debian/kugar.1
index af62a90fc..c3903a3d1 100644
--- a/ubuntu/maverick/applications/koffice/debian/kugar.1
+++ b/ubuntu/maverick/applications/koffice/debian/kugar.1
@@ -59,7 +59,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kugar/\fP.
+\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
 .SH AUTHOR
 Kugar was written by Keith Davis (Mutiny Bay Software)
 <info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
diff --git a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
index 4d2ff77a9..32f9e2f9c 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/kword-data-trinity.install
@@ -2,10 +2,10 @@ debian/kword.xpm opt/trinity/share/pixmaps
 debian/tmp/opt/trinity/share/applications/kde/kword.desktop
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/kword_konqi.desktop
 debian/tmp/opt/trinity/share/apps/kword
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.docbook
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kword/*.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kword/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
diff --git a/ubuntu/maverick/applications/koffice/debian/kword.1 b/ubuntu/maverick/applications/koffice/debian/kword.1
index 36be4f244..c191e2978 100644
--- a/ubuntu/maverick/applications/koffice/debian/kword.1
+++ b/ubuntu/maverick/applications/koffice/debian/kword.1
@@ -48,7 +48,7 @@ from the command-line.
 .PP
 If the KDE Help Centre is not installed then you can install the package
 \fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/kde/HTML/en/kword/\fP.
+\fI/usr/share/doc/tde/HTML/en/kword/\fP.
 .SH AUTHOR
 KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
 <weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules
index 0c94bbdc9..6493acaff 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/maverick/applications/koffice/debian/rules
@@ -36,8 +36,8 @@ install/chalk-data-trinity::
 
 common-binary-post-install-arch::
 	for pkg in `dh_listpackages`; do \
-		if test -d debian/$$pkg/usr/share/doc/kde/HTML/en/$$pkg; then \
-		dh_link -p$$pkg usr/share/doc/kde/HTML/en/$$pkg \
+		if test -d debian/$$pkg/usr/share/doc/tde/HTML/en/$$pkg; then \
+		dh_link -p$$pkg usr/share/doc/tde/HTML/en/$$pkg \
 		usr/share/doc/$$pkg/html; \
 		fi; \
 		dh_installmime -p$$pkg; \
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
index 346ca42aa..ca10af6cf 100644
--- a/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
+++ b/ubuntu/maverick/applications/konversation/debian/konversation-trinity.install
@@ -6,14 +6,14 @@ debian/tmp/opt/trinity/share/apps/konversation/konversationui.rc
 debian/tmp/opt/trinity/share/apps/konversation/scripts/*
 debian/tmp/opt/trinity/share/apps/konversation/themes/*
 debian/tmp/opt/trinity/share/config.kcfg/konversation.kcfg
-debian/tmp/opt/trinity/share/doc/kde/HTML/da/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/es/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/et/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/it/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/pt/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/ru/konversation/*
-debian/tmp/opt/trinity/share/doc/kde/HTML/sv/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/da/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/es/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/et/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/it/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/pt/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/ru/konversation/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/sv/konversation/*
 debian/tmp/opt/trinity/share/icons/*
 debian/tmp/opt/trinity/share/locale/*
 debian/tmp/opt/trinity/share/services/konvirc.protocol
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links b/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
index e80a6f57c..78a8ee9df 100644
--- a/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
+++ b/ubuntu/maverick/applications/kpicosim/debian/kpicosim-trinity.links
@@ -1 +1 @@
-/opt/trinity/share/doc/kde/HTML/en/kpicosim /opt/trinity/share/apps/kpicosim/doc
+/opt/trinity/share/doc/tde/HTML/en/kpicosim /opt/trinity/share/apps/kpicosim/doc
diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules
index 8d66d9609..4f9b2c73a 100755
--- a/ubuntu/maverick/applications/kpicosim/debian/rules
+++ b/ubuntu/maverick/applications/kpicosim/debian/rules
@@ -94,8 +94,8 @@ install: build
 	 fi; \
 	 mv debian/$$pkg/opt/trinity/share/doc/HTML debian/$$pkg/opt/trinity/share/doc/kde/; \
 	 fi; \
-	 if test -d debian/$$pkg/opt/trinity/share/doc/kde/HTML/en/$$pkg; then \
-	 dh_link -p$$pkg opt/trinity/share/doc/kde/HTML/en/$$pkg \
+	 if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
+	 dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
 	 opt/trinity/share/doc/$$pkg/html; \
 	 fi; \
 	done
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
index 888f4be38..345cc0a61 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave.cmake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules
index 4ec00e4dc..775c1387d 100755
--- a/ubuntu/maverick/applications/kradio/debian/rules
+++ b/ubuntu/maverick/applications/kradio/debian/rules
@@ -48,7 +48,7 @@ config.status: configure
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-rpath --disable-debug \
-		kde_htmldir=/usr/share/doc/kde/HTML
+		kde_htmldir=/usr/share/doc/tde/HTML
 															
 
 
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
index 58237d430..28fef39be 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs
@@ -6,5 +6,5 @@ export mandir=/opt/trinity/share/man
 export qtdir=/opt/trinity/share/qt3
 export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/opt/trinity/share/doc/kde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
 configkde=--with-extra-libs=/opt/trinity/lib --disable-debug --disable-rpath --prefix=$(kde_prefix) --sysconfdir=$(sysconfdir) --includedir=$(kde_includedir) --infodir=$(infodir) --mandir=$(mandir) --with-qt-dir=$(qtdir) 
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
index dfe8aa8ab..f2d481ccf 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs
+++ b/ubuntu/maverick/applications/ktechlab/debian/debiandirs
@@ -7,7 +7,7 @@ export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_moduledir=/opt/trinity/lib/trinity
 export kde_appsdir=/opt/trinity/share/applnk
 export kde_datadir=/opt/trinity/share/apps
-export kde_htmldir=/opt/trinity/share/doc/kde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
 export kde_icondir=/opt/trinity/share/icons
 export kde_locale=/opt/trinity/share/locale
 export kde_mimedir=/opt/trinity/share/mimelnk
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index d09854f82..53c516a66 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules
index 00d853fcc..22a49ef44 100755
--- a/ubuntu/maverick/applications/kvpnc/debian/rules
+++ b/ubuntu/maverick/applications/kvpnc/debian/rules
@@ -28,7 +28,7 @@ install/kvpnc-trinity::
 	chmod 0755 debian/kvpnc-trinity/opt/trinity/share/apps/kvpnc/ping_check.sh
 
 	# remove uneeded dir
-	rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/kde/HTML/kvpnc
+	rm -rf debian/kvpnc-trinity/opt/trinity/share/doc/tde/HTML/kvpnc
 
 	# install desktop file in applications
 	install -D -p -m0644 src/kvpnc.desktop \
diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules
index 6be58cd48..e3b2d82e6 100755
--- a/ubuntu/maverick/applications/potracegui/debian/rules
+++ b/ubuntu/maverick/applications/potracegui/debian/rules
@@ -78,7 +78,7 @@ install: build
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/potracegui-trinity
 	mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde
-	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/kde/HTML
+	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/HTML $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/doc/tde/HTML
 	mkdir -p $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics
 	mv $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities/potracegui.desktop $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Graphics/
 	rmdir $(CURDIR)/debian/potracegui-trinity/opt/trinity/share/applnk/Utilities
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/rosegarden/debian/changelog b/ubuntu/maverick/applications/rosegarden/debian/changelog
index da6daabcb..a44c404be 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/changelog
+++ b/ubuntu/maverick/applications/rosegarden/debian/changelog
@@ -33,7 +33,7 @@ rosegarden (1:1.7.0-1ubuntu2) intrepid; urgency=low
 rosegarden (1:1.7.0-1ubuntu1) intrepid; urgency=low
 
   * Merge from Debian unstable. (LP: #225849) Remaining Ubuntu changes:
-    - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
       help documentation.
     - Change fftw3-dev to libfftw3-dev.
     - Update maintainer field as per spec.
@@ -62,7 +62,7 @@ rosegarden (1:1.6.1-2) unstable; urgency=low
 rosegarden (1:1.6.1-1ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable, remaining changes:
-    - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
       help documentation.
     - Change fftw3-dev to libfftw3-dev.
     - Update maintainer field as per spec.
@@ -88,7 +88,7 @@ rosegarden (1:1.6.0-1ubuntu2) hardy; urgency=low
 rosegarden (1:1.6.0-1ubuntu1) hardy; urgency=low
 
   * Merge from Debian unstable, remaining changes:
-    Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
+    Add usr/share/doc/tde/HTML to rosegarden-data, to provide online
     help documentation.
     debian/control:
     + Update maintainer field.   
@@ -109,7 +109,7 @@ rosegarden (1:1.6.0-1) unstable; urgency=low
 rosegarden (1:1.5.1-3ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable, remaining changes:
-    - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
       help documentation.
     - Update maintainer field in debian/control.
 
@@ -129,7 +129,7 @@ rosegarden (1:1.5.1-3) unstable; urgency=low
 rosegarden (1:1.5.1-2ubuntu1) gutsy; urgency=low
 
   * Merge from Debian unstable. Remaining Ubuntu changes:
-    - Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+    - Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
       help documentation.
     - Changed maintainer field to MOTU.
 
@@ -178,7 +178,7 @@ rosegarden (1:1.5.0-1) unstable; urgency=low
 
 rosegarden (1:1.4.0-1ubuntu1) feisty; urgency=low
 
-  * Add usr/share/doc/kde/HTML/ to rosegarden-data, to provide online
+  * Add usr/share/doc/tde/HTML/ to rosegarden-data, to provide online
     help documentation. (Closes LP: #77079)
   * Changed maintainer field to MOTU.
 
diff --git a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
index d066a2d8f..59a4a5943 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
+++ b/ubuntu/maverick/applications/rosegarden/debian/rosegarden-data-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/apps
 debian/tmp/opt/trinity/share/icons
 debian/tmp/opt/trinity/share/locale
-debian/tmp/opt/trinity/share/doc/kde/HTML/
+debian/tmp/opt/trinity/share/doc/tde/HTML/
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
index de46528da..7064c79c0 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
+++ b/ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install
@@ -14,19 +14,19 @@ opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
 opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
-opt/trinity/share/doc/kde/HTML/en/guidance/index.cache.bz2
-opt/trinity/share/doc/kde/HTML/en/guidance/index.html
-opt/trinity/share/doc/kde/HTML/en/guidance/introduction.html
-opt/trinity/share/doc/kde/HTML/en/guidance/using-testapp.html
-opt/trinity/share/doc/kde/HTML/en/guidance/commands.html
-opt/trinity/share/doc/kde/HTML/en/guidance/developers.html
-opt/trinity/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
-opt/trinity/share/doc/kde/HTML/en/guidance/faq.html
-opt/trinity/share/doc/kde/HTML/en/guidance/credits.html
-opt/trinity/share/doc/kde/HTML/en/guidance/installation.html
-opt/trinity/share/doc/kde/HTML/en/guidance/requirements.html
-opt/trinity/share/doc/kde/HTML/en/guidance/compilation.html
-opt/trinity/share/doc/kde/HTML/en/guidance/configuration.html
+opt/trinity/share/doc/tde/HTML/en/guidance/index.cache.bz2
+opt/trinity/share/doc/tde/HTML/en/guidance/index.html
+opt/trinity/share/doc/tde/HTML/en/guidance/introduction.html
+opt/trinity/share/doc/tde/HTML/en/guidance/using-testapp.html
+opt/trinity/share/doc/tde/HTML/en/guidance/commands.html
+opt/trinity/share/doc/tde/HTML/en/guidance/developers.html
+opt/trinity/share/doc/tde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+opt/trinity/share/doc/tde/HTML/en/guidance/faq.html
+opt/trinity/share/doc/tde/HTML/en/guidance/credits.html
+opt/trinity/share/doc/tde/HTML/en/guidance/installation.html
+opt/trinity/share/doc/tde/HTML/en/guidance/requirements.html
+opt/trinity/share/doc/tde/HTML/en/guidance/compilation.html
+opt/trinity/share/doc/tde/HTML/en/guidance/configuration.html
 opt/trinity/share/applications/kde/serviceconfig.desktop
 opt/trinity/share/applications/kde/userconfig.desktop
 opt/trinity/share/applications/kde/mountconfig.desktop
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules
index b21fb6bd9..0f7236aad 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/maverick/applications/tellico/debian/rules
@@ -70,7 +70,7 @@ config.status: configure
 	
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	kde_htmldir=\$${prefix}/share/doc/kde/HTML \
+	kde_htmldir=\$${prefix}/share/doc/tde/HTML \
 		./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
@@ -129,7 +129,7 @@ install: build
 	install -c -p -m 644 -T icons/tellico_mime.svg debian/tmp/opt/trinity/share/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
 
 	# Remove  dead symlink from French translation
-	rm debian/tmp/opt/trinity/share/doc/kde/HTML/fr/tellico/common
+	rm debian/tmp/opt/trinity/share/doc/tde/HTML/fr/tellico/common
 
 
 # Build architecture-independent files here.
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index 856fa4932..5e704aa4a 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -81,15 +81,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
index 9dbcfbafd..4a098a312 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 47e83ef4a..311dc059d 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/debian-qt-kde.mk
@@ -84,15 +84,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/kde/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/kde/HTML/en/$$pkg; \
+	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
 	done
 
 clean::
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
@@ -39,7 +39,7 @@ include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/kde/HTML
+export kde_htmldir = \$${datadir}/doc/tde/HTML
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-04-16 08:50:40 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-04-16 08:50:40 -0500
commit	1d05dfa51ea2699e67b7b7b48339cc0baf4e249d (patch)
tree	86ba1ea4a3b68f7118ad45291c21648ebf5c3766 /ubuntu/maverick/applications
parent	2246bcd2933678a54e2290f2ce3b492e16d6cb9a (diff)
download	tde-packaging-1d05dfa51ea2699e67b7b7b48339cc0baf4e249d.tar.gz tde-packaging-1d05dfa51ea2699e67b7b7b48339cc0baf4e249d.zip