Bug#856475: pbuilder: binNMU broken

[Thorsten Glaser]

Package: pbuilder
Version: 0.228.4
Severity: important
Tags: patch

[…]
dpkg-deb: building package 'ruby-ffi-dbgsym' in '../ruby-ffi-dbgsym_1.9.10debian-1+b2_x32.deb'.
dpkg-deb: building package 'ruby-ffi' in '../ruby-ffi_1.9.10debian-1+b2_x32.deb'.
 dpkg-genbuildinfo --build=any
 dpkg-genchanges --build=any -mThorsten Glaser <tg at mirbsd.de> -eThorsten Glaser <tg at mirbsd.de> >../ruby-ffi_1.9.10debian-1+b2_x32.changes
dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included)
 dpkg-source --after-build ruby-ffi-1.9.10debian
dpkg-buildpackage: info: binary-only upload (no source included)
I: copying local configuration
E: Missing changes file: /var/cache/pbuilder/build/cow.6146/tmp/buildd/ruby-ffi_1.9.10debian-1_x32.changes
[…]

This happens both if I binNMU “the normal way” (with dch --bin-nmu inside
the chroot) and with pbuilder’s new --bin-nmu option.

Quick fix, at least for the latter:

--- /usr/lib/pbuilder/pbuilder-buildpackage~	2017-03-01 13:47:28.142346346 +0100
+++ /usr/lib/pbuilder/pbuilder-buildpackage	2017-03-01 13:47:45.246390822 +0100
@@ -155,14 +155,13 @@ checkbuilddep "$PACKAGENAME"
 save_aptcache
 trap umountproc_cleanbuildplace_trap exit sighup sigpipe
 
+CHANGES_BASENAME=$(dsc_get_basename "$PACKAGENAME" "yes")
 binNMU
 
 log.i "Building the package"
 
 executehooks "A"
 
-CHANGES_BASENAME=$(dsc_get_basename "$PACKAGENAME" "yes")
-
 ENV_PREFIX="env PATH=\"$PATH\" HOME=\"$BUILD_HOME\""
 DPKG_COMMANDLINE="$ENV_PREFIX dpkg-buildpackage -us -uc $DEBBUILDOPTS"
 
--- /usr/lib/pbuilder/pbuilder-buildpackage-funcs~	2017-03-01 13:50:43.286853777 +0100
+++ /usr/lib/pbuilder/pbuilder-buildpackage-funcs	2017-03-01 13:50:47.702865260 +0100
@@ -217,6 +217,7 @@ function binNMU() {
         log.w "No version provided for binNMU entry, fall back to 1."
         BINNMU_VERSION=1
     fi
+    CHANGES_BASENAME=$CHANGES_BASENAME+b$BINNMU_VERSION
     local arch=$($CHROOTEXEC dpkg-architecture -qDEB_HOST_ARCH)
     local date=$(date -R ${BINNMU_TIMESTAMP:+-d "${BINNMU_TIMESTAMP}"})
     log.i "Doing a binNMU, version $BINNMU_VERSION for $DISTRIBUTION/$arch to '$BINNMU_MESSAGE'"


-- System Information:
Debian Release: 9.0
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'buildd-unstable'), (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: i386, amd64

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/lksh
Init: sysvinit (via /sbin/init)

Versions of packages pbuilder depends on:
ii  debconf [debconf-2.0]  1.5.60
ii  debootstrap            1.0.88
ii  dpkg-dev               1.18.22
ii  wget                   1.19.1-1

Versions of packages pbuilder recommends:
ii  devscripts  2.17.1
ii  eatmydata   105-5
ii  fakeroot    1.21-3.1
ii  iproute2    4.9.0-1
ii  net-tools   1.60+git20161116.90da8a0-1
ii  sudo        1.8.19p1-1

Versions of packages pbuilder suggests:
ii  cowdancer   0.85
pn  gdebi-core  <none>

-- debconf information excluded