From: Ian Jackson Date: Sun, 21 Dec 2014 14:57:06 +0000 (+0000) Subject: nntpid: Provide proper copyright licence X-Git-Tag: debian/4.4.2~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=dfadcc0b3460fc3e2161a3c580039875688627f5 nntpid: Provide proper copyright licence Authors are: Simon Tatham Colin Watson Richard Kettlewell Ian Jackson Simon says, in email to me: Simon Tatham writes ("Re: nntpid"): > Ian Jackson wrote: > > Since IIRC it was yours originally we should probably pick your > > preferred licence which AIUI is MIT. > > It is, yes. Colin writes on IRC: 02:34 Republic,Diziet: anything DFSG-free is fine by me for my nntpid contributions Richard and me on IRC: 14:44 [Richard]: Oh, speaking of usenet things, did you see the email exchange with Simon about nntpid licence ? Are you happy with MIT ? 14:44 <[Richard]> y --- diff --git a/debian/changelog b/debian/changelog index c72dbc1..6cf191a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +chiark-utils (4.4.2) unstable; urgency=low + + Copyright licencing fixes: + * nntpid: Provice actual licence (dual MIT/GPL3+). Closes:#773650. + + -- + chiark-utils (4.4.1) unstable; urgency=low Safety and convenience fix: diff --git a/debian/copyright b/debian/copyright index 532965b..2112302 100644 --- a/debian/copyright +++ b/debian/copyright @@ -69,6 +69,13 @@ random-word, remountresizereiserfs, summarise-mailbox-preserving-privacy Miscellaneous utilities. Copyright 2004,2006 Ian Jackson +nntpid + Utility for finding usenet articles by messageid from an NNTP server + Copyright -2011 Simon Tatham + Copyright 2011 Richard Kettlewell + Copyright 2011 Colin Watson + Copyright 2011 Ian Jackson + Dual licence MIT/GPL3+ The chiark utilities are all free software; you can redistribute them and/or modify them under the terms of the GNU General Public License diff --git a/scripts/ChiarkNNTP.pm b/scripts/ChiarkNNTP.pm index 5b69e28..f31652e 100644 --- a/scripts/ChiarkNNTP.pm +++ b/scripts/ChiarkNNTP.pm @@ -1,5 +1,31 @@ #!/usr/bin/perl +# Originally by Simon Tatham +# Modified by Richard Kettlewell, Colin Watson, Ian Jackson +# +# Copyright -2011 Simon Tatham +# Copyright 2011 Richard Kettlewell +# Copyright 2011 Colin Watson +# Copyright 2011 Ian Jackson +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + use strict qw(subs); use warnings; diff --git a/scripts/nntpid b/scripts/nntpid index e0e286a..0de52a5 100755 --- a/scripts/nntpid +++ b/scripts/nntpid @@ -2,6 +2,29 @@ # Originally by Simon Tatham # Modified by Richard Kettlewell, Colin Watson, Ian Jackson +# +# Copyright -2011 Simon Tatham +# Copyright 2011 Richard Kettlewell +# Copyright 2011 Colin Watson +# Copyright 2011 Ian Jackson +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. use ChiarkNNTP;