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
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-26 11:35:47 +0000
+++ debian/changelog 2011-06-23 19:18:08 +0000
@@ -1,3 +1,10 @@
1python-boto (1.9b-4ubuntu2) oneiric; urgency=low
2
3 * debian/rules, debian/control: Transition from pysupport to dh_python2
4 (LP: #788514)
5
6 -- Evan Broder <evan@ebroder.net> Thu, 23 Jun 2011 11:59:24 -0700
7
1python-boto (1.9b-4ubuntu1) oneiric; urgency=low8python-boto (1.9b-4ubuntu1) oneiric; urgency=low
29
3 * Merge from debian unstable (LP: #788651). Remaining changes:10 * Merge from debian unstable (LP: #788651). Remaining changes:
411
=== modified file 'debian/control'
--- debian/control 2011-05-26 11:35:47 +0000
+++ debian/control 2011-06-23 19:18:08 +0000
@@ -1,12 +1,13 @@
1Source: python-boto1Source: python-boto
2Section: python2Section: python
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Eric Evans <eevans@debian.org>5XSBC-Original-Maintainer: Eric Evans <eevans@debian.org>
6Build-Depends: debhelper (>= 7), python-support (>= 0.6)6Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~)
7Homepage: http://code.google.com/p/boto/7Homepage: http://code.google.com/p/boto/
8XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto8XS-Debian-Vcs-Git: git://git.debian.org/git/users/eevans/python-boto
9XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto9XS-Debian-Vcs-Browser: http://git.debian.org/?p=users/eevans/python-boto
10X-Python-Version: >= 2.5
10Standards-Version: 3.9.111Standards-Version: 3.9.1
1112
12Package: python-boto13Package: python-boto
1314
=== removed file 'debian/pyversions'
--- debian/pyversions 2010-01-06 12:20:56 +0000
+++ debian/pyversions 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
12.5-
20
=== modified file 'debian/rules'
--- debian/rules 2010-01-05 15:12:37 +0000
+++ debian/rules 2011-06-23 19:18:08 +0000
@@ -50,7 +50,7 @@
50 dh_installchangelogs50 dh_installchangelogs
51 dh_compress51 dh_compress
52 dh_fixperms52 dh_fixperms
53 dh_pysupport53 dh_python2
54 dh_gencontrol54 dh_gencontrol
55 dh_installdeb55 dh_installdeb
56 dh_md5sums56 dh_md5sums

Subscribers

People subscribed via source and target branches

to all changes: