[SCM] libopenmpt/master: Update copyright including some modifications from decopy

Mon Oct 2 18:16:45 UTC 2017

The following commit has been merged in the master branch:
commit fa38159cd43a44f88018b17e2b36f61ac325586e
Author: James Cowgill <jcowgill at debian.org>
Date:   Fri Sep 29 22:15:01 2017 +0100

    Update copyright including some modifications from decopy

diff --git a/debian/copyright b/debian/copyright
index fa11eff..79f00b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,8 @@ Source: https://lib.openmpt.org/libopenmpt/
 
 Files: *
 Copyright:
- 2004-2017 OpenMPT contributors
- 1997-2003 Olivier Lapicque
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2016-2017 James Cowgill <jcowgill at debian.org>
+ 1997-2003, Olivier Lapicque
+ 2004-2017, OpenMPT contributors
 License: BSD-3-clause
 
 Files:
@@ -18,65 +14,52 @@ Files:
  build-aux/depcomp
  build-aux/missing
  build-aux/test-driver
-Copyright:
- 1996-2013 Free Software Foundation, Inc.
-License: GPL2+-with-Autoconf-exception
-
-Files: build-aux/config.*
-Copyright: 1992-2014 Free Software Foundation, Inc.
-License: GPL3+-with-Autoconf-exception
-
-Files: build-aux/install-sh
-Copyright: 1994 X Consortium
-License: X11
+Copyright: 1996-2013, Free Software Foundation, Inc
+License: GPL-2+ with Autoconf exception
 
 Files:
  build-aux/ltmain.sh
  m4/libtool.m4
-Copyright: 1996-2011 Free Software Foundation, Inc.
-License: GPL2+-libtool
-
-Files:
- m4/ax_append_flag.m4
- m4/ax_check_compile_flag.m4
-Copyright:
- 2008 Guido U. Draheim <guidod at gmx.de>
- 2011 Maarten Bosmans <mkbosmans at gmail.com>
-License: GPL3+-with-Autoconf-Macros-exception
-
-Files: m4/ax_cflags_warn_all.m4
-Copyright:
- 2008 Guido U. Draheim <guidod at gmx.de>
- 2010 Rhys Ulerich <rhys.ulerich at gmail.com>
-License: GPL3+-with-Autoconf-Macros-exception
+Copyright: 1996-2011, Free Software Foundation, Inc
+License: GPL-2+ with LibTool exception
 
-Files: m4/ax_cxx_compile_stdcxx_11.m4
-Copyright:
- 2008 Benjamin Kosnik <bkoz at redhat.com>
- 2012 Zack Weinberg <zackw at panix.com>
- 2013 Roy Stogner <roystgnr at ices.utexas.edu>
- 2014 Alexey Sokolov <sokolov at google.com>
-License: GNU-All-Permissive-License
+Files: build-aux/config.*
+Copyright: 1992-2016, Free Software Foundation, Inc
+License: GPL-3+ with AutoConf exception
 
-Files: m4/ax_prog_doxygen.m4
-Copyright: 2009 Oren Ben-Kiki <oren at ben-kiki.org>
-License: GNU-All-Permissive-License
+Files: build-aux/install-sh
+Copyright: 1994, X Consortium
+License: X11
 
-Files: m4/ax_require_defined.m4
-Copyright: 2014, Mike Frysinger <vapier at gentoo.org>
-License: GNU-All-Permissive-License
+Files: debian/*
+Copyright: 2016-2017, James Cowgill <jcowgill at debian.org>
+License: BSD-3-clause
 
 Files:
  m4/ltoptions.m4
  m4/ltsugar.m4
  m4/ltversion.m4
  m4/lt~obsolete.m4
-Copyright: 2004-2009 Free Software Foundation, Inc.
+Copyright: 2004-2009, Free Software Foundation, Inc
 License: GNU-All-Permissive-License-FSF
 
-Files: m4/pkg.m4
-Copyright: 2004 Scott James Remnant <scott at netsplit.com>
-License: GPL2+-with-Autoconf-exception
+Files:
+ m4/ax_cxx_compile_stdcxx.m4
+ m4/ax_cxx_compile_stdcxx_11.m4
+Copyright:
+ 2008, Benjamin Kosnik <bkoz at redhat.com>
+ 2012, Zack Weinberg <zackw at panix.com>
+ 2013, Roy Stogner <roystgnr at ices.utexas.edu>
+ 2014, Alexey Sokolov <sokolov at google.com>
+License: GNU-All-Permissive-License
+
+Files:
+ m4/ax_append_flag.m4
+ m4/ax_check_compile_flag.m4
+Copyright:
+ 2008, Guido U. Draheim <guidod at gmx.de>
+ 2011, Maarten Bosmans <mkbosmans at gmail.com>
+License: GPL-3+ with Autoconf Macros exception
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -112,7 +95,31 @@ License: GNU-All-Permissive-License-FSF
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
 
-License: GPL2+-libtool
+License: GPL-2+ with Autoconf 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that program.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-2+ with LibTool exception
  GNU Libtool 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
@@ -137,31 +144,7 @@ License: GPL2+-libtool
  On Debian GNU/Linux systems, the complete text of the GNU General Public
  License can be found in /usr/share/common-licenses/GPL-2.
 
-License: GPL2+-with-Autoconf-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 2 of the License, or
- (at your option) any later version.
- .
- This program 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA.
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that program.
- .
- On Debian GNU/Linux systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL-2.
-
-License: GPL3+-with-Autoconf-exception
+License: GPL-3+ with AutoConf exception
  This file 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
@@ -185,7 +168,7 @@ License: GPL3+-with-Autoconf-exception
  On Debian GNU/Linux systems, the complete text of the GNU General Public
  License can be found in /usr/share/common-licenses/GPL-3.
 
-License: GPL3+-with-Autoconf-Macros-exception
+License: GPL-3+ with Autoconf Macros 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

-- 
libopenmpt packaging

