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