[PATCH 1/5] Add explicit license information

diff --git a/a5/fd25bb92aaaf81839b48c98cf7418ab333460d b/a5/fd25bb92aaaf81839b48c98cf7418ab333460d
new file mode 100644 (file)
index 0000000..e88feb5
--- /dev/null
+++ b/a5/fd25bb92aaaf81839b48c98cf7418ab333460d
@@ -0,0 +1,118 @@
+Return-Path: <wking@tremily.us>\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 F2BC1431FDA\r
+       for <notmuch@notmuchmail.org>; Sat, 10 May 2014 12:13:47 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\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 ygkLBtlP7gS0 for <notmuch@notmuchmail.org>;\r
+       Sat, 10 May 2014 12:13:39 -0700 (PDT)\r
+Received: from qmta07.westchester.pa.mail.comcast.net\r
+       (qmta07.westchester.pa.mail.comcast.net [76.96.62.64])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4F51E431FC3\r
+       for <notmuch@notmuchmail.org>; Sat, 10 May 2014 12:13:33 -0700 (PDT)\r
+Received: from omta24.westchester.pa.mail.comcast.net ([76.96.62.76])\r
+       by qmta07.westchester.pa.mail.comcast.net with comcast\r
+       id 0K9j1o0011ei1Bg57KDVoz; Sat, 10 May 2014 19:13:29 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta24.westchester.pa.mail.comcast.net with comcast\r
+       id 0KDT1o00V152l3L3kKDUQB; Sat, 10 May 2014 19:13:29 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+       by odin.tremily.us (Postfix) with ESMTPS id 1C049119F473;\r
+       Sat, 10 May 2014 12:13:27 -0700 (PDT)\r
+Received: (nullmailer pid 7432 invoked by uid 1000);\r
+       Sat, 10 May 2014 19:12:54 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/5] Add explicit license information\r
+Date: Sat, 10 May 2014 12:12:45 -0700\r
+Message-Id:\r
+ <a5f999ca7d8d20e9476ae2c747999458f491a324.1399748615.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.9.1.353.gc66d89d\r
+In-Reply-To: <cover.1399748615.git.wking@tremily.us>\r
+References: <cover.1399748615.git.wking@tremily.us>\r
+In-Reply-To: <cover.1399748615.git.wking@tremily.us>\r
+References: <cover.1399748615.git.wking@tremily.us>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1399749209;\r
+       bh=zzJRBwI31zfkzJePOH7s24yMm3lZuGl6Pi6Mf14w+V4=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id;\r
+       b=LygfsHOWXfKDKnyc07omvZoo1DNn8hTOPueCH0VTNuY7t7+wScdYyiMXZIOc/UZIX\r
+       HwQ7MMSZYICzfAhgwODmt0lRep1mcD9EdID2BsFYckwDtVM3gNy71BrHEuCFHkelLn\r
+       uIx3atoRMx8zOBxuC0iKtUWnoEIOOPd81ZZtJTeaMbnwWrbEGcAtotSsntngfK5n97\r
+       gJRmE8qz6/71IZ6yODFHK8Tsk2KeU7a2/KxZGRgEt/xCjpRKO5iBwQDP7SV6rFd9kx\r
+       OoyaKQT6VrLE6FbPV7fdDaL489hJbx+bT0jAdFl6JmPPznGugAe2R1zkGbHbjR8ml9\r
+       tsDHHmn+lLtIg==\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: Sat, 10 May 2014 19:13:48 -0000\r
+\r
+From: Carl Worth <cworth@cworth.org>\r
+\r
+The "same license as notmuch" text was probably fine when the file was\r
+contained within the notmuch source repository, but here, externally,\r
+we should be explicit.\r
+---\r
+The "externally" reference in patch 1/5 won't apply if this commit\r
+lands in master.  I'm not sure it's worth changing though.  I don't\r
+mind either way, and I didn't want to change it without Carl's\r
+permission.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+ devel/nmbug/nmbug-status | 15 ++++++++++++++-\r
+ 1 file changed, 14 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
+index 03621bd..a7c7920 100755\r
+--- a/devel/nmbug/nmbug-status\r
++++ b/devel/nmbug/nmbug-status\r
+@@ -1,10 +1,23 @@\r
+ #!/usr/bin/python\r
+ #\r
+ # Copyright (c) 2011-2012 David Bremner <david@tethera.net>\r
+-# License: Same as notmuch\r
++#\r
+ # dependencies\r
+ #       - python 2.6 for json\r
+ #       - argparse; either python 2.7, or install separately\r
++#\r
++# This program is free software: you can redistribute it and/or modify\r
++# it under the terms of the GNU General Public License as published by\r
++# the Free Software Foundation, either version 3 of the License, or\r
++# (at your option) any later version.\r
++#\r
++# This program is distributed in the hope that it will be useful,\r
++# but WITHOUT ANY WARRANTY; without even the implied warranty of\r
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
++# GNU General Public License for more details.\r
++#\r
++# You should have received a copy of the GNU General Public License\r
++# along with this program.  If not, see http://www.gnu.org/licenses/ .\r
+ \r
+ from __future__ import print_function\r
+ from __future__ import unicode_literals\r
+-- \r
+1.9.1.353.gc66d89d\r
+\r