Merge lp:~broder/ubuntu/oneiric/python-boto/alt.pysupport.die.die.die into lp:ubuntu/oneiric/python-boto

Proposed by Evan Broder
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~broder/ubuntu/oneiric/python-boto/alt.pysupport.die.die.die
Merge into: lp:ubuntu/oneiric/python-boto
Diff against target: 53 lines (+11/-4)
4 files modified
debian/changelog (+7/-0)
debian/control (+3/-2)
debian/pyversions (+0/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~broder/ubuntu/oneiric/python-boto/alt.pysupport.die.die.die
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Ubuntu branches Pending
Review via email: mp+65712@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Evan Broder (broder) wrote :
Download full text (40.7 KiB)

mingo:~/src/python-boto evan$ debdiff python-boto_1.9b-4ubuntu1_all.deb python-boto_1.9b-4ubuntu2_all.deb
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .deb but not in first
-------------------------------------
-rwxr-xr-x root/root DEBIAN/preinst
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto-1.9b.egg-info -> ../../../share/pyshared/boto-1.9b.egg-info
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/__init__.py -> ../../../../share/pyshared/boto/__init__.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/__init__.py -> ../../../../../share/pyshared/boto/cloudfront/__init__.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/distribution.py -> ../../../../../share/pyshared/boto/cloudfront/distribution.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/exception.py -> ../../../../../share/pyshared/boto/cloudfront/exception.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/identity.py -> ../../../../../share/pyshared/boto/cloudfront/identity.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/logging.py -> ../../../../../share/pyshared/boto/cloudfront/logging.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/object.py -> ../../../../../share/pyshared/boto/cloudfront/object.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/cloudfront/signers.py -> ../../../../../share/pyshared/boto/cloudfront/signers.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/connection.py -> ../../../../share/pyshared/boto/connection.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/contrib/__init__.py -> ../../../../../share/pyshared/boto/contrib/__init__.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/contrib/m2helpers.py -> ../../../../../share/pyshared/boto/contrib/m2helpers.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/contrib/ymlmessage.py -> ../../../../../share/pyshared/boto/contrib/ymlmessage.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/__init__.py -> ../../../../../share/pyshared/boto/ec2/__init__.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/address.py -> ../../../../../share/pyshared/boto/ec2/address.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/autoscale/__init__.py -> ../../../../../../share/pyshared/boto/ec2/autoscale/__init__.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/autoscale/activity.py -> ../../../../../../share/pyshared/boto/ec2/autoscale/activity.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/autoscale/group.py -> ../../../../../../share/pyshared/boto/ec2/autoscale/group.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/autoscale/instance.py -> ../../../../../../share/pyshared/boto/ec2/autoscale/instance.py
lrwxrwxrwx root/root /usr/lib/python2.6/dist-packages/boto/ec2/autoscale/launchconfig.py -> ../../../../../../share/pyshared/boto/ec2/autoscale/launchconfig.py
lrwxrwxrw...

Revision history for this message
Barry Warsaw (barry) wrote :

Looks great, thanks! Also thanks for submitting a wishlist bug to Debian. I'll sponsor this upload.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-26 11:35:47 +0000
3+++ debian/changelog 2011-06-23 19:18:08 +0000
4@@ -1,3 +1,10 @@
5+python-boto (1.9b-4ubuntu2) oneiric; urgency=low
6+
7+ * debian/rules, debian/control: Transition from pysupport to dh_python2
8+ (LP: #788514)
9+
10+ -- Evan Broder <evan@ebroder.net> Thu, 23 Jun 2011 11:59:24 -0700
11+
12 python-boto (1.9b-4ubuntu1) oneiric; urgency=low
13
14 * Merge from debian unstable (LP: #788651). Remaining changes:
15
16=== modified file 'debian/control'
17--- debian/control 2011-05-26 11:35:47 +0000
18+++ debian/control 2011-06-23 19:18:08 +0000
19@@ -1,12 +1,13 @@
20 Source: python-boto
21 Section: python
22 Priority: optional
23-Maintainer: Ubuntu Developers <ubuntu-devel@lists.ubuntu.com>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25 XSBC-Original-Maintainer: Eric Evans <eevans@debian.org>
26-Build-Depends: debhelper (>= 7), python-support (>= 0.6)
27+Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~)
28 Homepage: http://code.google.com/p/boto/
29 XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto
30 XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto
31+X-Python-Version: >= 2.5
32 Standards-Version: 3.9.1
33
34 Package: python-boto
35
36=== removed file 'debian/pyversions'
37--- debian/pyversions 2010-01-06 12:20:56 +0000
38+++ debian/pyversions 1970-01-01 00:00:00 +0000
39@@ -1,1 +0,0 @@
40-2.5-
41
42=== modified file 'debian/rules'
43--- debian/rules 2010-01-05 15:12:37 +0000
44+++ debian/rules 2011-06-23 19:18:08 +0000
45@@ -50,7 +50,7 @@
46 dh_installchangelogs
47 dh_compress
48 dh_fixperms
49- dh_pysupport
50+ dh_python2
51 dh_gencontrol
52 dh_installdeb
53 dh_md5sums

Subscribers

People subscribed via source and target branches

to all changes: