This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch master
in repository devscripts.
commit 1108a9bb6afed4652ca98933a3956ac68042fe66
Author: James McCoy <james...@debian.org>
Date: Thu Jun 9 19:50:12 2016 -0400
debchange: Merge existing UNRELEASED stanza with -v and -D
When --newversion is specified, an existing UNRELEASED stanza is merged
with the new changelog entry. This should still be done when
--distribution is also specified.
Signed-off-by: James McCoy <james...@debian.org>
---
debian/changelog | 4 ++++
scripts/debchange.pl | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53a5866..cef044d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ devscripts (2.16.6) UNRELEASED; urgency=medium
+ Require an argument for ‘-s’ option, as intended, fixing a compatibility
issue with Perl 5.24's Getopt::Long. Thanks to Niko Tyni for the patch.
(Closes: #826401)
+ * debchange:
+ + Merging the existing changelog stanza when a package is UNRELEASED and
+ --newversion is used now also happens with --distribution. Thanks to
+ Ilias Tsitsimpi for the patch. (Closes: #826837)
[ Paul Wise ]
* uscan:
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index db52b60..af6176c 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1219,8 +1219,7 @@ if (($opt_i || $opt_n || $opt_bn || $opt_qa || $opt_R ||
$opt_s || $opt_team ||
if (($opt_v or $opt_i or $opt_l or $opt_d) and
$opt_release_heuristic eq 'changelog' and
- $changelog->{Distribution} eq 'UNRELEASED' and
- $distribution eq 'UNRELEASED') {
+ $changelog->{Distribution} eq 'UNRELEASED') {
$merge = 1;
} else {
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/collab-maint/devscripts.git
_______________________________________________
devscripts-devel mailing list
devscripts-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
