[Pkg-netatalk-devel] How do you manage the diffs of bootstrapped files?

Daniel Markstedt markstedt at gmail.com
Sat Aug 19 22:25:03 BST 2023


Never mind; I figured out the pristine-tar workflow. It's all good now!

On Thu, Aug 17, 2023 at 10:51 PM Daniel Markstedt <markstedt at gmail.com> wrote:
>
> Hi Jonas,
>
> I've been trying to build a local deb out of the 3.1.15~ds1 code in
> the debian/latest branch.
> However I'm stuck on managing the diffs between all the Makefile.in's
> and macros that are generated by autotools.
>
> What I do is grab the upstream tarball for the 3.1.15 release, and use
> that as the ".orig" tarball.
> However debuild fails with the "aborting due to unexpected upstream
> changes" error.
>
> Should I in fact use something else as the ".orig" tarball?
> Or is there a script for syncing the bootstrapped files between the
> working repo and the upstream tarball?
>
> In the 2.x branch I can deal with this easily since all the
> bootstrapped files are version controlled.
> However in the 3.x branch you moved to a different approach, so this
> method doesn't work.
>
> Anything obvious I'm missing?
>
> Thanks!
> Daniel



More information about the pkg-netatalk-devel mailing list