[cpp-log4shib] 18/20: New license for config/ltmain.sh and m4/ax_pthread.m4

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/1.0.9-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=68876b7952f1a5b1d112cbef27399b56f26f6bfb

commit 68876b7952f1a5b1d112cbef27399b56f26f6bfb
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 14 23:26:22 2016 +0100

    New license for config/ltmain.sh and m4/ax_pthread.m4
---
 debian/copyright | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9f6a44e..2eb6db3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -76,7 +76,10 @@ License: Expat
 Files: config/ltmain.sh
 Copyright: 1996,1997,1998,1999,2000,2001,2003
    Free Software Foundation, Inc.
-License: GPL-2+ or libtool-same-as-package
+License: GPL-2+ with libtool exception
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ .
  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 the License, or
@@ -91,13 +94,17 @@ License: GPL-2+ or libtool-same-as-package
  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 can find a copy of the GNU General Public License version 2
+ at /usr/share/common-licenses/GPL-2 on Debian systems.
 
-Files: m4/acx_pthread.m4
-Copyright: 2006 Steven G. Johnson <stevenj at alum.mit.edu>
-License: GPL-2+ or macro-archive-same-as-package
- This program is free software; you can redistribute it and/or modify it
+Files: m4/ax_pthread.m4
+Copyright: 2008 Steven G. Johnson <stevenj at alum.mit.edu>
+ 2011 Daniel Richard G. <skunk at iSKUNK.ORG>
+License: GPL-3+ 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
+ Free Software Foundation, either version 3 of the License, or (at your
  option) any later version.
  .
  This program is distributed in the hope that it will be useful, but
@@ -105,21 +112,21 @@ License: GPL-2+ or macro-archive-same-as-package
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  Public License for more details.
  .
- The full text of the GNU General Public License version 2 is available on
- Debian systems in /usr/share/common-licenses/GPL-2.
+ You can find a copy of the GNU General Public License version 3
+ at /usr/share/common-licenses/GPL-3 on Debian systems.
  .
  As a special exception, the respective Autoconf Macro's copyright owner
  gives unlimited permission to copy, distribute and modify the configure
  scripts that are the output of Autoconf when processing the Macro. You
- need not follow the terms of the GNU General Public License when using or
- distributing such scripts, even though portions of the text of the Macro
- appear in them. The GNU General Public License (GPL) does govern all
- other use of the material that constitutes the Autoconf Macro.
+ need not follow the terms of the GNU General Public License when using
+ or distributing such scripts, even though portions of the text of the
+ Macro appear in them. The GNU General Public License (GPL) does govern
+ all other use of the material that constitutes the Autoconf Macro.
  .
  This special exception to the GPL applies to versions of the Autoconf
- Macro released by the Autoconf Macro Archive. When you make and
- distribute a modified version of the Autoconf Macro, you may extend this
- special exception to the GPL to apply to your modified version as well.
+ Macro released by the Autoconf Archive. When you make and distribute a
+ modified version of the Autoconf Macro, you may extend this special
+ exception to the GPL to apply to your modified version as well.
 
 Files: src/snprintf.c
 Copyright: 1999 Mark Martinec

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.