tags 751233 patch thanks On Wed, 11 Jun 2014 12:13:22 +0200 (CEST) Thorsten Alteholz <[email protected]> wrote: > as you don't use the internal wheel stuff, please either remove all whl > files from the source package or add the licenses of their contents to > debian/copyright.
To not fill python-virtualenv's debian/copyright with licenses of convenience copy of packaged wheels I followed the suggestion to remove all whl files from the source package. A debdiff is attached. The package build twice in a row in a pbuilder chroot and is lintian clean. I also installed into a pbuilder chroot and seems to work fine. I'm a member of the DPMT, if you find more convenient to have my changes committed into python-virtualenv repository instead of the debdiff, just tell me to do so. Kind regards, -- Daniele Tricoli 'Eriol' http://mornie.org
diff -Nru python-virtualenv-1.11.6/debian/changelog python-virtualenv-1.11.6+ds/debian/changelog --- python-virtualenv-1.11.6/debian/changelog 2014-06-12 16:50:54.000000000 +0200 +++ python-virtualenv-1.11.6+ds/debian/changelog 2014-08-16 16:19:25.000000000 +0200 @@ -1,3 +1,16 @@ +python-virtualenv (1.11.6+ds-1) UNRELEASED; urgency=medium + + * Team upload + * Repack source package (using debian/repack) 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 + + -- Daniele Tricoli <[email protected]> Sat, 16 Aug 2014 15:37:57 +0200 + python-virtualenv (1.11.6-2) unstable; urgency=medium * d/patches/use-wheels.patch: Ignore EEXIST when creating the diff -Nru python-virtualenv-1.11.6/debian/copyright python-virtualenv-1.11.6+ds/debian/copyright --- python-virtualenv-1.11.6/debian/copyright 2014-01-06 01:06:47.000000000 +0100 +++ python-virtualenv-1.11.6+ds/debian/copyright 2014-08-16 16:24:29.000000000 +0200 @@ -1,6 +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 convenient copies of python-pip-whl and + python-setuptools-whl. + . + The debian/repack program removes those copies to create the Debian + upstream source tarball. Files: * Copyright: 2007, Ian Bicking and Contributors, @@ -16,14 +21,10 @@ 2012 Barry Warsaw <[email protected]> License: Expat -Files: virtualenv_support/pip-* -Copyright: 2008-2013 The pip developers +Files: debian/repack +Copyright: 2014, Daniele Tricoli <[email protected]>, 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 @@ -43,94 +44,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. diff -Nru python-virtualenv-1.11.6/debian/repack python-virtualenv-1.11.6+ds/debian/repack --- python-virtualenv-1.11.6/debian/repack 1970-01-01 01:00:00.000000000 +0100 +++ python-virtualenv-1.11.6+ds/debian/repack 2014-08-16 16:12:35.000000000 +0200 @@ -0,0 +1,54 @@ +#!/bin/sh +# +# debian/repack +# Part of the Debian package ‘python-virtualenv’. +# +# Copyright 2014 Daniele Tricoli <[email protected]> + +set -eu + +PACKAGE_NAME=$(dpkg-parsechangelog | sed -n -e 's/^Source: //p') +DEBIAN_SUFFIX="+ds" + +UPSTREAM_VERSION=$2 +UPSTREAM_TARBALL=$3 +DEBIAN_VERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX} + +DESTDIR=$(dirname $UPSTREAM_TARBALL) + +TMPDIR=`mktemp -d ${PACKAGE_NAME}-tmp.XXXXXX` +trap "rm -rf ${TMPDIR}" QUIT INT EXIT + +UPSTREAM_ROOTDIR="${TMPDIR}/upstream-unpacked" + +TAR_EXTRA_ARGS="--owner root --group root --mode a+rX" + +usage() { + printf "repack --upstream-version VERSION FILENAME\n" +} + +if [ $# -ne 3 ]; then + usage + exit 1 +fi + +printf "Repackaging ${UPSTREAM_TARBALL}\n" + +mkdir ${UPSTREAM_ROOTDIR} + +tar -C ${UPSTREAM_ROOTDIR} -xzf ${UPSTREAM_TARBALL} +if [ `ls -1 "${UPSTREAM_ROOTDIR}" | wc -l` -eq 1 ]; then + UNPACKED_SOURCEDIR="${UPSTREAM_ROOTDIR}/`ls -1 "${UPSTREAM_ROOTDIR}"`" +fi + +# Remove not used embedded wheels +rm -f ${UNPACKED_SOURCEDIR}/virtualenv_support/*.whl + +# Repack +GZIP=--best tar -C ${UPSTREAM_ROOTDIR} -cz ${TAR_EXTRA_ARGS} \ + -f ${PACKAGE_NAME}_${DEBIAN_VERSION}.orig.tar.gz \ + $(basename ${UNPACKED_SOURCEDIR}) + +mv ${PACKAGE_NAME}_${DEBIAN_VERSION}.orig.tar.gz ${DESTDIR} + +printf "Done\n" diff -Nru python-virtualenv-1.11.6/debian/rules python-virtualenv-1.11.6+ds/debian/rules --- python-virtualenv-1.11.6/debian/rules 2014-06-10 20:34:31.000000000 +0200 +++ python-virtualenv-1.11.6+ds/debian/rules 2014-08-16 16:13:05.000000000 +0200 @@ -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 diff -Nru python-virtualenv-1.11.6/debian/watch python-virtualenv-1.11.6+ds/debian/watch --- python-virtualenv-1.11.6/debian/watch 2014-01-06 16:41:42.000000000 +0100 +++ python-virtualenv-1.11.6+ds/debian/watch 2014-08-16 14:27:14.000000000 +0200 @@ -1,3 +1,4 @@ version=3 -opts=pgpsigurlmangle=s/$/.asc/ \ -https://pypi.python.org/packages/source/v/virtualenv/ virtualenv-(.*)\.tar\.gz +opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+ds// \ +https://pypi.python.org/packages/source/v/virtualenv/ virtualenv-(.*)\.tar\.gz \ +debian sh debian/repack
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Python-modules-team mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team
