From: Frédéric Perrin <fred@fperrin.net>
Date: Fri, 6 Nov 2020 20:19:01 +0000 (+0000)
Subject: [debian] Simpler branch layout
X-Git-Tag: v20.4.fp1~8
X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=a952111267ce69583288efe06330162dc33913a9

[debian] Simpler branch layout
---

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)