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

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit dc528440bab165ad49804edb0e3e458ec15469a6
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun Jun 17 16:19:15 2012 +0300

    Update patches

diff --git a/debian/patches/0001-proper-require-in-rgettext.patch b/debian/patches/0001-proper-require-in-rgettext.patch
index c21d581..67c1c11 100644
--- a/debian/patches/0001-proper-require-in-rgettext.patch
+++ b/debian/patches/0001-proper-require-in-rgettext.patch
@@ -4,7 +4,7 @@ Subject: proper require in rgettext
 
 ---
  bin/rgettext |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bin/rgettext b/bin/rgettext
 index 74eefba..be792e4 100755
diff --git a/debian/patches/0002-do-not-require-rubygems-in-tests.patch b/debian/patches/0002-do-not-require-rubygems-in-tests.patch
index cfae81e..ad17706 100644
--- a/debian/patches/0002-do-not-require-rubygems-in-tests.patch
+++ b/debian/patches/0002-do-not-require-rubygems-in-tests.patch
@@ -3,22 +3,9 @@ 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(-)
+ 1 file changed, 1 deletion(-)
 
-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
diff --git a/debian/patches/0003-No-rubygems-neither-bundler.patch b/debian/patches/0003-No-rubygems-neither-bundler.patch
new file mode 100644
index 0000000..4a9ab89
--- /dev/null
+++ b/debian/patches/0003-No-rubygems-neither-bundler.patch
@@ -0,0 +1,50 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sun, 17 Jun 2012 16:12:33 +0300
+Subject: No rubygems neither bundler
+
+---
+ Rakefile |   16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 0a01124..a5c3fa7 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -16,19 +16,8 @@ $:.unshift "./lib"
+ 
+ require "tempfile"
+ require 'rake'
+-require 'rubygems'
+-require "yard/rake/yardoc_task"
+ require 'gettext/version'
+ 
+-require "bundler/gem_helper"
+-class Bundler::GemHelper
+-  undef_method :version_tag
+-  def version_tag
+-    version
+-  end
+-end
+-Bundler::GemHelper.install_tasks
+-
+ PKG_VERSION = GetText::VERSION
+ 
+ ############################################################
+@@ -40,7 +29,7 @@ task :poparser => poparser_rb_path
+ 
+ poparser_ry_path = "src/poparser.ry"
+ file poparser_rb_path => poparser_ry_path do
+-  racc = File.join(Gem.bindir, "racc")
++  racc = "/usr/bin/racc"
+   tempfile = Tempfile.new("gettext-poparser")
+   command_line = "#{racc} -g #{poparser_ry_path} -o #{tempfile.path}"
+   ruby(command_line)
+@@ -216,8 +205,5 @@ task :test => "test:prepare" do
+   ruby "test/run-test.rb", *options
+ end
+ 
+-YARD::Rake::YardocTask.new do |t|
+-end
+-
+ desc "Setup Ruby-GetText-Package. (for setup.rb)"
+ task :setup => [:makemo]
diff --git a/debian/patches/series b/debian/patches/series
index d547275..937bf12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-proper-require-in-rgettext.patch
 0002-do-not-require-rubygems-in-tests.patch
+0003-No-rubygems-neither-bundler.patch

-- 
ruby-gettext.git