The following commit has been merged in the master branch: commit acfff8de5859077bc3a9c9ea17b600039045a7ff Author: Miguel Landaeta <mig...@miguel.cc> Date: Sat Jan 14 14:29:54 2012 -0430
Switch to default-jdk diff --git a/debian/changelog b/debian/changelog index 9146be3..ffbf0f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jruby (1.5.6-3) UNRELEASED; urgency=low + + * Team upload. + * Switch to default-jdk. (Closes: #655823). + + -- Miguel Landaeta <mig...@miguel.cc> Sat, 14 Jan 2012 14:13:54 -0430 + jruby (1.5.6-2) unstable; urgency=high * Add workaround for strange dpkg-source error. (Closes: #643516) diff --git a/debian/control b/debian/control index 0cee59a..d3d85e8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Sebastien Delafond <s...@debian.org>, Torsten Werner <twer...@debian.org> -Build-Depends: debhelper (>= 6.0.7~), openjdk-6-jdk | java6-sdk, ant-optional, +Build-Depends: debhelper (>= 6.0.7~), default-jdk, ant-optional, libasm3-java, libcommons-logging-java, libjarjar-java, libjoda-time-java, junit4, libemma-java, libbsf-java, libjline-java, bnd, libconstantine-java, netbase, libjgrapht0.8-java, libjcodings-java, libbytelist-java, libjffi-java, -- 100% pure-Java implementation of Ruby _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits