From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 8 Jun 2016 23:28:34 +0000 (+0000)
Subject: Added fix-requirements.txt.patch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3abd06cef7e5613419cbb6ef1d14be0a68fa3749;p=openstack-build%2Fneutron-build.git

Added fix-requirements.txt.patch

Rewritten-From: beb718539651e2361bd600beb6b857e354e2e071
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 904e68c64..6e737a086 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,7 @@ neutron (2:9.0.0~b1-1) experimental; urgency=medium
   * Fix neutron-metadata server templates.
   * Fixed (build-)depends for this release.
   * Drop Return_oslo_config_Opts_to_config_generator.patch applied upstream.
+  * Added fix-requirements.txt.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 00:59:14 +0200
 
diff --git a/xenial/debian/patches/fix-requirements.txt.patch b/xenial/debian/patches/fix-requirements.txt.patch
new file mode 100644
index 000000000..0c0498d7c
--- /dev/null
+++ b/xenial/debian/patches/fix-requirements.txt.patch
@@ -0,0 +1,27 @@
+Description: Fix requirements.txt
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2016-06-09
+
+--- neutron-9.0.0~b1.orig/requirements.txt
++++ neutron-9.0.0~b1/requirements.txt
+@@ -5,8 +5,7 @@ pbr>=1.6 # Apache-2.0
+ 
+ Paste # MIT
+ PasteDeploy>=1.5.0 # MIT
+-Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT
+-Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
++Routes
+ debtcollector>=1.2.0 # Apache-2.0
+ eventlet!=0.18.3,>=0.18.2 # MIT
+ pecan>=1.0.0 # BSD
+@@ -43,8 +42,7 @@ oslo.service>=1.10.0 # Apache-2.0
+ oslo.utils>=3.5.0 # Apache-2.0
+ oslo.versionedobjects!=1.9.0,>=1.5.0 # Apache-2.0
+ osprofiler>=1.3.0 # Apache-2.0
+-ovs>=2.5.0;python_version=='2.7' # Apache-2.0
+-ovs>=2.6.0.dev1;python_version>='3.4' # Apache-2.0
++ovs
+ 
+ python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+ python-designateclient>=1.5.0 # Apache-2.0
diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
new file mode 100644
index 000000000..bb52e829d
--- /dev/null
+++ b/xenial/debian/patches/series
@@ -0,0 +1 @@
+fix-requirements.txt.patch