Re: bsdgames: FTBFS: dpkg-buildpackage: error: dpkg-source -b bsdgames-2.17 gave error exit status 2

[Jonathan Nieder <jrnieder@gmail.com>]

Hi Raphaël,

Didier Raboud wrote:

> During a rebuild of all packages in sid, your package failed to build on
> amd64.
[...]
>> dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/bsdgames_2.17-19.diff.RWwHlX
>> dpkg-source: info: you can integrate the local changes with dpkg-source --commit
>> dpkg-buildpackage: error: dpkg-source -b bsdgames-2.17 gave error exit status 2
>> ────────────────────────────────────────────────────────────────────────────────
>> Build finished at 20110924-0020
>
> The full build log is available from:
>    http://people.debian.org/~lucas/logs/2011/09/23/bsdgames_2.17-19_lsid64.buildlog

The cause seems to be the following logic in Dpkg::Source::Package::V2:

    # Apply all patches except the last automatic one
    $self->apply_patches($tmp, skip_auto => 1, usage => 'build');

That means that debian/patches/debian-changes-2.17-19 is ignored,
causing a build failure.  I would have expected the patch to be
included because it already exists in the source package that was
extracted.  Its nondescriptive debian-changes-* name is water under
the bridge.

In other words, it seems like 1.16.1~143 (dpkg-source: implement
--commit and fail with unrecorded changes, 2011-07-14) is making
some existing packages no longer pass the following test:

	dpkg-source -x <package>.dsc
	cd <package>-<version>
	dpkg-buildpackage -S

Is that intended?  If not, any ideas for fixing it?