diff options
| author |  David Bremner <david@tethera.net> | 2014-01-12 19:56:25 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-01-12 19:56:25 -0400 |
| commit | 79b6b0190b36f5c9f14af48a3af675d2a16a46f3 (patch) | |
| tree | b01cf560437b942cfbe1a5ade83da86749620179 /debian/control | |
| parent | b65ca8e0ba5e234cfdbf957a454d386da526a6fc (diff) | |
| parent | f2e1f0b006d281b9b0a3361dcae37b019eecd502 (diff) | |
Merge tag 'debian/0.17-3'
uploaded to Debian unstable
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 1f8cbff7..a887263c 100644 --- a/debian/control +++ b/debian/control @@ -108,6 +108,7 @@ Architecture: all Section: mail Breaks: notmuch (<<0.6~254~) Replaces: notmuch (<<0.6~254~) +Conflicts: emacsen-common (<< 2.0.0) Depends: ${misc:Depends}, notmuch (>= ${source:Version}), emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) | emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~) |