Hi Eric, I have attached a debdiff, stripping out the upstream changes in the 2.32.1 release. My patch does this:
python-boto (2.32.1-1.1) experimental; urgency=medium * Non-maintainer upload. * Uploading new upstream release to Experimental (Closes: #760490). * Added Python 3 support. * Vcs-Git field now canonical. * Now using source format 3.0 (quilt). * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in debian/source/options. * debian/copyright using the parseable format 1.0. -- Thomas Goirand <z...@debian.org> Fri, 12 Sep 2014 08:21:48 +0000 Please consider applying the patch to the current release. Because I need this package soon in at least Experimental, and that there's currently no version of boto in that suite, I have uploaded the resulting package to experimental, using the delayed/2 queue. I hope this isn't a problem. If it is, just let me know, and I'll dcut the package out. However, I don't think any of my change would be controversial. I by the way hope you appreciate the work on the debian/copyright: the current one doesn't list the copyright holders, which is a violation of the licensing... This obviously must be fixed before Jessie is frozen. If you agree with this upload, then it'd be nice if you could upload it to Sid strait away so that we benefit from the Python 3 support, which will unlock the possibility of Python 3 support in numerous packages (and a lot that I maintain by the way...). Cheers, Thomas Goirand (zigo)
diff -Nru python-boto-2.29.1/debian/changelog python-boto-2.32.1/debian/changelog --- python-boto-2.29.1/debian/changelog 2014-09-12 09:04:35.000000000 +0000 +++ python-boto-2.32.1/debian/changelog 2014-09-12 09:03:01.000000000 +0000 @@ -1,3 +1,15 @@ +python-boto (2.32.1-1.1) experimental; urgency=medium + + * Non-maintainer upload. + * Uploading new upstream release to Experimental (Closes: #760490). + * Added Python 3 support. + * Vcs-Git field now canonical. + * Now using source format 3.0 (quilt). + * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in debian/source/options. + * debian/copyright using the parseable format 1.0. + + -- Thomas Goirand <z...@debian.org> Fri, 12 Sep 2014 08:21:48 +0000 + python-boto (2.29.1-1) unstable; urgency=medium * New upstream release (Closes: #750571). diff -Nru python-boto-2.29.1/debian/control python-boto-2.32.1/debian/control --- python-boto-2.29.1/debian/control 2014-09-12 09:04:35.000000000 +0000 +++ python-boto-2.32.1/debian/control 2014-09-12 08:34:10.000000000 +0000 @@ -2,19 +2,23 @@ Section: python Priority: optional Maintainer: Eric Evans <eev...@debian.org> -Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3) +Build-Depends: debhelper (>= 7), + python-all (>= 2.6.6-3), + python-setuptools, + python3-all (>= 3.2), + python3-setuptools XS-Testsuite: autopkgtest X-Python-Version: >= 2.5 Homepage: https://github.com/boto/boto -Vcs-Git: git://git.debian.org/git/users/eevans/python-boto +Vcs-Git: git://anonscm.debian.org/users/eevans/python-boto.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/eevans/python-boto.git Standards-Version: 3.9.5 Package: python-boto Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-requests +Depends: python-requests, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} -Description: Python interface to Amazon's Web Services +Description: Python interface to Amazon's Web Services - Python 2.x Boto is a Python interface to the infrastructure services available from Amazon. . @@ -35,3 +39,33 @@ * Glacier * Elastic Block Store (EBS) * and many more... + . + This package provides the Python 2.x module. + +Package: python3-boto +Architecture: all +Depends: python3-requests, ${misc:Depends}, ${python3:Depends} +Provides: ${python3:Provides} +Description: Python interface to Amazon's Web Services - Python 3.x + Boto is a Python interface to the infrastructure services available from + Amazon. + . + Boto supports the following services: + * Elastic Compute Cloud (EC2) + * Elastic MapReduce + * CloudFront + * DynamoDB + * SimpleDB + * Relational Database Service (RDS) + * Identity and Access Management (IAM) + * Simple Queue Service (SQS) + * CloudWatch + * Route53 + * Elastic Load Balancing (ELB) + * Flexible Payment Service (FPS) + * Simple Storage Service (S3) + * Glacier + * Elastic Block Store (EBS) + * and many more... + . + This package provides the Python 3.x module. diff -Nru python-boto-2.29.1/debian/copyright python-boto-2.32.1/debian/copyright --- python-boto-2.29.1/debian/copyright 2014-09-12 09:04:35.000000000 +0000 +++ python-boto-2.32.1/debian/copyright 2014-09-12 09:02:45.000000000 +0000 @@ -1,37 +1,99 @@ -This package was debianized by Eric Evans <eev...@debian.org> on -Wed, 04 Jul 2007 18:54:44 -0500 - -It was downloaded from: http://code.google.com/p/boto/ - -Upstream Author: Mitch Garnaat <mi...@garnaat.com> - -Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/ - -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 AUTHOR 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. - -Portions of boto/connection.py and boto.utils.py were copied or derived -from sample code supplied by Amazon. The following notice applies to that -code. - - This software code is made available "AS IS" without warranties of any - kind. You may copy, display, modify and redistribute the software code - either by itself or as incorporated into your code; provided that you do - not remove any proprietary notices. Your use of this software code is at - your own risk and you waive any claim against Amazon Digital Services, - Inc. or its affiliates with respect to your use of this software code. - (c) 2006 Amazon Digital Services, Inc. or its affiliates. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: boto +Source: http://code.google.com/p/boto/ + +Files: debian/* +Copyright: (c) 2007-2014, Eric Evans <eev...@debian.org> +License: Expat + +Files: * +Copyright: (c) 2006-2014, Mitch Garnaat <mi...@garnaat.com> + (c) 2012-2014, Amazon.com, Inc. or its affiliates. + (c) 2010-2014, Eucalyptus Systems, Inc. + (c) 2011, Joel Barciauskas + (c) 2009-2014, Chris Moyer http://coredumped.org + (c) 2010-2014, Jim Browne http://www.42lines.net + (c) 2012 Thomas Parslow http://almostobsolete.net/ + (c) Microsoft Corporation + (c) 2014, Skytap http://skytap.com/ + (c) 2009-2011, Reza Lotun http://reza.lotun.name + (c) 2010, Hunter Blanks http://artifex.org/~hblanks/ + (c) 2011, Nexenta Systems, Inc. + (c) 2010-2013, Google, Inc. + (c) 2011, Brian Beach + (c) 2012-2014, Andy Davidoff http://www.disruptek.com/ + (c) 2010 Jason R. Coombs http://www.jaraco.com/ + (c) 2013 Franc Carter franc.car...@gmail.com + (c) 2010 Jeremy Thurgood <firxen+b...@gmail.com> + (c) 2010 Spotify AB + (c) 2014 Netflix, Inc. Stefan Praszalowicz + (c) 2014 Tellybug, Matt Millar + (c) 2012 Robie Basak <ro...@justgohome.co.uk> + (c) 2011 Blue Pines Technologies LLC, Brad Carleton + (c) 2010-2011 Yelp + (c) 2012 Miguel Olivares http://moliware.com/ + (c) 2010-2014 Benjamin Peterson + (c) 2011 Harry Marr http://hmarr.com/ + (c) 2003-2007 Robey Pointer <ro...@lag.net> + (c) 2013 Anthony Tonns http://www.corsis.com/ + (c) 2014 Jumping Qu http://newrice.blogspot.com/ + (c) 2011 Jann Kleen + (c) 2010 Robert Mela +License: Expat + +Files: boto/connection.py boto/utils.py +Copyright: (c) 2006-2012 Mitch Garnaat http://garnaat.org/ + (c) 2012 Amazon.com, Inc. or its affiliates. + (c) 2010 Google + (c) 2008 rPath, Inc. + (c) 2009 The Echo Nest Corporation + (c) 2010, Eucalyptus Systems, Inc. + (c) 2011, Nexenta Systems Inc. +License: Expat-and-Amazon-License + +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 AUTHOR 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. + +License: Expat-and-Amazon-License + Portions of boto/connection.py and boto/utils.py were copied or derived from + sample code supplied by Amazon. The following notice applies to that code. + . + 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 AUTHOR 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. + . + This software code is made available "AS IS" without warranties of any kind. + You may copy, display, modify and redistribute the software code either by + itself or as incorporated into your code; provided that you do not remove any + proprietary notices. Your use of this software code is at your own risk and + you waive any claim against Amazon Digital Services, Inc. or its affiliates + with respect to your use of this software code. (c) 2006 Amazon Digital + Services, Inc. or its affiliates. diff -Nru python-boto-2.29.1/debian/rules python-boto-2.32.1/debian/rules --- python-boto-2.29.1/debian/rules 2014-09-12 09:04:35.000000000 +0000 +++ python-boto-2.32.1/debian/rules 2014-09-12 08:30:21.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f -# Verbose mode -#export DH_VERBOSE=1 +PYTHONS:=$(shell pyversions -vr) +PYTHON3S:=$(shell py3versions -vr) clean: dh_testdir @@ -27,15 +27,25 @@ dh_testdir dh_installdirs - python setup.py install --root $(CURDIR)/debian/python-boto \ - --install-scripts usr/share/doc/python-boto/examples/ \ - --install-layout=deb + # Python 2.x + set -e ; for pyvers in $(PYTHONS); do \ + python$$pyvers setup.py install --root $(CURDIR)/debian/python-boto \ + --install-scripts usr/share/doc/python-boto/examples/ \ + --install-layout=deb ; \ + done for f in `find $(CURDIR)/debian/python-boto -name \*.py`; do \ sed -e '\,^#!/usr/bin/env python,d' < $$f > $$f.tmp; \ mv $$f.tmp $$f; \ done + # Python 3.x + set -e ; for pyvers in $(PYTHON3S); do \ + python$$pyvers setup.py install --root $(CURDIR)/debian/python3-boto \ + --install-scripts usr/share/doc/python3-boto/examples/ \ + --install-layout=deb ; \ + done + touch install-stamp binary-arch: @@ -45,6 +55,7 @@ dh_compress dh_fixperms dh_python2 + dh_python3 dh_gencontrol dh_installdeb dh_md5sums diff -Nru python-boto-2.29.1/debian/source/format python-boto-2.32.1/debian/source/format --- python-boto-2.29.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.32.1/debian/source/format 2014-09-12 08:35:34.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru python-boto-2.29.1/debian/source/options python-boto-2.32.1/debian/source/options --- python-boto-2.29.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.32.1/debian/source/options 2014-09-12 08:35:56.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/"
