[DRE-commits] [SCM] ruby-test-unit.git branch, master, updated. upstream/2.4.0-8-gbd248a4

Cédric Boutillier cedric.boutillier at gmail.com
Mon Sep 19 20:55:30 UTC 2011


The following commit has been merged in the master branch:
commit 75fdd3dcca69b3217dd78312217a37a4961274c0
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Sep 19 16:24:00 2011 +0200

    update control and copyright info

diff --git a/debian/control b/debian/control
index 522762c..cc05621 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Cédric Boutillier <cedric.boutillier at gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~)
 Standards-Version: 3.9.2
-#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
+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
 Homepage: http://test-unit.rubyforge.org/
 XS-Ruby-Versions: all
 
@@ -16,7 +16,9 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 # rake (>= 0, development), yard (>= 0, development), jeweler (>= 0, development)
-Description: test-unit 2 - Improved version of Test::Unit bundled in Ruby 1.8.x.
- Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
- bundled in Ruby 1.8.x had not been improved but unbundled
- Test::Unit (test-unit 2) will be improved actively.
+Description: Improved version of Test::Unit library initially bundled in Ruby 1.8
+ Test::Unit is a testing framework originally bundled with Ruby 1.8. 
+ .
+ This package provides an updated version of this framework, with many fixes and
+ improvements, and support for Ruby 1.9, which bundles minitest, but not
+ Test::Unit.
diff --git a/debian/copyright b/debian/copyright
index cd3ef54..0bd5c6c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,140 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: test-unit
-Source: FIXME <http://example.com/>
+Source: http://test-unit.rubyforge.org/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+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 
+
+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
+
+Files: debian/*
+Copyright: 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: GPL-2 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
  .
  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'.
 
-Files: debian/*
-Copyright: 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
-License:
- [LICENSE TEXT]
+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:
+ .
+   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
+      original copyright notices and associated disclaimers.
+ .
+   2. You may modify your copy of the software in any way, provided that
+      you do at least ONE of the following:
+ .
+        a) place your modifications in the Public Domain or otherwise
+           make them Freely Available, such as by posting said
+ 	  modifications to Usenet or an equivalent medium, or by allowing
+ 	  the author to include your modifications in the software.
+ .
+        b) use the modified software only within your corporation or
+           organization.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or binary form,
+      provided that you do at least ONE of the following:
+ .
+        a) distribute the binaries and library files of the software,
+ 	  together with instructions (in the manual page or equivalent)
+ 	  on where to get the original distribution.
+ .
+        b) accompany the distribution with the machine-readable source of
+ 	  the software.
+ .
+        c) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   4. You may modify and include the part of the software into any other
+      software (possibly commercial).  But some files in the distribution
+      are not written by the author, so that they are not under these terms.
+ .
+      For the list of those files and their copying conditions, see the
+      file LEGAL.
+ .
+   5. The scripts and library files supplied as input to or produced as 
+      output from the software do not automatically fall under the
+      copyright of the software, but belong to whomever generated them, 
+      and may be sold commercially, and may be aggregated with this
+      software.
+ .
+   6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+      IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      PURPOSE.
+
+License: PSF
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+ Reserved" are retained in Python alone or in any derivative version 
+ prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee.  This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.

-- 
ruby-test-unit.git



More information about the Pkg-ruby-extras-commits mailing list