On Fri, May 18, 2012 at 02:44:37PM +0200, Salvatore Bonaccorso wrote:
> tags 673368 + patch
> thanks
>
> On Fri, May 18, 2012 at 01:43:28PM +0200, Salvatore Bonaccorso wrote:
> > Okay I have updated it with also an entry for the manpage.
>
> I forgot to really add it to the mail. So here it is.
Applied. Thanks a lot!
-- Guido
>
> Regards,
> Salvatore
> From c60256634a716bb031582979b0049e43383793f4 Mon Sep 17 00:00:00 2001
> From: Salvatore Bonaccorso <car...@debian.org>
> Date: Fri, 18 May 2012 08:23:55 +0200
> Subject: [PATCH] git-dch: Add support for --team switch for Team uploads
>
> ---
> docs/manpages/git-dch.sgml | 7 +++++++
> gbp/scripts/dch.py | 6 +++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
> index 6449ecd..573d6b2 100644
> --- 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
> --- 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
> --
> 1.7.10
>
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
