diff --git a/debian/changelog b/debian/changelog index 3d452df4fcee6199d2636279ed11404bd3d99e72..a0255ee0f8ed4c034f6822b8d046d5216b8528ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,11 @@ ruby-bert (1.1.6-2) unstable; urgency=medium * d/ruby-test-files.yaml: Replace by d/ruby-tests.rake. * d/ruby-tests.rake: Add file. * d/rules: Check dependencies on build and use gem installation layout. + * d/patches/0001-Fix-test-includes-for-Ruby-2.1.patch: Rename to + d/patches/0001-Fix-test-autorun.patch. + - Replace load by require, remove LOAD_PATH changes, require autorunner. + - Drop Ruby 2.1 related changes. + * d/patches/series: Adjust the file accordingly. * d/upstream/metadata: Add upstream metadata. * d/tests/control: Add allow-stderr to restrictions. * d/watch: Use gemwatch.d.n. diff --git a/debian/patches/0001-Fix-test-autorun.patch b/debian/patches/0001-Fix-test-autorun.patch new file mode 100644 index 0000000000000000000000000000000000000000..924d619c332ae5263cc7c834c221e8581928dfa0 --- /dev/null +++ b/debian/patches/0001-Fix-test-autorun.patch @@ -0,0 +1,30 @@ +From: Daniel Leidert <dleidert@debian.org> +Date: Mon, 8 Dec 2014 22:09:57 +0100 +Subject: Fix test run and autorun + +--- + test/test_helper.rb | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/test/test_helper.rb b/test/test_helper.rb +index d053e9a..1a80c7e 100644 +--- a/test/test_helper.rb ++++ b/test/test_helper.rb +@@ -1,10 +1,11 @@ +-require 'rubygems' ++#require 'rubygems' + require 'test/unit' ++require 'test/unit/autorunner' + require 'shoulda' + +-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) +-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext', 'bert', 'c')) ++#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) ++#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext', 'bert', 'c')) + +-load 'bert.rb' ++require 'bert' + +-puts "Using #{BERT::Decode.impl} implementation." +\ No newline at end of file ++puts "Using #{BERT::Decode.impl} implementation." diff --git a/debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch b/debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch deleted file mode 100644 index b5d3239c5bbab1662b3f115171a9bded578d8803..0000000000000000000000000000000000000000 --- a/debian/patches/0001-Fix-test-includes-for-Ruby-2.1.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9674150ba247cd3939c4fc119a452e5d5920dcf3 Mon Sep 17 00:00:00 2001 -From: Balint Reczey <balint@balintreczey.hu> -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..dbc0324 100644 ---- a/test/bert_test.rb -+++ b/test/bert_test.rb -@@ -1,4 +1,4 @@ --require 'test_helper' -+require File.dirname(__FILE__) + '/test_helper' - - class BertTest < Test::Unit::TestCase - context "BERT" do -diff --git a/test/decoder_test.rb b/test/decoder_test.rb -index 3bbfee6..9f0cc02 100644 ---- a/test/decoder_test.rb -+++ b/test/decoder_test.rb -@@ -1,4 +1,4 @@ --require 'test_helper' -+require File.dirname(__FILE__) + '/test_helper' - - 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..bb23d61 100644 ---- a/test/encoder_test.rb -+++ b/test/encoder_test.rb -@@ -1,6 +1,6 @@ - # encoding: utf-8 - --require 'test_helper' -+require File.dirname(__FILE__) + '/test_helper' - - 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..cf2d7f9 100644 ---- a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -1,5 +1,6 @@ - require 'rubygems' - require 'test/unit' -+require 'minitest/autorun' - require 'shoulda' - - $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) --- -2.1.3 - diff --git a/debian/patches/series b/debian/patches/series index baf6afc141ee58ce2b59e3e5396648371cd9f45c..420d5654fa48d0c517f962004171e6ab23d75f1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -0001-Fix-test-includes-for-Ruby-2.1.patch +0001-Fix-test-autorun.patch 0002-Force-encoding-in-BERT-test.patch 0003-Bert-format-stores-time-in-microseconds.patch