On Fri, 6 Aug 2021 19:26:56 +0900 Roger Shimizu <r...@debian.org> wrote:
> should be caused by:
> - https://bugs.debian.org/897653
> 
> if you upgrade tar to buster version 1.30+dfsg-6 or later, it should
> be resolved.

I am on buster with:
ii  pristine-tar   1.49         amd64        regenerate pristine tarballs
ii  tar            1.34+dfsg-1  amd64        GNU version of the tar archiving 
utility
and I still have the problem.

I try to upgrade the package 0ad to a new upstream version but that fails:
$ gbp import-orig --uscan
gbp:info: Launching uscan...
gbp:info: Using uscan downloaded tarball ../0ad_0.0.25.orig.tar.xz
What is the upstream version? [0.0.25]
gbp:info: Importing '../0ad_0.0.25.orig.tar.xz' to branch 'upstream'...
gbp:info: Source package is 0ad
gbp:info: Upstream version is 0.0.25
gbp:error: Import of ../0ad_0.0.25.orig.tar.xz failed: Couldn't commit to 
'pristine-tar' with upstream 'c98ef96af6f9638844dce03af30a3060b677fee2': 
pristine-xz failed to reproduce build of ../0ad_0.0.25.orig.tar.xz
(Please file a bug report.)
pristine-tar: failed to generate delta
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream by resetting it to 
86bb850b0a939ace014cbd3b7126410c258fc25c
gbp:info: Rolling back branch pristine-tar by resetting it to 
f0bd6693182069f87ebd7f5ab8e28911ffc157db
gbp:error: Rolled back changes after import error.

I tried with a fresh "git clone" of 0ad but the problem is still
present.

I don't want to regerenrate old tarballs, but to add a new one.

I extracted the upstream 0ad_0.0.25.orig.tar.xz and regenerated a new
.tar.xz file and this time the inclusion worked:
$ gbp import-orig ../0ad_0.0.25.orig.tar.xz
What is the upstream version? [0.0.25]
gbp:info: Importing '../0ad_0.0.25.orig.tar.xz' to branch 'upstream'...
gbp:info: Source package is 0ad
gbp:info: Upstream version is 0.0.25
gbp:info: Replacing upstream source on 'master'
gbp:info: Successfully imported version 0.0.25 of ../0ad_0.0.25.orig.tar.xz

But, of course, the archived version is not more a "pristine-tar" since
that is one that I re-created myself.

I have no idea what version of tar was used by upstream.
Upsteam file is available at 
https://releases.wildfiregames.com/0ad-0.0.25-alpha-unix-data.tar.xz

Bye

Reply via email to