From c6505155210d1957024dffd22c03ac8dad716c01 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2016 12:03:20 +0100 Subject: [PATCH] debian/gbp.conf: use DEP-14 branch names --- debian/changelog | 6 ++++++ debian/gbp.conf | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7e14b3b7..d809b336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ostree (2016.3-2) UNRELEASED; urgency=medium + + * debian/gbp.conf: use DEP-14 branch names + + -- Simon McVittie Mon, 28 Mar 2016 12:02:59 +0100 + ostree (2016.3-1) experimental; urgency=medium * Prepare package for Debian (Closes: #813308) diff --git a/debian/gbp.conf b/debian/gbp.conf index d0c1355f..11175b1b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,5 @@ [DEFAULT] pristine-tar = True compression = xz +debian-branch = debian/master +upstream-branch = upstream/master