[Python-modules-commits] r13105 - in packages/billiard/trunk/debian (changelog copyright)

Thu May 27 17:03:24 UTC 2010

Date: Thursday, May 27, 2010 @ 17:03:09
  Author: fladi-guest
Revision: 13105

Use DEP5 for copyright file.

Modified:
  packages/billiard/trunk/debian/changelog
  packages/billiard/trunk/debian/copyright

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

--- packages/billiard/trunk/debian/changelog	2010-05-27 16:02:56 UTC (rev 13104)
+++ packages/billiard/trunk/debian/changelog	2010-05-27 17:03:09 UTC (rev 13105)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #571656)
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 25 May 2010 07:13:47 +0200
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 27 May 2010 19:00:03 +0200

Modified: packages/billiard/trunk/debian/copyright
===================================================================
--- packages/billiard/trunk/debian/copyright	2010-05-27 16:02:56 UTC (rev 13104)
+++ packages/billiard/trunk/debian/copyright	2010-05-27 17:03:09 UTC (rev 13105)
@@ -1,37 +1,35 @@
-This work was packaged for Debian by:
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: billiard
+Maintainer: Ask Solem <askh at opera.com>
+Source: http://pypi.python.org/pypi/billiard/
 
-    Fladischer Michael <FladischerMichael at fladi.at> on Sat, 13 Feb 2010 21:49:08 +0100
+Files: *
+Copyright: 2010, Ask Solem
+Copyright: 2009, Opera Softare (WebTeam)
+License: BSD
 
-It was downloaded from:
+Files: billiard/utils/functional.py
+Copyright: 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software
+License: PSF-2
 
-    http://pypi.python.org/pypi/billiard/
+Files: debian/*
+Copyright: 2010, Fladischer Michael
+License: BSD
 
-Upstream Author:
-
-    Ask Solem <askh at opera.com>
-    Jesper Noehr <jesper at noehr.org>
-
-Copyright:
-
-    Copyright (C), 2009 Ask Solem
-    Copyright (C), 2009 Opera Softare (WebTeam)
-    Copyright (C), 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software
-
-License:
-
+License: BSD
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
-
+    .
       * Redistributions of source code must retain the above copyright notice,
         this list of conditions and the following disclaimer.
       * Redistributions in binary form must reproduce the above copyright
         notice, this list of conditions and the following disclaimer in the
         documentation and/or other materials provided with the distribution.
-
+    .
     Neither the name of Ask Solem nor the names of its contributors may be used
     to endorse or promote products derived from this software without specific
     prior written permission. 
-
+    .
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -44,22 +42,15 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-The Debian packaging is:
-
-    Copyright (C) 2010 Fladischer Michael <FladischerMichael at fladi.at>
-
-and it's licensed under the same terms.
-
-License for billiard/utils/functional.py:
-
+License: PSF-2
     PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
     --------------------------------------------
-
+    .
     1. This LICENSE AGREEMENT is between the Python Software Foundation
     ("PSF"), and the Individual or Organization ("Licensee") accessing and
     otherwise using this software ("Python") in source or binary form and
     its associated documentation.
-
+    .
     2. Subject to the terms and conditions of this License Agreement, PSF
     hereby grants Licensee a nonexclusive, royalty-free, world-wide
     license to reproduce, analyze, test, perform and/or display publicly,
@@ -69,34 +60,34 @@
     2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
     All Rights Reserved" are retained in Python alone or in any derivative
     version prepared by Licensee.
-
+    .
     3. In the event Licensee prepares a derivative work that is based on
     or incorporates Python or any part thereof, and wants to make
     the derivative work available to others as provided herein, then
     Licensee hereby agrees to include in any such work a brief summary of
     the changes made to Python.
-
+    .
     4. PSF is making Python available to Licensee on an "AS IS"
     basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
     IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
     DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
     FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
     INFRINGE ANY THIRD PARTY RIGHTS.
-
+    .
     5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
     FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
     A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
     OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
+    .
     6. This License Agreement will automatically terminate upon a material
     breach of its terms and conditions.
-
+    .
     7. Nothing in this License Agreement shall be deemed to create any
     relationship of agency, partnership, or joint venture between PSF and
     Licensee.  This License Agreement does not grant permission to use PSF
     trademarks or trade name in a trademark sense to endorse or promote
     products or services of Licensee, or any third party.
-
+    .
     8. By copying, installing or otherwise using Python, Licensee
     agrees to be bound by the terms and conditions of this License
     Agreement.


