[derby] 23/53: Reverted to the upstream javadoc directory structure in order to preserve the links in the HTML documentation

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository derby.

commit ac6d014d317a86fe504d919d95df6a006898581f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 7 23:32:49 2013 +0000

    Reverted to the upstream javadoc directory structure in order to preserve the links in the HTML documentation
---
 debian/derby-doc.docs | 3 +--
 debian/rules          | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/derby-doc.docs b/debian/derby-doc.docs
index 8337695..c4af995 100644
--- a/debian/derby-doc.docs
+++ b/debian/derby-doc.docs
@@ -1,5 +1,4 @@
-javadoc/engine
-javadoc/publishedapi
+javadoc
 java/demo
 published_api_overview.html
 releaseSummary.xml
diff --git a/debian/rules b/debian/rules
index 6a191f1..6eccc69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,10 @@ override_dh_auto_build:
 override_dh_install:
 	chmod a+x debian/derby-tools/usr/lib/derby/bin/*
 
+override_dh_installdocs:
+	rm -Rf javadoc/testing
+	dh_installdocs
+
 override_dh_test:
 	env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
 	    java org.apache.derby.tools.sysinfo

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