X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Fcontrol;h=8d8e938ed83aa5ed789a4c3ff603fdc34348db0f;hp=1f8cbff725449c5bec294567df61adb9c0290f60;hb=3fed6736a7ef8b8b1f05d0fabb136bdd3b5917ee;hpb=c734dd75344ea0d1701969a8ecb9ff00d2bd5531

diff --git a/debian/control b/debian/control
index 1f8cbff7..8d8e938e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,13 @@ Build-Depends:
  libz-dev,
  python-all (>= 2.6.6-3~),
  python3-all (>= 3.1.2-7~),
+ python-sphinx (>= 1.0),
  ruby, ruby-dev (>>1:1.9.3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
  gdb [!s390x !ia64],
- dtach (>= 0.8)
+ 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 +110,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~)