Merge branch 'master' into bug488214-rra

[debian/debian-policy.git] / virtual-package-names-list.txt

diff --git a/virtual-package-names-list.txt b/virtual-package-names-list.txt
index d1beab876a17b73cc84b8482c658b07bfdfc6b04..7944d8de07d05168c78608befe8d3aa63570f1fc 100644 (file)
--- a/virtual-package-names-list.txt
+++ b/virtual-package-names-list.txt
@@ -83,6 +83,7 @@ System
                          other applications
  time-daemon             anything that serves as a time daemon
  ups-monitor             anything that is capable of controlling an UPS
+ cron-daemon             Any cron daemon that correctly follows policy requirements
 
 Documentation
 -------------
@@ -122,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)
@@ -315,3 +317,6 @@ Russ Allbery:
               Rename inetd-superserver to inet-superserver
    2 Dec 2007 Added ttf-japanese-gothic
               Added ttf-japanese-mincho
+
+Manoj Srivastava:
+  21 Nov 2009 (Re)Added cron-daemon