From 676612776f8f4864939656753b39c3f04b10ab7f Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 2 Dec 2015 15:07:52 +0100
Subject: [PATCH] Now packaging 0.4.2 from debian/mitaka branch.

---
 debian/changelog |  6 ++++++
 debian/control   | 14 ++++++++------
 debian/gbp.conf  |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f52562..2bd193a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-os-testr (0.4.2-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 02 Dec 2015 15:07:37 +0100
+
 python-os-testr (0.2.0-4) unstable; urgency=medium
 
   * Fixed tweak of $PATH when running tests (Closes: #806489).
diff --git a/debian/control b/debian/control
index 0e93806..9f6e953 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                openstack-pkg-tools,
                python-all,
-               python-pbr,
+               python-pbr (>= 1.8),
                python-setuptools,
                python-sphinx,
                python3-all,
-               python3-pbr,
+               python3-pbr (>= 1.8),
                python3-setuptools,
 Build-Depends-Indep: python-babel (>= 1.3),
                      python-coverage (>= 3.6),
@@ -22,13 +22,13 @@ Build-Depends-Indep: python-babel (>= 1.3),
                      python-oslotest (>= 1.2.0),
                      python-six (>= 1.9.0),
                      python-testscenarios (>= 0.4),
-                     python-testtools (>= 0.9.36),
+                     python-testtools (>= 1.4.0),
                      python3-babel (>= 1.3),
                      python3-ddt,
                      python3-oslotest (>= 1.2.0),
                      python3-six (>= 1.9.0),
                      python3-testscenarios (>= 0.4),
-                     python3-testtools (>= 0.9.36),
+                     python3-testtools (>= 1.4.0),
                      subunit (>= 0.0.18),
                      testrepository (>= 0.0.18),
 Standards-Version: 3.9.6
@@ -40,7 +40,8 @@ XS-Testsuite: autopkgtest
 Package: python-os-testr
 Architecture: all
 Depends: python-babel (>= 1.3),
-         python-testtools (>= 0.9.36),
+         python-pbr (>= 1.8),
+         python-testtools (>= 1.4.0),
          python-testrepository (>= 0.0.18),
          subunit (>= 0.0.18),
          ${misc:Depends},
@@ -57,9 +58,10 @@ Description: Utility wrappers for testrepository for OpenStack projects - Python
 Package: python3-os-testr
 Architecture: all
 Depends: python3-babel (>= 1.3),
+         python3-pbr (>= 1.8),
          python3-subunit (>= 0.0.18),
          python3-testrepository (>= 0.0.18),
-         python3-testtools (>= 0.9.36),
+         python3-testtools (>= 1.4.0),
          ${misc:Depends},
          ${python3:Depends},
 Breaks: python3-tempest-lib (<< 0.5.0-2~),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7da944a..c737cbb 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/liberty
+debian-branch = debian/mitaka
 upstream-tag = %(version)s
 compression = xz