[Python-modules-commits] r13890 - in packages/python-django-piston/trunk/debian (2 files)

[svedrin-guest at users.alioth.debian.org]

    Date: Sunday, July 11, 2010 @ 08:50:58
  Author: svedrin-guest
Revision: 13890

Remove reference to /usr/share/common-licenses/BSD and strip trailing
whitespace in copyright.

Modified:
  packages/python-django-piston/trunk/debian/changelog
  packages/python-django-piston/trunk/debian/copyright

Modified: packages/python-django-piston/trunk/debian/changelog
===================================================================
--- packages/python-django-piston/trunk/debian/changelog	2010-07-11 08:39:25 UTC (rev 13889)
+++ packages/python-django-piston/trunk/debian/changelog	2010-07-11 08:50:58 UTC (rev 13890)
@@ -1,8 +1,10 @@
 python-django-piston (0.2.2-2) UNRELEASED; urgency=low
 
   * Bump Standards Version to 3.9.0.
+  * Remove reference to /usr/share/common-licenses/BSD and strip trailing
+    whitespace in copyright.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 11 Jul 2010 10:37:46 +0200
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Sun, 11 Jul 2010 10:50:38 +0200
 
 python-django-piston (0.2.2-1) unstable; urgency=low
 

Modified: packages/python-django-piston/trunk/debian/copyright
===================================================================
--- packages/python-django-piston/trunk/debian/copyright	2010-07-11 08:39:25 UTC (rev 13889)
+++ packages/python-django-piston/trunk/debian/copyright	2010-07-11 08:50:58 UTC (rev 13890)
@@ -59,10 +59,27 @@
 
     This software is licensed under the 2-clause BSD license.
 
-    On Debian systems, the complete text of the BSD license can be found in
-    /usr/share/common-licenses/BSD
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    Redistributions in bytecode 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.
 
+    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 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+    BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+    OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+    DAMAGE.
 
+
 ===============================================================================
 
 The file tests/bootstrap.py is copyright to the Zope Corporation and licensed
@@ -76,44 +93,44 @@
 
     Zope Public License (ZPL) Version 2.1
     -------------------------------------
-    
+
     A copyright notice accompanies this license document that
     identifies the copyright holders.
-    
+
     This license has been certified as open source. It has also
     been designated as GPL compatible by the Free Software
     Foundation (FSF).
-    
+
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that the
     following conditions are met:
-    
+
     1. Redistributions in source code must retain the
        accompanying copyright notice, this list of conditions,
        and the following disclaimer.
-    
+
     2. Redistributions in binary form must reproduce the accompanying
        copyright notice, this list of conditions, and the
        following disclaimer in the documentation and/or other
        materials provided with the distribution.
-    
+
     3. Names of the copyright holders must not be used to
        endorse or promote products derived from this software
        without prior written permission from the copyright
        holders.
-    
+
     4. The right to distribute this software or to use it for
        any purpose does not give you the right to use
        Servicemarks (sm) or Trademarks (tm) of the copyright
        holders. Use of them is covered by separate agreement
        with the copyright holders.
-    
+
     5. If any files are modified, you must cause the modified
        files to carry prominent notices stating that you changed
        the files and the date of any change.
-    
+
     Disclaimer
-    
+
       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
       AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
       NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY