[DRE-commits] [SCM] ruby-mime-types.git branch, master, updated. upstream/1.17.2-17-g649f43f

Tue Jun 26 08:13:19 UTC 2012

The following commit has been merged in the master branch:
commit 66914bc10a71619da8fe0519307ff08720e4fd98
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Jun 25 11:25:51 2012 +0200

    Update copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index 7a6a481..0e05579 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,90 +1,91 @@
-This package was debianized by Decklin Foster <decklin at red-bean.com> on
-Thu, 26 Jun 2008 16:48:06 -0400.
-
-It was downloaded from http://mime-types.rubyforge.org/
-
-Upstream Author: 
-
-    Austin Ziegler <austin at halostatue.ca>
-
-Copyright: 
-
-    Copyright (C) 2002 - 2006, Austin Ziegler
-    Based on prior work copyright Mark Overmeer
-
-License:
-
-    MIME::Types is available under three disjunctive licences: Ruby's licence,
-    Perl Artistic Licence, GNU GPL version 2 (or later).
-
-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 GPL
-    (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.
-
-Artistic License:
-
-    On Debian systems, the complete text of the Artistic License can be found
-    in `/usr/share/common-licenses/Artistic`.
-
-GNU General Public License:
-
-    On Debian systems, the complete text of the GNU General Public License can
-    be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2008, Decklin Foster <decklin at red-bean.com> and
-is licensed under the GPL.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mime-types
+Source: http://mime-types.rubyforge.org/
+
+Files: *
+Copyright: 2003-2012, Austin Ziegler <austin at halostatue.ca>
+License: Ruby or GPL-2+ or Artistic
+Comment: Based on prior work copyright Mark Overmeer
+
+Files: debian/*
+Copyright: 2008, Decklin Foster <decklin at red-bean.com>
+License: GPL-2+
+
+License: Ruby
+ 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 GPL
+ (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: Artistic
+ On Debian systems, the complete text of the Artistic License can be found
+ in `/usr/share/common-licenses/Artistic`.
+
+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 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.
+ .
+ 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'.

-- 
ruby-mime-types.git

