[DRE-commits] [SCM] ruby-gettext.git branch, master, updated. debian/2.3.9-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit cab0431c59c924f5a64be620515d8611723a0ecc
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue May 7 09:44:46 2013 +0000

    Rework debian/patches to properly support upstream Rakefile

diff --git a/debian/patches/0003-Do-not-use-Bundler-in-Rakefile.patch b/debian/patches/0003-Do-not-use-Bundler-in-Rakefile.patch
new file mode 100644
index 0000000..9367562
--- /dev/null
+++ b/debian/patches/0003-Do-not-use-Bundler-in-Rakefile.patch
@@ -0,0 +1,32 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sun, 17 Jun 2012 16:12:33 +0300
+Subject: Do not use Bundler in Rakefile
+
+---
+ Rakefile |   12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 6b8e252..16c7b84 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -22,18 +22,8 @@ require "yard"
+ require "gettext/version"
+ require "gettext/tools"
+ require "gettext/task"
+-require "bundler/gem_helper"
+ 
+-class Bundler::GemHelper
+-  undef_method :version_tag
+-  def version_tag
+-    version
+-  end
+-end
+-
+-helper = Bundler::GemHelper.new(base_dir)
+-helper.install
+-spec = helper.gemspec
++spec = Gem::Specification.load('gettext.gemspec')
+ 
+ task :default => :test
+ 
diff --git a/debian/patches/0003-No-rubygems-neither-bundler.patch b/debian/patches/0003-No-rubygems-neither-bundler.patch
deleted file mode 100644
index 5e5819e..0000000
--- a/debian/patches/0003-No-rubygems-neither-bundler.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Sun, 17 Jun 2012 16:12:33 +0300
-Subject: No rubygems neither bundler
-
----
- Rakefile |   19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/Rakefile b/Rakefile
-index 6b8e252..8e0ff6a 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -17,23 +17,9 @@ $LOAD_PATH.unshift(File.join(base_dir, 'lib'))
- 
- require "tempfile"
- require "rake"
--require "rubygems"
--require "yard"
- require "gettext/version"
- require "gettext/tools"
- require "gettext/task"
--require "bundler/gem_helper"
--
--class Bundler::GemHelper
--  undef_method :version_tag
--  def version_tag
--    version
--  end
--end
--
--helper = Bundler::GemHelper.new(base_dir)
--helper.install
--spec = helper.gemspec
- 
- task :default => :test
- 
-@@ -50,7 +36,7 @@ end
- 
- 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")
-   ruby(racc, "-g", poparser_ry_path, "-o", tempfile.path)
- 
-@@ -166,6 +152,3 @@ task "test:gettext"
- task :package => [:gettext]
- 
- task :build => [:gettext]
--
--YARD::Rake::YardocTask.new do |t|
--end
diff --git a/debian/patches/0004-Use-system-racc-in-Rakefile.patch b/debian/patches/0004-Use-system-racc-in-Rakefile.patch
new file mode 100644
index 0000000..737e1b8
--- /dev/null
+++ b/debian/patches/0004-Use-system-racc-in-Rakefile.patch
@@ -0,0 +1,21 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Tue, 7 May 2013 09:43:01 +0000
+Subject: Use system racc in Rakefile
+
+---
+ Rakefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Rakefile b/Rakefile
+index 16c7b84..aad2f1c 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -40,7 +40,7 @@ end
+ 
+ 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")
+   ruby(racc, "-g", poparser_ry_path, "-o", tempfile.path)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index bb7dc10..b49c9d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch
-0003-No-rubygems-neither-bundler.patch
+0003-Do-not-use-Bundler-in-Rakefile.patch
+0004-Use-system-racc-in-Rakefile.patch

-- 
ruby-gettext.git