From 2932f407c99dbb4f096be2a8aff71a5791e3e44e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 21 Jun 2018 22:50:50 +0100 Subject: [PATCH] Set git branch back to debian/master --- debian/changelog | 1 - debian/control | 2 +- debian/gbp.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4955434..07f8dd51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ ostree (2018.5+42+gecdebeb2-1) UNRELEASED; urgency=medium - * Switch to experimental branch * New upstream git snapshot with support for peer-to-peer software collections, required by Flatpak's peer-to-peer app sharing feature - d/copyright: Update diff --git a/debian/control b/debian/control index a71776e8..f89fc6d7 100644 --- a/debian/control +++ b/debian/control @@ -48,7 +48,7 @@ Build-Depends-Indep: Rules-Requires-Root: no Standards-Version: 4.1.4 Homepage: https://github.com/ostreedev/ostree/ -Vcs-Git: https://salsa.debian.org/debian/ostree.git -b debian/experimental +Vcs-Git: https://salsa.debian.org/debian/ostree.git Vcs-Browser: https://salsa.debian.org/debian/ostree Package: gir1.2-ostree-1.0 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