Merge lp:~smoser/ubuntu/precise/python-boto/merge-2.0.2 into lp:ubuntu/precise/python-boto

[Scott Moser]

Sync with debian 2.0.2, in anticipation of pulling pulling in 2.1.1 from upstream.

I wanted to get our delta down as small as possible, as we will have no upstream delta that I'm aware of for 2.1.1, and the only debian delta left is debian/watch.

[Loïc Minier (lool)]

Looked good -- merged, thanks; NB: dch recognizes only "UNRELEASED" in debian/changelog, not the lower cased "unreleased".

review: Approve

=== modified file 'boto.egg-info/SOURCES.txt'
--- boto.egg-info/SOURCES.txt	2011-07-14 16:11:57 +0000
+++ boto.egg-info/SOURCES.txt	2011-11-30 04:00:30 +0000
@@ -237,4 +237,4 @@
 tests/sdb/test_connection.py
 tests/sqs/__init__.py
 tests/sqs/test_connection.py
-tests/utils/test_password.py
 \ No newline at end of file
+tests/utils/test_password.py
 
=== removed file 'debian/TODO'
--- debian/TODO	2009-12-24 13:27:40 +0000
+++ debian/TODO	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-
- * generate sphinx doco and install to a python-boto-doc package.
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-14 16:11:57 +0000
+++ debian/changelog	2011-11-30 04:00:30 +0000
@@ -1,3 +1,35 @@
+python-boto (2.0-2ubuntu1) unreleased; urgency=low
+
+  * Sync with debian.
+  * Remaining changes from debian:
+    - debian/watch: fix for mangled versions (#650480)
+  * Changes from upstream:
+    - boto/auth.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.
+  * Dropped delta:
+    - debian/rules: Run testsuite during build but ignore failures 
+      since it currently doesn't pass.
+    - debian/rules, debian/control: Transition from pysupport to dh_python2
+      (LP: #788514)
+    - debian/rules:
+      + README removed (no longer in source tarball)
+      + doc install of cq.py removed (it is now installed to /usr/bin)
+
+ -- Scott Moser <[e-mail]>  Tue, 29 Nov 2011 21:55:58 -0500
+
+python-boto (2.0-2) unstable; urgency=low
+
+  * Promote new upstream to unstable (Closes: #638931).
+
+ -- Eric Evans <[e-mail]>  Sun, 13 Nov 2011 11:58:40 -0800
+
+python-boto (2.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Eric Evans <[e-mail]>  Sun, 16 Oct 2011 17:22:44 -0500
+
 python-boto (2.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
@@ -21,6 +53,20 @@
 
  -- Scott Moser <[e-mail]>  Thu, 14 Jul 2011 16:11:57 -0400
 
+python-boto (1.9b-6) unstable; urgency=low
+
+  * Convert packaging to dh_python2 (Closes: #631430).
+
+ -- Eric Evans <[e-mail]>  Sat, 30 Jul 2011 19:43:19 +0200
+
+python-boto (1.9b-5) unstable; urgency=low
+
+  * Updated to Debian Policy version 3.9.2.
+  * Patched to include Python 2.7 in httplib work-around for https
+    signatures.  Thanks Matthias Klose.  (Closes: #607120)
+
+ -- Eric Evans <[e-mail]>  Sun, 03 Jul 2011 16:04:44 -0500
+
 python-boto (1.9b-4ubuntu2) oneiric; urgency=low
 
   * debian/rules, debian/control: Transition from pysupport to dh_python2
 
=== modified file 'debian/control'
--- debian/control	2011-07-14 16:11:57 +0000
+++ debian/control	2011-11-30 04:00:30 +0000
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Eric Evans <[e-mail]>
-Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3)
+X-Python-Version: >= 2.5
 Homepage: http://code.google.com/p/boto/
 XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto
-XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto
-X-Python-Version: >= 2.5
+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/eevans/python-boto.git
 Standards-Version: 3.9.2
 
 Package: python-boto
 
=== modified file 'debian/rules'
--- debian/rules	2011-07-14 16:11:57 +0000
+++ debian/rules	2011-11-30 04:00:30 +0000
@@ -7,13 +7,15 @@
 	dh_testdir
 	dh_testroot
 	
-	rm -f build-stamp check-stamp install-stamp
+	rm -f build-stamp install-stamp
 	rm -rf build
 	find boto/ -name *.pyc | xargs rm -f
 	
 	dh_clean
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
 
@@ -21,19 +23,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
 
 	python setup.py install --root $(CURDIR)/debian/python-boto \
-		--install-scripts usr/share/doc/python-boto/examples/
+		--install-scripts usr/share/doc/python-boto/examples/ \
+	        --install-layout=deb
 
 	for f in `find $(CURDIR)/debian/python-boto -name \*.py`; do \
 	    sed -e '\,^#!/usr/bin/env python,d' < $$f > $$f.tmp; \
@@ -41,10 +37,10 @@
 	done
 
 	touch install-stamp
-	
 
-binary-arch: $(maybe_check)
-binary-indep: $(maybe_check) install
+binary-arch:
+binary-indep: install
+	dh_installdocs
 	dh_installchangelogs
 	dh_compress
 	dh_fixperms