[PATCH] Build-Depend on libgmime-2.6-dev | libgmime2.4-dev

diff --git a/bf/92fa55cbd1bd5036a52508f37db1bf2f6a071c b/bf/92fa55cbd1bd5036a52508f37db1bf2f6a071c
new file mode 100644 (file)
index 0000000..a311fca
--- /dev/null
+++ b/bf/92fa55cbd1bd5036a52508f37db1bf2f6a071c
@@ -0,0 +1,68 @@
+Return-Path: <dkg@fifthhorseman.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 90DEB431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 15:20:05 -0800 (PST)\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 0zQAeLpmZFsM for <notmuch@notmuchmail.org>;\r
+       Thu,  9 Feb 2012 15:20:05 -0800 (PST)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+       by olra.theworths.org (Postfix) with ESMTP id 25038431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Feb 2012 15:20:05 -0800 (PST)\r
+Received: from pip.fifthhorseman.net (lair.fifthhorseman.net [108.58.6.98])\r
+       by che.mayfirst.org (Postfix) with ESMTPSA id C5B21F970;\r
+       Thu,  9 Feb 2012 18:20:00 -0500 (EST)\r
+Received: by pip.fifthhorseman.net (Postfix, from userid 1000)\r
+       id AD0231187A; Thu,  9 Feb 2012 18:20:43 -0500 (EST)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] Build-Depend on libgmime-2.6-dev | libgmime2.4-dev\r
+Date: Thu,  9 Feb 2012 18:20:20 -0500\r
+Message-Id: <1328829620-28220-1-git-send-email-dkg@fifthhorseman.net>\r
+X-Mailer: git-send-email 1.7.8.3\r
+Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\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: Thu, 09 Feb 2012 23:20:05 -0000\r
+\r
+libgmime-2.6-dev entered debian unstable today.  If 2.6 is available,\r
+notmuch should build against 2.6 instead of 2.4, as 2.6 is the current\r
+upstream stable version of libgmime.\r
+---\r
+ debian/control |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/debian/control b/debian/control\r
+index f6f415e..b60790e 100644\r
+--- a/debian/control\r
++++ b/debian/control\r
+@@ -10,7 +10,7 @@ Build-Depends:\r
+  debhelper (>= 7.0.50~),\r
+  pkg-config,\r
+  libxapian-dev,\r
+- libgmime-2.4-dev,\r
++ libgmime-2.6-dev | libgmime-2.4-dev,\r
+  libtalloc-dev,\r
+  libz-dev,\r
+  python-all (>= 2.6.6-3~),\r
+-- \r
+1.7.8.3\r
+\r