Added fix-requirements.txt.patch

Rewritten-From: 4c872f30bdef01470d43b3e0f25bad0f9cd58974

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 33f300821edb0ed5fbfd7cd1743dbcdedbb57360..5812371f4d441b737092844964b5af291789f7d1 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,7 @@ heat (1:7.0.0~b1-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Added fix-requirements.txt.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 10:39:57 +0200
 

diff --git a/xenial/debian/patches/fix-requirements.txt.patch b/xenial/debian/patches/fix-requirements.txt.patch
new file mode 100644 (file)
index 0000000..6fffdf1
--- /dev/null
+++ b/xenial/debian/patches/fix-requirements.txt.patch
@@ -0,0 +1,61 @@
+Description: Fix requirements.txt
+ This patch avoids FTBFS with dpkg-gencontrol being confused by the !=
+ stuff.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-06-12
+
+--- heat-7.0.0~b1.orig/requirements.txt
++++ heat-7.0.0~b1/requirements.txt
+@@ -5,14 +5,14 @@
+ pbr>=1.6 # Apache-2.0
+ Babel>=2.3.4 # BSD
+ croniter>=0.3.4 # MIT License
+-cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0
++cryptography
+ debtcollector>=1.2.0 # Apache-2.0
+-eventlet!=0.18.3,>=0.18.2 # MIT
++eventlet
+ greenlet>=0.3.2 # MIT
+ keystoneauth1>=2.1.0 # Apache-2.0
+-keystonemiddleware!=4.1.0,!=4.5.0,>=4.0.0 # Apache-2.0
++keystonemiddleware
+ lxml>=2.3 # BSD
+-netaddr!=0.7.16,>=0.7.12 # BSD
++netaddr
+ oslo.cache>=1.5.0 # Apache-2.0
+ oslo.config>=3.9.0 # Apache-2.0
+ oslo.concurrency>=3.8.0 # Apache-2.0
+@@ -33,17 +33,17 @@ PasteDeploy>=1.5.0 # MIT
+ pycrypto>=2.6 # Public Domain
+ python-barbicanclient>=4.0.0 # Apache-2.0
+ python-ceilometerclient>=2.2.1 # Apache-2.0
+-python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
++python-cinderclient
+ python-designateclient>=1.5.0 # Apache-2.0
+ python-glanceclient>=2.0.0 # Apache-2.0
+ python-heatclient>=1.1.0 # Apache-2.0
+-python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
++python-keystoneclient
+ python-magnumclient>=2.0.0 # Apache-2.0
+ python-manilaclient>=1.3.0 # Apache-2.0
+ python-mistralclient>=1.0.0 # Apache-2.0
+ python-monascaclient>=1.0.30 # Apache-2.0
+ python-neutronclient>=4.2.0 # Apache-2.0
+-python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
++python-novaclient
+ python-openstackclient>=2.1.0 # Apache-2.0
+ python-saharaclient>=0.13.0 # Apache-2.0
+ python-senlinclient>=0.3.0 # Apache-2.0
+@@ -53,9 +53,8 @@ python-zaqarclient>=1.0.0 # Apache-2.0
+ pytz>=2013.6 # MIT
+ PyYAML>=3.1.0 # MIT
+ requests>=2.10.0 # Apache-2.0
+-retrying!=1.3.0,>=1.2.3 # Apache-2.0
+-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
++retrying
++Routes
+ six>=1.9.0 # MIT
+ SQLAlchemy<1.1.0,>=1.0.10 # MIT
+ sqlalchemy-migrate>=0.9.6 # Apache-2.0

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 5f60075e8e45e4306f9bfb7babeaeb4f9a77ee1b..2986d079e390499c92bc0cbc6d32901646e1bb84 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1 +1,2 @@
 only-run-tests-in-heat.tests.patch
+fix-requirements.txt.patch