[pkg-java] r2707 - trunk/dom4j/dom4j/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-01 15:00:59 +0100 (Wed, 01 Nov 2006)
New Revision: 2707

Added:
   trunk/dom4j/dom4j/debian/libdom4j-java-doc.lintian-overrides
Modified:
   trunk/dom4j/dom4j/debian/libdom4j-java-doc.doc-base
   trunk/dom4j/dom4j/debian/libdom4j-java-doc.links
   trunk/dom4j/dom4j/debian/rules
Log:
Merge debian branch (r2706).


Modified: trunk/dom4j/dom4j/debian/libdom4j-java-doc.doc-base
===================================================================
--- trunk/dom4j/dom4j/debian/libdom4j-java-doc.doc-base	2006-11-01 13:59:59 UTC (rev 2706)
+++ trunk/dom4j/dom4j/debian/libdom4j-java-doc.doc-base	2006-11-01 14:00:59 UTC (rev 2707)
@@ -5,5 +5,5 @@
 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/*

Modified: trunk/dom4j/dom4j/debian/libdom4j-java-doc.links
===================================================================
--- trunk/dom4j/dom4j/debian/libdom4j-java-doc.links	2006-11-01 13:59:59 UTC (rev 2706)
+++ trunk/dom4j/dom4j/debian/libdom4j-java-doc.links	2006-11-01 14:00:59 UTC (rev 2707)
@@ -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

Copied: trunk/dom4j/dom4j/debian/libdom4j-java-doc.lintian-overrides (from rev 2706, branches/dom4j/feature/debian/debian/libdom4j-java-doc.lintian-overrides)

Modified: trunk/dom4j/dom4j/debian/rules
===================================================================
--- trunk/dom4j/dom4j/debian/rules	2006-11-01 13:59:59 UTC (rev 2706)
+++ trunk/dom4j/dom4j/debian/rules	2006-11-01 14:00:59 UTC (rev 2707)
@@ -46,10 +46,8 @@
 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