[redeclipse] 435/494: update Debian copyright and generation script
Martin Werner
arand-guest at moszumanska.debian.org
Sun Jun 21 20:53:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch debdir
in repository redeclipse.
commit 542c1cb0b80785efbfc5c1d5ee8a5963187b8350
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Fri Mar 22 17:41:00 2013 +0100
update Debian copyright and generation script
* Manual removal of incorrect blank line :16 in all-licenses.txt before
generating
* Add auto-removal of Enet and CC-BY-3.0-US
---
copyright | 235 ++++-------------------------------------------------
generate-copyright | 8 ++
2 files changed, 23 insertions(+), 220 deletions(-)
diff --git a/copyright b/copyright
index be5fdd2..b9b4ddf 100644
--- a/copyright
+++ b/copyright
@@ -14,8 +14,8 @@ License: Red-Eclipse
Red Eclipse is based on Cube Engine 2, both of which are covered under the ZLIB
license, you may use the source code so long as you obey this license.
.
- Red Eclipse, Copyright (C) 2009-2012 Quinton Reeves, Lee Salzman
- Cube Engine 2, Copyright (C) 2001-2012 Wouter van Oortmerssen, Lee Salzman,
+ Red Eclipse, Copyright (C) 2009-2013 Quinton Reeves, Lee Salzman
+ Cube Engine 2, Copyright (C) 2001-2013 Wouter van Oortmerssen, Lee Salzman,
Mike Dysart, Robert Pointon, and Quinton Reeves
http://www.opensource.org/licenses/zlib-license.php
.
@@ -43,11 +43,12 @@ License: Red-Eclipse
is intended to be "open source" friendly.
.
In the absence of an explicit license, content is considered to be covered by
- the CC-BY-SA license, you may use the content in Red Eclipse so long as you
- obey individual licensing criteria.
+ the CC-BY-SA license, either version 3.0 or (at your option) any later version,
+ you may use the content in Red Eclipse so long as you obey individual
+ licensing criteria.
.
- Red Eclipse, Copyright (C) 2009-2012 Red Eclipse Team
- Creative Commons Attribution ShareAlike 3.0 License (CC-BY-SA)
+ Red Eclipse, Copyright (C) 2009-2013 Red Eclipse Team
+ Creative Commons Attribution ShareAlike 3.0+ License (CC-BY-SA)
See cc-by-sa.txt or http://creativecommons.org/licenses/by-sa/3.0/
.
For a license breakdown of all content in Red Eclipse, see all-licenses.txt.
@@ -56,13 +57,13 @@ License: Red-Eclipse
governed by the Red Eclipse Mark Policy (see trademark.txt).
Files: *
-Copyright: 2009-2012, Red Eclipse Team
-License: CC-BY-SA-3.0
+Copyright: 2009-2013, Red Eclipse Team
+License: CC-BY-SA-3.0+
Files: src/*
-Copyright: 2009-2012, Quinton Reeves, Lee Salzman
- 2001-2012, Wouter van Oortmerssen, Lee Salzman, Mike Dysart,
+Copyright: 2001-2013, Wouter van Oortmerssen, Lee Salzman, Mike Dysart,
Robert Pointon, Quinton Reeves
+ 2009-2013, Quinton Reeves, Lee Salzman
License: Zlib
Files: doc/trademark.txt
@@ -73,7 +74,7 @@ License: CC-BY-SA-3.0
Files: src/redeclipse.ico src/install/nix/redeclipse*.png
Copyright: 2011, Red Eclipse Team
-License: CC-BY-SA-3.0 and Mark-Policy
+License: CC-BY-SA-3.0+ and Mark-Policy
Files: src/system-install.mk src/dist.mk src/install/nix/redeclipse.am
src/install/nix/redeclipse.desktop.am
@@ -81,203 +82,16 @@ Copyright: 2011-2012, Red Eclipse Team
License: Zlib
Files: doc/examples/*
-Copyright: 2011-2012, Red Eclipse Team
+Copyright: 2011-2013, Red Eclipse Team
License: Zlib
Files: doc/man/cube2font.1 doc/man/redeclipse.6.am
- doc/man/redeclipse-server.6.am
+ doc/man/redeclipse-server.6.am src/scripts/*
Copyright: 2011-2012, Martin Erik "arand" Werner <martinerikwerner at gmail.com>
License: ZLib
-Files: src/enet/*
-Copyright: 2002-2012 Lee Salzman
-License: Expat
-
-Files: src/enet/aclocal.m4
-Copyright: 1996-2012 Free Software Foundation, Inc.
-License:
- This file is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: src/enet/config.guess src/enet/config.sub src/enet/depcomp
- src/enet/missing
-Copyright: 1992-2012 Free Software Foundation, Inc.
-License: GPL-2+
- 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 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 systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-Files: src/enet/configure
-Copyright: 1992-2012 Free Software Foundation, Inc.
-License: custom and GPL-2+
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- .
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- .
- 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 (at your option) any later version.
- .
- As a special exception to the GNU General Public License,
- if you distribute this file as part of a program or library that
- is built using GNU Libtool, you may include this file under the
- same distribution terms that you use for the rest of that program.
- .
- GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
- can be downloaded from http://www.gnu.org/licenses/gpl.html, or
- obtained by writing to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-Files: src/enet/install-sh
-Copyright: 1994 X Consortium
-License: custom and public-domain
- 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
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
- .
- FSF changes to this file are in the public domain.
-
-Files: src/enet/ltmain.sh
-Copyright: 1996-2008 Free Software Foundation, Inc.
-License: GPL-2+
- 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
- (at your option) any later version.
- .
- As a special exception to the GNU General Public License,
- if you distribute this file as part of a program or library that
- is built using GNU Libtool, you may include this file under the
- same distribution terms that you use for the rest of that program.
- .
- GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
- can be downloaded from http://www.gnu.org/licenses/gpl.html,
- or obtained by writing to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-Files: src/enet/m4/*
-Copyright: 2004-2009 Free Software Foundation, Inc.
-License:
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
-Files: src/enet/m4/libtool.m4
-Copyright: 1996-2011 Free Software Foundation, Inc.
-License: custom, GPL-2+
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
- .
- 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 (at your option) any later version.
- .
- As a special exception to the GNU General Public License,
- if you distribute this file as part of a program or library that
- is built using GNU Libtool, you may include this file under the
- same distribution terms that you use for the rest of that program.
- .
- GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
- can be downloaded from http://www.gnu.org/licenses/gpl.html, or
- obtained by writing to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- This config.lt script is free software; the Free Software Foundation
- gives unlimited permision to copy, distribute and modify it.
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-Files: src/enet/Makefile.in
-Copyright: 1994-2011
- Free Software Foundation, Inc.
-License:
- This Makefile.in is free software; the Free Software Foundation
- gives unlimited permission to copy and/or distribute it,
- with or without modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
Files: debian/*
-Copyright: 2011-2012 Martin Erik Werner <martinerikwerner at gmail.com>
+Copyright: 2011-2013 Martin Erik Werner <martinerikwerner at gmail.com>
License: Zlib
License: Zlib
@@ -300,25 +114,6 @@ License: Zlib
3. This notice may not be removed or altered from any source
distribution.
-License: Expat
- 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.
-
License: CC-BY-SA-3.0
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
diff --git a/generate-copyright b/generate-copyright
index fe3a56a..b058b79 100755
--- a/generate-copyright
+++ b/generate-copyright
@@ -47,10 +47,18 @@ mv debian/copyright-temp debian/copyright-new
awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-3.0$/' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
+# Remove record for "CC-BY-SA-3.0-US" license
+awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-3.0-US$/' debian/copyright-new > debian/copyright-temp
+mv debian/copyright-temp debian/copyright-new
+
# Remove record for "CC-BY-SA-3.0-AU" license
awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: CC-BY-SA-3.0-AU$/' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
+# Remove record for "Expat" license
+awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: Expat$/' debian/copyright-new > debian/copyright-temp
+mv debian/copyright-temp debian/copyright-new
+
# Add marker for inserting Debian chunk
awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 ~ /^License: Zlib$/ { print "INSERT_DEBIAN_HERE" } { print }' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git
More information about the Pkg-games-commits
mailing list