From: Vsevolod Stakhov Date: Tue, 7 Aug 2012 22:36:56 +0000 (+0400) Subject: Fix debian copyright. Suggested by: Laszlo Boszormenyi (GCS) X-Git-Tag: 0.5.2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=257ccf3ff71a752d8049be78630b0759514bafa7;p=thirdparty%2Frspamd.git Fix debian copyright. Suggested by: Laszlo Boszormenyi (GCS) --- diff --git a/debian/copyright b/debian/copyright index 4fcc640927..687b4ac343 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,9 +3,9 @@ Upstream-Name: rspamd Source: https://bitbucket.org/vstakhov/rspamd Files: contrib/lgpl/* -Copyright: 1999, 2000 Scott Wimer -Copyright: 2004, Matthias Clasen -Copyright: 2005 - 2007, Marco Barisione +Copyright: 1999, 2000 Scott Wimer, + 2004 Matthias Clasen , + 2005 - 2007 Marco Barisione License: LGPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -51,9 +51,16 @@ License: Expat Files: * Copyright: 2008-2012 Vsevolod Stakhov -License: BSD +License: BSD-2-Clause Redistribution and use in source and binary forms, with or without - modification, are permitted under the terms of the BSD License. + modification, are permitted provided that the following conditions are met: + . + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. . THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -66,9 +73,6 @@ License: BSD LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - . - On Debian systems, the complete text of the BSD License can be - found in `/usr/share/common-licenses/BSD'. Files: debian/* Copyright: 2011-2012 Vsevolod Stakhov