[frog] 01/01: copyright fix (dep5-copyright-license-name-not-unique)

[Maarten van Gompel]

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

proycon-guest pushed a commit to branch master
in repository frog.

commit d4015aaaf5d1d62ccd4078316bf8e73169644d88
Author: proycon <proycon at anaproy.nl>
Date:   Mon Sep 5 14:05:40 2016 +0200

    copyright fix (dep5-copyright-license-name-not-unique)
---
 debian/copyright | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ec5a2fc..59d6251 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,6 @@ Source: https://github.com/LanguageMachines/frog
 Files: debian/*
 Copyright: Copyright © 2010 Joost van Baal <joostvb at ad1810.com>
 License: GPL-3+
- The Debian packaging is licensed under the GPL, version 3 or later,
- see below.
 Author: Joost van Baal, Maarten van Gompel
 
 Files: m4/ac_define_dir.m4
@@ -21,7 +19,7 @@ Author: Stepan Kasal, Andreas Schwab, Guido U. Draheim, Alexandre Oliva
 
 Files: m4/acx_pthread.m4
 Copyright: Copyright © 2008 Steven G. Johnson <stevenj at alum.mit.edu>
-License: other
+License: GPL-3+exception
  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
@@ -51,7 +49,7 @@ Author: Steven G. Johnson
 
 Files: m4/pkg.m4
 Copyright: Copyright © 2004 Scott James Remnant <scott at netsplit.com>
-License: other
+License: GPL-2+
  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 2 of the License, or
@@ -79,6 +77,10 @@ Copyright: Copyright © 2006 - 2016, Centre for Language and Speech
  (Tilburg University, The Netherlands) and the CLiPS Research Centre
  (University of Antwerp, Belgium).
 License: GPL-3+
+Author: Antal van den Bosch, Berjan Busser, Maarten van Gompel,
+ Ko van der Sloot
+
+License: GPL-3+
  Frog 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
@@ -93,5 +95,3 @@ License: GPL-3+
  License, Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
  The complete text of the GNU General Public License, Version 2, can
  be found in `/usr/share/common-licenses/GPL-2'.
-Author: Antal van den Bosch, Berjan Busser, Maarten van Gompel,
- Ko van der Sloot

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/frog.git