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

diff --git a/cd/4115836fda429dd67a1c6b7966a8ff82eadbf1 b/cd/4115836fda429dd67a1c6b7966a8ff82eadbf1
new file mode 100644 (file)
index 0000000..fa5baad
--- /dev/null
+++ b/cd/4115836fda429dd67a1c6b7966a8ff82eadbf1
@@ -0,0 +1,104 @@
+Return-Path: <Sebastian@SSpaeth.de>\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 19ACE431FD0\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Aug 2011 00:21:04 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.09\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.09 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001, T_MIME_NO_TEXT=0.01] 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 0mmKaVcnJktb for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Aug 2011 00:21:02 -0700 (PDT)\r
+Received: from homiemail-a21.g.dreamhost.com (caiajhbdcbbj.dreamhost.com\r
+       [208.97.132.119])\r
+       by olra.theworths.org (Postfix) with ESMTP id 74914431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Aug 2011 00:21:02 -0700 (PDT)\r
+Received: from homiemail-a21.g.dreamhost.com (localhost [127.0.0.1])\r
+       by homiemail-a21.g.dreamhost.com (Postfix) with ESMTP id A8DAF300080;\r
+       Wed, 24 Aug 2011 00:21:00 -0700 (PDT)\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=SSpaeth.de; h=from:to:subject\r
+       :in-reply-to:references:date:message-id:mime-version:\r
+       content-type; q=dns; s=sspaeth.de; b=CsuIKQdDniVZgNOMNZ5rumQJtZ8\r
+       ARMEg0E6IM+0jc2ncdnbo00DNGSn6ZtQequAHng9DKSzsOmiXBlYAOz3jqyM0Xgk\r
+       HWmbH2628rEO5ahqqDYsMyI2BQYWNBS0xBIqltiBYJ0/rcjL3w+entzBGz8OPt6/\r
+       VMHWOFr32AMd60Gs=\r
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=SSpaeth.de; h=from:to\r
+       :subject:in-reply-to:references:date:message-id:mime-version:\r
+       content-type; s=sspaeth.de; bh=Wd5ePiWwrCDFiBkMnPLjcXWcLDQ=; b=C\r
+       oZZJMmBItfv5RL+snsxnrEFOyI0xqID4YxLLtA3f6wgKvcCEySAM4AS5rpujN/Wq\r
+       vG+kZ0+Ffe91AoeXLiDhXYAi6ly/GIlqXDrLsa5suv+bkbaOWU+2jlSb4vS2qKu/\r
+       bfy850dK66KZRox+Cbz9cf2tUAuZIT+lMlLNK0+x5k=\r
+Received: from spaetzbook.sspaeth.de (mtec-hg-docking-1-dhcp-21.ethz.ch\r
+       [129.132.133.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       (Authenticated sender: fax@sspaeth.de)\r
+       by homiemail-a21.g.dreamhost.com (Postfix) with ESMTPSA id 01100300074; \r
+       Wed, 24 Aug 2011 00:20:58 -0700 (PDT)\r
+Received: by spaetzbook.sspaeth.de (sSMTP sendmail emulation);\r
+       Wed, 24 Aug 2011 09:20:57 +0200\r
+From: Sebastian Spaeth <Sebastian@SSpaeth.de>\r
+To: Michael Hudson-Doyle <michael.hudson@canonical.com>,\r
+       notmuch@notmuchmail.org, David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH] Do not import notmuch in setup.py (again).\r
+In-Reply-To: <87d3fvvdqp.fsf@canonical.com>\r
+References: <87d3fvvdqp.fsf@canonical.com>\r
+User-Agent: Notmuch/0.7-19-gee4579a (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 24 Aug 2011 09:20:51 +0200\r
+Message-ID: <87zkizxoks.fsf@SSpaeth.de>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\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 07:21:04 -0000\r
+\r
+--=-=-=\r
+\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
+@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
+Sebastian\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iEYEARECAAYFAk5UplMACgkQVYX1jMgnoGJLAgCghA9aQYqhbQITTtJFsgxDJWs1\r
+TQkAnRyKDj53120zBF3NP4OTiWHqtkF+\r
+=+Tb7\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r