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

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit f893928ee1dc0d6be528cc510f0eb6a002195bc5
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Mar 16 22:49:44 2013 +0000

    Add a patch to stop comment propagation in Ruby parser
    
    Closes: #684184

diff --git a/debian/patches/0001-Stop-propagating-comments-between-two-strings-in-Rub.patch b/debian/patches/0001-Stop-propagating-comments-between-two-strings-in-Rub.patch
new file mode 100644
index 0000000..173616f
--- /dev/null
+++ b/debian/patches/0001-Stop-propagating-comments-between-two-strings-in-Rub.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Sat, 16 Mar 2013 22:49:44 +0000
+Subject: Stop propagating comments between two strings in Ruby parser
+
+---
+ lib/gettext/tools/parser/ruby.rb |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/gettext/tools/parser/ruby.rb b/lib/gettext/tools/parser/ruby.rb
+index 40b9d82..6e776fc 100644
+--- a/lib/gettext/tools/parser/ruby.rb
++++ b/lib/gettext/tools/parser/ruby.rb
+@@ -160,7 +160,9 @@ module GetText
+           ignore_next_comma = false
+           case tk
+           when RubyToken::TkIDENTIFIER, RubyToken::TkCONSTANT
+-            store_po_entry(po, po_entry, path, line_no, last_comment)
++            if store_po_entry(po, po_entry, path, line_no, last_comment)
++              last_comment = ""
++            end
+             if ID.include?(tk.name)
+               po_entry = POEntry.new(:normal)
+             elsif PLURAL_ID.include?(tk.name)
diff --git a/debian/patches/series b/debian/patches/series
index bb7dc10..5b76991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-Stop-propagating-comments-between-two-strings-in-Rub.patch
 0002-Make-test-unit-notify-and-test-unit-rr-optional-to-r.patch
 0003-No-rubygems-neither-bundler.patch

-- 
ruby-gettext.git