Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package ruby-gettext. This version includes patches for bugs #684182 and #684184, it has tests always run and it has better package description. unblock ruby-gettext/2.2.1-3 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (50, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=be_BY.UTF-8, LC_CTYPE=be_BY.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff -Nru ruby-gettext-2.2.1/debian/changelog ruby-gettext-2.2.1/debian/changelog --- ruby-gettext-2.2.1/debian/changelog 2012-06-30 20:39:47.000000000 +0300 +++ ruby-gettext-2.2.1/debian/changelog 2012-10-07 23:28:50.000000000 +0300 @@ -1,3 +1,19 @@ +ruby-gettext (2.2.1-3) unstable; urgency=low + + [ Cédric Boutillier ] + * Improve description. Thanks to Justin B. Rye (Closes: #682543) + + [ Hleb Valoshka ] + * debian/patches + - 0004-reset-last_comment-when-pomessage-is-stored.patch: rgettext won't + skip translatable strings containing the hash symbol (Closes: #684182) + - 0005-process-RubyToken-TkDSTRING-too.patch: rgettext won't copy + comments for translators to all subsequent messages (Closes: #684184) + * Fix lintian complaints. + * Ensure tests are run. + + -- Hleb Valoshka <375...@gmail.com> Wed, 08 Aug 2012 21:42:52 +0300 + ruby-gettext (2.2.1-2) unstable; urgency=low * Team upload. diff -Nru ruby-gettext-2.2.1/debian/control ruby-gettext-2.2.1/debian/control --- ruby-gettext-2.2.1/debian/control 2012-06-30 20:39:47.000000000 +0300 +++ ruby-gettext-2.2.1/debian/control 2012-10-07 23:28:51.000000000 +0300 @@ -4,7 +4,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org> Uploaders: Hleb Valoshka <375...@gmail.com> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-locale | liblocale-ruby1.8, ruby-locale | liblocale-ruby1.9.1, rake +Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-locale, ruby-test-unit Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-gettext.git Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-gettext.git;a=summary @@ -18,15 +18,14 @@ Breaks: libgettext-ruby1.8 (<< ${source:Version}), libgettext-ruby1.9.1 (<< ${source:Version}), libgettext-ruby (<< ${source:Version}) Replaces: libgettext-ruby1.8 (<< ${source:Version}), libgettext-ruby1.9.1 (<< ${source:Version}), libgettext-ruby (<<${source:Version}) Provides: libgettext-ruby1.8, libgettext-ruby1.9.1, libgettext-ruby -Description: Gettext for Ruby - Ruby GetText Package is Native Language Support Library and Tools - which modeled after GNU gettext package. +Description: gettext for Ruby + This Ruby package is a localization library and toolset modeled after + GNU gettext, and with a similar simple API. . - Features: - * Simple APIs(similar GNU gettext) - * rgettext creates po-files from ruby scripts. - The po-file is compatible to GNU gettext. - * rmsgfmt creates a mo-file from a po-file. + It provides: + * rgettext - creates gettext-compatible PO files from Ruby scripts; + * rmsgfmt - creates a MO file from a PO file; + * rmsgmerge - extracts translatable strings from Ruby scripts. Package: libgettext-ruby Section: oldlibs diff -Nru ruby-gettext-2.2.1/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch ruby-gettext-2.2.1/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch --- ruby-gettext-2.2.1/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch 1970-01-01 03:00:00.000000000 +0300 +++ ruby-gettext-2.2.1/debian/patches/0004-reset-last_comment-when-pomessage-is-stored.patch 2012-09-25 01:39:43.000000000 +0300 @@ -0,0 +1,21 @@ +From: Hleb Valoshka <375...@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 -Nru ruby-gettext-2.2.1/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch ruby-gettext-2.2.1/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch --- ruby-gettext-2.2.1/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch 1970-01-01 03:00:00.000000000 +0300 +++ ruby-gettext-2.2.1/debian/patches/0005-process-RubyToken-TkDSTRING-too.patch 2012-09-25 01:39:43.000000000 +0300 @@ -0,0 +1,40 @@ +From: Hleb Valoshka <375...@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 -Nru ruby-gettext-2.2.1/debian/patches/series ruby-gettext-2.2.1/debian/patches/series --- ruby-gettext-2.2.1/debian/patches/series 2012-06-24 22:22:20.000000000 +0300 +++ ruby-gettext-2.2.1/debian/patches/series 2012-09-25 01:39:43.000000000 +0300 @@ -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 diff -Nru ruby-gettext-2.2.1/debian/ruby-gettext.lintian-overrides ruby-gettext-2.2.1/debian/ruby-gettext.lintian-overrides --- ruby-gettext-2.2.1/debian/ruby-gettext.lintian-overrides 2012-03-21 17:32:13.000000000 +0300 +++ ruby-gettext-2.2.1/debian/ruby-gettext.lintian-overrides 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -ruby-gettext: executable-not-elf-or-script ./usr/share/doc/ruby-gettext/examples/makemo.rb diff -Nru ruby-gettext-2.2.1/debian/ruby-tests.rb ruby-gettext-2.2.1/debian/ruby-tests.rb --- ruby-gettext-2.2.1/debian/ruby-tests.rb 2012-06-24 22:22:20.000000000 +0300 +++ ruby-gettext-2.2.1/debian/ruby-tests.rb 2012-10-07 23:28:51.000000000 +0300 @@ -1 +1 @@ -exec "rake", "test" +require "test/run-test" diff -Nru ruby-gettext-2.2.1/debian/source/lintian-overrides ruby-gettext-2.2.1/debian/source/lintian-overrides --- ruby-gettext-2.2.1/debian/source/lintian-overrides 1970-01-01 03:00:00.000000000 +0300 +++ ruby-gettext-2.2.1/debian/source/lintian-overrides 2012-10-07 23:28:51.000000000 +0300 @@ -0,0 +1,2 @@ +ruby-gettext source: duplicate-short-description libgettext-ruby libgettext-ruby1.8 libgettext-ruby1.9.1 +ruby-gettext source: duplicate-long-description libgettext-ruby libgettext-ruby1.8 libgettext-ruby1.9.1
