The following commit has been merged in the master branch: commit bb38bb2f2d5bc7920a0172fa1f1bce2bf32697c8 Author: Niels Thykier <ni...@thykier.net> Date: Mon Mar 12 10:23:37 2012 +0100
jh_depends: remove sun JVM Signed-off-by: Niels Thykier <ni...@thykier.net> diff --git a/debian/changelog b/debian/changelog index 33e9bd6..ec198d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,9 @@ javatools (0.41) UNRELEASED; urgency=low * Try to parse arguments passed via -O for jh_lib.sh as regular options, but ignore them if they are unknown. Previously, -O options was silently ignored. - + * Remove support for using the "sun" (and "sun6") JVM with + jh_depends, as Debian is no longer ships the Sun/Oracle Java. + -- Sylvestre Ledru <sylves...@debian.org> Fri, 24 Feb 2012 16:22:58 +0100 javatools (0.40) unstable; urgency=low diff --git a/jh_depends b/jh_depends index 93bf6b6..9b86991 100755 --- a/jh_depends +++ b/jh_depends @@ -19,7 +19,7 @@ syntax() echo -e "\t-a --arch: work on all arch-specific packages" echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper" echo -e "\t-n --no-act: don't actually do anything, just print the results" - echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, sun, sun6. Can be a space-separated list." + echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open. Can be a space-separated list." echo -e "\t-X<package> --exclude=<package>: don't add this package to depends" echo -e "" echo -e "Note: \"headless\" (for --jvm) affects other values and alternatives (e.g. java6-runtime becomes" @@ -74,12 +74,6 @@ function home-to-jvm() if echo $JHOME | grep 6-openjdk >/dev/null; then JVM="$JVM open" fi - if echo $JHOME | grep 6-sun >/dev/null; then - JVM="$JVM sun6" - fi - if echo $JHOME | grep 1.5.0-sun >/dev/null; then - JVM="$JVM sun5" - fi echo "$JVM" } @@ -229,9 +223,6 @@ for p in $PACKAGES; do "gcj") JVMDEPS="$JVMDEPS gcj-jre$headles $alternateversiondeps " ;; - "sun"|"sun6") - JVMDEPS="$JVMDEPS sun-java6-jre$headless " - ;; "open") JVMDEPS="$JVMDEPS openjdk-6-jre$headless " ;; diff --git a/jh_depends.1 b/jh_depends.1 index fb65b5b..86b0e84 100644 --- a/jh_depends.1 +++ b/jh_depends.1 @@ -24,6 +24,6 @@ Refer to the tutorials in /usr/share/doc/javahelper for more detail .HP \fB\-n\fR \fB\-\-no\-act\fR: don't actually do anything, just print the results .HP -\fB\-j[\fR<jvm>] \fB\-\-jvm[=\fR<jvm>]: Options are: default, headless, gcj, open, sun, sun5, sun6. May be a space-separated list +\fB\-j[\fR<jvm>] \fB\-\-jvm[=\fR<jvm>]: Options are: default, headless, gcj, open. May be a space-separated list .HP \fB\-X[\fR<package>] \fB\-\-exclude[=\fR<package>]: Don't include this package in depends -- UNNAMED PROJECT _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits