summaryrefslogtreecommitdiffstats
path: root/debian/gbp.conf
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:11 +0000
commitc6e9e3d3dcccd736b1e06fd7658cdae3016edf6a (patch)
tree95f42db38abf86c766dd78b0b9c57bc38ef056f9 /debian/gbp.conf
parentMerging upstream version 3.0.0. (diff)
downloadhaproxy-c6e9e3d3dcccd736b1e06fd7658cdae3016edf6a.tar.xz
haproxy-c6e9e3d3dcccd736b1e06fd7658cdae3016edf6a.zip
Merging debian version 3.0.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 33ef1db..5b1f541 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
[DEFAULT]
pristine-tar = True
-upstream-branch = upstream-2.9
+upstream-branch = upstream-3.0
+debian-branch = experimental-3.0