diff options
| author | Jan Hauke Rahm <jhr@debian.org> | 2010-09-21 13:02:53 +0200 |
|---|---|---|
| committer | Andreas Beckmann <debian@abeckmann.de> | 2012-10-01 20:07:48 +0200 |
| commit | a19ad89aa00966e91320e7dbad3e707df8fd41ae (patch) | |
| tree | b8c2aca676c59b280cbf51d9aa7937236c09de1e | |
| parent | ebf541f9fb6a8bcaab97720c64baa0f56da78b84 (diff) | |
| download | sendmail-debian/8.14.3-9.4.tar.gz | |
Imported Debian patch 8.14.3-9.4debian/8.14.3-9.4
| -rw-r--r-- | debian/build/debian/control.m4.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/build/debian/control.m4.in b/debian/build/debian/control.m4.in index 97e72b2..dbd323b 100644 --- a/debian/build/debian/control.m4.in +++ b/debian/build/debian/control.m4.in @@ -70,7 +70,7 @@ dnl # 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 diff --git a/debian/changelog b/debian/changelog index bae7b17..4458de8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sendmail (8.14.3-9.4) unstable; urgency=low + + * Non-maintainer upload. + * Actually fix the conflict bug. debian/build/control.m4.in is used instead + of plain debian/control (Closes: #592243) + + -- Jan Hauke Rahm <jhr@debian.org> Tue, 21 Sep 2010 13:02:53 +0200 + sendmail (8.14.3-9.3) unstable; urgency=low * Non-maintainer upload. |