Refreshed fix-default-db.patch.

Rewritten-From: 61ef0fedf87f0d87f42c44ad2e041c4d7b627219

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 59d23def7c607375cc0a0d90632f80f97620f7e4..4cc17d931dd5db973da975d0b49c3dce3aa1d7d3 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+heat (2014.1-4) unstable; urgency=medium
+
+  * Refreshed fix-default-db.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 21 May 2014 16:02:56 +0800
+
 heat (2014.1-3) unstable; urgency=medium
 
   * Now using "service X restart" to restart services in logrotate script, and

diff --git a/trusty/debian/patches/fix-default-db.patch b/trusty/debian/patches/fix-default-db.patch
index 263a2056ba6c4b7374e2799d2e9255a6f6e40b32..e1be17e35232d4373e3143f5e4840a596162c22d 100644 (file)
--- a/trusty/debian/patches/fix-default-db.patch
+++ b/trusty/debian/patches/fix-default-db.patch
@@ -5,9 +5,11 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
 Last-Update: 2014-04-08
 
---- heat-2014.1~rc1.orig/etc/heat/heat.conf.sample
-+++ heat-2014.1~rc1/etc/heat/heat.conf.sample
-@@ -814,7 +814,7 @@
+Index: heat/etc/heat/heat.conf.sample
+===================================================================
+--- heat.orig/etc/heat/heat.conf.sample        2014-05-21 16:02:38.000000000 +0800
++++ heat/etc/heat/heat.conf.sample     2014-05-21 16:02:42.000000000 +0800
+@@ -818,7 +818,7 @@
  # Deprecated group/name - [DEFAULT]/sql_connection
  # Deprecated group/name - [DATABASE]/sql_connection
  # Deprecated group/name - [sql]/connection