This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch experimental in repository jruby.
commit 62a9de17f7a85552dd90d6d11ca53f6f1dd4944c Author: Miguel Landaeta <nomad...@debian.org> Date: Mon Apr 10 22:33:32 2017 +0100 Add Build-Conflicts on open-infrastructure-locales-c.utf-8 --- debian/changelog | 5 +++-- debian/control | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f24c6dd..63fe388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,15 +4,16 @@ jruby (9.1.8.0-1~exp2) UNRELEASED; urgency=medium However, a few tests were excluded, so an additional patch was introduced: 0010-Exclude-mri-tests-failing-in-debian.patch * Reintroduce B-D on locales-all. - * Enable additional JRuby tests tasks. + * Enable additional JRuby tests tasks: - Drop patch 0009-Bundle-psych-java-extension.patch. - Add dependencies on: + ruby-jar-dependencies + ruby-json (>= 2.0.1+dfsg-4~) + ruby-psych + - Add Build-Conflicts on open-infrastructure-locales-c.utf-8. - Simplify several d/rules targets. - -- Miguel Landaeta <nomad...@debian.org> Wed, 22 Mar 2017 22:37:49 +0000 + -- Miguel Landaeta <nomad...@debian.org> Mon, 10 Apr 2017 22:32:52 +0100 jruby (9.1.8.0-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 38c76f5..825b213 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,7 @@ Build-Depends: ant-optional, ruby-psych, ruby-rspec, ruby-test-unit +Build-Conflicts: open-infrastructure-locales-c.utf-8 Standards-Version: 3.9.8 Homepage: http://jruby.org/ Vcs-Git: https://anonscm.debian.org/git/pkg-java/jruby.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits