summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/kdiff3
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3')
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/cdbs/debian-qt-kde.mk10
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity-doc.links178
-rwxr-xr-xubuntu/maverick/applications/kdiff3/debian/rules8
4 files changed, 99 insertions, 99 deletions
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/