Re: Advice on dealing with git repo - ffmpeg
Hi Sylvain,
On Thu, Jan 22, 2026 at 09:41:06AM +0100, Sylvain Beucler wrote:
>
> On 22/01/2026 04:11, Carlos Henrique Lima Melara wrote:
> > > We might want to completely ditch our repository and re-import debian/buster
> > > and debian/stretch as well, as they still point to Anton's separate
> > > 'upstream' and 'pristine-tar' branches.
> >
> > I didn't spend to much time on those because they build from source, but
> > if they are as messy, yeah, I think it's worth a shot at re-importing
> > things. Though, we don't have something like snapshot.d.o for ELTS, so
> > if at some point an ELTS tag doesn't build from source, we might not be
> > able to regenerate the .dsc for re-importing it.
Well, now I took a closer look because you prompted me and I'm actively
working on buster's CVEs and they don't continue over the official Debian
git but it seems easy enough to do so from snapshots.d.o and the elts tags
from the repo (at least for buster) so I'll re-work them to have a nice
and homogenous commit history.
> I think we mostly need to move files from Anton's LTS 'pristine-tar' branch
> to the main 'pristine-tar' branch, because there can only be one
> pristine-tar branch and you probably intend to replace it with the one from
> the original repo.
>
> Dropping Anton's LTS 'upstream' branch and re-importing stretch&buster would
> be nice, but less urgent. Maybe rename 'upstream' to 'upstream/elts-old'
> meanwhile.
Ack, I moved to upstream/elts-old as you sugggested and will take a look
at the pristine-tar branch soon (tm).
Oh, I did push debian/bullseye as discussed since no-one joined saying
it was a bad option.
Cheers,
Charles
Reply to: