about summary refs log tree commit diff
path: root/debian/gbp.conf
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-01-13 16:10:30 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-01-13 16:31:40 +0100
commit5a09f7759860f4f2a9bb01471ca8099cd705bc10 (patch)
tree3a9cffc9622d53c9196771a1c7924bceb754f118 /debian/gbp.conf
parent25691220fd27093630cf244e219b2f4f1f4e749e (diff)
parentca847639aab94434daed120c874e1100c3d75dcf (diff)
Merge remote-tracking branch 'salsa/debian/master'
Diffstat (limited to 'debian/gbp.conf')
-rw-r--r--debian/gbp.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index bd290ea2..b8723043 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,6 @@
 [DEFAULT]
 pristine-tar = True
 patch-numbers = False
-debian-branch = master
+debian-branch = ubuntu/master
 debian-tag = ubuntu/%(version)s
+upstream-branch = upstream/latest