X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=debian%2Fcontrol;h=c5475c41167127ce297286d35df4018e5551757d;hb=268a33f4c2c0eefc06b2130f6aa77643f7d5995a;hp=816998bc4d1d30ca0fa7228eed980c2d9092b459;hpb=89bf67fe41e3db270366a49be4f0a7afb07d0eae;p=notmuch

diff --git a/debian/control b/debian/control
index 816998bc..c5475c41 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,9 @@ Build-Depends:
  ruby, ruby-dev (>>1:1.9.3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb [!s390x],
- dtach (>= 0.8)
+ gdb [!s390x !ia64],
+ dtach (>= 0.8),
+ bash-completion (>=1.9.0~)
 Standards-Version: 3.9.4
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
@@ -108,6 +109,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~)