Now packaging 6.0.0~b1 from debian/mitaka

Rewritten-From: 7968ed6b5b7b64aae41b648043fbaef5fc3740f4

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index be11a7739b9bcb13cf543089b2c12680ee4ab2b0..e4c0e48dc2516aa80ef9282e1911dd5045f8573a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+heat (1:6.0.0~b1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 14:16:00 +0100
+
 heat (1:5.0.0-4) unstable; urgency=medium
 
   * debian/rules:

diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf
index e804d476fcc4a494c45275961b5672fa376318c6..6fb07d66f1cdee92bddf6fd7edddd4bae9c76bed 100644 (file)
--- a/trusty/debian/gbp.conf
+++ b/trusty/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