[Merge] lp:~gnuoy/swift/juno-update-deps into lp:~ubuntu-server-dev/swift/juno

[Chuck Short]

Review: Needs Fixing

See comments.

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-07-03 13:02:20 +0000
> +++ debian/changelog	2014-07-04 14:09:57 +0000
> @@ -1,11 +1,15 @@
> -swift (1.13.1-0ubuntu2) UNRELEASED; urgency=medium
> +swift (1.13.1-0ubuntu3) UNRELEASED; urgency=medium
>  
> +  [ Chuck Short ]
>    * debian/control: Open up juno release
>    * debian/patches/ring-perms.patch: Dropped no longer needed.
>    * debian/switf-container.install: Add swift-reconciler-enqueue
>      and swift-container-reconciler.
>  
> - -- Chuck Short <zulcss at ubuntu.com>  Tue, 22 Apr 2014 11:28:13 -0400
> +  [ Liam Young ]
> +  * debian/control: Merged in deps from requirements.txt 
> +
> + -- Liam Young <liam.young at canonical.com>  Thu, 03 Jul 2014 09:24:42 +0100
>  
>  swift (1.13.1-0ubuntu1) trusty; urgency=medium
>  
> 
> === modified file 'debian/control'
> --- debian/control	2014-04-22 15:28:14 +0000
> +++ debian/control	2014-07-04 14:09:57 +0000
> @@ -13,19 +13,19 @@
>   debhelper (>= 7.0.50~),
>   python-all-dev (>= 2.6.6-3~),
>   python-dnspython (>= 1.10.0),
> - python-eventlet (>= 0.9.8),
> + python-eventlet (>= 0.9.15),
>   python-greenlet (>= 0.3.1),
>   python-mock,
> - python-netifaces,
> + python-netifaces (>> 0.10.1),
>   python-nose,
>   python-openssl,
>   python-paste,
> - python-pastedeploy,
> + python-pastedeploy (>= 1.3.3),
>   python-setuptools,
> - python-simplejson,
> + python-simplejson (>= 2.0.9),
>   python-sphinx (>= 1.0),
>   python-swiftclient,
> - python-xattr
> + python-xattr (>= 0.4)
>  Standards-Version: 3.9.4
>  Homepage: http://launchpad.net/swift
>  Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/juno/files
> @@ -150,8 +150,8 @@
>   ${python:Depends},
>   ${shlibs:Depends}
>  Provides: ${python:Provides}
> -Breaks: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)

Im not sure why you changed this here?

> -Replaces: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)
> +Breaks: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
> +Replaces: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
>  Description: distributed virtual object store - object expirer
>   OpenStack Object Storage (code-named Swift) is open source software for
>   creating redundant, scalable object storage using clusters of standardized
> 


-- 
https://code.launchpad.net/~gnuoy/swift/juno-update-deps/+merge/225675
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/swift/juno.