[DRE-commits] [SCM] ruby-test-unit.git branch, master, updated. debian/2.5.0-2-4-g06f7b93

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 3f403ce0152d462043b6aa0e4554103ffaeebd3d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 17 11:46:59 2013 +0200

    update copyright and control

diff --git a/debian/control b/debian/control
index bff8f2d..c3856c5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: ruby-test-unit
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Cédric Boutillier <cedric.boutillier at gmail.com>
-DM-Upload-Allowed: yes
+Uploaders: Cédric Boutillier <boutil at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~)
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-test-unit.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-test-unit.git;a=summary
+Standards-Version: 3.9.4
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-test-unit.git
+Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-test-unit.git;a=summary
 Homepage: http://test-unit.rubyforge.org/
 XS-Ruby-Versions: all
 
diff --git a/debian/copyright b/debian/copyright
index d2fb868..778b66a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,37 +3,49 @@ Upstream-Name: test-unit
 Source: http://test-unit.rubyforge.org/
 
 Files: *
-Copyright: Copyright 2008-2010 Kouhei Sutou <kou at cozmixng.org>
-           Copyright Ryan Davis <ryand-ruby at zenspider.com>
-           Copyright 2000-2003 Nathaniel Talbott <nathaniel at talbott.ws>
-License: GPL-2 or Ruby
+Copyright: 2008-2012 Kouhei Sutou <kou at clear-code.com>
+           Ryan Davis <ryand-ruby at zenspider.com>
+           2000-2003 Nathaniel Talbott <nathaniel at talbott.ws>
+License: BSD-2-clause or Ruby
 
 Files: lib/test/unit/diff.rb
 Copyright: Copyright 2001-2008 Python Software Foundation
-           Copyright 2008-2010 Kouhei Sutou <kou at cozmixng.org>
-License: GPL-2 or Ruby, and PSF
+           Copyright 2008-2012 Kouhei Sutou <kou at clear-code.com>
+License: BSD-2-clause or Ruby, and PSF
+
+Files: lib/test-unit.rb
+Copyright: 2012 Kouhei Sutou <kou at clear-code.com>
+License: BSD-2-clause or Ruby or LGPL-2.1
 
 Files: debian/*
-Copyright: 2011, 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
-License: GPL-2 or Ruby
+Copyright: 2011-2013 Cédric Boutillier <boutil at debian.org>
+License: BSD-2-clause or Ruby
 
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License Version 2 as published
- by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met: 
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer. 
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution. 
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: LGPL-2.1
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ `/usr/share/common-licenses/LGPL-2.1'.
 
 License: PSF
  1. This LICENSE AGREEMENT is between the Python Software Foundation
@@ -83,8 +95,8 @@ License: PSF
  Agreement.
 
 License: Ruby
- You can redistribute it and/or modify it under either the terms of the GPL
- version 2 (see the file GPL), or the conditions below:
+ You can redistribute it and/or modify it under either the terms of the
+ 2-clause BSDL (see the file BSDL), or the conditions below:
  .
    1. You may make and give away verbatim copies of the source form of the
       software without restriction, provided that you duplicate all of the
@@ -138,4 +150,3 @@ License: Ruby
       IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
       PURPOSE.
-

-- 
ruby-test-unit.git