d/gbp.conf: Return to debian/master branch

This commit is contained in:
Simon McVittie 2019-07-09 17:56:21 +01:00
parent 9945a059fe
commit c1cbb41bf7
2 changed files with 2 additions and 1 deletions

1
debian/changelog vendored
View File

@ -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

2
debian/gbp.conf vendored
View File

@ -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