[DRE-commits] [ruby-bert] 02/02: Refresh patches to match upstreamed commits
Balint Reczey
rbalint at moszumanska.debian.org
Thu Dec 11 10:33:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
rbalint pushed a commit to branch master
in repository ruby-bert.
commit fe2ed1bb112dfd79b4d5942819c1f57dab7ee425
Author: Balint Reczey <balint at balintreczey.hu>
Date: Thu Dec 11 11:26:22 2014 +0100
Refresh patches to match upstreamed commits
---
...h => 0001-Fix-test-includes-for-Ruby-2.1.patch} | 23 ++++++++++++++------
...atch => 0002-Force-encoding-in-BERT-test.patch} | 25 +++++++++++++---------
...3-Bert-format-stores-time-in-microseconds.patch | 25 ++++++++++++++++++++++
debian/patches/series | 5 +++--
4 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/debian/patches/01_fix_test_includes.patch b/debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch
similarity index 72%
rename from debian/patches/01_fix_test_includes.patch
rename to debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch
index 960dcfd..b5d3239 100644
--- a/debian/patches/01_fix_test_includes.patch
+++ b/debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch
@@ -1,9 +1,17 @@
+From 9674150ba247cd3939c4fc119a452e5d5920dcf3 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint at balintreczey.hu>
-Subject: Fix includes in test files
-Forwarded: not-needed
+Date: Mon, 8 Dec 2014 22:09:57 +0100
+Subject: [PATCH 1/3] Fix test includes for Ruby 2.1
+
+---
+ test/bert_test.rb | 2 +-
+ test/decoder_test.rb | 2 +-
+ test/encoder_test.rb | 2 +-
+ test/test_helper.rb | 1 +
+ 4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/test/bert_test.rb b/test/bert_test.rb
-index 10d3f46..7a32dc0 100644
+index 10d3f46..dbc0324 100644
--- a/test/bert_test.rb
+++ b/test/bert_test.rb
@@ -1,4 +1,4 @@
@@ -13,7 +21,7 @@ index 10d3f46..7a32dc0 100644
class BertTest < Test::Unit::TestCase
context "BERT" do
diff --git a/test/decoder_test.rb b/test/decoder_test.rb
-index 3bbfee6..16d84cf 100644
+index 3bbfee6..9f0cc02 100644
--- a/test/decoder_test.rb
+++ b/test/decoder_test.rb
@@ -1,4 +1,4 @@
@@ -23,7 +31,7 @@ index 3bbfee6..16d84cf 100644
class DecoderTest < Test::Unit::TestCase
BERT_NIL = [131,104,2,100,0,4,98,101,114,116,100,0,3,110,105,108].pack('c*')
diff --git a/test/encoder_test.rb b/test/encoder_test.rb
-index 75290a7..04a9c76 100644
+index 75290a7..bb23d61 100644
--- a/test/encoder_test.rb
+++ b/test/encoder_test.rb
@@ -1,6 +1,6 @@
@@ -35,7 +43,7 @@ index 75290a7..04a9c76 100644
class EncoderTest < Test::Unit::TestCase
context "BERT Encoder complex type converter" do
diff --git a/test/test_helper.rb b/test/test_helper.rb
-index d053e9a..153c659 100644
+index d053e9a..cf2d7f9 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,6 @@
@@ -45,3 +53,6 @@ index d053e9a..153c659 100644
require 'shoulda'
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+--
+2.1.3
+
diff --git a/debian/patches/02_fix_tests.patch b/debian/patches/0002-Force-encoding-in-BERT-test.patch
similarity index 81%
rename from debian/patches/02_fix_tests.patch
rename to debian/patches/0002-Force-encoding-in-BERT-test.patch
index b91e96c..41f1946 100644
--- a/debian/patches/02_fix_tests.patch
+++ b/debian/patches/0002-Force-encoding-in-BERT-test.patch
@@ -1,6 +1,17 @@
+From afde6b70000fd27c4e7d6af98d2f5e92e164c7e2 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Wed, 10 Dec 2014 18:33:09 +0100
+Subject: [PATCH 2/3] Force encoding in BERT test
+
+---
+ test/bert_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/bert_test.rb b/test/bert_test.rb
+index dbc0324..bd2ca7d 100644
--- a/test/bert_test.rb
+++ b/test/bert_test.rb
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ class BertTest < Test::Unit::TestCase
setup do
time = Time.at(1254976067)
@ruby = t[:user, {:name => 'TPW'}, [/cat/i, 9.9], time, nil, true, false, :true, :false]
@@ -9,12 +20,6 @@
@ebin = "<<131,104,9,100,0,4,117,115,101,114,104,3,100,0,4,98,101,114,116,100,0,4,100,105,99,116,108,0,0,0,1,104,2,100,0,4,110,97,109,101,109,0,0,0,3,84,80,87,106,108,0,0,0,2,104,4,100,0,4,98,101,114,116,100,0,5,114,101,103,101,120,109,0,0,0,3,99,97,116,108,0,0,0,1,100,0,8,99,97,115,101,108,101,115,115,106,99,57,46,57,48,48,48,48,48,48,48,48,48,48,48,48,48,48,101,43,48,48,0,0,0,0,0,0,0,0,0,0,106,104,5,100,0,4,98,101,114,116,100,0,4,116,105,109,101,98,0,0,4,230,98,0,14,228,195,97,0 [...]
end
-@@ -42,7 +42,7 @@
- dd << {}
- dd << {:a => 1}
- dd << {:a => 1, :b => 2}
-- dd << Time.now
-+ dd << Time.now.round(6)
- dd << /^c(a)t$/i
-
- dd << 178
+--
+2.1.3
+
diff --git a/debian/patches/0003-Bert-format-stores-time-in-microseconds.patch b/debian/patches/0003-Bert-format-stores-time-in-microseconds.patch
new file mode 100644
index 0000000..9303896
--- /dev/null
+++ b/debian/patches/0003-Bert-format-stores-time-in-microseconds.patch
@@ -0,0 +1,25 @@
+From 406682398ecd96236cffe697602f197b7a568a80 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Wed, 10 Dec 2014 18:39:46 +0100
+Subject: [PATCH 3/3] Bert format stores time in microseconds
+
+---
+ test/bert_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/bert_test.rb b/test/bert_test.rb
+index bd2ca7d..dc7f5a7 100644
+--- a/test/bert_test.rb
++++ b/test/bert_test.rb
+@@ -42,7 +42,7 @@ class BertTest < Test::Unit::TestCase
+ dd << {}
+ dd << {:a => 1}
+ dd << {:a => 1, :b => 2}
+- dd << Time.now
++ dd << Time.now.round(6)
+ dd << /^c(a)t$/i
+
+ dd << 178
+--
+2.1.3
+
diff --git a/debian/patches/series b/debian/patches/series
index bd3193a..baf6afc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-01_fix_test_includes.patch
-02_fix_tests.patch
+0001-Fix-test-includes-for-Ruby-2.1.patch
+0002-Force-encoding-in-BERT-test.patch
+0003-Bert-format-stores-time-in-microseconds.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-bert.git
More information about the Pkg-ruby-extras-commits
mailing list