4 files changed, 61 insertions, 61 deletions
diff --git a/debian/squeeze/tdelibs/debian/cdbs/kde.mk b/debian/squeeze/tdelibs/debian/cdbs/kde.mk
index 7842ef980..765560c89 100644
--- a/debian/squeeze/tdelibs/debian/cdbs/kde.mk
+++ b/debian/squeeze/tdelibs/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/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog
index d75004323..2969809e6 100644
--- a/debian/squeeze/tdelibs/debian/changelog
+++ b/debian/squeeze/tdelibs/debian/changelog
@@ -3765,7 +3765,7 @@ tdelibs-cvs (4:2.0-19990903-1.0) experimental; urgency=low
 tdelibs-cvs (4:2.0-19990823-1.0) experimental; urgency=low
 
   * More CVS updates
-  * Adding in a process to the postinst to verify that /usr/doc/kde/HTML/default
+  * Adding in a process to the postinst to verify that /usr/doc/tde/HTML/default
     is a link and not a directory
   * Removing ldconfig from postrm
 
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index 6cd2a864c..fd084886c 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -1725,64 +1725,64 @@ debian/tmp/opt/trinity/share/apps/LICENSES/LGPL_V2
 debian/tmp/opt/trinity/share/apps/LICENSES/QPL_V1.0
 debian/tmp/opt/trinity/share/apps/proxyscout/eventsrc
 debian/tmp/opt/trinity/share/autostart/kab2kabc.desktop
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/10.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/3.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/4.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/5.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/6.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/7.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/8.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/9.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/appheader.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/artistic-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-middle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bottom-right.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/bsd-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/docheadergears.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1a.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1b.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop1.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doctop2.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/doxygen.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/favicon.ico
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/fdl-notice.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/footer.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/gpl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/gpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/grad.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/headerbg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/header.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-common.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-default.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_gear_64.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-localised.css.template
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_logo_bg.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde_logo.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kde-web.css
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/kmenu.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/lgpl-license
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/lgpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/mainfooter.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/mainheader.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/qpl-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/shadow.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-left.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-middle.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/top-right-konqueror.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/web-docbottom.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/web-doctop.png
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/x11-license.html
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/common/xml.dcl
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/common
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/index.cache.bz2
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/kspell/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/10.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/3.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/4.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/5.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/6.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/7.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/8.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/9.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/appheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/artistic-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-middle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bottom-right.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/bsd-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/docheadergears.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1a.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1b.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop1.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doctop2.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/doxygen.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/favicon.ico
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/fdl-notice.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/footer.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/gpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/grad.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/headerbg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/header.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-common.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-default.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_gear_64.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-localised.css.template
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo_bg.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde_logo.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kde-web.css
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/kmenu.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/lgpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainfooter.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/mainheader.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/qpl-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/shadow.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-left.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-middle.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/top-right-konqueror.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-docbottom.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/web-doctop.png
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/x11-license.html
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/common/xml.dcl
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kspell/index.docbook
 debian/tmp/opt/trinity/share/emoticons/Default/angry.png
 debian/tmp/opt/trinity/share/emoticons/Default/bat.png
 debian/tmp/opt/trinity/share/emoticons/Default/beer.png
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-doc.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-doc.install
index c45e2a51e..71ae7f63f 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-doc.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-doc.install
@@ -1 +1 @@
-debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdelibs-apidocs/*
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdelibs-apidocs/*