[Pkg-netatalk-devel] 3.1.16~ds-1

[Jonas Smedegaard]

Quoting Daniel Markstedt (2023-09-12 09:05:39)
> Hi Jonas,
> 
> I have prepared the code changes for 3.1.16~ds-1, with this changelog:
> https://salsa.debian.org/netatalk-team/netatalk/-/blob/debian/latest/debian/changelog
> 
> It should be ready for testing, except I think I messed up the pristine tarball delta generation.
> The binary delta came out way too large, and debuild complains about binary files that has changed.
> So I think I made a mistake somewhere working at this too late at night!
> 
> In hindsight I should not have pushed to the pristine-tar remote before fully testing:
> https://salsa.debian.org/netatalk-team/netatalk/-/blob/pristine-tar/netatalk_3.1.16~ds.orig.tar.gz.delta
> So I guess we may have to revert this and start over. Sorry about the mess!
> I'll try to look at it again later in the week.
> 
> This is what debuild complains about:
> dpkg-source: error: cannot represent change to doc/gfx/logo.png: binary file contents changed
> dpkg-source: error: add doc/gfx/logo.png in debian/source/include-binaries if you want to store the modified binary in the debian tarball
> dpkg-source: error: cannot represent change to etc/afpd/spotlight-packet.bin: binary file contents changed
> dpkg-source: error: add etc/afpd/spotlight-packet.bin in debian/source/include-binaries if you want to store the modified binary in the debian tarball
> dpkg-source: error: cannot represent change to etc/afpd/spotlight-packet2.bin: binary file contents changed
> dpkg-source: error: add etc/afpd/spotlight-packet2.bin in debian/source/include-binaries if you want to store the modified binary in the debian tarball
> dpkg-source: error: unrepresentable changes to source

The above indicates *either* a totally broken set of pristine-tar +
upstream/latest git branches *or* an obsolete local auto-generated
tarball that you simply need to delete to have git-buidpackage generate
a fresh one properly in sync with corresponding git branches/tags.  Try
the latter first, and if that doesn't work then tell me, and I recommend
that I try clean up the mess (because it involves either force-pushing
public git branches or merging to paper over the mess, where I prefer
the former because the latter can later bite us in the ass due to
subtleties of how git tries to second-guess evolution of changes.


 - Jonas

-- 
 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/
 * Sponsorship: https://ko-fi.com/drjones

 [x] quote me freely  [ ] ask before reusing  [ ] keep private
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-netatalk-devel/attachments/20230912/99467153/attachment.sig>