[devscripts] 05/05: debchange: update changelog entry correctly

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit df9e22fb0e16c5bd693595e0d03e86164380e471
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Sep 10 07:44:14 2017 +0900

    debchange: update changelog entry correctly
    
    Fix #842468
    
    Signed-off-by: Osamu Aoki <osamu at debian.org>
---
 debian/changelog     | 3 +++
 scripts/debchange.1  | 8 ++++++--
 scripts/debchange.pl | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4d7719..ebb0328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,9 @@ devscripts (2.17.10) UNRELEASED; urgency=medium
     + Skip upstream signature when repacking.  Closes: #874667
   * uupdate 
     + -b option is not "New upstream release". Closes: #842468, #845610
+    + Use space as the argument of debchange to create an empty entry
+      template.
+  * debchange: Handle multimaint case properly.  Closes: #842468
   * Made source package bootstrappable. Closes: #870640
 
   [ Antonio Terceiro ]
diff --git a/scripts/debchange.1 b/scripts/debchange.1
index 369bab0..14cb6a6 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -11,8 +11,12 @@ the Debian changelog in the current source tree.  This command must be
 run from within that tree.  If the text of the change is given on the
 command line, \fBdebchange\fR will run in batch mode and simply add the
 text, with line breaks as necessary, at the appropriate place in
-\fIdebian/changelog\fR (or the changelog specified by options, as
-described below).  If no text is specified then \fBdebchange\fR
+\fIdebian/changelog\fR (or the changelog specified by options, as described
+below).  If the text given on the command line is a null string,
+\fBdebchange\fR will run in batch mode without adding any text.  If the
+text given on the command line is a space string, \fBdebchange\fR will run
+in batch mode and add a blank changelog entry.
+If no text is specified then \fBdebchange\fR
 will run the editor as determined by \fBsensible-editor\fR for you to
 edit the file.  (The environment variables \fBVISUAL\fR and
 \fBEDITOR\fR are used in this order to determine which editor to use.)
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index b44b963..d1f115e 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -1411,7 +1411,8 @@ if (($opt_r || $opt_a || $merge) && ! $opt_create) {
 
     if (! $opt_r) {
 	# Add a multi-maintainer header...
-	if ($multimaint) {
+	if ($multimaint and
+		(@closes_text or $TEXT or $opt_news or !$EMPTY_TEXT)) {
 	    # ...unless there already is one for this maintainer.
 	    if (!defined $maintline) {
 		print O "\n  [ $MAINTAINER ]\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git