From 2d7482820032bc636765a6e6ac1f392ec08431fb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= <fred@fperrin.net>
Date: Fri, 6 Nov 2020 20:19:01 +0000
Subject: [PATCH] [debian] Simpler branch layout

---
 debian/gbp.conf      | 8 +++++++-
 debian/source/format | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6eeb7cd..d36060f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,12 @@
+# After making changes:
+# git tag v20.1.fpXX
+## Note the dch version doesn't have the v prefix
+# gbp dch --release --new-version 20.1.fpXX --commit
+# gbp buildpackage -us -uc
+
 [DEFAULT]
 upstream-tag = v%(version)s
-debian-branch = debian/sid
+debian-branch = fp-integration-dev-20.1
 
 [buildpackage]
 unsigned-source = True
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
-- 
2.43.0