[DRE-commits] [ruby-rjb] 02/08: Refresh patches

Jérémy Bobbio lunar at moszumanska.debian.org
Tue Dec 20 22:06:27 UTC 2016


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

lunar pushed a commit to branch master
in repository ruby-rjb.

commit cb868824f44d79e9d557af862d7be1016cde8d0e
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Nov 30 23:11:32 2016 +0100

    Refresh patches
---
 ...e-file-to-be-specified-using-the-RJB_BRID.patch |  4 +-
 .../0002-Fix-paths-to-jars-in-test-suite.patch     | 60 +++++++++++-----------
 ...od-that-always-returns-an-object-in-test_.patch | 30 -----------
 .../patches/0005-Always-JVM_TYPE-to-server.patch   |  2 +-
 ...OME-with-a-sensible-value-if-not-set-when.patch |  4 +-
 debian/patches/series                              |  1 -
 6 files changed, 35 insertions(+), 66 deletions(-)

diff --git a/debian/patches/0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch b/debian/patches/0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch
index 72a8e28..456450f 100644
--- a/debian/patches/0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch
+++ b/debian/patches/0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch
@@ -8,10 +8,10 @@ Subject: Allow bridge file to be specified using the RJB_BRIDGE_FILE
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/rjb.rb b/lib/rjb.rb
-index e0b759e..8af52e2 100755
+index 8af08c1..a591376 100644
 --- a/lib/rjb.rb
 +++ b/lib/rjb.rb
-@@ -53,7 +53,7 @@ module RjbConf
+@@ -56,7 +56,7 @@ module RjbConf
    else
      datadir = RbConfig::CONFIG['datadir']
    end
diff --git a/debian/patches/0002-Fix-paths-to-jars-in-test-suite.patch b/debian/patches/0002-Fix-paths-to-jars-in-test-suite.patch
index b949861..4d2913d 100644
--- a/debian/patches/0002-Fix-paths-to-jars-in-test-suite.patch
+++ b/debian/patches/0002-Fix-paths-to-jars-in-test-suite.patch
@@ -10,48 +10,48 @@ Subject: Fix paths to jars in test suite
  4 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/test/jartest.rb b/test/jartest.rb
-index 9bf7a21..5bf7511 100644
+index 279bfa4..af36fe4 100644
 --- a/test/jartest.rb
 +++ b/test/jartest.rb
 @@ -17,8 +17,8 @@ class JarTest < Test::Unit::TestCase
-   end
-   
-   def test_depends
--    add_jar(File.expand_path('./jartest2.jar'))    
--    add_jar(File.expand_path('./jartest.jar'))
-+    add_jar(File.expand_path('../jartest2.jar', __FILE__))
-+    add_jar(File.expand_path('../jartest.jar', __FILE__))
-     assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
-   end
- end
+   end
+   
+   def test_depends
+-    add_jar(File.expand_path('./jartest2.jar'))    
+-    add_jar(File.expand_path('./jartest.jar'))
++    add_jar(File.expand_path('../jartest2.jar', __FILE__))
++    add_jar(File.expand_path('../jartest.jar', __FILE__))
+     assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+   end
+ end
 diff --git a/test/jartest2.rb b/test/jartest2.rb
-index 8fc0303..05b759d 100644
+index 7acd962..257203a 100644
 --- a/test/jartest2.rb
 +++ b/test/jartest2.rb
 @@ -17,7 +17,7 @@ class JarTest < Test::Unit::TestCase
-   end
-   
-   def test_depends
--    add_jar([File.expand_path('./jartest2.jar'), File.expand_path('./jartest.jar')])
-+    add_jar([File.expand_path('../jartest2.jar', __FILE__), File.expand_path('../jartest.jar', __FILE__)])
-     assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
-   end
- end
+   end
+   
+   def test_depends
+-    add_jar([File.expand_path('./jartest2.jar'), File.expand_path('./jartest.jar')])
++    add_jar([File.expand_path('../jartest2.jar', __FILE__), File.expand_path('../jartest.jar', __FILE__)])
+     assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+   end
+ end
 diff --git a/test/jartest3.rb b/test/jartest3.rb
-index cc673b9..9b301f0 100644
+index c993f8a..6e55418 100644
 --- a/test/jartest3.rb
 +++ b/test/jartest3.rb
 @@ -17,7 +17,7 @@ class JarTest < Test::Unit::TestCase
