Merge lp:~ttx/swift/add-oldies-and-orphans into lp:~openstack-ubuntu-packagers/swift/ubuntu

Proposed by Thierry Carrez
Status: Merged
Merged at revision: 53
Proposed branch: lp:~ttx/swift/add-oldies-and-orphans
Merge into: lp:~openstack-ubuntu-packagers/swift/ubuntu
Diff against target: 31 lines (+6/-1)
2 files modified
debian/changelog (+3/-0)
debian/swift.install (+3/-1)
To merge this branch: bzr merge lp:~ttx/swift/add-oldies-and-orphans
Reviewer Review Type Date Requested Status
Chuck Short (community) Approve
Review via email: mp+87650@code.launchpad.net

Commit message

Ship swift-oldies and swift-orphans in swift package

Description of the change

Ship swift-oldies and swift-orphans in swift package, in order to fix PPA build failure.
See bug 911444

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

lgtm

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-12-16 14:45:33 +0000
+++ debian/changelog 2012-01-05 16:47:28 +0000
@@ -1,5 +1,6 @@
1swift (1.4.5~20111202.1634-0ubuntu2) precise; urgency=low1swift (1.4.5~20111202.1634-0ubuntu2) precise; urgency=low
22
3 [ Chuck Short ]
3 * Drop swauth man pages. (LP: #900888)4 * Drop swauth man pages. (LP: #900888)
4 * debian/control:5 * debian/control:
5 - Clean up build depends.6 - Clean up build depends.
@@ -8,6 +9,8 @@
8 * debian/python-swift.postinst: Change user's shell to /bin/false.9 * debian/python-swift.postinst: Change user's shell to /bin/false.
9 * Fix some lintian warnings.10 * Fix some lintian warnings.
1011
12 [ Thierry Carrez (ttx) ]
13 * Ship swift-oldies and swift-orphans in swift package
1114
12 -- Chuck Short <zulcss@ubuntu.com> Fri, 16 Dec 2011 09:45:28 -050015 -- Chuck Short <zulcss@ubuntu.com> Fri, 16 Dec 2011 09:45:28 -0500
1316
1417
=== modified file 'debian/swift.install'
--- debian/swift.install 2011-11-11 15:48:52 +0000
+++ debian/swift.install 2012-01-05 16:47:28 +0000
@@ -7,4 +7,6 @@
7usr/bin/swift-dispersion-populate7usr/bin/swift-dispersion-populate
8usr/bin/swift-dispersion-report8usr/bin/swift-dispersion-report
9usr/bin/swift-recon9usr/bin/swift-recon
10usr/bin/swift-recon-cron 10usr/bin/swift-recon-cron
11usr/bin/swift-oldies
12usr/bin/swift-orphans

Subscribers

People subscribed via source and target branches