Merge lp:~zulcss/heat/icehouse-ftbfs into lp:~ubuntu-server-dev/heat/icehouse

[Chuck Short]

fixes ftbfs

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-22 16:55:12 +0000
+++ debian/changelog	2013-11-26 01:53:50 +0000
@@ -1,9 +1,20 @@
-heat (2013.2~rc2-0ubuntu2) UNRELEASED; urgency=low
+heat (2013.2-0ubuntu2) UNRELEASED; urgency=low
 
-  * debian/control: open icehouse release.
+  * debian/control:
+    + Open icehouse release.
+    + Dropped python-argparse.
+    + Add versioned depends for python-pbr.
+    + Add python-testscenarios as a build dependency.
+  * debian/patches/default-sqlite.patch: Dropped no longer needed.
 
  -- Chuck Short <[e-mail]>  Tue, 22 Oct 2013 09:55:12 -0700
 
+heat (2013.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release (LP: #1236462).
+
+ -- Chuck Short <[e-mail]>  Thu, 17 Oct 2013 09:30:24 -0400
+
 heat (2013.2~rc2-0ubuntu1) saucy; urgency=low
 
   * New upstream release candidate (LP: #1239156).

=== modified file 'debian/control'
--- debian/control	2013-10-22 16:55:12 +0000
+++ debian/control	2013-11-26 01:53:50 +0000
@@ -12,9 +12,8 @@
 Build-Depends:
  debhelper (>= 9),
  python-all (>= 2.6.6-3~),
- python-pbr
+ python-pbr (>= 0.5.21),
 Build-Depends-Indep:
- python-argparse,
  python-babel,
  python-boto (>= 2.4),
  python-ceilometerclient,
@@ -53,6 +52,7 @@
  python-sqlalchemy (>= 0.7.8),
  python-swiftclient,
  python-testrepository (>= 0.0.13),
+ python-testscenarios,
  python-testtools (>= 0.9.29),
  python-webob (>= 1.2.3),
  python-yaml,

=== removed file 'debian/patches/default-sqlite.patch'
--- debian/patches/default-sqlite.patch	2013-09-06 23:40:55 +0000
+++ debian/patches/default-sqlite.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Default to using sqlite
-Author: James Page <[e-mail]>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: heat/etc/heat/heat.conf.sample
---- heat.orig/etc/heat/heat.conf.sample	2013-09-06 16:37:54.000000000 -0700
-+++ heat/etc/heat/heat.conf.sample	2013-09-06 16:39:31.363547917 -0700
-@@ -7,6 +7,7 @@
- # The SQLAlchemy connection string used to connect to the
- # database (string value)
- #sql_connection=mysql://heat:heat@localhost/heat
-+sql_connection = sqlite:////var/lib/heat/heat.sqlite
- 
- # timeout before idle sql connections are reaped (integer
- # value)

=== removed file 'debian/patches/series'
--- debian/patches/series	2013-09-06 23:40:55 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-default-sqlite.patch