Removed the patch for allowing routes 2.0.

Rewritten-From: bd68b50eef7af9b0ebe1824df2091800c12bcf5b

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index cf9f137beff7c53d1a096e53823845b31e6b8fd6..cf5ad6406c1915a4472122d70df2598ea9c34c7a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ heat (1:6.0.0~b1-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Removed the patch for allowing routes 2.0.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 14:16:00 +0100
 

diff --git a/trusty/debian/patches/allow-route-2.0.patch b/trusty/debian/patches/allow-route-2.0.patch
deleted file mode 100644 (file)
index 2bb397a..0000000
--- a/trusty/debian/patches/allow-route-2.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Allow Routes == 2.0
- The Debian package for Routes 2.0 is perfectly valid, as it contains patches.
- This patch makes it possible to use it.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2015-08-02
-
-Index: heat/requirements.txt
-===================================================================
---- heat.orig/requirements.txt
-+++ heat/requirements.txt
-@@ -49,8 +49,7 @@ python-zaqarclient>=0.1.1
- pytz>=2013.6
- PyYAML>=3.1.0
- requests>=2.5.2
--Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
--Routes!=2.0,>=1.12.3;python_version!='2.7'
-+Routes>=1.12.3
- six>=1.9.0
- SQLAlchemy<1.1.0,>=0.9.9
- sqlalchemy-migrate>=0.9.6

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index b8ea60012f42277f641ff8ae4d8b0769f30859f7..5f60075e8e45e4306f9bfb7babeaeb4f9a77ee1b 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,2 +1 @@
 only-run-tests-in-heat.tests.patch
-allow-route-2.0.patch