[Python-modules-commits] r25601 - in packages/billiard/trunk/debian (5 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Fri Aug 16 08:55:45 UTC 2013
Date: Friday, August 16, 2013 @ 08:55:43
Author: fladi-guest
Revision: 25601
Update license and install README.rst.
Added:
packages/billiard/trunk/debian/python-billiard.docs
(from rev 25596, packages/billiard/trunk/debian/docs)
Modified:
packages/billiard/trunk/debian/changelog
packages/billiard/trunk/debian/copyright
packages/billiard/trunk/debian/rules
Deleted:
packages/billiard/trunk/debian/docs
Modified: packages/billiard/trunk/debian/changelog
===================================================================
--- packages/billiard/trunk/debian/changelog 2013-08-16 03:51:09 UTC (rev 25600)
+++ packages/billiard/trunk/debian/changelog 2013-08-16 08:55:43 UTC (rev 25601)
@@ -10,4 +10,4 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 01 Jul 2013 14:18:48 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at> Fri, 16 Aug 2013 10:18:12 +0200
Modified: packages/billiard/trunk/debian/copyright
===================================================================
--- packages/billiard/trunk/debian/copyright 2013-08-16 03:51:09 UTC (rev 25600)
+++ packages/billiard/trunk/debian/copyright 2013-08-16 08:55:43 UTC (rev 25601)
@@ -1,11 +1,11 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: billiard
-Upstream-Contact: ask at celeryproject.org
+Upstream-Contact: Ask Solem <ask at celeryproject.org>
Source: http://pypi.python.org/pypi/billiard/
Files: *
Copyright: 2010-2013, Ask Solem <ask at celeryproject.org>
-License: BSD-Ask-Solem
+License: BSD
Files: billiard/connection.py
billiard/__init__.py
@@ -40,80 +40,80 @@
Files: debian/*
Copyright: 2013, Michael Fladischer <FladischerMichael at fladi.at>
2012, Thomas Bechtold
-License: BSD-Ask-Solem
+License: BSD
-License: BSD-Ask-Solem
- 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
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the name of author nor the names of any contributors may be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
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,
- 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, 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.
+ 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, 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.
Deleted: packages/billiard/trunk/debian/docs
===================================================================
--- packages/billiard/trunk/debian/docs 2013-08-16 03:51:09 UTC (rev 25600)
+++ packages/billiard/trunk/debian/docs 2013-08-16 08:55:43 UTC (rev 25601)
@@ -1 +0,0 @@
-README.rst
Copied: packages/billiard/trunk/debian/python-billiard.docs (from rev 25596, packages/billiard/trunk/debian/docs)
===================================================================
--- packages/billiard/trunk/debian/python-billiard.docs (rev 0)
+++ packages/billiard/trunk/debian/python-billiard.docs 2013-08-16 08:55:43 UTC (rev 25601)
@@ -0,0 +1,2 @@
+README.rst
+
Modified: packages/billiard/trunk/debian/rules
===================================================================
--- packages/billiard/trunk/debian/rules 2013-08-16 03:51:09 UTC (rev 25600)
+++ packages/billiard/trunk/debian/rules 2013-08-16 08:55:43 UTC (rev 25601)
@@ -11,10 +11,6 @@
dh_auto_build
PYTHONPATH=. sphinx-build -b html -N Doc/ Doc/.build/html
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
- dh_installdocs -XREADME -XTODO -A
-
.PHONY: override_dh_installchangelogs
override_dh_installchangelogs:
dh_installchangelogs CHANGES.txt
More information about the Python-modules-commits
mailing list