Re: [notmuch] Using test-lib.sh under GPLv3?

diff --git a/04/119ad0f1f5b62f77812cbd171a58db8537ecd6 b/04/119ad0f1f5b62f77812cbd171a58db8537ecd6
new file mode 100644 (file)
index 0000000..330e20f
--- /dev/null
+++ b/04/119ad0f1f5b62f77812cbd171a58db8537ecd6
@@ -0,0 +1,99 @@
+Return-Path: <cworth@cworth.org>\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 8C75C431FBF\r
+       for <notmuch@notmuchmail.org>; Fri, 19 Feb 2010 11:01:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -3.226\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-3.226 tagged_above=-999 required=5\r
+       tests=[ALL_TRUSTED=-1.8, AWL=1.173, BAYES_00=-2.599] autolearn=ham\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 g+MlNwKzseoh; Fri, 19 Feb 2010 11:01:19 -0800 (PST)\r
+Received: from yoom.home.cworth.org (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C5C55431FBD;\r
+       Fri, 19 Feb 2010 11:01:19 -0800 (PST)\r
+Received: by yoom.home.cworth.org (Postfix, from userid 1000)\r
+       id 7E4A825427A; Fri, 19 Feb 2010 11:01:19 -0800 (PST)\r
+From: Carl Worth <cworth@cworth.org>\r
+To: Johannes Schindelin <Johannes.Schindelin@gmx.de>, Michal Sojka\r
+       <sojkam1@fel.cvut.cz>\r
+In-Reply-To: <alpine.DEB.1.00.1002191138280.20986@pacific.mpi-cbg.de>\r
+References: <87ljf8pvxx.fsf@yoom.home.cworth.org>\r
+       <87hbpwpoko.fsf@yoom.home.cworth.org>\r
+       <5641883d1002060727ia4e6c16lf800a92fc8735430@mail.gmail.com>\r
+       <201002081614.24284.sojkam1@fel.cvut.cz>\r
+       <871vgr78lr.fsf@yoom.home.cworth.org>\r
+       <87iqa2y0gz.fsf@steelpick.localdomain>\r
+       <87r5oqe7mi.fsf@yoom.home.cworth.org>\r
+       <871vgmki4f.fsf@steelpick.localdomain>\r
+       <7vaav8hpfo.fsf@alter.siamese.dyndns.org>\r
+       <87tytdiqob.fsf@steelpick.localdomain>\r
+       <alpine.DEB.1.00.1002191138280.20986@pacific.mpi-cbg.de>\r
+Date: Fri, 19 Feb 2010 11:01:19 -0800\r
+Message-ID: <873a0xhwxs.fsf@yoom.home.cworth.org>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+Cc: Johannes Sixt <j6t@kdbg.org>, notmuch@notmuchmail.org,\r
+       Pierre Habouzit <madcoder@debian.org>, git@vger.kernel.org,\r
+       Sverre Rabbelier <srabbelier@gmail.com>\r
+Subject: Re: [notmuch] Using test-lib.sh under GPLv3?\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, 19 Feb 2010 19:01:21 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Fri, 19 Feb 2010 11:39:04 +0100 (CET), Johannes Schindelin <Johannes.Sch=\r
+indelin@gmx.de> wrote:\r
+> On Fri, 19 Feb 2010, Michal Sojka wrote:\r
+>=20\r
+> > as you can read bellow, I'd like to use git's test-lib.sh in a GPLv3=20\r
+> > project. Do you mind if I use your work in that file under GPLv3?\r
+>=20\r
+> I do not mind, but I would like to ask that you contribute the=20\r
+> improvements back under GPLv2.\r
+\r
+Thanks everyone for your agreement.\r
+\r
+And yes, we'll contribute back any improvements under GPLv2.\r
+\r
+I think the most clear step forward would be for test-lib.sh to be\r
+updated in the git repository with an explicit licensing blurb\r
+reflecting this agreement. The most convenient would be something using\r
+the standard language of "either version 2 of the License, or (at your\r
+option) any later version".\r
+\r
+Then, any generic improvements we make within notmuch, (such as a --tap\r
+option or whatever), I'll be sure to pass on to the git community.\r
+\r
+Thanks again,\r
+\r
+=2DCarl\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.10 (GNU/Linux)\r
+\r
+iD8DBQFLft//6JDdNq8qSWgRAsnWAJ9kJ0HbT1dZMdA694l8gJskTAocHgCfYy0e\r
+tObx6v2wRUzboKeGhCXjTQA=\r
+=WSgi\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r