[pkg-java] r15287 - trunk/libgetopt-java/debian

[Niels Thykier]

Author: nthykier
Date: 2011-10-28 18:25:06 +0000 (Fri, 28 Oct 2011)
New Revision: 15287

Added:
   trunk/libgetopt-java/debian/libgetopt-java-doc.javadoc
Modified:
   trunk/libgetopt-java/debian/changelog
   trunk/libgetopt-java/debian/compat
   trunk/libgetopt-java/debian/control
   trunk/libgetopt-java/debian/rules
Log:
Bump dh to 8, compile and split javadoc

Modified: trunk/libgetopt-java/debian/changelog
===================================================================
--- trunk/libgetopt-java/debian/changelog	2011-10-28 17:51:17 UTC (rev 15286)
+++ trunk/libgetopt-java/debian/changelog	2011-10-28 18:25:06 UTC (rev 15287)
@@ -2,6 +2,11 @@
 
   * Added build-arch and build-indep targets.
   * Bumped Standards-Versions to 3.9.2 - no changes required.
+  * Compile javadoc during build instead of using the prebuilt one.
+    - Link javadoc against the system javadoc
+  * Split the javadoc to a separate package.
+    - New location: /usr/share/doc/libgetopt-java-doc/api
+  * Bumped debhelper compat 8.
 
  -- Niels Thykier <niels at thykier.net>  Fri, 28 Oct 2011 08:10:39 +0200
 

Modified: trunk/libgetopt-java/debian/compat
===================================================================
--- trunk/libgetopt-java/debian/compat	2011-10-28 17:51:17 UTC (rev 15286)
+++ trunk/libgetopt-java/debian/compat	2011-10-28 18:25:06 UTC (rev 15287)
@@ -1 +1 @@
-7
+8

Modified: trunk/libgetopt-java/debian/control
===================================================================
--- trunk/libgetopt-java/debian/control	2011-10-28 17:51:17 UTC (rev 15286)
+++ trunk/libgetopt-java/debian/control	2011-10-28 18:25:06 UTC (rev 15287)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper
+Build-Depends: debhelper (>= 7), default-jdk, default-jdk-doc, javahelper (>= 0.33~),
+               maven-repo-helper
 Standards-Version: 3.9.2
 Homepage: http://www.urbanophile.com/arenn/hacking/download.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgetopt-java
@@ -12,8 +13,22 @@
 Package: libgetopt-java
 Architecture: all
 Depends: ${misc:Depends}
+Suggests: default-jdk-doc
 Description: GNU getopt - Java port
  The GNU Java getopt classes support short and long argument parsing 
  in a manner 100% compatible with the version of GNU getopt in glibc 
  2.0.6 with a mostly compatible programmer's interface as well. Note that 
  this is a port, not a new implementation.
+
+Package: libgetopt-java-doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: default-jdk-doc
+Description: GNU getopt - Java port (doc)
+ The GNU Java getopt classes support short and long argument parsing 
+ in a manner 100% compatible with the version of GNU getopt in glibc 
+ 2.0.6 with a mostly compatible programmer's interface as well. Note that 
+ this is a port, not a new implementation.
+ .
+ This package contains the Java Programming API docs.
+

Added: trunk/libgetopt-java/debian/libgetopt-java-doc.javadoc
===================================================================
--- trunk/libgetopt-java/debian/libgetopt-java-doc.javadoc	                        (rev 0)
+++ trunk/libgetopt-java/debian/libgetopt-java-doc.javadoc	2011-10-28 18:25:06 UTC (rev 15287)
@@ -0,0 +1 @@
+api

Modified: trunk/libgetopt-java/debian/rules
===================================================================
--- trunk/libgetopt-java/debian/rules	2011-10-28 17:51:17 UTC (rev 15286)
+++ trunk/libgetopt-java/debian/rules	2011-10-28 18:25:06 UTC (rev 15287)
@@ -29,7 +29,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -fr classes
+	rm -fr classes api
 	dh_clean
 
 install: build
@@ -38,9 +38,9 @@
 	dh_prep
 	dh_installdirs
 	(cd classes; ${JAR} cvf ../gnu-getopt.jar gnu)
-	mkdir -p debian/libgetopt-java/usr/share/doc/libgetopt-java/api
-	cp -a gnu/getopt/*.html debian/libgetopt-java/usr/share/doc/libgetopt-java/api
+	javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/*.java
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
@@ -52,6 +52,8 @@
 	mh_installpom -plibgetopt-java $(CURDIR)/debian/pom.xml
 	mh_installjar -plibgetopt-java -ngnu-getopt -l $(CURDIR)/debian/pom.xml \
 		$(CURDIR)/gnu-getopt.jar
+	jh_installjavadoc
+	jh_depends
 	dh_compress	
 	dh_link
 	dh_installdeb