Fix kdiff3 FTBFS on Debian and Ubuntu

5 files changed, 21 insertions, 21 deletions

diff --git a/ubuntu/precise/applications/kdiff3/debian/compat b/ubuntu/precise/applications/kdiff3/debian/compat
index b8626c4cf..7ed6ff82d 100644
--- a/ubuntu/precise/applications/kdiff3/debian/compat
+++ b/ubuntu/precise/applications/kdiff3/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
index 014004a26..f72b088e4 100644
--- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
+++ b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.doc-base
@@ -1,4 +1,4 @@
-Document: kdiff3
+Document: kdiff3-trinity
 Title: KDiff3 Handbook
 Author: Joachim Eibl <joachim.eibl@gmx.de>
 Abstract:  The manual for KDiff3. KDiff3 compares two or three input files 
@@ -9,5 +9,5 @@ Abstract:  The manual for KDiff3. KDiff3 compares two or three input files
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/kdiff3-doc/html/index.html
-Files: /usr/share/doc/kdiff3-doc/html/*.html
+Index: /opt/trinity/share/doc/kdiff3/html/index.html
+Files: /opt/trinity/share/doc/kdiff3/html/*.html
diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install
index 6d9c9dd9a..5184aa633 100644
--- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install
+++ b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.install
@@ -1,2 +1,2 @@
 /opt/trinity/share/doc/tde
-/opt/trinity/share/doc/kdiff3-doc/html
+/opt/trinity/share/doc/kdiff3/html
diff --git a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links
index e3fbe7781..8d3a5bde5 100644
--- a/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links
+++ b/ubuntu/precise/applications/kdiff3/debian/kdiff3-trinity-doc.links
@@ -83,15 +83,15 @@
 /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/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
+/opt/trinity/share/doc/tde/HTML/en/common						/opt/trinity/share/doc/kdiff3/html/common
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirbrowser.png			/opt/trinity/share/doc/kdiff3/html/dirbrowser.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/dirmergebig.png		/opt/trinity/share/doc/kdiff3/html/dirmergebig.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/iteminfo.png			/opt/trinity/share/doc/kdiff3/html/iteminfo.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/letter_by_letter.png	/opt/trinity/share/doc/kdiff3/html/letter_by_letter.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/merge_current.png		/opt/trinity/share/doc/kdiff3/html/merge_current.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/new.png				/opt/trinity/share/doc/kdiff3/html/new.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/open_dialog.png		/opt/trinity/share/doc/kdiff3/html/open_dialog.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_diff.png	/opt/trinity/share/doc/kdiff3/html/screenshot_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/screenshot_merge.png	/opt/trinity/share/doc/kdiff3/html/screenshot_merge.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/triple_diff.png		/opt/trinity/share/doc/kdiff3/html/triple_diff.png
+/opt/trinity/share/doc/tde/HTML/en/kdiff3/white_space.png		/opt/trinity/share/doc/kdiff3/html/white_space.png
diff --git a/ubuntu/precise/applications/kdiff3/debian/rules b/ubuntu/precise/applications/kdiff3/debian/rules
index 19ea44a07..2ab87b0e9 100755
--- a/ubuntu/precise/applications/kdiff3/debian/rules
+++ b/ubuntu/precise/applications/kdiff3/debian/rules
@@ -74,14 +74,14 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-		kde_htmldir=/opt/trinity/share/doc/tde/HTML
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	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/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/tde/HTML/en/kdiff3/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3-doc/html/
+	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
+	mv $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc/*.html $(CURDIR)/debian/tmp/opt/trinity/share/doc/kdiff3/html/
+	rmdir $(CURDIR)/debian/tmp/opt/trinity/share/apps/kdiff3/doc
 	# move kdiff3.desktop to freedesktop.org conforming place
 	mkdir --parents $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/
 	mv $(CURDIR)/debian/tmp/opt/trinity/share/applnk/Development/kdiff3.desktop $(CURDIR)/debian/tmp/opt/trinity/share/applications/tde/