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

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 77e0eabb155d9c8241eb72ba853442c9f3b18097
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue May 7 09:23:05 2013 +0000

    Update debian/copyright after upstream clarifications

diff --git a/debian/copyright b/debian/copyright
index 8f8f9af..e92d4c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,19 +7,19 @@ Copyright:      2012  The ruby-gettext project
            2001-2006 Masao Mutoh <mutoh at highwhay.ne.jp>
            2001,2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
            2001,2002 Yasushi Shoji <yashi at yashi.com>
-License: Ruby or GPL-2
+License: Ruby or GPL-2 LGPL-3+
 
 Files: Rakefile
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
                 2012 Haruka Yoshihara <yoshihara at clear-code.com>
            2005-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby
+License: Ruby or GPL-2
 
 Files: bin/rmsgfmt
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
                 2012 Haruka Yoshihara <yoshihara at clear-code.com>
            2005-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: bin/rmsginit
        lib/gettext/tools/msginit.rb
@@ -28,34 +28,34 @@ Files: bin/rmsginit
        test/tools/test_po.rb
 Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
            2012 Haruka Yoshihara <yoshihara at clear-code.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: bin/rmsgmerge
        bin/rxgettext
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
            2005-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext.rb
 Copyright: 2001-2010 Masao Mutoh <mutoh at highwhay.ne.jp>
            2001-2003 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/cgi.rb
        lib/gettext/core_ext/string.rb
        lib/gettext/tools/parser/erb.rb
 Copyright: 2005-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/core_ext/iconv.rb
 Copyright: 2004-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/parser/ruby.rb
 Copyright: 2001-2005 Masao Mutoh <mutoh at highwhay.ne.jp>
                 2005 speakillof
            2001,2002 Yasushi Shoji <yashi at yashi.com>
-License: Ruby
+License: Ruby or GPL-2
 
 Files: lib/gettext/runtime/locale_path.rb
 Copyright: 2001-2010 Masao Mutoh <mutoh at highwhay.ne.jp>
@@ -65,22 +65,22 @@ Files: lib/gettext/runtime/mo.rb
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
            2002-2009 Masao Mutoh <mutomasa at gmail.com>
            2001-2002 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
-License: Ruby
+License: Ruby or GPL-2
 
 Files: lib/gettext/runtime/mofile.rb
        lib/gettext/tools/po.rb
 Copyright: 2012 Haruka Yoshihara <yoshihara at clear-code.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/runtime/textdomain.rb
 Copyright: 2001-2009 Masao Mutoh <mutomasa at gmail.com>
            2001-2003 Masahiro Sakai <s01397ms at sfc.keio.ac.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/runtime/textdomain_group.rb
        lib/gettext/runtime/textdomain_manager.rb
 Copyright: 2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/task.rb
        test/fixtures/_/one_line.rb
@@ -90,89 +90,89 @@ Files: lib/gettext/task.rb
        test/gettext-test-utils.rb
        test/run-test.rb
 Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools.rb
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
            2005-2008 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/msgfmt.rb
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
                 2012 Haruka Yoshihara <yoshihara at clear-code.com>
            2003-2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/msgmerge.rb
 Copyright: 2012-2013 Haruka Yoshihara <yoshihara at clear-code.com>
                 2012 Kouhei Sutou <kou at clear-code.com>
            2005-2009 Masao Mutoh <mutomasa at gmail.com>
            2005,2006 speakillof
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/parser/glade.rb
 Copyright: 2004,2005 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/parser/ruby.rb
 Copyright: 2001-2009 Masao Mutoh <mutomasa at gmail.com>
                 2005 speakillof
            2001,2002 Yasushi Shoji <yashi at yashi.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/po_entry.rb
 Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
            2010 masone (Christian Felder) <ema at rh-productions.ch>
            2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/poparser.rb
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
            2003-2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/tools/xgettext.rb
 Copyright:      2012 Haruka Yoshihara <yoshihara at clear-code.com>
                 2012 Kouhei Sutou <kou at clear-code.com>
            2001-2010 Masao Mutoh <mutomasa at gmail.com>
            2001,2002 Yasushi Shoji <yashi at yashi.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/utils.rb
 Copyright: 2005,2006 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: lib/gettext/version.rb
 Copyright: 2012-2013 Kouhei Sutou <kou at clear-code.com>
            2005-2009 Masao Mutoh <mutoh at highwhay.ne.jp>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: src/poparse.ry
 Copyright: 2012-2013 Haruka Yoshihara <yoshihara at clear-code.com>
                 2012 Kouhei Sutou <kou at clear-code.com>
            2002-2008 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/fixtures/_.rb
 Copyright: 2012 Haruka Yoshihara <yoshihara at clear-code.com>
            2010 masone (Christian Felder) <ema at rh-productions.ch>
            2009 Vladimir Dobriakov <vladimir at geekq.net>
            2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/fixtures/n_.rb
        test/fixuters/p_.rb
 Copyright: 2010 masone (Christian Felder) <ema at rh-productions.ch>
            2009 Vladimir Dobriakov <vladimir at geekq.net>
            2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/fixtures/np_.rb
        test/fixtures/ns_.rb
        test/fixuters/s_.rb
 Copyright: 2010 masone (Christian Felder) <ema at rh-productions.ch>
            2009 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/parser/test_ruby.rb
        test/test_parser.rb
@@ -181,14 +181,14 @@ Copyright:      2012 Haruka Yoshihara <yoshihara at clear-code.com>
                 2010 masone (Christian Felder) <ema at rh-productions.ch>
                 2009 Vladimir Dobriakov <vladimir at geekq.net>
            2009-2010 Masao Mutoh <mutomasa at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/test_gettext.rb
 Copyright:      2012 Kouhei Sutou <kou at clear-code.com>
            2009-2010 Masao Mutoh <mutomasa at gmail.com>
                 2009 OZAWA Sakuro <github at 2238club.org>
                 2009 grosser <grosser.michael at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/test_po_generation.rb
 Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
@@ -196,17 +196,17 @@ Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
            2010 masone (Christian Felder) <ema at rh-productions.ch>
            2009 Masao Mutoh <mutomasa at gmail.com>
            2009 Vladimir Dobriakov <vladimir at geekq.net>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/tools/test_msgmerge.rb
 Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
            2010 Eddie Lau <tatonlto at gmail.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 Files: test/tools/test_xgettext.rb
 Copyright: 2012-2013 Kouhei Sutou <kou at clear-code.com>
                 2012 Haruka Yoshihara <yoshihara at clear-code.com>
-License: Ruby or LGPL-3+
+License: Ruby or GPL-2 or LGPL-3+
 
 License: GPL-2
  This program is free software; you can redistribute it

-- 
ruby-gettext.git