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

diff --git a/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9 b/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9
new file mode 100644 (file)
index 0000000..4a3898d
--- /dev/null
+++ b/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9
@@ -0,0 +1,105 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 730B2431E62\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 17:56:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 8W28VdPxMe1J for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 17:56:38 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9B922431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 17:56:38 -0700 (PDT)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Sx6Bt-0003oE-Nk; Thu, 02 Aug 2012 21:56:33 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Sx6Bo-00064F-AR; Thu, 02 Aug 2012 21:56:28 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] debian: alternately depend on emacs24 for notmuch-emacs,\r
+ build\r
+Date: Thu,  2 Aug 2012 21:56:26 -0300\r
+Message-Id: <1343955386-23276-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 03 Aug 2012 00:56:39 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This should allow users to install notmuch-emacs with only emacs24\r
+installed on their system. For good measure, allow building with\r
+emacs24 as a 4th choice.\r
+---\r
+ debian/changelog |    3 ++-\r
+ debian/control   |    6 ++++--\r
+ 2 files changed, 6 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/debian/changelog b/debian/changelog\r
+index f6bc852..36f06af 100644\r
+--- a/debian/changelog\r
++++ b/debian/changelog\r
+@@ -7,8 +7,9 @@ notmuch (0.14-1) unstable; urgency=low\r
+   [ David Bremner ]\r
+   * Do a better job of cleaning up after configuration and testing\r
+     (Closes: #683505)\r
++  * Alternately depend on emacs24 instead of emacs23 (Closes: #677900).\r
+ \r
+- -- David Bremner <bremner@debian.org>  Thu, 02 Aug 2012 09:36:05 -0300\r
++ -- David Bremner <bremner@debian.org>  Thu, 02 Aug 2012 21:32:31 -0300\r
+ \r
+ notmuch (0.13.2-1) unstable; urgency=low\r
+ \r
+diff --git a/debian/control b/debian/control\r
+index e24fd94..f725276 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -14,7 +14,8 @@ Build-Depends:\r
+  libtalloc-dev,\r
+  libz-dev,\r
+  python-all (>= 2.6.6-3~),\r
+- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),\r
++ emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |\r
++ emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),\r
+  gdb,\r
+  dtach (>= 0.8)\r
+ Standards-Version: 3.9.3\r
+@@ -80,7 +81,8 @@ Section: mail\r
+ Breaks: notmuch (<<0.6~254~)\r
+ Replaces: notmuch (<<0.6~254~)\r
+ Depends: ${misc:Depends}, notmuch (>= ${source:Version}),\r
+- emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)\r
++ emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |\r
++ emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)\r
+ Description: thread-based email index, search and tagging (emacs interface)\r
+  Notmuch is a system for indexing, searching, reading, and tagging\r
+  large collections of email messages in maildir or mh format. It uses\r
+-- \r
+1.7.10.4\r
+\r