[DRE-commits] [SCM] ruby-gettext.git branch, master, updated. upstream/2.2.0-8-g3c0bbcc

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 009c936f9c983e64c6ce370c6521967e09adcd74
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sat Mar 17 10:39:06 2012 +0300

    add patches

diff --git a/debian/patches/0001-proper-require-in-rgettext.patch b/debian/patches/0001-proper-require-in-rgettext.patch
new file mode 100644
index 0000000..c21d581
--- /dev/null
+++ b/debian/patches/0001-proper-require-in-rgettext.patch
@@ -0,0 +1,21 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sat, 17 Mar 2012 10:38:07 +0300
+Subject: proper require in rgettext
+
+---
+ bin/rgettext |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bin/rgettext b/bin/rgettext
+index 74eefba..be792e4 100755
+--- a/bin/rgettext
++++ b/bin/rgettext
+@@ -10,7 +10,7 @@
+ =end
+ 
+ begin
+-  require 'gettext/rgettext'
++  require 'gettext/tools/rgettext'
+ rescue LoadError
+   begin
+     require 'rubygems'
diff --git a/debian/patches/0002-do-not-require-rubygems-in-tests.patch b/debian/patches/0002-do-not-require-rubygems-in-tests.patch
new file mode 100644
index 0000000..cfae81e
--- /dev/null
+++ b/debian/patches/0002-do-not-require-rubygems-in-tests.patch
@@ -0,0 +1,33 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sat, 17 Mar 2012 10:38:37 +0300
+Subject: do not require rubygems in tests
+
+---
+ test/Rakefile          |    2 +-
+ test/testlib/helper.rb |    1 -
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/test/Rakefile b/test/Rakefile
+index 044e361..f6dbe64 100644
+--- a/test/Rakefile
++++ b/test/Rakefile
+@@ -12,6 +12,6 @@ desc 'Run all tests'
+ task :test do
+    Dir.glob("**/test_*.rb").each do |path|
+     puts ""
+-    ruby "-I../lib:../../locale/lib:. -rubygems #{path}"
++    ruby "-I../lib:. #{path}"
+    end
+ end
+diff --git a/test/testlib/helper.rb b/test/testlib/helper.rb
+index 3322556..3071311 100644
+--- a/test/testlib/helper.rb
++++ b/test/testlib/helper.rb
+@@ -3,7 +3,6 @@
+ $LOAD_PATH.unshift File.expand_path("../../lib", File.dirname(__FILE__))
+ require 'test/unit'
+ 
+-require 'rubygems'
+ require 'gettext'
+ 
+ #optional gems
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d547275
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-proper-require-in-rgettext.patch
+0002-do-not-require-rubygems-in-tests.patch

-- 
ruby-gettext.git