Re: Git branch layout for packages requiring DFSG-cleaning

Andrey Rakhmatullin <[email protected]> Fri, 21 Aug 2026 02:29:26 +0500

Newsgroups	gmane.linux.debian.devel.general
Message-ID	<[email protected]>

On Thu, Aug 20, 2026 at 09:45:02PM +0200, Marcin Owsiany wrote:
>I found some conflicting information about the recommended branch layout
>and I'm wondering why that is (mistake? outdated recommendation) and
>what folks tend to use in practice and why.

Such questions are more suitable for debian-mentors@.

>- DEP14 recommends upstream/* [1] for the *repacked* sources but says
>  nothing about the original sources in that case
>- gbp manual recommends `upstream/latest` for the *original* sources, and
>  for the repacked sources: `dfsg/latest` in one place [2] and
>  `dfsg_clean` in another place [3]

You are most likely confused by different workflows. Both documents you 
read talk about several of those.

Are you thinking about "Importing upstream release tarballs in Git" or 
"Importing upstream releases from Git tags"? The layouts are different and 
recommendations of both docs are different in these two cases.

>I'm leaning towards setting `upstream-branch = dfsg/latest` in
>debian/gbp.conf to make it a bit more visible that a repacking step is
>needed.

How are you planning to do the repacking step?

-- 
WBR, wRAR

signature.asc (application/pgp-signature, 894 B)