"Daniel Shahaf" <danie...@apache.org> writes:

> Here's a revision of the patch incorporating the feedback so far:

Thank you for this patch!  I confirmed that your description matches the
regular expression.  This has now been applied for the next release of
Debian Policy.

> [[[
> diff --git a/policy/ch-source.rst b/policy/ch-source.rst
> index 1d870d9..1c71525 100644
> --- a/policy/ch-source.rst
> +++ b/policy/ch-source.rst
> @@ -151,9 +151,9 @@ used here to separate groups of changes, if desired.
>  If this upload resolves bugs recorded in the Bug Tracking System (BTS),
>  they may be automatically closed on the inclusion of this package into
>  the Debian archive by including the string: ``closes:  Bug#nnnnn`` in
> -the change details.  [#]_ This information is conveyed via the
> -``Closes`` field in the ``.changes`` file (see
> -:ref:`s-f-Closes`).
> +the change details, where ``#nnnnn`` is the bug number.  [#]_ This
> +information is conveyed via the ``Closes`` field in the ``.changes``
> +file (see :ref:`s-f-Closes`).
>  
>  The maintainer name and email address used in the changelog should be
>  the details of the person who prepared this release of the package. They
> @@ -860,10 +860,19 @@ should not exist a file ``debian/patches/foo.series`` 
> for any ``foo``.
>  
>         /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/i
>  
> -   Then all of the bug numbers listed will be closed by the archive
> +   That is: The string should consist of the word ``closes:`` followed by
> +   a comma-separated list of bug numbers. Bug numbers may be preceded by
> +   the word ``bug`` and/or a ``#`` sign, as in
> +   ``Closes: 42, bug#43, #44, bug 45``.
> +   
> +   The list of bug numbers may span multiple lines.
> +
> +   All of the bug numbers listed will be closed by the archive
>     maintenance software (``dak``) using the version of the changelog
>     entry.
>  
> +   The words ``closes:`` and ``bug`` are not case sensitive.
> +
>  .. [#]
>     In the case of a sponsored upload, the uploader signs the files, but
>     the changelog maintainer name and address are those of the person who
> ]]]

-- 
Russ Allbery (r...@debian.org)              <https://www.eyrie.org/~eagle/>

Reply via email to