Re: [PATCH] Do not import notmuch in setup.py (again).

diff --git a/d2/a9a704ddf0209171c16e10006a6b6ea7150c8e b/d2/a9a704ddf0209171c16e10006a6b6ea7150c8e
new file mode 100644 (file)
index 0000000..4b629a3
--- /dev/null
+++ b/d2/a9a704ddf0209171c16e10006a6b6ea7150c8e
@@ -0,0 +1,77 @@
+Return-Path: <michael.hudson@canonical.com>\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 5089F431FD0\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Aug 2011 03:46:22 -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 0JWbob7hpItE for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Aug 2011 03:46:21 -0700 (PDT)\r
+Received: from youngberry.canonical.com (youngberry.canonical.com\r
+       [91.189.89.112])\r
+       by olra.theworths.org (Postfix) with ESMTP id A1E9C431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Aug 2011 03:46:21 -0700 (PDT)\r
+Received: from 121-73-77-183.cable.telstraclear.net ([121.73.77.183]\r
+       helo=angrist) by youngberry.canonical.com with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71)\r
+       (envelope-from <michael.hudson@canonical.com>)\r
+       id 1QwAyR-0002gY-5b; Wed, 24 Aug 2011 10:46:19 +0000\r
+Received: by angrist (Postfix, from userid 1000)\r
+       id 7B5C32033CE; Wed, 24 Aug 2011 22:46:15 +1200 (NZST)\r
+From: Michael Hudson-Doyle <michael.hudson@canonical.com>\r
+To: Sebastian Spaeth <Sebastian@SSpaeth.de>, notmuch@notmuchmail.org,\r
+       David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH] Do not import notmuch in setup.py (again).\r
+In-Reply-To: <87zkizxoks.fsf@SSpaeth.de>\r
+References: <87d3fvvdqp.fsf@canonical.com> <87zkizxoks.fsf@SSpaeth.de>\r
+User-Agent: Notmuch/0.7 (http://notmuchmail.org) Emacs/23.1.50.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 24 Aug 2011 22:46:15 +1200\r
+Message-ID: <87ty971408.fsf@canonical.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 24 Aug 2011 10:46:22 -0000\r
+\r
+rOn Wed, 24 Aug 2011 09:20:51 +0200, Sebastian Spaeth <Sebastian@SSpaeth.de> wrote:\r
+> On Wed, 24 Aug 2011 12:45:34 +1200, Michael Hudson-Doyle <michael.hudson@canonical.com> wrote:\r
+> > Revert part of 8826f.  As explained in c39b492c, importing notmuch in setup.py breaks make -f debian/rules clean in an environment that does not have notmuch installed already.\r
+> \r
+> Ahh, sorry, I must have missed that patch (or forgotten about it). I\r
+> solved this now by having the version number in version.py (which\r
+> contains nothing else, so David Bremner can easily overwrite it with\r
+> makefile magic :-)).\r
+\r
+Ah cool.\r
+\r
+> @David, feel free to automagically modify (or overwrite)\r
+> bindings/python/notmuch/version.py.\r
+> \r
+> We read in version.py using execfile() and verify that getting the\r
+> version number actually worked.\r
+> \r
+> Sorry, I did not apply your patch as I had fixed this before even seeing\r
+> your patch.\r
+\r
+No worries.  5dc189c seems to be building fine so far...\r
+\r
+Cheers,\r
+mwh\r