[Python-modules-team] Bug#751233: missing licenses in debian/copyright
Stefano Rivera
stefanor at debian.org
Sat Nov 1 01:00:08 UTC 2014
Hi Daniele (2014.08.16_08:02:21_-0700)
Thanks for looking at this.
I think we can do slightly better, by using uscan's built-in repacking
support. Like so.
I'll request an unblock.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 461 1230 C: +27 72 419 8559
-------------- next part --------------
Index: debian/changelog
===================================================================
--- debian/changelog (revision 30261)
+++ debian/changelog (working copy)
@@ -1,3 +1,16 @@
+python-virtualenv (1.11.6+ds-1) unstable; urgency=medium
+
+ [ Daniele Tricoli ]
+ * Repack source package to remove embedded copy of python-pip-whl and
+ python-setuptools-whl (Closes: #751233)
+ * debian/rules:
+ - Don't override dh_auto_configure to remove embedded wheels since
+ they are removed from source package
+ * debian/watch:
+ - Add dversionmangle option
+
+ -- Stefano Rivera <stefanor at debian.org> Fri, 31 Oct 2014 17:59:34 -0700
+
python-virtualenv (1.11.6-2) unstable; urgency=medium
* d/patches/use-wheels.patch: Ignore EEXIST when creating the
Index: debian/copyright
===================================================================
--- debian/copyright (revision 30261)
+++ debian/copyright (working copy)
@@ -1,7 +1,11 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: virtualenv
Source: https://github.com/pypa/virtualenv
+ The pristine upstream source contains convenience copies of python-pip-whl and
+ python-setuptools-whl.
+Files-Excluded: virtualenv_support/*.whl
+
Files: *
Copyright: 2007, Ian Bicking and Contributors,
2009, Ian Bicking, The Open Planning Project,
@@ -16,15 +20,7 @@
2012 Barry Warsaw <barry at python.org>
License: Expat
-Files: virtualenv_support/pip-*
-Copyright: 2008-2013 The pip developers
License: Expat
-
-Files: virtualenv_support/setuptools-*
-Copyright: Phillip J. Eby
-License: PSF-2 or Zope-2.1
-
-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
@@ -43,94 +39,3 @@
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.
-
-License: PSF-2
- 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.
-
-License: Zope-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 AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT HOLDERS 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.
Index: debian/rules
===================================================================
--- debian/rules (revision 30261)
+++ debian/rules (working copy)
@@ -5,11 +5,6 @@
%:
dh $@ --with python2,python3 --buildsystem=pybuild
-override_dh_auto_configure:
- # Remove the embedded wheels in favor of the -whl packages.
- rm -f virtualenv_support/*.whl
- dh_auto_configure
-
override_dh_python3:
dh_python3 --shebang=/usr/bin/python3
Index: debian/watch
===================================================================
--- debian/watch (revision 30261)
+++ debian/watch (working copy)
@@ -1,3 +1,3 @@
version=3
-opts=pgpsigurlmangle=s/$/.asc/ \
+opts=pgpsigurlmangle=s/$/.asc/,uversionmangle=s/$/+ds/ \
https://pypi.python.org/packages/source/v/virtualenv/ virtualenv-(.*)\.tar\.gz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/python-modules-team/attachments/20141031/12d26183/attachment.sig>
More information about the Python-modules-team
mailing list