[jruby] 01/03: Don't hard-code libyaml-snake-java version in psych stdlib module

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch experimental
in repository jruby.

commit e146239fef25c5ec77cfb373e6168f0596446f47
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Mar 4 11:27:38 2017 +0000

    Don't hard-code libyaml-snake-java version in psych stdlib module
---
 debian/changelog |  6 ++++++
 debian/rules     | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5265b38..21c38e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jruby (9.1.6.0-1~exp2) UNRELEASED; urgency=medium
+
+  * Don't hard-code libyaml-snake-java version in psych stdlib module.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 04 Mar 2017 11:23:24 +0000
+
 jruby (9.1.6.0-1~exp1) experimental; urgency=medium
 
   The "better late than never" release.
diff --git a/debian/rules b/debian/rules
index 2ffae03..a59de2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,15 +39,16 @@ override_dh_prep:
 	dh_prep
 	mkdir -p $(DIST_TARGET_DIR)
 	tar zxf $(DIST_TARBALL) -C $(DIST_TARGET_DIR) --strip-components=1
-	cd $(DIST_TARGET_DIR) && (                                                \
-		mv ./bin/jruby.bash ./bin/jruby                                   \
-		&& cp ./bin/jruby ../../bin                                       \
-		&& chmod 0755 ./bin/*                                             \
-		&& mkdir -p ./lib/jni/                                            \
-		&& find ./lib/ruby/truffle -name LICENSE -delete                  \
-	        && cp -a /usr/lib/ruby/2.3.0/psych* ./lib/ruby/stdlib/            \
-		&& sed '1d' -i ./lib/ruby/truffle/jruby+truffle/bin/jruby+truffle \
-		&& rm -r ./tool/nailgun/*                                         )
+	cd $(DIST_TARGET_DIR) && (                                                     \
+		mv ./bin/jruby.bash ./bin/jruby                                        \
+		&& cp ./bin/jruby ../../bin                                            \
+		&& chmod 0755 ./bin/*                                                  \
+		&& mkdir -p ./lib/jni/                                                 \
+		&& find ./lib/ruby/truffle -name LICENSE -delete                       \
+	        && cp -a /usr/lib/ruby/2.3.0/psych* ./lib/ruby/stdlib/                 \
+	        && sed 's/1\.[0-9]\{1,2\}/1.x/' -i ./lib/ruby/stdlib/psych/versions.rb \
+		&& sed '1d' -i ./lib/ruby/truffle/jruby+truffle/bin/jruby+truffle      \
+		&& rm -r ./tool/nailgun/*                                              )
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git