[dom4j] 18/20: Merge debian branch (r2706).

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1.6.1+dfsg-1
in repository dom4j.

commit a306d8651715e9772af15b6669ada96f51a9d2b4
Author: Marcus Better <marcus at better.se>
Date:   Wed Nov 1 14:00:59 2006 +0000

    Merge debian branch (r2706).
---
 debian/libdom4j-java-doc.doc-base          | 4 ++--
 debian/libdom4j-java-doc.links             | 2 +-
 debian/libdom4j-java-doc.lintian-overrides | 3 +++
 debian/rules                               | 4 +---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/libdom4j-java-doc.doc-base b/debian/libdom4j-java-doc.doc-base
index 607e9b2..6703d03 100644
--- a/debian/libdom4j-java-doc.doc-base
+++ b/debian/libdom4j-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the dom4j library.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libdom4j-java-doc/api/index.html
-Files: /usr/share/doc/libdom4j-java-doc/api/*
+Index: /usr/share/doc/libdom4j-java-doc/apidocs/index.html
+Files: /usr/share/doc/libdom4j-java-doc/apidocs/*
diff --git a/debian/libdom4j-java-doc.links b/debian/libdom4j-java-doc.links
index b5984f2..6bf2942 100644
--- a/debian/libdom4j-java-doc.links
+++ b/debian/libdom4j-java-doc.links
@@ -1 +1 @@
-usr/share/doc/libdom4j-java-doc/changelog.html	usr/share/doc/libdom4j-java-doc/changes-report.html
+usr/share/doc/libdom4j-java-doc/changelog-report.html	usr/share/doc/libdom4j-java-doc/changelog.html
diff --git a/debian/libdom4j-java-doc.lintian-overrides b/debian/libdom4j-java-doc.lintian-overrides
new file mode 100644
index 0000000..2552024
--- /dev/null
+++ b/debian/libdom4j-java-doc.lintian-overrides
@@ -0,0 +1,3 @@
+# The changelog is referenced by the HTML documentation, so we leave
+# it uncompressed.
+libdom4j-java-doc: changelog-file-not-compressed changelog.html
diff --git a/debian/rules b/debian/rules
index cf7a724..cc935e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,10 +46,8 @@ install: build
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
+	dh_installchangelogs -k docs/changes-report.html
 	dh_installdocs
-	mv $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/apidocs \
-	   $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api
 	install -m 644 build/dom4j.jar $(JAVALIBDIR)/dom4j-$(VERSION).jar
 	ln -s dom4j-$(VERSION).jar $(JAVALIBDIR)/dom4j.jar
 	dh_link

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git