[Python-modules-commits] r26011 - in packages/pyasn1/trunk/debian (changelog copyright)

[bernat at users.alioth.debian.org]

    Date: Monday, September 30, 2013 @ 06:42:30
  Author: bernat
Revision: 26011

Licensing change (BSD-2-clause)

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

Modified: packages/pyasn1/trunk/debian/changelog
===================================================================
--- packages/pyasn1/trunk/debian/changelog	2013-09-29 22:06:38 UTC (rev 26010)
+++ packages/pyasn1/trunk/debian/changelog	2013-09-30 06:42:30 UTC (rev 26011)
@@ -5,6 +5,7 @@
   * Bump Standards-Version to 3.9.4.
   * Examples are not provided any more. Ship more documentation instead.
   * Add python3-pyasn1 package for Python 3 support.
+  * Update debian/copyright to reflect licensing change.
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.

Modified: packages/pyasn1/trunk/debian/copyright
===================================================================
--- packages/pyasn1/trunk/debian/copyright	2013-09-29 22:06:38 UTC (rev 26010)
+++ packages/pyasn1/trunk/debian/copyright	2013-09-30 06:42:30 UTC (rev 26011)
@@ -4,34 +4,8 @@
 Source: http://pyasn1.sf.net
 
 Files: *
-Copyright: 2005-2012, Ilya Etingof <ilya at glas.net>, all rights reserved.
-License:
- THIS SOFTWARE IS NOT  FAULT TOLERANT AND SHOULD NOT BE  USED IN ANY SITUATION
- ENDANGERING HUMAN LIFE OR PROPERTY.
- .
- 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.
- .
-   * The name of  the authors may not  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 PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL  THE REGENTS 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.
+Copyright: 2005-2013, Ilya Etingof <ilya at glas.net>
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2006-2012 Arnaud Fontaine <arnau at debian.org>
@@ -54,3 +28,26 @@
  .
  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'.
+
+License: BSD-2-clause
+ 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.
+ .
+ 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 HOLDER 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.