Merge tag 'debian/0.17-3'

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index 1f8cbff725449c5bec294567df61adb9c0290f60..a887263cfbd7d4c5053882f53b7fff6fd0e4f2c5 100644 (file)
--- 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~)