[debian] Simpler branch layout

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6eeb7cd1e32fbebb81a2159a9393fbe851e0effb..d36060ff1bb808de9301de2b9db61f086cd9a686 100644 (file)
--- 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 163aaf8d82b6c54f23c45f32895dbdfdcc27b047..89ae9db8f88b823b6a7eabf55e203658739da122 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)