OpenStack Object Storage (swift)

Merge lp:~james-page/swift/fixup-upgrades into lp:~ubuntu-server-dev/swift/icehouse

  1. fixup-upgrades
  2. Merge into icehouse
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 177
Merged at revision: 177
Proposed branch: lp:~james-page/swift/fixup-upgrades
Merge into: lp:~ubuntu-server-dev/swift/icehouse
Diff against target: 78 lines (+18/-3)
2 files modified
debian/changelog (+6/-1)
debian/control (+12/-2)
To merge this branch: bzr merge lp:~james-page/swift/fixup-upgrades
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+215423@code.launchpad.net
To post a comment you must log in.

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 2014-04-10 13:16:50 +0000
3+++ debian/changelog 2014-04-11 13:47:53 +0000
4@@ -1,8 +1,13 @@
5 swift (1.13.1~rc1-0ubuntu3) UNRELEASED; urgency=medium
6
7+ [ Chuck Short ]
8 * debian/patches/ring-perms.patch: Dropped no longer needed.
9
10- -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Apr 2014 09:16:24 -0400
11+ [ James Page ]
12+ * d/control: Add appropriate Breaks/Replaces to support move of man pages
13+ between binary packages in 1.13.1~rc1-0ubuntu1 (LP: #1306241).
14+
15+ -- James Page <james.page@ubuntu.com> Fri, 11 Apr 2014 14:43:33 +0100
16
17 swift (1.13.1~rc1-0ubuntu2) trusty; urgency=medium
18
19
20=== modified file 'debian/control'
21--- debian/control 2014-04-04 09:58:02 +0000
22+++ debian/control 2014-04-11 13:47:53 +0000
23@@ -50,6 +50,8 @@
24 ${misc:Depends},
25 ${python:Depends}
26 Provides: ${python:Provides}
27+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
28+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
29 Description: distributed virtual object store - Python libraries
30 OpenStack Object Storage (code-named Swift) is open source software for
31 creating redundant, scalable object storage using clusters of standardized
32@@ -115,6 +117,8 @@
33 ${python:Depends},
34 ${shlibs:Depends}
35 Provides: ${python:Provides}
36+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
37+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
38 Description: distributed virtual object store - proxy server
39 OpenStack Object Storage (code-named Swift) is open source software for
40 creating redundant, scalable object storage using clusters of standardized
41@@ -146,8 +150,8 @@
42 ${python:Depends},
43 ${shlibs:Depends}
44 Provides: ${python:Provides}
45-Breaks: swift-object (<< 1.12.0-0ubuntu2)
46-Replaces: swift-object (<< 1.12.0-0ubuntu2)
47+Breaks: swift-object (<< 1.12.0-0ubuntu2), (<< 1.13.1~rc1-0ubuntu1~)
48+Replaces: swift-object (<< 1.12.0-0ubuntu2), (<< 1.13.1~rc1-0ubuntu1~)
49 Description: distributed virtual object store - object expirer
50 OpenStack Object Storage (code-named Swift) is open source software for
51 creating redundant, scalable object storage using clusters of standardized
52@@ -180,6 +184,8 @@
53 ${python:Depends},
54 ${shlibs:Depends}
55 Provides: ${python:Provides}
56+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
57+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
58 Description: distributed virtual object store - object server
59 OpenStack Object Storage (code-named Swift) is open source software for
60 creating redundant, scalable object storage using clusters of standardized
61@@ -211,6 +217,8 @@
62 ${python:Depends},
63 ${shlibs:Depends}
64 Provides: ${python:Provides}
65+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
66+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
67 Description: distributed virtual object store - container server
68 OpenStack Object Storage (code-named Swift) is open source software for
69 creating redundant, scalable object storage using clusters of standardized
70@@ -242,6 +250,8 @@
71 ${python:Depends},
72 ${shlibs:Depends}
73 Provides: ${python:Provides}
74+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
75+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
76 Description: distributed virtual object store - account server
77 OpenStack Object Storage (code-named Swift) is open source software for
78 creating redundant, scalable object storage using clusters of standardized

Subscribers

People subscribed via source and target branches