Merge lp:~corey.bryant/ubuntu/wily/ryu/3.24-updates into lp:ubuntu/wily-proposed/ryu

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-09 17:45:44 +0000
+++ debian/changelog	2015-09-29 16:29:41 +0000
@@ -1,3 +1,11 @@
+ryu (3.24-1ubuntu1) wily; urgency=medium
+
+  * d/p/uncap-pbr-version.patch: Drop requirement of pbr<1.0.
+  * d/rules: Run tests during build.
+  * d/control: Align dependencies with upstream.
+
+ -- Corey Bryant <[e-mail]>  Tue, 29 Sep 2015 11:46:46 -0400
+
 ryu (3.24-1) unstable; urgency=medium
 
   * Imported Upstream version 3.24 (Closes: #794101)

=== modified file 'debian/control'
--- debian/control	2015-03-22 19:37:52 +0000
+++ debian/control	2015-09-29 16:29:41 +0000
@@ -4,15 +4,18 @@
 Maintainer: Dariusz Dwornikowski <[e-mail]>
 Build-Depends: debhelper (>= 9), python-all (>= 2.6), python-sphinx, sphinx-common, dh-python
 Build-Depends-Indep:
- python-eventlet,
+ python-eventlet (>= 0.15),
+ python-formencode,
  python-lxml,
+ python-mock,
  python-msgpack (>= 0.3.0),
  python-netaddr,
- python-oslo.config (>= 1:1.2.0),
+ python-nose,
+ python-oslo.config (>= 1:1.6.0),
  python-paramiko,
  python-routes,
  python-six (>= 1.4.0),
- python-webob (>=1.2),
+ python-webob (>= 1.2),
  python-setuptools,
  python-pbr
 Standards-Version: 3.9.6
@@ -25,15 +28,15 @@
 Architecture: all
 Section: python
 Depends:
- python-eventlet,
+ python-eventlet (>= 0.15),
  python-lxml,
  python-msgpack (>= 0.3.0),
  python-netaddr,
- python-oslo.config (>= 1:1.2.0),
+ python-oslo.config (>= 1:1.6.0),
  python-paramiko,
  python-routes,
  python-six (>= 1.4.0),
- python-webob (>=1.2),
+ python-webob (>= 1.2),
  ${misc:Depends},
  ${python:Depends}
 Suggests: python-ryu-doc

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2015-09-29 16:29:41 +0000
@@ -0,0 +1,1 @@
+uncap-pbr-version.patch

=== added file 'debian/patches/uncap-pbr-version.patch'
--- debian/patches/uncap-pbr-version.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/uncap-pbr-version.patch	2015-09-29 16:29:41 +0000
@@ -0,0 +1,28 @@
+From 992bf7318d06090cc96a21521dbeba62f148d079 Mon Sep 17 00:00:00 2001
+From: IWAMOTO Toshihiro <[e-mail]>
+Date: Fri, 11 Sep 2015 10:33:01 +0900
+Subject: [PATCH] Uncap pbr version
+
+This reverts commit 9414322f307fe607f7fefb8611871bbf810b5ee4,
+as the workaround for readthedocs seems to be no longer necessary.
+
+Signed-off-by: IWAMOTO Toshihiro <[e-mail]>
+Signed-off-by: FUJITA Tomonori <[e-mail]>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 4fc4d45..cf2a404 100644
+--- a/setup.py
++++ b/setup.py
+@@ -26,5 +26,5 @@ import ryu.hooks
+ 
+ ryu.hooks.save_orig()
+ setuptools.setup(name='ryu',
+-                 setup_requires=['pbr<1.0'],
++                 setup_requires=['pbr'],
+                  pbr=True)
+-- 
+2.5.0
+

=== modified file 'debian/rules'
--- debian/rules	2015-07-30 20:55:33 +0000
+++ debian/rules	2015-09-29 16:29:41 +0000
@@ -34,3 +34,6 @@
 	rm -rf ryu.egg-info/
 	rm -rf debian/ryu-manager.8 debian/ryu.8
 	dh_auto_clean
+
+override_dh_auto_test:
+	./run_tests.sh -N -P