debian: alternately depend on emacs24 for notmuch-emacs, build

This should allow users to install notmuch-emacs with only emacs24
installed on their system. For good measure, allow building with
emacs24 as a 4th choice.

diff --git a/debian/changelog b/debian/changelog
index f6bc852df911703377b891d3b0c6e0c6757946d5..36f06af31558c11ccfce74741cdbcb8b29983c41 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ notmuch (0.14-1) unstable; urgency=low
   [ David Bremner ]
   * Do a better job of cleaning up after configuration and testing
     (Closes: #683505)
   [ David Bremner ]
   * Do a better job of cleaning up after configuration and testing
     (Closes: #683505)

+  * Alternately depend on emacs24 instead of emacs23 (Closes: #677900).

 
 

- -- David Bremner <bremner@debian.org>  Thu, 02 Aug 2012 09:36:05 -0300
+ -- David Bremner <bremner@debian.org>  Thu, 02 Aug 2012 21:32:31 -0300

 
 notmuch (0.13.2-1) unstable; urgency=low
 
 
 notmuch (0.13.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index e24fd94d6d06aaac71ef825c8fe7d62788683806..f72527699b548a268402cddfaeb1f9df7104cceb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends:
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),

- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+ emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
+ emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),

  gdb,
  dtach (>= 0.8)
 Standards-Version: 3.9.3
  gdb,
  dtach (>= 0.8)
 Standards-Version: 3.9.3


@@ -80,7 +81,8 @@ Section: mail
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
 Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
 Depends: ${misc:Depends}, notmuch (>= ${source:Version}),

- emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)
+ emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
+ emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)

 Description: thread-based email index, search and tagging (emacs interface)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
 Description: thread-based email index, search and tagging (emacs interface)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses