[DRE-commits] [SCM] ruby-gettext.git branch, master, updated. debian/2.2.1-2-27-g97c4c33

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 315ec0f8dc8dda164f2a241fafa57c7ecc17ca9e
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Mar 16 16:26:16 2013 +0000

    Add a patch to avoid adding test-unit-notify and test-unit-rr as Build-Depends

diff --git a/debian/patches/0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch b/debian/patches/0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch
new file mode 100644
index 0000000..388a861
--- /dev/null
+++ b/debian/patches/0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch
@@ -0,0 +1,35 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Sat, 16 Mar 2013 16:21:28 +0000
+Subject: Make test-unit-notify and test-unit-rr optional to run the tests
+
+---
+ test/run-test.rb |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/test/run-test.rb b/test/run-test.rb
+index 48d7242..24bfee6 100755
+--- a/test/run-test.rb
++++ b/test/run-test.rb
+@@ -29,8 +29,20 @@ $LOAD_PATH.unshift(lib_dir)
+ $LOAD_PATH.unshift(test_dir)
+ 
+ require "test-unit"
+-require "test/unit/notify"
+-require "test/unit/rr"
++begin
++  require "test/unit/notify"
++rescue LoadError
++  # Let's do without notifications
++end
++begin
++  require "test/unit/rr"
++rescue LoadError
++  # Include RR manually
++  require "rr"
++  class Test::Unit::TestCase
++    include RR::Adapters::TestUnit
++  end
++end
+ 
+ require "gettext-test-utils"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 83e086e..bb7dc10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch
 0003-No-rubygems-neither-bundler.patch

-- 
ruby-gettext.git