From b9a23e5af815dac2b7be11314cca8291674833f8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 18 Feb 2020 12:21:07 +0200 Subject: New LICENSE arrangement --- LICENSE | 12 ++---------- libstudxml/buildfile | 10 +++++----- libstudxml/details/expat/COPYING | 22 ++++++++++++++++++++++ libstudxml/details/expat/LICENSE | 22 ---------------------- libstudxml/details/expat/README | 2 +- libstudxml/details/genx/README | 2 +- libstudxml/details/genx/char-props.c | 5 ++--- libstudxml/details/genx/genx.c | 5 ++--- libstudxml/details/genx/genx.h | 5 ++--- 9 files changed, 37 insertions(+), 48 deletions(-) create mode 100644 libstudxml/details/expat/COPYING delete mode 100644 libstudxml/details/expat/LICENSE diff --git a/LICENSE b/LICENSE index 05d257a..18fe54e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,8 @@ -xml/details/expat/*: - -MIT License, see the xml/details/expat/LICENSE file for copyright information. - -xml/details/genx/*: - -MIT License, see the xml/details/genx/LICENSE file for copyright information. - -The rest: - MIT License Copyright (c) 2013-2020 Code Synthesis Tools CC. +Copyright (c) the Expat authors for the libstudxml/details/expat/* files. +Copyright (c) the Genx authors for the libstudxml/details/genx/* files. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/libstudxml/buildfile b/libstudxml/buildfile index 8cb06b2..6d3869d 100644 --- a/libstudxml/buildfile +++ b/libstudxml/buildfile @@ -12,16 +12,19 @@ lib{studxml}: details/expat/{ \ c{xmlparse xmlrole xmltok} \ file{ascii.h asciitab.h config.h iasciitab.h internal.h latin1tab.h nametab.h \ utf8tab.h xmlrole.h xmltok.h xmltok_impl.h xmltok_impl.c xmltok_ns.c} \ - doc{LICENSE README} \ + doc{COPYING README} \ } details/expat/doc{README}@./: install = false -details/expat/doc{LICENSE}@./: install = doc/EXPAT-LICENSE +details/expat/doc{COPYING}@./: install = doc/EXPAT-LICENSE # Genx. # lib{studxml}: details/genx/{h{*} c{*} doc{LICENSE README}} +details/genx/doc{README}@./: install = false +details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE + # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). @@ -76,6 +79,3 @@ else install = include/libstudxml/ install.subdirs = true } - -details/genx/doc{README}@./: install = false -details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE diff --git a/libstudxml/details/expat/COPYING b/libstudxml/details/expat/COPYING new file mode 100644 index 0000000..dcb4506 --- /dev/null +++ b/libstudxml/details/expat/COPYING @@ -0,0 +1,22 @@ +Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + and Clark Cooper +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/libstudxml/details/expat/LICENSE b/libstudxml/details/expat/LICENSE deleted file mode 100644 index dcb4506..0000000 --- a/libstudxml/details/expat/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd - and Clark Cooper -Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/libstudxml/details/expat/README b/libstudxml/details/expat/README index 3b1ced2..4aeb87f 100644 --- a/libstudxml/details/expat/README +++ b/libstudxml/details/expat/README @@ -1,2 +1,2 @@ This directory contains the Expat XML parser library for internal -use by libstudxml. +use by libstudxml. See the COPYING file for license. diff --git a/libstudxml/details/genx/README b/libstudxml/details/genx/README index 10a7238..638f1f6 100644 --- a/libstudxml/details/genx/README +++ b/libstudxml/details/genx/README @@ -1,2 +1,2 @@ This directory contains a customized version of the Genx XML generator -library for internal use by libstudxml. +library for internal use by libstudxml. See the LICENSE file for license. diff --git a/libstudxml/details/genx/char-props.c b/libstudxml/details/genx/char-props.c index 680dd13..d50e822 100644 --- a/libstudxml/details/genx/char-props.c +++ b/libstudxml/details/genx/char-props.c @@ -1,9 +1,8 @@ /* * Copyright (c) 2004 by Tim Bray and Sun Microsystems. - * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE - * file for details. + * Copyright (c) Code Synthesis Tools CC (see the LICENSE file). * - * For copying permission, see the accompanying COPYING file. + * For copying permission, see the accompanying LICENSE file. */ /* diff --git a/libstudxml/details/genx/genx.c b/libstudxml/details/genx/genx.c index 49b7095..9c82059 100644 --- a/libstudxml/details/genx/genx.c +++ b/libstudxml/details/genx/genx.c @@ -1,9 +1,8 @@ /* * Copyright (c) 2004 by Tim Bray and Sun Microsystems. - * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE - * file for details. + * Copyright (c) Code Synthesis Tools CC (see the LICENSE file). * - * For copying permission, see the accompanying COPYING file. + * For copying permission, see the accompanying LICENSE file. */ #define GENX_VERSION "cs-1" diff --git a/libstudxml/details/genx/genx.h b/libstudxml/details/genx/genx.h index 31e5831..041815f 100644 --- a/libstudxml/details/genx/genx.h +++ b/libstudxml/details/genx/genx.h @@ -4,10 +4,9 @@ /* * Copyright (c) 2004 by Tim Bray and Sun Microsystems. - * Copyright (c) Code Synthesis Tools CC; see the accompanying LICENSE - * file for details. + * Copyright (c) Code Synthesis Tools CC (see the LICENSE file). * - * For copying permission, see the accompanying COPYING file. + * For copying permission, see the accompanying LICENSE file. */ #ifndef GENX_H -- cgit v1.1