Refreshed patches.

Rewritten-From: a4704688be7a78fca269127b52a75dfc174642ea

diff --git a/trusty/debian/patches/allow-routes-2.0.patch b/trusty/debian/patches/allow-routes-2.0.patch
index 381c3ff4412bedab045554bd8246e5cd105e1c35..672e13defabf3125396f46029199cd1ce767d34e 100644 (file)
--- a/trusty/debian/patches/allow-routes-2.0.patch
+++ b/trusty/debian/patches/allow-routes-2.0.patch
@@ -1,19 +1,18 @@
-Description: Fix requirements.txt to allow routes 2.0
- The issue with routes 2.0 was only in the PyPi release, and using the
- Debian package isn't at all an issue. This patch makes it then possible to use
- python-routes, which is what Debian has currently.
+Description: Allow routes 2.0
+ The python-routes 2.0 from Debian is perfectly working, the issue with 2.0
+ is only the PyPi release, so we patch requirements.txt to allow it.
 Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
-Last-Update: 2014-09-22
+Last-Update: 2014-10-02
 
---- heat-2014.2~b3.orig/requirements.txt
-+++ heat-2014.2~b3/requirements.txt
-@@ -29,7 +29,7 @@ python-troveclient>=1.0.4
+--- heat-2014.2~rc1.orig/requirements.txt
++++ heat-2014.2~rc1/requirements.txt
+@@ -34,7 +34,7 @@ python-troveclient>=1.0.4
  PyYAML>=3.1.0
  qpid-python
- requests>=1.1
+ requests>=1.2.1,!=2.4.0
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
  six>=1.7.0
- SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.9.1
+ SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
+ sqlalchemy-migrate>=0.9.1,!=0.9.2

diff --git a/trusty/debian/patches/fix-default-db.patch b/trusty/debian/patches/fix-default-db.patch
index 563c1860ee31dadd257cd819169a7e605cb5c958..0884a13680b7dad2d42d9cfa572a945d171cbb2f 100644 (file)
--- a/trusty/debian/patches/fix-default-db.patch
+++ b/trusty/debian/patches/fix-default-db.patch
@@ -6,9 +6,9 @@ Last-Update: 2014-07-01
 
 Index: heat/etc/heat/heat.conf.sample
 ===================================================================
---- heat.orig/etc/heat/heat.conf.sample        2014-09-22 16:59:01.000000000 +0800
-+++ heat/etc/heat/heat.conf.sample     2014-09-22 17:16:09.000000000 +0800
-@@ -865,7 +865,7 @@
+--- heat.orig/etc/heat/heat.conf.sample        2014-10-02 19:01:45.000000000 +0800
++++ heat/etc/heat/heat.conf.sample     2014-10-02 19:01:49.000000000 +0800
+@@ -866,7 +866,7 @@
  # Deprecated group/name - [DEFAULT]/sql_connection
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection