Bug#836596: libavutil55: borked NMUs with differing changelog

[Daniel Schepler]

On Sun, Sep 4, 2016 at 4:40 AM, Thorsten Glaser <tg at mirbsd.de> wrote:
> Unpacking libavutil55:x32 (7:3.1.3-1+b3) over (7:3.1.3-1) ...
> dpkg: error processing archive /tmp/apt-dpkg-install-rPYNV8/09-libavutil55_7%3a3.1.3-1+b3_x32.deb (--unpack):
>  trying to overwrite shared '/usr/share/doc/libavutil55/changelog.Debian.gz', which is different from other instances of package libavutil55:x32
> Preparing to unpack .../10-libswresample2_7%3a3.1.3-1+b3_i386.deb ...
> De-configuring libswresample2:x32 (7:3.1.3-1) ...
> […]
>
> And indeed, the file differs:
>
> -rw-r--r--  1 tglase tglase  7526 Aug 28 12:12 clog-i386.gz
> -rw-r--r--  1 tglase tglase  7642 Sep  3 16:36 clog-x32.gz
>
> On x32, the binNMU was applied directly, apparently:
>
> tglase at tglase:~ $ diff -u clog-*
> --- clog-i386   2016-08-28 12:12:00.000000000 +0200
> +++ clog-x32    2016-09-03 16:36:00.000000000 +0200
> @@ -1,3 +1,10 @@
> +ffmpeg (7:3.1.3-1+b3) unstable; urgency=medium
> +
> +  * Binary-only NMU: Rebuild against against libchromaprint1.
> +  * Manually built to resolve circular Build-Depends with chromaprint.
> +
> + -- x32 Build Daemon (frobozz) <buildd_x32-frobozz at buildd.debian-ports.org>  Sat, 03 Sep 2016 07:36:24 -0700
> +
>  ffmpeg (7:3.1.3-1) unstable; urgency=medium
>
>    * Team upload.

Sorry about that, I did in fact have to do manual builds for the
reason mentioned (and it looks like essentially the same situation
still exists on hppa and sparc64).  I thought the build system would
automatically separate out the binNMU log into
/usr/share/doc/*/changelog.x32.gz.

At this point, I can't really see any way to fix the issue, though
(short of scheduling another binNMU for all architectures).
-- 
Daniel Schepler