diff -u python-boto-1.9b/debian/control python-boto-1.9b/debian/control --- python-boto-1.9b/debian/control +++ python-boto-1.9b/debian/control @@ -1,7 +1,8 @@ Source: python-boto Section: python Priority: optional -Maintainer: Eric Evans +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Eric Evans Build-Depends: debhelper (>= 7), python-support (>= 0.6) Homepage: http://code.google.com/p/boto/ Vcs-Git: git://git.debian.org/git/users/eevans/python-boto diff -u python-boto-1.9b/debian/changelog python-boto-1.9b/debian/changelog --- python-boto-1.9b/debian/changelog +++ python-boto-1.9b/debian/changelog @@ -1,3 +1,20 @@ +python-boto (1.9b-4ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #788651). Remaining changes: + - debian/rules: Run testsuite during build but ignore failures + since it currently doesn't pass. + - boto/ec2/snapshot.py: work around non-int data in volumeSize + returned from Eucalyptus. LP: #520707. + - boto/connection.py: Handle 2.7 the same way as 2.6 for httplib + compatibility. LP: #688773. + - boto/cloudfront/__init__.py, boto/connection.py: use + email.utils.formatdate(usegmt=True) instead of strftime as the latter + breaks when boto is used from application setting up locales (like + bpython or ipython); upstream issue #140. + * boto.egg-info/SOURCES.txt: add last EOL, as it is now in debian + + -- Scott Moser Thu, 26 May 2011 11:35:47 -0400 + python-boto (1.9b-4) unstable; urgency=low * Do not require Name param on RegisterImage (Closes: #591466). @@ -16,6 +33,48 @@ -- Eric Evans Wed, 06 Jan 2010 12:20:56 -0600 +python-boto (1.9b-1ubuntu5) natty; urgency=low + + * boto/cloudfront/__init__.py, boto/connection.py: use + email.utils.formatdate(usegmt=True) instead of strftime as the latter + breaks when boto is used from application setting up locales (like bpython + or ipython); upstream issue #140. + * boto.egg-info/SOURCES.txt: remove last EOL again to have less diff with + upstream. + + -- Loïc Minier Fri, 04 Mar 2011 22:16:36 +0100 + +python-boto (1.9b-1ubuntu4) natty; urgency=low + + * Handle 2.7 the same way as 2.6 for httplib compatibility. LP: #688773. + + -- Matthias Klose Tue, 14 Dec 2010 19:28:01 +0100 + +python-boto (1.9b-1ubuntu3) lucid; urgency=low + + * work around non-int data in volumeSize (LP: #520707) + + -- Scott Moser Wed, 17 Feb 2010 11:51:05 -0500 + +python-boto (1.9b-1ubuntu2) lucid; urgency=low + + * boto/ec2/connection.py: fix image registration (LP: #504530). + Patch taken from upstream: + http://bazaar.launchpad.net/~vcs-imports/boto/trunk/revision/1001 + + -- Mathias Gug Mon, 11 Jan 2010 16:12:10 -0500 + +python-boto (1.9b-1ubuntu1) lucid; urgency=low + + * merge Loic's changes made in 1.8d-1ubuntu2 + * Rename Vcs-* to XS-Debian-Vcs-*. + * Run testsuite during build but ignore failures since it currently doesn't + pass. + * Add ${misc:Depends}. + * Add XB-Python-Version: ${python:Versions}. + + -- Scott Moser Tue, 05 Jan 2010 15:12:37 -0500 + python-boto (1.9b-1) unstable; urgency=low * New upstream version. diff -u python-boto-1.9b/debian/rules python-boto-1.9b/debian/rules --- python-boto-1.9b/debian/rules +++ python-boto-1.9b/debian/rules @@ -7,7 +7,7 @@ dh_testdir dh_testroot - rm -f build-stamp install-stamp + rm -f build-stamp check-stamp install-stamp rm -rf build find boto/ -name *.pyc | xargs rm -f @@ -21,6 +21,13 @@ touch build-stamp +check: check-stamp +check-stamp: + -boto/tests/test.py + >$@ + +maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) + install: build-stamp dh_testdir dh_installdirs @@ -36,8 +43,8 @@ touch install-stamp -binary-arch: -binary-indep: install +binary-arch: $(maybe_check) +binary-indep: $(maybe_check) install dh_installdocs README dh_installexamples cq.py dh_installchangelogs only in patch2: unchanged: --- python-boto-1.9b.orig/boto/connection.py +++ python-boto-1.9b/boto/connection.py @@ -54,6 +54,7 @@ from boto.resultset import ResultSet import boto.utils from boto import config, UserAgent, handler +from email.utils import formatdate # # the following is necessary because of the incompatibilities @@ -239,8 +240,9 @@ # versions, it would append ":443" to the hostname sent # in the Host header and so we needed to make sure we # did the same when calculating the V2 signature. In 2.6 + # (and higher!) # it no longer does that. Hence, this kludge. - if sys.version[:3] == "2.6" and port == 443: + if sys.version[:3] in ('2.6', '2.7') and port == 443: signature_host = self.host else: signature_host = '%s:%d' % (self.host, port) @@ -461,8 +463,7 @@ def add_aws_auth_header(self, headers, method, path): path = self.get_path(path) if not headers.has_key('Date'): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime()) + headers['Date'] = formatdate(usegmt=True) c_string = boto.utils.canonical_string(method, path, headers) boto.log.debug('Canonical: %s' % c_string) only in patch2: unchanged: --- python-boto-1.9b.orig/boto/ec2/snapshot.py +++ python-boto-1.9b/boto/ec2/snapshot.py @@ -52,7 +52,10 @@ elif name == 'ownerId': self.owner_id = value elif name == 'volumeSize': - self.volume_size = int(value) + try: + self.volume_size = int(value) + except: + self.volume_size = value elif name == 'description': self.description = value else: only in patch2: unchanged: --- python-boto-1.9b.orig/boto/cloudfront/__init__.py +++ python-boto-1.9b/boto/cloudfront/__init__.py @@ -22,7 +22,6 @@ import xml.sax import base64 -import time import boto.utils from boto.connection import AWSAuthConnection from boto import handler @@ -31,6 +30,7 @@ from boto.cloudfront.identity import OriginAccessIdentityConfig from boto.resultset import ResultSet from boto.cloudfront.exception import CloudFrontServerError +from email.utils import formatdate class CloudFrontConnection(AWSAuthConnection): @@ -53,8 +53,7 @@ def add_aws_auth_header(self, headers, method, path): if not headers.has_key('Date'): - headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime()) + headers['Date'] = formatdate(usegmt=True) hmac = self.hmac.copy() hmac.update(headers['Date'])