[DRE-commits] r3454 - packages/thin/trunk/debian

Sat Apr 25 19:34:53 UTC 2009

Author: ryan52-guest
Date: 2009-04-25 19:34:53 +0000 (Sat, 25 Apr 2009)
New Revision: 3454

Modified:
   packages/thin/trunk/debian/changelog
   packages/thin/trunk/debian/copyright
Log:
fix copyright file

Modified: packages/thin/trunk/debian/changelog
===================================================================

--- packages/thin/trunk/debian/changelog	2009-04-25 19:19:32 UTC (rev 3453)
+++ packages/thin/trunk/debian/changelog	2009-04-25 19:34:53 UTC (rev 3454)
@@ -1,11 +1,6 @@
 thin (1.2.0-1) UNRELEASED; urgency=low
 
-  * new upstream release
-
- -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 16 Mar 2009 18:58:02 -0700
-
-thin (1.1.0-1) unstable; urgency=low
-
   * Initial release (Closes: #504966)
+  * fix copyright format
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Mon, 23 Feb 2009 20:57:01 -0800
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 25 Apr 2009 12:34:08 -0700

Modified: packages/thin/trunk/debian/copyright
===================================================================
--- packages/thin/trunk/debian/copyright	2009-04-25 19:19:32 UTC (rev 3453)
+++ packages/thin/trunk/debian/copyright	2009-04-25 19:34:53 UTC (rev 3454)
@@ -5,38 +5,81 @@
 
 Files: *
 Copyright: Copyright 2007-2008, Marc-Andre Cournoyer <macournoyer at gmail.com>
-Copyright: Copyright 2008, Kevin Williams <kevwil at gmail.com>
-Copyright: Copyright 2008, James Golick
-License: other
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+ Copyright 2008, Kevin Williams <kevwil at gmail.com>
+ Copyright 2008, James Golick
+License: Ruby
+ Upstream said in an email to me:
+ I released Thin under the Ruby license.
+ The parser is from Mongrel which is Ruby license and GPL2.
 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 Files: ext/thin_parser/*
 Copyright: Copyright (c) 2005, Zed A. Shaw
-Copyright: Copyright (c) 2008, Marc-Andre Cournoyer
-License: GPL
- Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
- <zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
- either the terms of the GPL.
+ Copyright (c) 2008, Marc-Andre Cournoyer
+License: Ruby | GPL-2
 
 Files: debian/*
-Copyright: Copyright 2008, Ryan Niebur <ryanryan52 at gmail.com>
-License: GPL-2+
+Copyright: Copyright 2008-2009, Ryan Niebur <ryanryan52 at gmail.com>
+License: GPL-2
 
-On Debian systems the full text of the GNU General Public License can
-be found in `/usr/share/common-licenses/GPL'.
+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 version 2.
+ .
+ On Debian systems the full text of the GNU General Public License version 2 can
+ be found in `/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.
+
+  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.


