[DRE-commits] [ruby-rjb] 02/09: Refresh patches
Jérémy Bobbio
lunar at moszumanska.debian.org
Wed Sep 9 19:56:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch master
in repository ruby-rjb.
commit 08de2162650fec79e05971f856c863f03fcb60f8
Author: Jérémy Bobbio <lunar at debian.org>
Date: Wed Sep 9 19:33:38 2015 +0200
Refresh patches
---
...e-file-to-be-specified-using-the-RJB_BRID.patch | 8 +-
.../0002-Fix-paths-to-jars-in-test-suite.patch | 12 +--
.../patches/0003-Remove-broken-encoding-test.patch | 91 ----------------------
...od-that-always-returns-an-object-in-test_.patch | 10 +--
...OME-with-a-sensible-value-if-not-set-when.patch | 10 +--
debian/patches/series | 1 -
6 files changed, 20 insertions(+), 112 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 1f54fda..72a8e28 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
@@ -1,17 +1,17 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
Date: Mon, 12 Aug 2013 16:14:12 +0200
Subject: Allow bridge file to be specified using the RJB_BRIDGE_FILE
environment variable
---
- lib/rjb.rb | 2 +-
+ lib/rjb.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/rjb.rb b/lib/rjb.rb
-index 97125dc..1836f7b 100755
+index e0b759e..8af52e2 100755
--- a/lib/rjb.rb
+++ b/lib/rjb.rb
-@@ -24,7 +24,7 @@ module RjbConf
+@@ -53,7 +53,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 7d94631..b949861 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
@@ -1,12 +1,12 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
Date: Mon, 12 Aug 2013 20:17:00 +0200
Subject: Fix paths to jars in test suite
---
- test/jartest.rb | 4 ++--
- test/jartest2.rb | 2 +-
- test/jartest3.rb | 2 +-
- test/test.rb | 6 +++---
+ test/jartest.rb | 4 ++--
+ test/jartest2.rb | 2 +-
+ test/jartest3.rb | 2 +-
+ test/test.rb | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/jartest.rb b/test/jartest.rb
@@ -51,7 +51,7 @@ index cc673b9..9b301f0 100644
Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
fail 'no exception'
diff --git a/test/test.rb b/test/test.rb
-index ed79ca1..80907d8 100755
+index ac6b458..84dbebe 100755
--- a/test/test.rb
+++ b/test/test.rb
@@ -749,14 +749,14 @@ class TestRjb < Test::Unit::TestCase
diff --git a/debian/patches/0003-Remove-broken-encoding-test.patch b/debian/patches/0003-Remove-broken-encoding-test.patch
deleted file mode 100644
index d08e39b..0000000
--- a/debian/patches/0003-Remove-broken-encoding-test.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
-Date: Mon, 12 Aug 2013 20:31:36 +0200
-Subject: Remove broken encoding test
-
----
- test/test.rb | 72 ----------------------------------------------------------
- 1 file changed, 72 deletions(-)
-
-diff --git a/test/test.rb b/test/test.rb
-index 80907d8..7ef5b7c 100755
---- a/test/test.rb
-+++ b/test/test.rb
-@@ -143,78 +143,6 @@ class TestRjb < Test::Unit::TestCase
- assert_equal(3, oa[2].intValue)
- end
-
-- def test_kjconv()
-- if Object::const_defined?(:Encoding)
-- test = import('jp.co.infoseek.hp.arton.rjb.Test').new
-- euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding Encoding::EUC_JP
-- s = @jString.new(euc_kj)
-- assert_equal(s.toString().encoding, Encoding::UTF_8)
-- assert(test.isSameString(s))
-- assert(test.isSameString(euc_kj))
-- assert_equal(s.toString().encode(Encoding::EUC_JP), euc_kj)
-- sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding Encoding::SHIFT_JIS
-- s = @jString.new(sjis_kj)
-- assert_equal(s.toString().encoding, Encoding::UTF_8)
-- assert(test.isSameString(s))
-- assert(test.isSameString(sjis_kj))
-- assert_equal(s.toString().encode(Encoding::SHIFT_JIS), sjis_kj)
-- utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding Encoding::UTF_8
-- s = @jString.new(utf8_kj)
-- assert_equal(s.toString().encoding, Encoding::UTF_8)
-- assert(test.isSameString(s))
-- assert(test.isSameString(utf8_kj))
-- assert_equal(s.toString().encode(Encoding::UTF_8), utf8_kj)
-- iso2022jp_kj = "\x1b\x24\x42\x34\x41\x3b\x7a\x25\x46\x25\x2d\x25\x39\x25\x48\x1b\x28\x42".force_encoding Encoding::ISO_2022_JP
-- s = @jString.new(iso2022jp_kj)
-- assert_equal(s.toString().encoding, Encoding::UTF_8)
-- assert(test.isSameString(s))
-- assert(test.isSameString(iso2022jp_kj))
-- assert_equal(s.toString().encode(Encoding::ISO_2022_JP), iso2022jp_kj)
-- assert_equal(@jString.new("abcdef".force_encoding(Encoding::ASCII_8BIT)).toString(), "abcdef")
-- assert_equal(@jString.new("abcdef".force_encoding(Encoding::find("us-ascii"))).toString(), "abcdef")
-- else
-- default_kcode = $KCODE
-- begin
-- $KCODE = 'euc'
-- euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-- s = @jString.new(euc_kj)
-- assert_equal(s.toString(), euc_kj)
-- $KCODE = 'sjis'
-- sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-- s = @jString.new(sjis_kj)
-- assert_equal(s.toString(), sjis_kj)
-- $KCODE = 'utf8'
-- utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-- s = @jString.new(utf8_kj)
-- assert_equal(s.toString(), utf8_kj)
-- $KCODE = 'none'
-- if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-- #expecting shift_jis on windows
-- none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-- else
-- #expecting utf-8 unless windows
-- none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-- end
-- s = @jString.new(none_kj)
-- assert_equal(s.toString(), none_kj)
-- $KCODE = 'utf8'
-- utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-- s = @jString.new(utf8_kj)
-- assert_equal(s.toString(), utf8_kj)
-- $KCODE = 'sjis'
-- sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-- s = @jString.new(sjis_kj)
-- assert_equal(s.toString(), sjis_kj)
-- $KCODE = 'euc'
-- euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-- s = @jString.new(euc_kj)
-- assert_equal(s.toString(), euc_kj)
-- ensure
-- $KCODE = default_kcode
-- end
-- end
-- end
--
- def test_combination_charcters
- teststr = "\xc7\x96\xc3\xbc\xcc\x84\x75\xcc\x88\xcc\x84\xed\xa1\xa9\xed\xba\xb2\xe3\x81\x8b\xe3\x82\x9a"
- test = import('jp.co.infoseek.hp.arton.rjb.Test').new
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
index 7e59a71..ae6814f 100644
--- 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
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+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
@@ -6,14 +6,14 @@ 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 ++++----
+ test/test.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/test.rb b/test/test.rb
-index 7ef5b7c..5eb2cfe 100755
+index 84dbebe..b9fa9a9 100755
--- a/test/test.rb
+++ b/test/test.rb
-@@ -796,10 +796,10 @@ class TestRjb < Test::Unit::TestCase
+@@ -867,10 +867,10 @@ class TestRjb < Test::Unit::TestCase
end
def test_noarg_sinvoke()
sys = import('java.lang.System')
@@ -27,4 +27,4 @@ index 7ef5b7c..5eb2cfe 100755
+ assert_equal(cons._classname, sys._invoke('getProperties')._classname)
end
def test_longarg
- assert_equal(597899502607411822, @jLong.reverse(0x7654321076543210))
+ skip('rbx can handle 64bits long') if RUBY_ENGINE == 'rbx'
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 c7fbf28..3358cf1 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
@@ -1,10 +1,10 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
Date: Tue, 13 Aug 2013 22:58:40 +0200
Subject: Fill JAVA_HOME with a sensible value if not set when loading the JVM
---
- ext/RBridge.java | 3 +++
- lib/rjb.rb | 14 ++++++++++++++
+ ext/RBridge.java | 3 +++
+ lib/rjb.rb | 14 ++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/ext/RBridge.java b/ext/RBridge.java
@@ -20,10 +20,10 @@ index a29ab82..645c0ea 100644
+ }
}
diff --git a/lib/rjb.rb b/lib/rjb.rb
-index 1836f7b..9ce0cf7 100755
+index 8af52e2..22a9637 100755
--- a/lib/rjb.rb
+++ b/lib/rjb.rb
-@@ -34,6 +34,20 @@ end
+@@ -63,6 +63,20 @@ end
require 'rjbcore'
module Rjb
diff --git a/debian/patches/series b/debian/patches/series
index cdcb708..3ef6c44 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
-0003-Remove-broken-encoding-test.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
--
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