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

Proposed by Scott Moser
Status: Merged
Merged at revision: 19
Proposed branch: lp:~smoser/ubuntu/precise/python-boto/merge-2.0.2
Merge into: lp:ubuntu/precise/python-boto
Diff against target: 155 lines (+59/-19)
5 files modified
boto.egg-info/SOURCES.txt (+1/-1)
debian/TODO (+0/-2)
debian/changelog (+46/-0)
debian/control (+3/-3)
debian/rules (+9/-13)
To merge this branch: bzr merge lp:~smoser/ubuntu/precise/python-boto/merge-2.0.2
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Review via email: mp+83891@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Loïc Minier (lool) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'boto.egg-info/SOURCES.txt'
2--- boto.egg-info/SOURCES.txt 2011-07-14 16:11:57 +0000
3+++ boto.egg-info/SOURCES.txt 2011-11-30 04:00:30 +0000
4@@ -237,4 +237,4 @@
5 tests/sdb/test_connection.py
6 tests/sqs/__init__.py
7 tests/sqs/test_connection.py
8-tests/utils/test_password.py
9\ No newline at end of file
10+tests/utils/test_password.py
11
12=== removed file 'debian/TODO'
13--- debian/TODO 2009-12-24 13:27:40 +0000
14+++ debian/TODO 1970-01-01 00:00:00 +0000
15@@ -1,2 +0,0 @@
16-
17- * generate sphinx doco and install to a python-boto-doc package.
18
19=== modified file 'debian/changelog'
20--- debian/changelog 2011-07-14 16:11:57 +0000
21+++ debian/changelog 2011-11-30 04:00:30 +0000
22@@ -1,3 +1,35 @@
23+python-boto (2.0-2ubuntu1) unreleased; urgency=low
24+
25+ * Sync with debian.
26+ * Remaining changes from debian:
27+ - debian/watch: fix for mangled versions (#650480)
28+ * Changes from upstream:
29+ - boto/auth.py: use email.utils.formatdate(usegmt=True) instead of strftime
30+ as the latter breaks when boto is used from application setting up
31+ locales (like bpython or ipython); upstream issue #140.
32+ * Dropped delta:
33+ - debian/rules: Run testsuite during build but ignore failures
34+ since it currently doesn't pass.
35+ - debian/rules, debian/control: Transition from pysupport to dh_python2
36+ (LP: #788514)
37+ - debian/rules:
38+ + README removed (no longer in source tarball)
39+ + doc install of cq.py removed (it is now installed to /usr/bin)
40+
41+ -- Scott Moser <smoser@ubuntu.com> Tue, 29 Nov 2011 21:55:58 -0500
42+
43+python-boto (2.0-2) unstable; urgency=low
44+
45+ * Promote new upstream to unstable (Closes: #638931).
46+
47+ -- Eric Evans <eevans@debian.org> Sun, 13 Nov 2011 11:58:40 -0800
48+
49+python-boto (2.0-1) experimental; urgency=low
50+
51+ * New upstream release.
52+
53+ -- Eric Evans <eevans@debian.org> Sun, 16 Oct 2011 17:22:44 -0500
54+
55 python-boto (2.0-0ubuntu1) oneiric; urgency=low
56
57 * New upstream release.
58@@ -21,6 +53,20 @@
59
60 -- Scott Moser <smoser@ubuntu.com> Thu, 14 Jul 2011 16:11:57 -0400
61
62+python-boto (1.9b-6) unstable; urgency=low
63+
64+ * Convert packaging to dh_python2 (Closes: #631430).
65+
66+ -- Eric Evans <eevans@debian.org> Sat, 30 Jul 2011 19:43:19 +0200
67+
68+python-boto (1.9b-5) unstable; urgency=low
69+
70+ * Updated to Debian Policy version 3.9.2.
71+ * Patched to include Python 2.7 in httplib work-around for https
72+ signatures. Thanks Matthias Klose. (Closes: #607120)
73+
74+ -- Eric Evans <eevans@debian.org> Sun, 03 Jul 2011 16:04:44 -0500
75+
76 python-boto (1.9b-4ubuntu2) oneiric; urgency=low
77
78 * debian/rules, debian/control: Transition from pysupport to dh_python2
79
80=== modified file 'debian/control'
81--- debian/control 2011-07-14 16:11:57 +0000
82+++ debian/control 2011-11-30 04:00:30 +0000
83@@ -3,11 +3,11 @@
84 Priority: optional
85 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
86 XSBC-Original-Maintainer: Eric Evans <eevans@debian.org>
87-Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~)
88+Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3)
89+X-Python-Version: >= 2.5
90 Homepage: http://code.google.com/p/boto/
91 XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto
92-XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto
93-X-Python-Version: >= 2.5
94+XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/eevans/python-boto.git
95 Standards-Version: 3.9.2
96
97 Package: python-boto
98
99=== modified file 'debian/rules'
100--- debian/rules 2011-07-14 16:11:57 +0000
101+++ debian/rules 2011-11-30 04:00:30 +0000
102@@ -7,13 +7,15 @@
103 dh_testdir
104 dh_testroot
105
106- rm -f build-stamp check-stamp install-stamp
107+ rm -f build-stamp install-stamp
108 rm -rf build
109 find boto/ -name *.pyc | xargs rm -f
110
111 dh_clean
112
113-build: build-stamp
114+build: build-arch build-indep
115+build-arch: build-stamp
116+build-indep: build-stamp
117 build-stamp:
118 dh_testdir
119
120@@ -21,19 +23,13 @@
121
122 touch build-stamp
123
124-check: check-stamp
125-check-stamp:
126- -boto/tests/test.py
127- >$@
128-
129-maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
130-
131 install: build-stamp
132 dh_testdir
133 dh_installdirs
134
135 python setup.py install --root $(CURDIR)/debian/python-boto \
136- --install-scripts usr/share/doc/python-boto/examples/
137+ --install-scripts usr/share/doc/python-boto/examples/ \
138+ --install-layout=deb
139
140 for f in `find $(CURDIR)/debian/python-boto -name \*.py`; do \
141 sed -e '\,^#!/usr/bin/env python,d' < $$f > $$f.tmp; \
142@@ -41,10 +37,10 @@
143 done
144
145 touch install-stamp
146-
147
148-binary-arch: $(maybe_check)
149-binary-indep: $(maybe_check) install
150+binary-arch:
151+binary-indep: install
152+ dh_installdocs
153 dh_installchangelogs
154 dh_compress
155 dh_fixperms

Subscribers

People subscribed via source and target branches

to all changes: