From 371027d34cd238478b2cbb1a823b6cc13921bcdd Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 1 Jun 2015 10:55:58 +0100
Subject: [PATCH] New upstream release

d/control: Add new BD's on paramiko and ddt.
d/control: Align version requirements with upstream.
d/gbp.conf: Use debian/liberty branch.
---
 debian/changelog |  9 +++++++++
 debian/control   | 33 ++++++++++++++++++---------------
 debian/gbp.conf  |  4 ++--
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d3b875..60624a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-tempest-lib (0.5.0-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release:
+    - d/control: Add new BD's on paramiko and ddt.
+    - d/control: Align version requirements with upstream.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 01 Jun 2015 10:51:06 +0100
+
 python-tempest-lib (0.4.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f1a954d..4bbf4ee 100644
--- a/debian/control
+++ b/debian/control
@@ -12,36 +12,40 @@ Build-Depends: debhelper (>= 9),
                python-sphinx,
                python3-all,
                python3-pbr,
-               python3-setuptools,
+               python3-setuptools
 Build-Depends-Indep: python-babel,
                      python-coverage,
+                     python-ddt,
                      python-fixtures,
                      python-hacking,
                      python-httplib2,
                      python-iso8601,
                      python-jsonschema,
                      python-mock,
-                     python-oslo.log (>= 0.4.0),
-                     python-oslosphinx (>= 2.2.0.0),
-                     python-oslotest (>= 1.2.0),
+                     python-oslo.log (>= 1.0.0),
+                     python-oslosphinx (>= 2.5.0),
+                     python-oslotest (>= 1.5.1),
+                     python-paramiko (>= 1.13.0),
                      python-six (>= 1.9.0),
                      python-testresources,
                      python-testscenarios,
                      python-testtools,
                      python3-babel,
+                     python3-ddt,
                      python3-fixtures,
                      python3-httplib2,
                      python3-iso8601,
                      python3-jsonschema,
                      python3-mock,
-                     python3-oslo.log (>= 0.4.0),
-                     python3-oslotest (>= 1.2.0),
+                     python3-oslo.log (>= 1.0.0),
+                     python3-oslotest (>= 1.5.1),
+                     python3-paramiko (>= 1.13.0),
                      python3-six (>= 1.9.0),
                      python3-subunit,
                      python3-testscenarios,
                      python3-testtools,
                      subunit,
-                     testrepository,
+                     testrepository
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-tempest-lib.git
 Vcs-Git: git://anonscm.debian.org/openstack/python-tempest-lib.git
@@ -54,12 +58,12 @@ Depends: python-babel,
          python-httplib2,
          python-iso8601,
          python-jsonschema,
-         python-oslo.log (>= 0.4.0),
+         python-oslo.log (>= 1.0.0),
          python-pbr,
          python-six (>= 1.9.0),
          ${misc:Depends},
-         ${python:Depends},
-Suggests: python-tempest-lib-doc,
+         ${python:Depends}
+Suggests: python-tempest-lib-doc
 Description: OpenStack Functional Testing Library - Python 2.x
  This package contains the OpenStack Functional Testing Library which is used
  by the Tempest Functional Testing suite.
@@ -73,12 +77,12 @@ Depends: python3-babel,
          python3-httplib2,
          python3-iso8601,
          python3-jsonschema,
-         python3-oslo.log (>= 0.4.0),
+         python3-oslo.log (>= 1.0.0),
          python3-pbr,
          python3-six (>= 1.9.0),
          ${misc:Depends},
-         ${python3:Depends},
-Suggests: python-tempest-lib-doc,
+         ${python3:Depends}
+Suggests: python-tempest-lib-doc
 Description: OpenStack Functional Testing Library - Python 3.x
  This package contains the OpenStack Functional Testing Library which is used
  by the Tempest Functional Testing suite.
@@ -88,8 +92,7 @@ Description: OpenStack Functional Testing Library - Python 3.x
 Package: python-tempest-lib-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         ${sphinxdoc:Depends},
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: OpenStack Functional Testing Library - doc
  This package contains the OpenStack Functional Testing Library which is used
  by the Tempest Functional Testing suite.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 5f3628d..0ae05ad 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,9 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/kilo
+debian-branch = debian/liberty
 upstream-tag = %(version)s
 compression = xz
 
-[git-buildpackage]
+[buildpackage]
 export-dir = ../build-area/