summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-09-06 07:03:56 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-09-06 07:03:56 -0700
commite73cee37bff56c4e3f5fed99c53a3b859dce4044 (patch)
tree1559a1b12ad92723cbbba97e91a39fc394ff2419 /debian/copyright
parent2029d4a51f82a4d27d0e75106bd4107b77719e40 (diff)
parent1cb54e1d5000856bfedd98c5cf4274aa411e44c3 (diff)
downloadmailscripts-e73cee37bff56c4e3f5fed99c53a3b859dce4044.tar.gz
Merge tag 'debian/0.10-1' into buster-bpo
mailscripts release 0.10-1 for unstable (sid) [dgit] [dgit distro=debian no-split --quilt=linear] # gpg: Signature made Tue 30 Jul 2019 05:29:55 AM MST # gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240 # gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate] # Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B # Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright6
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright
index b3d860e..f6f2e0e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Collection of scripts for manipulating e-mail on Debian
Copyright (C)2017 Aurelien Aptel
Copyright (C)2017-2019 Sean Whitton
+Copyright (C)2019 Daniel Kahn Gillmor
These programs are free software: you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -22,8 +23,9 @@ The contents of the notmuch-extract-patch/ directory was imported from
https://github.com/aaptel/notmuch-extract-patch/ using git-subtree(1)
-Contributions are accepted upstram under the same terms; please sign
-off your patches (by writing an approprite Signed-Off-By tag in your
+Contributions are accepted upstream under the same terms (or another
+DFSG-compatible license for completely new scripts); please sign off
+your patches (by writing an approprite Signed-Off-By tag in your
commit message or patch submission) to indicate your attestation that
the Developer Certificate of Origin (version 1.1) applies.