-   end
-   
-   def test_depends
--    add_jar(File.expand_path('./jartest2.jar'))    
-+    add_jar(File.expand_path('../jartest2.jar', __FILE__))
-     begin
-       Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
-       fail 'no exception'
+   end
+   
+   def test_depends
+-    add_jar(File.expand_path('./jartest2.jar'))    
++    add_jar(File.expand_path('../jartest2.jar', __FILE__))
+     begin
+       Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+       fail 'no exception'
 diff --git a/test/test.rb b/test/test.rb
-index ac6b458..84dbebe 100755
+index ea58f06..e0fb5a8 100644
 --- a/test/test.rb
 +++ b/test/test.rb
 @@ -749,14 +749,14 @@ class TestRjb < Test::Unit::TestCase
diff --git a/debian/patches/0004-Use-an-method-that-always-returns-an-object-in-test_.patch b/debian/patches/0004-Use-an-method-that-always-returns-an-object-in-test_.patch
deleted file mode 100644
index ae6814f..0000000
--- a/debian/patches/0004-Use-an-method-that-always-returns-an-object-in-test_.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
-Date: Mon, 12 Aug 2013 20:37:54 +0200
-Subject: Use an method that always returns an object in test_noarg_sinvoke
-
-test_noarg_sinvoke used to call the console() method which might return
-null if there's no console attached. This is exactly the case while
-building the Debian package unattended.
----
- test/test.rb | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/test.rb b/test/test.rb
-index 84dbebe..b9fa9a9 100755
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -867,10 +867,10 @@ class TestRjb < Test::Unit::TestCase
-   end
-   def test_noarg_sinvoke()
-     sys = import('java.lang.System')
--    cons = sys.console
--    assert_equal(cons._classname, sys._invoke('console', '')._classname)
--    assert_equal(cons._classname, sys._invoke('console', nil)._classname)
--    assert_equal(cons._classname, sys._invoke('console')._classname)    
-+    cons = sys.getProperties
-+    assert_equal(cons._classname, sys._invoke('getProperties', '')._classname)
-+    assert_equal(cons._classname, sys._invoke('getProperties', nil)._classname)
-+    assert_equal(cons._classname, sys._invoke('getProperties')._classname)
-   end
-   def test_longarg
-     skip('rbx can handle 64bits long') if RUBY_ENGINE == 'rbx'
diff --git a/debian/patches/0005-Always-JVM_TYPE-to-server.patch b/debian/patches/0005-Always-JVM_TYPE-to-server.patch
index 49d48ea..9cd9613 100644
--- a/debian/patches/0005-Always-JVM_TYPE-to-server.patch
+++ b/debian/patches/0005-Always-JVM_TYPE-to-server.patch
@@ -12,7 +12,7 @@ Closes: #814411
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ext/load.c b/ext/load.c
-index fb38a56..db6b617 100644
+index 44b13aa..eb48f48 100644
 --- a/ext/load.c
 +++ b/ext/load.c
 @@ -32,7 +32,7 @@
diff --git a/debian/patches/0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch b/debian/patches/0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
index 3358cf1..8a0b5fe 100644
--- a/debian/patches/0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
+++ b/debian/patches/0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
@@ -20,10 +20,10 @@ index a29ab82..645c0ea 100644
 +    }
  }
 diff --git a/lib/rjb.rb b/lib/rjb.rb
-index 8af52e2..22a9637 100755
+index a591376..c5bec07 100644
 --- a/lib/rjb.rb
 +++ b/lib/rjb.rb
-@@ -63,6 +63,20 @@ end
+@@ -66,6 +66,20 @@ end
  require 'rjbcore'
  
  module Rjb
diff --git a/debian/patches/series b/debian/patches/series
index 687b4ee..f0775f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Allow-bridge-file-to-be-specified-using-the-RJB_BRID.patch
 0002-Fix-paths-to-jars-in-test-suite.patch
-0004-Use-an-method-that-always-returns-an-object-in-test_.patch
 0005-Fill-JAVA_HOME-with-a-sensible-value-if-not-set-when.patch
 0005-Always-JVM_TYPE-to-server.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rjb.git



More information about the Pkg-ruby-extras-commits mailing list