X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Fcontrol;h=a887263cfbd7d4c5053882f53b7fff6fd0e4f2c5;hp=81b9b12b468425eceaa5db33c438330ffca33631;hb=79b6b0190b36f5c9f14af48a3af675d2a16a46f3;hpb=819d7b4de2ae72b17742cd445d7dab801c4c412f

diff --git a/debian/control b/debian/control
index 81b9b12b..a887263c 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  ruby, ruby-dev (>>1:1.9.3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb,
+ gdb [!s390x !ia64],
  dtach (>= 0.8)
 Standards-Version: 3.9.4
 Homepage: http://notmuchmail.org/
@@ -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~)