From: david Date: Fri, 3 Aug 2012 00:56:26 +0000 (+2100) Subject: [PATCH] debian: alternately depend on emacs24 for notmuch-emacs, build X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=134841147afa69ff50a79334c44c7e591c487f65;p=notmuch-archives.git [PATCH] debian: alternately depend on emacs24 for notmuch-emacs, build --- diff --git a/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9 b/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9 new file mode 100644 index 000000000..4a3898dcf --- /dev/null +++ b/69/0ab4514ec904c37bedc8d5d9fd8af3c176b4e9 @@ -0,0 +1,105 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 730B2431E62 + for ; Thu, 2 Aug 2012 17:56:39 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 8W28VdPxMe1J for ; + Thu, 2 Aug 2012 17:56:38 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 9B922431FAF + for ; Thu, 2 Aug 2012 17:56:38 -0700 (PDT) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1Sx6Bt-0003oE-Nk; Thu, 02 Aug 2012 21:56:33 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Sx6Bo-00064F-AR; Thu, 02 Aug 2012 21:56:28 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] debian: alternately depend on emacs24 for notmuch-emacs, + build +Date: Thu, 2 Aug 2012 21:56:26 -0300 +Message-Id: <1343955386-23276-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 03 Aug 2012 00:56:39 -0000 + +From: David Bremner + +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. +--- + debian/changelog | 3 ++- + debian/control | 6 ++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/debian/changelog b/debian/changelog +index f6bc852..36f06af 100644 +--- 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) ++ * Alternately depend on emacs24 instead of emacs23 (Closes: #677900). + +- -- David Bremner Thu, 02 Aug 2012 09:36:05 -0300 ++ -- David Bremner Thu, 02 Aug 2012 21:32:31 -0300 + + notmuch (0.13.2-1) unstable; urgency=low + +diff --git a/debian/control b/debian/control +index e24fd94..f725276 100644 +--- a/debian/control ++++ b/debian/control +@@ -14,7 +14,8 @@ Build-Depends: + 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 +@@ -80,7 +81,8 @@ Section: mail + 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 +-- +1.7.10.4 +