This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-policy.
commit 4410220da2243ccab555f86825443ec1a7e39df2 Author: Matthias Klose <[email protected]> Date: Sun Nov 1 18:39:13 2009 +0000 * Build a default-jdk-doc package to make the documentation available in a path (/usr/share/doc/default-jdk/api) independent of the depending package. --- debian/changelog | 8 ++++++++ debian/control | 10 ++++++++++ debian/rules | 9 ++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4d28ac0..9a28bc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +java-common (0.34) UNRELEASED; urgency=low + + * Build a default-jdk-doc package to make the documentation available + in a path (/usr/share/doc/default-jdk/api) independent of the depending + package. + + -- Matthias Klose <[email protected]> Sun, 01 Nov 2009 18:57:06 +0100 + java-common (0.33) unstable; urgency=low [ Matthias Klose ] diff --git a/debian/control b/debian/control index 960d1ca..fe7f213 100644 --- a/debian/control +++ b/debian/control @@ -56,6 +56,16 @@ Description: Standard Java or Java compatible Development Kit development kit recommended for this architecture, which is ${jdk} for ${jre:arch}. +Package: default-jdk-doc +Architecture: all +Section: doc +Depends: ${doc} +Suggests: default-jdk +Description: Standard Java or Java compatible Development Kit (documentation) + This package points to the documentation for the Java development kit, + or Java compatible development kit recommended for Debian, which is + ${doc}. + Package: default-jdk-builddep Architecture: any Depends: default-jdk (= ${binary:Version}), ${jdk:builddep} diff --git a/debian/rules b/debian/rules index bd17f00..aa4e208 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH), alpha amd64 armel i386 ia64 lpia mips mipsel jvmdir = java-6-openjdk endif +p_doc = openjdk-6-doc + jre_provides = $(call mk_cslist,$(provides),runtime) jhl_provides = $(call mk_cslist,$(provides),runtime-headless) jdk_provides = $(call mk_cslist,$(provides),sdk) @@ -118,6 +120,9 @@ binary-indep: build-indep install-indep dh_install -i # dh_installdebconf -i ### dh_installdocs -i + mkdir -p debian/default-jdk-doc/usr/share/doc/default-jre-headless + ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api + ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api dh_installexamples -i dpsch-cvsclean dh_installmenu -i @@ -127,7 +132,9 @@ binary-indep: build-indep install-indep dh_compress -i dh_fixperms -i dh_installdeb -i - dh_gencontrol -i + dh_gencontrol -i -- \ + '-Vdoc=$(p_doc)' \ + '-Vjdk=$(p_jdk)' dh_md5sums -i dh_builddeb -i -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
