Re: Ongoing lugaru packaging
2017-05-24 20:15 GMT+02:00 Martin Erik Werner <martinerikwerner@gmail.com>:
>
> I'm wondering how to handle the 'upstream' branch in the Debian repo in
> this case.
>
> We could make it just be point-imports and use the standard
> git-buildpackage workflow where the Debian repo is history-wise
> disconnected from the osslugaru repo going forward.
>
> Or we could track the osslugaru repo and merge from its tags, with some
> workflow considerations[0].
>
> Which do you prefer, or do you have another alternative in mind?
>
>
> [0]
> If we want to link the two, since osslugaru tends to branch off into a
> maintenance branch before each release we could have a Debian setup with
> the 1:1 branch mappings
> 'osslugaru/master' -> 'debian/upstream'
> 'osslugaru/v1.2' -> 'debian/upstream-v1.2'
> etc. and merge from osslugaru release tag into 'debian/master' on point
> releases.
>
> For pristine-tar imports, we could either import-orig and merge to
> 'debian/master' without making the import part of any branch (as done
> already in 724f7a6). Or, as long as osslugaru tags match 1:1 with the
> orig source, we could skip the import-orig step completely and just do
> the tarball data commit to the 'debian/pristine-tar' branch.
I'm not familiar with Debian packaging, but I would encourage you to
go for the simplest workflow that doesn't involve unnecessarily
diverging from upstream.
Two of us upstream are RPM packagers and we know how to make proper
tarballs for downstream packagers - the tarballs will always be 1:1
matches for the tags (as they're generated with `git archive <tag>
--prefix=lugaru-<tag>/ -o ../lugaru-<tag>.tar.xz`).
Alternatively you can also rely on the GitLab tar.gz or tar.bz2 for
the tags, but sadly those include commit hashes in their folder name
instead of the tagged version, which is why we provide a "clean"
tar.xz.
Cheers,
Rémi Verschelde / Akien
Reply to: