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

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 721fa2ffbaf53d79b27df2bc50b8b74f34f2c439
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Wed Aug 8 21:25:17 2012 +0300

    add patches for bugs 684182 and 684184

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
new file mode 100644
index 0000000..c09641d
--- /dev/null
+++ b/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..0d3e281
--- /dev/null
+++ b/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch
@@ -0,0 +1,40 @@
+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 937bf12..0b6fd34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 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