[sikuli] 11/21: Drop patch jruby-compat-1.9.patch

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit 2126b306744d99a2a1fb125e0ec6bf916b85284b
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Nov 2 15:28:36 2015 +0100

    Drop patch jruby-compat-1.9.patch
---
 debian/changelog                      |  5 +++--
 debian/patches/jruby-compat-1.9.patch | 16 ----------------
 debian/patches/series                 |  1 -
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b902ae0..fbcd297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ sikulix (1.1.0-1) UNRELEASED; urgency=medium
   * Refresh patches.
   * New patch no-vnc-package.patch to drop dependency against non-free
     VNC package (removed from upstream source tree).
-  * Disable patch jruby-compat-1.9.patch (probably not needed anymore).
-  * Drop patch fix-image-path.patch (applied upstream).
+  * Drop patches:
+    - jruby-compat-1.9.patch (not needed anymore)
+    - fix-image-path.patch (applied upstream).
 
  -- Gilles Filippini <pini at debian.org>  Sun, 01 Nov 2015 20:58:27 +0100
 
diff --git a/debian/patches/jruby-compat-1.9.patch b/debian/patches/jruby-compat-1.9.patch
deleted file mode 100644
index 1bd659d..0000000
--- a/debian/patches/jruby-compat-1.9.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Force Ruby 1.9 compatibility
- Because JRuby is stuck at version 1.5.6 in Debian.
-Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
-===================================================================
---- sikuli.orig/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
-+++ sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
-@@ -440,7 +440,7 @@ public class JRubyScriptRunner implement
- 
- 			interpreter = new ScriptingContainer(
- 							LocalContextScope.THREADSAFE);
--			interpreter.setCompatVersion(CompatVersion.RUBY2_0);
-+			interpreter.setCompatVersion(CompatVersion.RUBY1_9);
- 			interpreter.setCompileMode(CompileMode.JIT);
- 		}
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 335ba5f..3158019 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ no-maven-repo-dependencies.patch
 drop-useless-resources.patch
 add-classpath.patch
 pom-removed-modules.patch
-#jruby-compat-1.9.patch
 python-shebang.patch
 #no-gem-maven-plugin.patch
 dependency-opencv.patch

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