| Message ID | 1507728759-29952-1-git-send-email-marcelo.cerri@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [T/X/Z/A] UBUNTU: d/s/m/insert-ubuntu-changes: <stop at> should not be included in the changelog | expand |
On 11.10.2017 15:32, Marcelo Henrique Cerri wrote: > Ignore: yes > > Commit "UBUNTU: d/s/m/insert-ubuntu-changes: use full version numbers" > wrongly change the behaviour of the "<stop at>" parameter. > > Change the script to not include the <stop at> version into the target > changelog. > > Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian/scripts/misc/insert-ubuntu-changes | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/scripts/misc/insert-ubuntu-changes b/debian/scripts/misc/insert-ubuntu-changes > index 7af9c20c1215..145c81c5dbd3 100755 > --- a/debian/scripts/misc/insert-ubuntu-changes > +++ b/debian/scripts/misc/insert-ubuntu-changes > @@ -37,7 +37,7 @@ open(CHG, "<debian.master/changelog") || > die "$0: debian/changelog: open failed - $!\n"; > while (<CHG>) { > if (/^\S+\s+\((.*)\)/) { > - if (version_cmp($1, $end) <= -1) { > + if (version_cmp($1, $end) <= 0) { > last; > } > if ($1 eq $start) { >
On Wed, Oct 11, 2017 at 10:32:39AM -0300, Marcelo Henrique Cerri wrote: > Ignore: yes > > Commit "UBUNTU: d/s/m/insert-ubuntu-changes: use full version numbers" > wrongly change the behaviour of the "<stop at>" parameter. > > Change the script to not include the <stop at> version into the target > changelog. > > Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Applied to artful/master-next and unstable/master, thanks!
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Applied to trusty/master-next, xenial/master-next and zesty/master-next branches. Thanks.
diff --git a/debian/scripts/misc/insert-ubuntu-changes b/debian/scripts/misc/insert-ubuntu-changes index 7af9c20c1215..145c81c5dbd3 100755 --- a/debian/scripts/misc/insert-ubuntu-changes +++ b/debian/scripts/misc/insert-ubuntu-changes @@ -37,7 +37,7 @@ open(CHG, "<debian.master/changelog") || die "$0: debian/changelog: open failed - $!\n"; while (<CHG>) { if (/^\S+\s+\((.*)\)/) { - if (version_cmp($1, $end) <= -1) { + if (version_cmp($1, $end) <= 0) { last; } if ($1 eq $start) {
Ignore: yes Commit "UBUNTU: d/s/m/insert-ubuntu-changes: use full version numbers" wrongly change the behaviour of the "<stop at>" parameter. Change the script to not include the <stop at> version into the target changelog. Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> --- debian/scripts/misc/insert-ubuntu-changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)