[Python-modules-commits] r26532 - in packages/pytest/trunk/debian (changelog copyright)

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

    Date: Sunday, November 24, 2013 @ 21:30:10
  Author: laarmen-guest
Revision: 26532

Bump copyright years and remove the paragraph for distribute_setup.py

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

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2013-11-24 19:25:49 UTC (rev 26531)
+++ packages/pytest/trunk/debian/changelog	2013-11-24 21:30:10 UTC (rev 26532)
@@ -8,6 +8,7 @@
   * New upstream release (Closes: #728526)
     + Drop the reset-tmpdir-mode patch as the issue has been adressed upstream
   * Bump the policy version to 3.9.5 (no changes needed)
+  * Bump copyright years and remove the paragraph for distribute_setup.py
 
  -- Simon Chopin <chopin.simon at gmail.com>  Fri, 22 Nov 2013 18:00:14 +0100
 

Modified: packages/pytest/trunk/debian/copyright
===================================================================
--- packages/pytest/trunk/debian/copyright	2013-11-24 19:25:49 UTC (rev 26531)
+++ packages/pytest/trunk/debian/copyright	2013-11-24 21:30:10 UTC (rev 26532)
@@ -3,8 +3,8 @@
 Source: http://pytest.org/
 
 Files: *
-Copyright: 2007-2012 Holger Kregel <holger at merlinux.eu>
-           2007-2012 Merlinux GmbH <offive at merlinux.eu>
+Copyright: 2007-2013 Holger Kregel <holger at merlinux.eu>
+           2007-2013 Merlinux GmbH <offive at merlinux.eu>
 License: Expat
 
 Files: debian/*
@@ -55,55 +55,3 @@
  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.
-
-Files: distribute_setup.py
-Copyright: 2006-2011 The Fellowship of the Packaging
-License: Python-2.0
- 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,
- prepare derivative works, distribute, and otherwise use Python
- 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, 2003, 2004, 2005, 2006 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.