[chocolate-doom] 01/02: A couple of source files that were in the previous release and were GPL3 have been replaced by GPL2 equivalents. Previous releases that included these files should be retroactively considered GPL3 (Closes: #785122). Update debian/copyright accordingly.

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian pushed a commit to branch master
in repository chocolate-doom.

commit 51544ee15a1637fc30e574c03f0e3dc6193beb2f
Author: Fabian Greffrath <fabian at debian.org>
Date:   Fri Jun 12 14:57:12 2015 +0200

    A couple of source files that were in the previous release and were GPL3 have been replaced by GPL2 equivalents. Previous releases that included these files should be retroactively considered GPL3 (Closes: #785122). Update debian/copyright accordingly.
---
 debian/copyright | 61 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 7d3a734..a3e21aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,47 +87,52 @@ License: BSD-3-clause
 Files: src/aes_prng.c
 Copyright: 2005-2014 Simon Howard
   2000-2008 Free Software Foundation, Inc.
-License: GPL-3+ and public-domain
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
+License: GPL-2+ or BSD-3-Clause
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GnuPG 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.
+ * ---------------------------------------------------------------------------
+ * Copyright (c) 2002, Dr Brian Gladman <brg at gladman.me.uk>, Worcester, UK.
+ * All rights reserved.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *******************************************************************
- * The code here is based on the optimized implementation taken from
- * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000,
- * which carries this notice:
- *------------------------------------------
- * rijndael-alg-fst.c   v2.3   April '2000
+ * LICENSE TERMS
  *
- * Optimised ANSI C code
+ * The free distribution and use of this software in both source and binary
+ * form is allowed (with or without changes) provided that:
  *
- * authors: v1.0: Antoon Bosselaers
- *          v2.0: Vincent Rijmen
- *          v2.3: Paulo Barreto
+ *   1. distributions of this source code include the above copyright
+ *      notice, this list of conditions and the following disclaimer;
  *
- * This code is placed in the public domain.
+ *   2. distributions in binary form include the above copyright
+ *      notice, this list of conditions and the following disclaimer
+ *      in the documentation and/or other associated materials;
+ *
+ *   3. the copyright holder's name is not used to endorse products
+ *      built using this software without specific written permission.
+ *
+ * ALTERNATIVELY, provided that this notice is retained in full, this product
+ * may be distributed under the terms of the GNU General Public License (GPL),
+ * in which case the provisions of the GPL apply INSTEAD OF those given above.
+ *
+ * DISCLAIMER
+ *
+ * This software is provided 'as is' with no explicit or implied warranties
+ * in respect of its properties, including, but not limited to, correctness
+ * and/or fitness for purpose.
 Comment:
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: src/sha1.c
 Copyright: 1998-2001, Free Software Foundation, Inc
-License: GPL-3+
+License: GPL-2+
  * This file is part of GnuPG.
  *
  * GnuPG 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
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
@@ -136,10 +141,12 @@ License: GPL-3+
  * 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/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
 Comment:
  On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: msvc/win_opendir.c
 Copyright: -

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git