[DRE-commits] [ruby-systemu] 01/02: d/copyright: updated to fit Ruby license (GPL2 + Ruby)

Jonas Genannt jonas at brachium-system.net
Thu Jan 16 08:44:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-systemu.

commit 375cf0bf433b64d4103693d6d33dbf0cbe2fed44
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Thu Jan 16 09:43:38 2014 +0100

    d/copyright: updated to fit Ruby license (GPL2 + Ruby)
---
 debian/copyright | 114 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 63 insertions(+), 51 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 46cdb54..0fa08df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,74 +1,86 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: systemu
-Source: https://github.com/ahoward/systemu 
+Source: https://github.com/ahoward/systemu
 
 Files: *
 Copyright: 2007 Ara T. Howard <ara.t.howard at gmail.com>
-License: Ruby's License
+License: Ruby or GPL2
 
 Files: debian/*
 Copyright: 2011 Praveen Arimbrathodiyil <pravi.a at gmail.com>
-License: Ruby's License
+License: Ruby or GPL2
 
-License: Ruby's License
- Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
- 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:
+License: GPL2
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License version 2as 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 package; 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: Ruby
+ 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.
  .
-        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.
+ 2. You may modify your copy of the software in any way, provided that
+    you do at least ONE of the following:
  .
-        b) use the modified software only within your corporation or
-           organization.
+      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.
  .
-        c) rename any non-standard executables so the names do not conflict
-	         with standard executables, which must also be provided.
+      b) use the modified software only within your corporation or
+         organization.
  .
-        d) make other distribution arrangements with the author.
+      c) rename any non-standard executables so the names do not conflict
+          with standard executables, which must also be provided.
  .
-   3. You may distribute the software in object code or executable
-      form, provided that you do at least ONE of the following:
+      d) make other distribution arrangements with the author.
  .
-        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.
+ 3. You may distribute the software in object code or executable
+    form, provided that you do at least ONE of the following:
  .
-        b) accompany the distribution with the machine-readable source of
- 	         the software.
+      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.
  .
-        c) give non-standard executables non-standard names, with
-           instructions on where to get the original software distribution.
+      b) accompany the distribution with the machine-readable source of
+         the software.
  .
-        d) make other distribution arrangements with the author.
+      c) give non-standard executables non-standard names, with
+         instructions on where to get the original software distribution.
  .
-   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.
+      d) make other distribution arrangements with the author.
  .
-      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.
+ 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.
  .
-   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.
+    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.
  .
-   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.
+ 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.
  .
- On Debian systems, the full text of the GNU General Public License 
- can be found in the file `/usr/share/common-licenses/GPL'.
-
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-systemu.git



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