diff options
author | Russ Allbery <rra@debian.org> | 2019-06-01 16:13:04 -0700 |
---|---|---|
committer | Russ Allbery <rra@debian.org> | 2019-06-01 16:13:04 -0700 |
commit | 5a1e20e95d02af883205b884d1c4283ad46bb17c (patch) | |
tree | fac5ed8112cc8d07989651243de59f2b68a70fc5 | |
parent | 1175328d6b609e15cff44c91631d8a3917bec8eb (diff) |
Fix formatting of debian_revision in Policy 5.6.12
* Fix formatting of the debian_revision explanation in Policy 5.6.12.
Thanks to Emmanuel Arias for the patch.
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | policy/ch-controlfields.rst | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 7878523..0432d94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ debian-policy (4.3.0.4) UNRELEASED; urgency=medium + [ Sean Whitton] * Fix reference to FHS section in Policy 9.1.2. Thanks to Juuso "Linda" Lapinlampi for the patch. + [ Russ Allbery ] + * Fix formatting of the debian_revision explanation in Policy 5.6.12. + Thanks to Emmanuel Arias for the patch. + -- Sean Whitton <spwhitton@spwhitton.name> Tue, 09 Apr 2019 10:20:30 -0700 debian-policy (4.3.0.3) unstable; urgency=medium diff --git a/policy/ch-controlfields.rst b/policy/ch-controlfields.rst index 44080c9..f6ac436 100644 --- a/policy/ch-controlfields.rst +++ b/policy/ch-controlfields.rst @@ -577,11 +577,11 @@ The three components here are: tilde) and should start with a digit. If there is no ``debian_revision`` then hyphens are not allowed. -``debian_revision`` This part of the version number specifies the - version of the Debian package based on the upstream version. It - may contain only alphanumerics and the characters ``+`` ``.`` - ``~`` (plus, full stop, tilde) and is compared in the same way as - the ``upstream_version`` is. +``debian_revision`` + This part of the version number specifies the version of the Debian + package based on the upstream version. It may contain only + alphanumerics and the characters ``+`` ``.`` ``~`` (plus, full stop, + tilde) and is compared in the same way as the ``upstream_version`` is. It is optional; if it isn't present then the ``upstream_version`` may not contain a hyphen. This format represents the case where a |