[DRE-commits] [ruby-zip] 12/13: Update copyright file

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-zip.

commit 9564b180f266c8737d400458dba3f8ba31dd3e1d
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Dec 29 20:35:39 2013 +0100

    Update copyright file
---
 debian/changelog |  1 +
 debian/copyright | 85 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fca25f..ccdbeed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-zip (1.1.0-1) unstable; urgency=medium
   * Add working watch file
   * debian/control: update homepage url
   * Update standards version; no changes needed
+  * Update copyright file
 
  -- David Suárez <david.sephirot at gmail.com>  Sun, 29 Dec 2013 19:30:30 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8b7c784..da37b80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,67 +1,72 @@
-This package was debianized by Tatsuki Sugiura <sugi at nemui.org> on
-Tue, 16 Sep 2003 02:31:19 +0900.
-
-It was downloaded from http://sourceforge.net/projects/rubyzip
-
-Upstream Author: Thomas Sondergaard <thomas at thomassondergaard.com>
-
-Copyright: Ruby's
-
------------------------------------------------------------------------------
-You can redistribute this program  and/or modify it under either the terms of 
-the LGPL (see the file LGPL), or the conditions below:
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rubyzip
+Source: https://github.com/rubyzip/rubyzip
+
+Files: *
+Copyright: Thomas Sondergaard <thomas at thomassondergaard.com>
+License: Ruby's License
+
+Files: debian/*
+Copyright: 2003-2010 Tatsuki Sugiura <sugi at nemui.org>
+                2013 David Suárez <david.sephirot at gmail.com>
+License: public-domain
+ Files in debian/ were written by Tatsuki Sugiura, and is placed in the public
+ domain. The author hereby disclaims copyright to this source code.
+
+License: Ruby's License
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
+ 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
      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.
-
+      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.
-
+ .
+       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 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.
-
+ .
+  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 executables non-standard names, with
+      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.
------------------------------------------------------------------------------
-and you can find GPL: /usr/share/common-licenses/GPL

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