The following commit has been merged in the master branch:
commit 55cc2011eced4d6fb5b1bb921b52e5bdb44bc56c
Author: James Vega <[email protected]>
Date: Sun Aug 1 23:48:07 2010 -0400
debchange: Add --[no]multimaint-merge option.
Closes: #590842
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index b796d5f..251bad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ devscripts (2.10.66) UNRELEASED; urgency=low
Based on a patch by Salvatore Bonaccorso. (Closes: #589607)
* checkbashisms: Allow kill & trap XSI-isms unless --posix is given, as per
Policy 3.9.1.0. (Closes: #486823)
+ * debchange: Add --[no]multimaint-merge option, corresponding to the
+ DEBCHANGE_MULTIMAINT_MERGE configuration variable. (Closes: #590842)
[ Cyril Brulebois ]
* uscan: Get rid of extra quoting in dpkg --compare-versions calls.
diff --git a/scripts/debchange.1 b/scripts/debchange.1
index 9f4ef97..4fa65ba 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -314,6 +314,11 @@ Should we indicate that parts of a changelog entry have
been made by
different maintainers? Default is yes; see the discussion above and
also the \fBDEBCHANGE_MULTIMAINT\fR configuration file option below.
.TP
+\fB\-\-[no]multimaint\-merge\fR
+Should all changes made by the same author be merged into the same
+changelog section? Default is no; see the discussion above and also the
+\fBDEBCHANGE_MULTIMAINT_MERGE\fR configuration file option below.
+.TP
.BR \-\-maintmaint ", " \-m
Do not modify the maintainer details previously listed in the changelog.
This is useful particularly for sponsors wanting to automatically add a
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 641fb59..c4cb8fe 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -158,6 +158,10 @@ Options:
--[no]multimaint
When appending an entry to a changelog section (-a), [do not]
indicate if multiple maintainers are now involved (default: do so)
+ --[no]multimaint-merge
+ When appending an entry to a changelog section, [do not] merge the
+ entry into an existing changelog section for the current author.
+ (default: do not)
-m, --maintmaint
Don\'t change (maintain) the maintainer details in the changelog entry
-t, --mainttrailer
@@ -335,6 +339,8 @@ GetOptions("help|h" => \$opt_help,
"news:s"; => \$opt_news,
"multimaint!" => \$opt_multimaint,
"multi-maint!" => \$opt_multimaint,
+ 'multimaint-merge!' => \$opt_multimaint_merge,
+ 'multi-maint-merge!' => \$opt_multimaint_merge,
"m|maintmaint" => \$opt_m,
"t|mainttrailer!" => \$opt_t,
"check-dirname-level=s" => \$opt_level,
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
