[Python-modules-commits] r20648 - in packages/pexpect/trunk/debian (changelog copyright)

Fri Mar 2 16:08:20 UTC 2012

Date: Friday, March 2, 2012 @ 16:08:18
  Author: adejong
Revision: 20648

  * New upstream release (Closes: #609195).
  * Update debian/copyright (license is actually MIT instead of Python 2.3).

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

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

--- packages/pexpect/trunk/debian/changelog	2012-03-02 15:28:47 UTC (rev 20647)
+++ packages/pexpect/trunk/debian/changelog	2012-03-02 16:08:18 UTC (rev 20648)
@@ -1,5 +1,16 @@
-pexpect (2.3-2) UNRELEASED; urgency=low
+pexpect (2.4-1) UNRELEASED; urgency=low
 
+  [ Arthur de Jong ]
+  * New upstream release (Closes: #609195).
+  * Switch to 3.0 (quilt) source format.
+  * Switch to dh-style debian/rules.
+  * Moved packaging from python-central to dh_python2 (Closes: #616935,
+    LP: #788514).
+  * Drop Conflicts/Replaces on ancient versions which shipped in sarge.
+  * Bump standards-version to 3.9.3.
+  * Register documentation with doc-base.
+  * Update debian/copyright (license is actually MIT instead of Python 2.3).
+
   [ Piotr OÅ¼arowski ]
   * Added Vcs-Svn and Vcs-Browser fields
 
@@ -13,15 +24,6 @@
   * debian/control
     - Added Homepage field.
 
-  [ Arthur de Jong ]
-  * Switch to 3.0 (quilt) source format.
-  * Switch to dh-style debian/rules.
-  * Moved packaging from python-central to dh_python2 (Closes: #616935,
-    LP: #788514).
-  * Drop Conflicts/Replaces on ancient versions which shipped in sarge.
-  * Bump standards-version to 3.9.3.
-  * Register documentation with doc-base.
-
  -- Arthur de Jong <adejong at debian.org>  Fri, 02 Mar 2012 16:15:00 +0100
 
 pexpect (2.3-1) unstable; urgency=low

Modified: packages/pexpect/trunk/debian/copyright
===================================================================
--- packages/pexpect/trunk/debian/copyright	2012-03-02 15:28:47 UTC (rev 20647)
+++ packages/pexpect/trunk/debian/copyright	2012-03-02 16:08:18 UTC (rev 20648)
@@ -1,62 +1,25 @@
-This Debian package was created by Ganesan Rajagopal <rganesan at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pexpect
+Upstream-Contact: Noah Spurrier <noah at noah.org>
+Source: http://pypi.python.org/pypi/pexpect/
 
-The upstream source was found on the following address:
-
-    http://sourceforge.net/projects/pexpect
-
-Upstream author:
-
-    Noah Spurrier <noah at noah.org>
-
-Copyright:
-
-Pexpect is released under the Python Software Foundation License.
-
-PSF LICENSE AGREEMENT FOR PYTHON 2.3
-------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using Python 2.3 software 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,
-prepare derivative works, distribute, and otherwise use Python 2.3
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002 Python Software Foundation; All Rights Reserved" are
-retained in Python 2.3 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 2.3 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 2.3.
-
-4. PSF is making Python 2.3 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 2.3 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
-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 2.3, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
+Files: *
+Copyright: Copyright (c) 2006-2008 Noah Spurrier
+License: Expat
+ 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:
+ .
+ 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 OR COPYRIGHT HOLDERS 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.


