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

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 26ac6b9eeca383c2b404ebc8b9c3adff7622b70b
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Apr 5 09:04:56 2013 +0000

    Refresh patches
    
     - Remove 0001-Stop-propagating-comments-between-two-strings-in-Rub.patch:
       applied upppstream.

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
deleted file mode 100644
index 173616f..0000000
--- a/debian/patches/0001-Stop-propagating-comments-between-two-strings-in-Rub.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 5b76991..bb7dc10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-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