From 169feb563f1fe232a8223ecbc46af78288e18a67 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Mon, 9 Jun 2025 19:16:48 -0500 Subject: [PATCH] Name upstream and debian branches properly Upstream keeps it's changes on "master". This may be the default for `gbp`, but may *not* be. Explicitly set the upstream branch just to be sure. The Debian branch shouldn't be called "trunk" (or "main" or "master"). I'm calling it "deb" in case a real Debian maintainer picks up the upstream project and wants to use the name "debian". It's configurable, so hardly critical, but I may as well be a good neighbor and leave it unused. --- debian/gbp.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index dff5f5d..db32588 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,7 +1,6 @@ [DEFAULT] -# upstream-branch = upstream - -debian-branch = trunk +upstream-branch = master +debian-branch = deb upstream-tag = %(version)s pristine-tar = False