[jruby] 03/04: Refresh patches

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit de1974d3d09fdf25283fbfcdf7a005f2726b72f4
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Oct 4 19:52:35 2017 +0100

    Refresh patches
---
 debian/changelog                                   |  5 ++-
 ...004-Add-missing-maven-artifacts-pom-files.patch | 12 +++----
 ...Configure-unit-tests-to-run-at-build-time.patch | 41 +++++++++++++---------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0539a41..aaeb415 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ jruby (9.1.13.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Fix FTBFS with Java 9. (Closes: #875588)
+  * Refresh patches:
+    - d/p/0004-Add-missing-maven-artifacts-pom-files.patch
+    - d/p/0008-Configure-unit-tests-to-run-at-build-time.patch
 
- -- Miguel Landaeta <nomadium at debian.org>  Wed, 04 Oct 2017 19:49:55 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Wed, 04 Oct 2017 19:51:55 +0100
 
 jruby (9.1.8.0-3) unstable; urgency=medium
 
diff --git a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
index bac69d5..2edbcc1 100644
--- a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
+++ b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
@@ -5,7 +5,7 @@ Description: Add missing POM files for maven artifacts
  need to add them manually to the source
 Author: Miguel Landaeta <nomadium at debian.org>
 Forwarded: no
-Last-Update: 2017-03-08
+Last-Update: 2017-10-04
 
 --- /dev/null
 +++ jruby-9.1.8.0/maven/pom.xml
@@ -24,7 +24,7 @@ Last-Update: 2017-03-08
 +  <parent>
 +    <groupId>org.jruby</groupId>
 +    <artifactId>jruby-parent</artifactId>
-+    <version>9.1.8.0</version>
++    <version>9.1.13.0</version>
 +  </parent>
 +  <artifactId>jruby-artifacts</artifactId>
 +  <packaging>pom</packaging>
@@ -161,7 +161,7 @@ Last-Update: 2017-03-08
 +  <parent>
 +    <groupId>org.jruby</groupId>
 +    <artifactId>jruby-artifacts</artifactId>
-+    <version>9.1.8.0</version>
++    <version>9.1.13.0</version>
 +  </parent>
 +  <artifactId>jruby-dist</artifactId>
 +  <packaging>pom</packaging>
@@ -375,7 +375,7 @@ Last-Update: 2017-03-08
 +  <parent>
 +    <groupId>org.jruby</groupId>
 +    <artifactId>jruby-artifacts</artifactId>
-+    <version>9.1.8.0</version>
++    <version>9.1.13.0</version>
 +  </parent>
 +  <artifactId>jruby-complete</artifactId>
 +  <packaging>bundle</packaging>
@@ -692,7 +692,7 @@ Last-Update: 2017-03-08
 +  <parent>
 +    <groupId>org.jruby</groupId>
 +    <artifactId>jruby-artifacts</artifactId>
-+    <version>9.1.8.0</version>
++    <version>9.1.13.0</version>
 +  </parent>
 +  <artifactId>jruby</artifactId>
 +  <name>JRuby Main Maven Artifact</name>
@@ -922,7 +922,7 @@ Last-Update: 2017-03-08
 +  <parent>
 +    <groupId>org.jruby</groupId>
 +    <artifactId>jruby-parent</artifactId>
-+    <version>9.1.8.0</version>
++    <version>9.1.13.0</version>
 +  </parent>
 +  <artifactId>jruby-tests</artifactId>
 +  <name>JRuby Integration Tests</name>
diff --git a/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch b/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
index 5cc7015..856d2ed 100644
--- a/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
+++ b/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
@@ -20,25 +20,30 @@ Last-Update: 2017-02-10
 
 --- jruby-9.1.6.0.orig/bin/rake
 +++ jruby-9.1.6.0/bin/rake
-@@ -6,17 +6,23 @@
+@@ -6,22 +6,28 @@
  # this file is here to facilitate running it.
  #
  
 -require 'rubygems'
-+#require 'rubygems'
-+#
-+#version = ">= 0.a"
-+#
-+#if ARGV.first
-+#  str = ARGV.first
-+#  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
-+#  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
-+#    version = $1
-+#    ARGV.shift
-+#  end
-+#end
-+#
-+#load Gem.activate_bin_path('rake', 'rake', version)
++# require 'rubygems'
++# 
++# version = ">= 0.a"
++# 
++# if ARGV.first
++#   str = ARGV.first
++#   str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
++#   if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
++#     version = $1
++#     ARGV.shift
++#   end
++# end
++# 
++# if Gem.respond_to?(:activate_bin_path)
++# load Gem.activate_bin_path('rake', 'rake', version)
++# else
++# gem "rake", version
++# load Gem.bin_path("rake", "rake", version)
++# end
  
 -version = ">= 0.a"
 +$LOAD_PATH << '/usr/lib/ruby/vendor_ruby'
@@ -53,9 +58,13 @@ Last-Update: 2017-02-10
 -end
 +require 'rake'
  
+-if Gem.respond_to?(:activate_bin_path)
 -load Gem.activate_bin_path('rake', 'rake', version)
+-else
+-gem "rake", version
+-load Gem.bin_path("rake", "rake", version)
+-end
 +Rake.application.run
-
 --- jruby-9.1.6.0.orig/rakelib/test.rake
 +++ jruby-9.1.6.0/rakelib/test.rake
 @@ -117,6 +117,7 @@ namespace :test do

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