Merge lp:~james-page/swift/missing-dnspython into lp:~ubuntu-server-dev/swift/havana

[James Page]

Add missing dependency on python-dnspython, tidy debian/*

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-13 14:44:37 +0000
+++ debian/changelog	2013-09-25 15:13:20 +0000
@@ -1,3 +1,10 @@
+swift (1.9.1-0ubuntu2) saucy; urgency=low
+
+  * d/control: Add missing dependency on python-dnspython >= 1.10.0.
+  * d/control: Wrap and sort.
+
+ -- James Page <[e-mail]>  Wed, 25 Sep 2013 16:08:35 +0100
+
 swift (1.9.1-0ubuntu1) saucy; urgency=low
 
   [ James Page ]

=== modified file 'debian/control'
--- debian/control	2013-07-09 13:00:28 +0000
+++ debian/control	2013-09-25 15:13:20 +0000
@@ -3,26 +3,29 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Soren Hansen <[e-mail]>
-Uploaders: Monty Taylor <[e-mail]>,
+Uploaders:
+ Monty Taylor <[e-mail]>,
  Greg Holt <[e-mail]>,
  Jay Payne <[e-mail]>,
  Michael Barton <[e-mail]>,
  Thomas Goirand <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends:
+ debhelper (>= 7.0.50~),
  python-all-dev (>= 2.6.6-3~),
- python-openssl,
- python-setuptools,
- python-simplejson,
- python-xattr,
- python-netifaces,
+ python-dnspython (>= 1.10.0),
+ python-eventlet (>= 0.9.8),
  python-greenlet (>= 0.3.1),
- python-eventlet (>= 0.9.8),
  python-mock,
+ python-netifaces,
  python-nose,
+ python-openssl,
  python-paste,
  python-pastedeploy,
+ python-setuptools,
+ python-simplejson,
  python-sphinx (>= 1.0),
- python-swiftclient
+ python-swiftclient,
+ python-xattr
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/swift
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/havana/files
@@ -32,16 +35,20 @@
 Package: python-swift
 Architecture: all
 Section: python
-Depends: adduser, ${python:Depends}, ${misc:Depends},
+Depends:
+ adduser,
+ python-dnspython (>= 1.10.0),
+ python-eventlet (>= 0.9.8),
+ python-greenlet (>= 0.3.1),
+ python-netifaces,
  python-openssl,
- python-setuptools,
  python-paste,
  python-pastedeploy,
+ python-setuptools,
  python-simplejson,
  python-xattr,
- python-netifaces,
- python-greenlet (>= 0.3.1),
- python-eventlet (>= 0.9.8)
+ ${misc:Depends},
+ ${python:Depends}
 Provides: ${python:Provides}
 Description: distributed virtual object store - Python libraries
  OpenStack Object Storage (code-named Swift) is open source software for
@@ -68,7 +75,11 @@
 
 Package: swift
 Architecture: all
-Depends: python-swift (=${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-swift (=${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Provides: ${python:Provides}
 Replaces: swift (<< 1.6.0-0ubuntu1)
 Breaks: swift (<< 1.6.0-0ubuntu1)
@@ -97,7 +108,11 @@
 
 Package: swift-proxy
 Architecture: all
-Depends: python-swift (=${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-swift (=${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: distributed virtual object store - proxy server
  OpenStack Object Storage (code-named Swift) is open source software for
@@ -124,7 +139,12 @@
 
 Package: swift-object
 Architecture: all
-Depends: python-swift (=${binary:Version}), rsync, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-swift (=${binary:Version}),
+ rsync,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: distributed virtual object store - object server
  OpenStack Object Storage (code-named Swift) is open source software for
@@ -150,7 +170,12 @@
 
 Package: swift-container
 Architecture: all
-Depends: python-swift (=${binary:Version}), rsync, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-swift (=${binary:Version}),
+ rsync,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: distributed virtual object store - container server
  OpenStack Object Storage (code-named Swift) is open source software for
@@ -176,7 +201,12 @@
 
 Package: swift-account
 Architecture: all
-Depends: python-swift (=${binary:Version}), rsync, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-swift (=${binary:Version}),
+ rsync,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: distributed virtual object store - account server
  OpenStack Object Storage (code-named Swift) is open source software for

=== modified file 'debian/copyright'
--- debian/copyright	2012-02-17 14:38:17 +0000
+++ debian/copyright	2013-09-25 15:13:20 +0000
@@ -1,20 +1,20 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: swift
-Source: https://code.launchpad.net/swift
-Files: *
-Copyright: 2010 OpenStack, LLC.
-License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-     http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian-based systems the full text of the Apache version 2.0 license
- can be found in `/usr/share/common-licenses/Apache-2.0'.
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: swift
+Source: https://code.launchpad.net/swift
+Files: *
+Copyright: 2010 OpenStack, LLC.
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.

=== modified file 'debian/python-swift.install'
--- debian/python-swift.install	2011-08-02 17:45:09 +0000
+++ debian/python-swift.install	2013-09-25 15:13:20 +0000
@@ -1,3 +1,3 @@
+usr/bin/swift-drive-audit
+usr/bin/swift-init
 usr/lib/python*/dist-packages/*
-usr/bin/swift-init
-usr/bin/swift-drive-audit

=== modified file 'debian/swift-account.install'
--- debian/swift-account.install	2011-11-11 15:48:52 +0000
+++ debian/swift-account.install	2013-09-25 15:13:20 +0000
@@ -1,5 +1,5 @@
-usr/bin/swift-account-server
-usr/bin/swift-account-replicator
+usr/bin/swift-account-audit
 usr/bin/swift-account-auditor
 usr/bin/swift-account-reaper
-usr/bin/swift-account-audit
+usr/bin/swift-account-replicator
+usr/bin/swift-account-server

=== modified file 'debian/swift-container.install'
--- debian/swift-container.install	2011-11-11 15:59:26 +0000
+++ debian/swift-container.install	2013-09-25 15:13:20 +0000
@@ -1,5 +1,5 @@
+usr/bin/swift-container-auditor
+usr/bin/swift-container-replicator
 usr/bin/swift-container-server
-usr/bin/swift-container-replicator
-usr/bin/swift-container-auditor
+usr/bin/swift-container-sync
 usr/bin/swift-container-updater
-usr/bin/swift-container-sync

=== modified file 'debian/swift-object.install'
--- debian/swift-object.install	2011-11-11 15:48:52 +0000
+++ debian/swift-object.install	2013-09-25 15:13:20 +0000
@@ -1,6 +1,6 @@
+usr/bin/swift-object-auditor
+usr/bin/swift-object-expirer
+usr/bin/swift-object-info
+usr/bin/swift-object-replicator
 usr/bin/swift-object-server
-usr/bin/swift-object-replicator
-usr/bin/swift-object-auditor
 usr/bin/swift-object-updater
-usr/bin/swift-object-info
-usr/bin/swift-object-expirer

=== modified file 'debian/swift.install'
--- debian/swift.install	2013-05-03 13:29:35 +0000
+++ debian/swift.install	2013-09-25 15:13:20 +0000
@@ -1,15 +1,15 @@
 usr/bin/swift-bench
+usr/bin/swift-bench-client
 usr/bin/swift-config
-usr/bin/swift-ring-builder
-usr/bin/swift-get-nodes
 usr/bin/swift-dispersion-populate
 usr/bin/swift-dispersion-report
-usr/bin/swift-recon
-usr/bin/swift-recon-cron
+usr/bin/swift-form-signature
+usr/bin/swift-get-nodes
 usr/bin/swift-oldies
 usr/bin/swift-orphans
 usr/bin/swift-recon
-usr/bin/swift-recon-cron
+usr/bin/swift-recon
+usr/bin/swift-recon-cron
+usr/bin/swift-recon-cron
+usr/bin/swift-ring-builder
 usr/bin/swift-temp-url
-usr/bin/swift-form-signature
-usr/bin/swift-bench-client