This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libgetopt-java.
commit 2526b977259d5b14ffd11fca63bd51d3cfd56656 Author: Niels Thykier <[email protected]> Date: Fri Oct 28 18:25:06 2011 +0000 Bump dh to 8, compile and split javadoc --- debian/changelog | 5 +++++ debian/compat | 2 +- debian/control | 17 ++++++++++++++++- debian/libgetopt-java-doc.javadoc | 1 + debian/rules | 8 +++++--- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 70d0982..9b00045 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ libgetopt-java (1.0.13-4) UNRELEASED; urgency=low * 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 <[email protected]> Fri, 28 Oct 2011 08:10:39 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index b2eda85..732feae 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]>, Niels Thykier <[email protected]> -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 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgetopt-java 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. + diff --git a/debian/libgetopt-java-doc.javadoc b/debian/libgetopt-java-doc.javadoc new file mode 100644 index 0000000..eedd89b --- /dev/null +++ b/debian/libgetopt-java-doc.javadoc @@ -0,0 +1 @@ +api diff --git a/debian/rules b/debian/rules index 509e70b..46daa35 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,7 @@ clean: dh_testdir dh_testroot rm -f build-stamp - rm -fr classes + rm -fr classes api dh_clean install: build @@ -38,8 +38,8 @@ install: build 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 @@ -52,6 +52,8 @@ binary-indep: build install 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgetopt-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
