Bug#892142: debian-policy: update example to use default-mta instead of exim

[Jonathan Nieder <jrnieder@gmail.com>]

tags 892142 + patch
quit

Hi,

Paul Wise wrote:

> In Policy 7.1. Syntax of relationship fields, there is an example:
>
>    For example, a list of dependencies might appear as:
>
>    Package: mutt
>    Version: 1.3.17-1
>    Depends: libc6 (>= 2.2.1), exim | mail-transport-agent
>
> I would like to suggest that this be updated to replace exim with
> default-mta, since exim is no longer in Debian as it has been replaced
> with exim4 and many years ago we switched to using the default-mta
> virtual package to make it easier to change the default MTA on Debian.
>
> https://www.debian.org/doc/debian-policy/#syntax-of-relationship-fields

Thanks!  This is non-normative, so a policy editor can just make the
change.

How about this patch?  It should be possible to apply by downloading
this message as an mbox and using "git am --scissors mbox-file".

-- >8 --
Subject: Use default-mta in MTA dependency example

Reported-by: Paul Wise <pabs@debian.org>
Closes: #892142
---
 debian/changelog            | 5 +++++
 policy/ch-relationships.rst | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0ec082f..99f6068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-policy (4.1.4.0) UNRELEASED; urgency=medium
 
+  [ Sean Whitton ]
   * Policy: Drop get-orig-source rules target
     Wording: Helmut Grohne <helmut@subdivi.de>
     Seconded: Holger Levsen <holger@layer-acht.org>
@@ -29,6 +30,10 @@ debian-policy (4.1.4.0) UNRELEASED; urgency=medium
   * Fix indentation of description of the clean target (Closes: #889960).
     Thanks Ferenc Wágner for the report.
 
+  [ Jonathan Nieder ]
+  * Use default-mta instead of exim in dependency example (Closes: #892142).
+    Thanks to Paul Wise for the report.
+
  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 29 Dec 2017 18:46:59 +0000
 
 debian-policy (4.1.3.0) unstable; urgency=medium
diff --git a/policy/ch-relationships.rst b/policy/ch-relationships.rst
index 77cf0e1..1eaa422 100644
--- a/policy/ch-relationships.rst
+++ b/policy/ch-relationships.rst
@@ -45,7 +45,7 @@ For example, a list of dependencies might appear as:
 
     Package: mutt
     Version: 1.3.17-1
-    Depends: libc6 (>= 2.2.1), exim | mail-transport-agent
+    Depends: libc6 (>= 2.2.1), default-mta | mail-transport-agent
 
 Relationships may be restricted to a certain set of architectures. This
 is indicated in brackets after each individual package name and the
-- 
2.16.2.660.g709887971b