Now packaging Liberty b1 from debian/liberty branch.

Rewritten-From: b10e82854945e34a056e2d8561a77d8fe9e8301c

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 0182151305961598162e9253f58cd45555452133..e3a7a816b5185cc3a48f1e881fa2e2a063c01612 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (7.0.0~b1-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 16 Jul 2015 15:06:54 +0200
+
 neutron (2015.1.0+2015.06.24.git61.bdf194a0e1-3) unstable; urgency=medium
 
   * Added requirements.txt patch for SQLA version.

diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf
index b719733c88a5eaed0dfa540b87d193c3a80f80a4..7da944a9d0264f223053c1bd3ae0723caa42b81f 100644 (file)
--- a/trusty/debian/gbp.conf
+++ b/trusty/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/kilo
+debian-branch = debian/liberty
 upstream-tag = %(version)s
 compression = xz