From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 26 Dec 2014 05:40:57 +0000 (+0800)
Subject: Refreshed allow-route-2.0.patch.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8ab1db4731947fb24e801404c1ee9899519398ba;p=openstack-build%2Fheat-build.git

Refreshed allow-route-2.0.patch.

Rewritten-From: 753ccaf838c400cf1fed6389d24e49dc9ec5b163
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index cb8f4b91..ccb0ac80 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -3,6 +3,7 @@ heat (2015.1~b1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Reviewed (build-)depends for this release.
   * Build the heat.conf.sample on the fly at build time.
+  * Refreshed allow-route-2.0.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 24 Dec 2014 17:45:14 +0800
 
diff --git a/trusty/debian/patches/allow-route-2.0.patch b/trusty/debian/patches/allow-route-2.0.patch
new file mode 100644
index 00000000..a0e67156
--- /dev/null
+++ b/trusty/debian/patches/allow-route-2.0.patch
@@ -0,0 +1,19 @@
+Description: Allow routes 2.0
+ Upstream is rejecting Routes 2.0 because the archive on PyPi is broken,
+ however, the Debian package for Routes 2.0 is perfectly fine. So we remove
+ the restriction.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2014-12-26
+
+--- heat-2015.1~b1.orig/requirements.txt
++++ heat-2015.1~b1/requirements.txt
+@@ -37,7 +37,7 @@ python-troveclient>=1.0.7
+ PyYAML>=3.1.0
+ qpid-python
+ requests>=2.2.0,!=2.4.0
+-Routes>=1.12.3,!=2.0
++Routes>=1.12.3
+ six>=1.7.0
+ SQLAlchemy>=0.9.7,<=0.9.99
+ sqlalchemy-migrate>=0.9.1,!=0.9.2
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
new file mode 100644
index 00000000..838c9075
--- /dev/null
+++ b/trusty/debian/patches/series
@@ -0,0 +1 @@
+allow-route-2.0.patch