From: Russ Allbery <rra@debian.org>
Date: Wed, 18 Aug 2010 20:55:56 +0000 (-0700)
Subject: Merge branch 'master' into bug488214-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f1e57c2dd51829620dffb46e12271e3ec6f1f6f4;hp=478c037195972221841011150aad26d631da18fc;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug488214-rra
---

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index 9ba66e5..7944d8d 100644
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -123,6 +123,7 @@ News and Mail
  imap-server             an IMAP mail server
  mail-reader             a mail user agent (e.g. Pine, Elm, mailx, &c)
  mail-transport-agent    a mail transport agent (e.g. Smail, Sendmail, &c)
+ mailx                   a /usr/bin/mailx binary (*)
  news-reader             a news reader (e.g. trn, tin, &c)
  news-transport-system   a local news system (e.g. INN, C News or B News)
  pgp                     a version of PGP (International or US)