[pkg-java] r16861 - trunk/derby/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-06-07 23:32:49 +0000 (Fri, 07 Jun 2013)
New Revision: 16861

Modified:
   trunk/derby/debian/derby-doc.docs
   trunk/derby/debian/rules
Log:
Reverted to the upstream javadoc directory structure in order to preserve the links in the HTML documentation



Modified: trunk/derby/debian/derby-doc.docs
===================================================================
--- trunk/derby/debian/derby-doc.docs	2013-06-07 23:25:09 UTC (rev 16860)
+++ trunk/derby/debian/derby-doc.docs	2013-06-07 23:32:49 UTC (rev 16861)
@@ -1,5 +1,4 @@
-javadoc/engine
-javadoc/publishedapi
+javadoc
 java/demo
 published_api_overview.html
 releaseSummary.xml

Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules	2013-06-07 23:25:09 UTC (rev 16860)
+++ trunk/derby/debian/rules	2013-06-07 23:32:49 UTC (rev 16861)
@@ -32,6 +32,10 @@
 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