summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hauke Rahm <jhr@debian.org>2010-09-17 13:08:44 +0200
committerAndreas Beckmann <debian@abeckmann.de>2012-10-01 20:07:47 +0200
commitebf541f9fb6a8bcaab97720c64baa0f56da78b84 (patch)
tree7400954cb90c8be3e4287774c32841e9f5d45750
parent611a606c3911c227c0f77982f4d65d482f23aa0f (diff)
downloadsendmail-debian/8.14.3-9.3.tar.gz
Imported Debian patch 8.14.3-9.3debian/8.14.3-9.3
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 066002d..bae7b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sendmail (8.14.3-9.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add conflict of rmail against masqmail (Closes: #592243)
+
+ -- Jan Hauke Rahm <jhr@debian.org> Fri, 17 Sep 2010 13:08:44 +0200
+
sendmail (8.14.3-9.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 99de6f2..6999f5b 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Homepage: http://www.sendmail.org
Package: rmail
Architecture: any
Section: mail
-Conflicts: sendmail (<< 8.13.1-7), postfix, exim, exim-tls, exim4-daemon-custom, exim4-daemon-heavy, exim4-daemon-light, courier-mta, smail, zmailer
+Conflicts: sendmail (<< 8.13.1-7), postfix, exim, exim-tls, exim4-daemon-custom, exim4-daemon-heavy, exim4-daemon-light, courier-mta, smail, zmailer, masqmail
Depends: sendmail-bin | mail-transport-agent, ${shlibs:Depends}
Description: MTA->UUCP remote mail handler
Rmail handles mail received via uucp and passes it to the local