git-dch: Add support for --team switch for Team uploads

Closes: #673368
Signed-off-by: Guido Günther <agx@sigxcpu.org>

diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 6449ecd..573d6b2 100644 (file)
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -39,6 +39,7 @@
        <arg><option>--bpo</option></arg>
        <arg><option>--nmu</option></arg>
        <arg><option>--qa</option></arg>
+       <arg><option>--team</option></arg>
       </group>
       <arg><option>--[no-]full</option></arg>
       <arg><option>--[no-]meta</option></arg>
@@ -191,6 +192,12 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>--team</option></term>
+        <listitem>
+          <para>Create a Team upload changelog entry.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--git-log=</option><replaceable>git-log-options</replaceable>
         </term>
         <listitem>

diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 14dff29..0a69510 100644 (file)
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -382,6 +382,8 @@ def main(argv):
                       help="Increment  the  Debian  release  number  for a non-maintainer upload")
     version_group.add_option("--qa", dest="qa", action="store_true", default=False,
                       help="Increment the Debian release number for a Debian QA Team upload, and add a QA upload changelog comment.")
+    version_group.add_option("--team", dest="team", action="store_true", default=False,
+                      help="Increment the Debian release number for a Debian Team upload, and add a Team upload changelog comment.")
     version_group.add_boolean_config_file_option(option_name="git-author", dest="git_author")
     commit_group.add_boolean_config_file_option(option_name="meta", dest="meta")
     commit_group.add_config_file_option(option_name="meta-closes", dest="meta_closes",
@@ -448,13 +450,15 @@ def main(argv):
         commits.reverse()
 
         # add a new changelog section if:
-        if options.new_version or options.bpo or options.nmu or options.qa:
+        if options.new_version or options.bpo or options.nmu or options.qa or options.team:
             if options.bpo:
                 version_change['increment'] = '--bpo'
             elif  options.nmu:
                 version_change['increment'] = '--nmu'
             elif  options.qa:
                 version_change['increment'] = '--qa'
+            elif  options.team:
+                version_change['increment'] = '--team'
             else:
                 version_change['version'] = options.new_version
             # the user wants to force a new version