[DRE-commits] [SCM] ruby-highline.git branch, master, updated. upstream/1.6.9-20-g9ecc9f8

Cédric Boutillier cedric.boutillier at gmail.com
Wed May 16 13:27:27 UTC 2012


The following commit has been merged in the master branch:
commit 143ec721e20718a473650718d5198f311e18b94c
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed May 16 14:44:36 2012 +0200

    convert copyright file to DEP-5

diff --git a/debian/copyright b/debian/copyright
index e26c4bf..61e851c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,79 +1,112 @@
-This package was debianized by Esteban Manchado Velázquez <zoso at debian.org> on
-Fri Jun  9 22:26:18 WEST 2006.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: highline
+Source: http://rubyforge.org/frs/?group_id=683
+
+Files: *
+Copyright: 2005-2011 James Edward Gray II <james at grayproductions.net>
+           2005-2011 Greg Brown <gregory.t.brown at gmail.com> 
+License: GPL-2 or Ruby
+
+Files: setup.rb
+Copyright: 2000-2004 Minero Aoki
+License: LGPL-2.1
+
+Files: debian/*
+Copyright: 2011-2012 Lucas Nussbaum <lucas at debian.org>
+           2012 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'.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+License: Ruby
+ You can redistribute it and/or modify it under either the terms of the 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) rename any non-standard executables so the names do not conflict
+           with standard executables, which must also be provided.
+ .
+        d) make other distribution arrangements with the author.
+ .
+   3. You may distribute the software in object code or executable
+      form, provided that you do at least ONE of the following:
+ .
+        a) distribute the executables 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 executables 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 this terms.
+ .
+      They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+      files under the ./missing directory.  See each file for the copying
+      condition.
+ .
+   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.
 
-It was downloaded from http://rubyforge.org/frs/?group_id=683
-
-Copyright Holders: James Edward Gray II <james at grayproductions.net> and
-                   Greg Brown <gregory.t.brown at gmail.com>. 
-
-License:
-
-Distributed under the user's choice of the GPL (see
-/usr/share/common-licenses/GPL) or the Ruby software license (see below) by
-James Edward Gray II and Greg Brown.
-
-Ruby license:
-
-HighLine is copyrighted free software by James Edward Gray II
-<james at grayproductions.net> and Greg Brown.  You can redistribute it and/or
-modify it under either the terms of the GPL (see COPYING.txt file), 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) rename any non-standard executables so the names do not conflict
-          with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables 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 executables 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 this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  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.
-
---
-The setup.rb file included in this source package is released under the GNU
-LGPL. On Debian systems, the complete text of the GNU Lesser General Public
-can be found in `/usr/share/common-licenses/LGPL'.

-- 
ruby-highline.git



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