[buildd-tools-devel] Bug#844583: sbuild: allow arbitrary version suffix for binary rebuild (binNMU)

[Raphael Hertzog]

On Thu, 22 Dec 2016, Johannes Schauer wrote:
> what do you think about the following patch? Would it solve this bug?

Yes. A few improvements:

> --- a/man/sbuild.1.in
> +++ b/man/sbuild.1.in
> @@ -539,6 +539,10 @@ ARCH -- no source changes\[rq]. Please note that the versions in the
>  \fIPACKAGE_VERSION[.dsc]\fR arguments still have to be the unmodified (non-NMU
>  ones) so that the sources can be found. The version number in log files and
>  mails will be modified by \fBsbuild\fR automatically.
> +The \-\-append\-to\-version option has a similar effect but allows to specify

s/allows to/lets you/

> +an arbitrary version suffix instead of a free-text changelog entry. To have a
> +custom version suffix and a free-text changelog entry, use \-\-make\-binNMU and

s/free-text/custom/g (matches twice)

> +\-\-append\-to\-version at the same time.

s/time\./time with --binNMU=0./

>  This command line option sets the \fBBIN_NMU\fP configuration variable and sets the \fBBIN_NMU_VERSION\fP configuration variable to 1 if it was not set yet, for example by the --binNMU option. See
>  .BR sbuild.conf (5)
>  for more information.
> @@ -547,6 +551,9 @@ for more information.
>  The version number of the binary NMU.  This should be used in conjunction with
>  \-\-make\-binNMU.  \fIversion\fP is a single number for the (+b\fIn\fR) format
>  used for binary NMUs.
> +If the argument is the empty string or zero, then the +b\fIn\fR suffix will not
> +be appended.
> +The +b\fIn\fR suffix will be appended after the string given via \-\-append\-to\-version.
>  This command line option sets the \fBBIN_NMU_VERSION\fP configuration variable. See
>  .BR sbuild.conf (5)
>  for more information.
> @@ -566,6 +573,10 @@ for more information.
>  This option is similar to \-\-make\-binNMU except that it allows the user to
>  specify an arbitrary string to be appended to the version number (immediately
>  before the '+' in the Debian revision if \-\-make\-binNMU is also provided).
> +If \-\-binNMU is given as well and not empty or zero, then its argument will be
> +added at the end after this string.

The parenthesis before already implies that the string is added before the
"+" added by the bin-NMU suffix. So this sentences is not needed IMO.

> +To pass an arbitrary changelog text as well, combine this option with
> +\-\-make\-binNMU.

To pass an arbitrary changelog text as well, combine this option with
--make-binNMU but be aware that this will also add the +bn suffix unless
you also pass --binNMU=0 to disable it.


Thanks for your work on sbuild!
-- 
Raphaël Hertzog ◈ Debian Developer

Support Debian LTS: http://www.freexian.com/services/debian-lts.html
Learn to master Debian: http://debian-handbook.info/get/