This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jruby.
commit 4e7cf11d0c997d5469f2e05c099545fad9bbd464 Author: tony mancill <[email protected]> Date: Sat Nov 1 19:58:17 2014 -0700 apply patch for 759947 --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/rules | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e48ff3..92d2df7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +jruby (1.5.6-9) unstable; urgency=medium + + * Team upload. + * Build-depend on openjdk-7-jdk >= 7u71-2.5.3 (closes: #759947). + This version restores the "apt" tool. + - Thank you to Michael Gilbert for the patch. + + -- tony mancill <[email protected]> Sat, 01 Nov 2014 19:55:32 -0700 + jruby (1.5.6-8) unstable; urgency=medium [ tony mancill ] diff --git a/debian/control b/debian/control index d314dd4..88a20a3 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Sebastien Delafond <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 9~), default-jdk, ant-optional, +Build-Depends: debhelper (>= 9~), openjdk-7-jdk (>= 7u71-2.5.3), ant-optional, libasm3-java, libcommons-logging-java, libjarjar-java, libjoda-time-java, junit4, libbsf-java, libjline-java, bnd, libconstantine-java, netbase, libjgrapht0.8-java, libjcodings-java, libbytelist-java, libjffi-java, diff --git a/debian/rules b/debian/rules index bf6699c..b6af033 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH) DEB_ANT_CLEAN_TARGET := clean-all DEB_ANT_BUILD_TARGET := -Ddev.gems=false -DdocsNotNeeded=true \ -Dshared.lib.dir=/usr/share/java test dist-bin -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
