From c1cbb41bf7bed130e095a83cd19d758bd2cd4080 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 9 Jul 2019 17:56:21 +0100 Subject: [PATCH] d/gbp.conf: Return to debian/master branch --- debian/changelog | 1 + debian/gbp.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 64c4b394..773e962a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ostree (2019.2-2) UNRELEASED; urgency=medium + * d/gbp.conf: Return to debian/master branch * d/salsa-ci.yml: Request standard CI on salsa.debian.org - Disable build-time tests with DEB_BUILD_OPTIONS=nocheck for now. They don't currently work in the salsa-ci infrastructure, but I diff --git a/debian/gbp.conf b/debian/gbp.conf index eda2cdd2..2bda9c8b 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,7 @@ [DEFAULT] pristine-tar = True compression = xz -debian-branch = debian/experimental +debian-branch = debian/master upstream-branch = upstream/latest patch-numbers = False upstream-vcs-tag = v%(version)s