[DRE-commits] [SCM] ruby-gettext.git branch, master, updated. debian/2.2.1-2-27-g97c4c33
Jérémy Bobbio
lunar at debian.org
Sat Mar 16 21:50:36 UTC 2013
The following commit has been merged in the master branch:
commit 85c2d7925d154f5ad772e67192e0f258262d146b
Author: Jérémy Bobbio <lunar at debian.org>
Date: Sat Mar 16 14:57:28 2013 +0000
Refresh patches against new upstream version
Dropped as issues have been fixed upstream:
- 0001-proper-require-in-rgettext.patch
- 0002-do-not-require-rubygems-in-tests.patch
- 0004-reset-last_comment-when-pomessage-is-stored.patch
- 0005-process-RubyToken-TkDSTRING-too.patch
Refreshed:
- 0003-No-rubygems-neither-bundler.patch
diff --git a/debian/patches/0001-proper-require-in-rgettext.patch b/debian/patches/0001-proper-require-in-rgettext.patch
deleted file mode 100644
index 67c1c11..0000000
--- a/debian/patches/0001-proper-require-in-rgettext.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 file changed, 1 insertion(+), 1 deletion(-)
-
-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
deleted file mode 100644
index ad17706..0000000
--- a/debian/patches/0002-do-not-require-rubygems-in-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Sat, 17 Mar 2012 10:38:37 +0300
-Subject: do not require rubygems in tests
-
----
- test/testlib/helper.rb | 1 -
- 1 file changed, 1 deletion(-)
-
-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/0003-No-rubygems-neither-bundler.patch b/debian/patches/0003-No-rubygems-neither-bundler.patch
index 4a9ab89..5e5819e 100644
--- a/debian/patches/0003-No-rubygems-neither-bundler.patch
+++ b/debian/patches/0003-No-rubygems-neither-bundler.patch
@@ -3,48 +3,50 @@ Date: Sun, 17 Jun 2012 16:12:33 +0300
Subject: No rubygems neither bundler
---
- Rakefile | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
+ Rakefile | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/Rakefile b/Rakefile
-index 0a01124..a5c3fa7 100644
+index 6b8e252..8e0ff6a 100644
--- a/Rakefile
+++ b/Rakefile
-@@ -16,19 +16,8 @@ $:.unshift "./lib"
+@@ -17,23 +17,9 @@ $LOAD_PATH.unshift(File.join(base_dir, 'lib'))
require "tempfile"
- require 'rake'
--require 'rubygems'
--require "yard/rake/yardoc_task"
- require 'gettext/version'
-
+ 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
--Bundler::GemHelper.install_tasks
-
- PKG_VERSION = GetText::VERSION
+-helper = Bundler::GemHelper.new(base_dir)
+-helper.install
+-spec = helper.gemspec
+
+ task :default => :test
- ############################################################
-@@ -40,7 +29,7 @@ task :poparser => poparser_rb_path
+@@ -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")
- 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
+ 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
--
- desc "Setup Ruby-GetText-Package. (for setup.rb)"
- task :setup => [:makemo]
diff --git a/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch b/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch
deleted file mode 100644
index c09641d..0000000
--- a/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Wed, 8 Aug 2012 20:47:00 +0300
-Subject: reset last_comment when pomessage is stored
-
- - this patch fixes bug #684184
----
- lib/gettext/tools/parser/ruby.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/gettext/tools/parser/ruby.rb b/lib/gettext/tools/parser/ruby.rb
-index 883474f..79703a9 100644
---- a/lib/gettext/tools/parser/ruby.rb
-+++ b/lib/gettext/tools/parser/ruby.rb
-@@ -162,6 +162,7 @@ module GetText
- else
- if store_pomessage(pomessages, pomessage, path, line_no, last_comment)
- pomessage = nil
-+ last_comment = ""
- end
- end
- rescue
diff --git a/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch b/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch
deleted file mode 100644
index 0d3e281..0000000
--- a/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Wed, 8 Aug 2012 21:23:52 +0300
-Subject: process RubyToken::TkDSTRING too
-
- - this patch fixes bug #684182
----
- lib/gettext/tools/parser/ruby.rb | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/gettext/tools/parser/ruby.rb b/lib/gettext/tools/parser/ruby.rb
-index 79703a9..218b4a3 100644
---- a/lib/gettext/tools/parser/ruby.rb
-+++ b/lib/gettext/tools/parser/ruby.rb
-@@ -21,7 +21,7 @@ module GetText
- def parse
- until ( (tk = token).kind_of?(RubyToken::TkEND_OF_SCRIPT) && !@continue or tk.nil? )
- s = get_readed
-- if RubyToken::TkSTRING === tk
-+ if RubyToken::TkSTRING === tk or RubyToken::TkDSTRING === tk
- def tk.value
- @value
- end
-@@ -44,7 +44,7 @@ module GetText
- end
-
- if $DEBUG
-- if tk.is_a? TkSTRING
-+ if tk.is_a? TkSTRING or tk.is_a? TkDSTRING
- $stderr.puts("#{tk}: #{tk.value}")
- elsif tk.is_a? TkIDENTIFIER
- $stderr.puts("#{tk}: #{tk.name}")
-@@ -153,7 +153,7 @@ module GetText
- pomessage = nil
- end
- line_no = tk.line_no.to_s
-- when RubyToken::TkSTRING
-+ when RubyToken::TkSTRING, RubyToken::TkDSTRING
- pomessage.set_current_attribute tk.value if pomessage
- when RubyToken::TkPLUS, RubyToken::TkNL
- #do nothing
diff --git a/debian/patches/series b/debian/patches/series
index 0b6fd34..83e086e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-0001-proper-require-in-rgettext.patch
-0002-do-not-require-rubygems-in-tests.patch
0003-No-rubygems-neither-bundler.patch
-0004-reset-last_comment-when-pomessage-is-stored.patch
-0005-process-RubyToken-TkDSTRING-too.patch
--
ruby-gettext.git
More information about the Pkg-ruby-extras-commits
mailing list