Control: retitle -1 clarify documentation for --append-to-version and --make-binNMU
Hi, Quoting Raphael Hertzog (2016-12-22 10:09:04) > On Thu, 22 Dec 2016, Johannes Schauer wrote: > > > Maybe you can enhance the description of --make-binNMU to say that when > > > you need full control on the generated version number, you should use > > > --append-to-version without --make-binNMU and that in that case the text > > > of > > > the changelog entry is not user controllable. > > > > you can also use --append-to-version together with --make-binNMU to set the > > text but set --binNMU="" to not get the +bX appended. > > That was not clear from the manual page either. I would have expected to get > "<version><append>+b" in that case. what do you think about the following patch? Would it solve this bug? Suggestions welcome! --- 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 +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 +\-\-append\-to\-version at the same time. 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. +To pass an arbitrary changelog text as well, combine this option with +\-\-make\-binNMU. This command line option sets the \fBAPPEND_TO_VERSION\fP configuration variable. See .BR sbuild.conf (5) for more information.
signature.asc
Description: signature