Bug#683848: bin-NMU support

[Andreas Beckmann]

Package: pbuilder
Followup-For: Bug #683848

Hi,

the patch lacks the "binary-only=yes" suffix in the changelog.
Also I think adding -m\"$BINNMU_MAINTAINER\" to DEBBUILDOPTS is wrong -
-e\"$BINNMU_MAINTAINER\" should be sufficient:

diff -Nru pbuilder-0.215+nmu3+0anbe0/pbuilder-modules pbuilder-0.215+nmu3+0anbe1/pbuilder-modules
--- pbuilder-0.215+nmu3+0anbe0/pbuilder-modules	2014-10-15 07:16:02.000000000 +0200
+++ pbuilder-0.215+nmu3+0anbe1/pbuilder-modules	2014-10-15 12:02:27.000000000 +0200
@@ -637,8 +637,8 @@
 	echo "No maintainer provided for binNMU entry, fall back to last uploader."
 	BINNMU_MAINTAINER=$changedby
     fi
-    DEBBUILDOPTS="${DEBBUILDOPTS} -m\"$BINNMU_MAINTAINER\" -e\"$BINNMU_MAINTAINER\""
-    echo "$package ($version+b$BINNMU_VERSION) $DISTRIBUTION; urgency=low" > $cl
+    DEBBUILDOPTS="${DEBBUILDOPTS} -e\"$BINNMU_MAINTAINER\""
+    echo "$package ($version+b$BINNMU_VERSION) $DISTRIBUTION; urgency=low, binary-only=yes" > $cl
     echo >> $cl
     echo "  * Binary-only non-maintainer upload for $arch; no source changes." >> $cl
     echo "  * $BINNMU_MESSAGE" >> $cl

That said, can't you use dch to generate the binary changelog?
This would simplify the changelog generation a lot ...

$CHROOTEXEC dch --bin-nmu -c $PATHTOCHANGELOG -D $DISTRIBUTION \
"$MESSAGE"

I have no idea how to pass a binnmu number != 1 to dch.
Also you cannot pass the maintainer as a command line option - need
environment variables instead, so maybe

$CHROOTEXEC env DEBEMAIL=$DEBEMAIL DEBFULLNAME="$DEBFULLNAME" dch ...

which makes the --bin-nmu-maintainer option moot because I have to set
it to --bin-nmu-maintainer "$DEBFULLNAME <$DEBEMAIL>" anyway, so
pbuilder could just use the same variables as dch ...
I find the binnmu uploader = last uploader fallback not that useful ...

(experiences from preparing my very first binNMU (for a package not
uploaded by me before))


Andreas