diff -Nru redeclipse-1.3.1/debian/changelog redeclipse-1.4/debian/changelog --- redeclipse-1.3.1/debian/changelog 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/changelog 2013-03-27 21:40:07.000000000 +0000 @@ -1,3 +1,28 @@ +redeclipse (1.4-2~quantal1) quantal; urgency=low + + * Rebuild for PPA + + -- Martin Erik Werner Wed, 27 Mar 2013 14:58:29 +0100 + +redeclipse (1.4-2) experimental; urgency=low + + * Fix broken server-only installs + - Add upstream server install patch + - Add upstream patch enabling the server to start without data + + -- Martin Erik Werner Mon, 25 Mar 2013 21:18:33 +0100 + +redeclipse (1.4-1) experimental; urgency=low + + * New upstream release + * Move server examples to /usr/share/games/doc/redeclipse/ + * Added screenshot URL for Ubuntu + * Removed Enet from source package (unused) + * Drop dpkg Pre-Depends (upgrades from old Ubuntu versions not relevant) + * Include version.cfg in tarball, required for server + + -- Martin Erik Werner Fri, 15 Feb 2013 00:30:48 +0100 + redeclipse (1.3.1-1) experimental; urgency=low * New upstream release diff -Nru redeclipse-1.3.1/debian/clean redeclipse-1.4/debian/clean --- redeclipse-1.3.1/debian/clean 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/clean 2013-03-27 13:52:42.000000000 +0000 @@ -1,2 +1,2 @@ -bin/reclient_native -bin/reserver_native +bin/redeclipse_native +bin/redeclipse_server_native diff -Nru redeclipse-1.3.1/debian/control redeclipse-1.4/debian/control --- redeclipse-1.3.1/debian/control 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/control 2013-03-27 13:52:42.000000000 +0000 @@ -17,8 +17,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/redeclipse.git;a=summary Package: redeclipse +XB-Thumbnail-Url: http://redeclipse.net/bits/thumbs/02.jpg +XB-Screenshot-Url: http://redeclipse.net/bits/images/02.jpg Architecture: any -Pre-Depends: dpkg (>= 1.15.6~) Depends: redeclipse-data (>= ${source:Upstream-Version}), ${misc:Depends}, ${shlibs:Depends} @@ -40,14 +41,12 @@ Section: contrib/debug Priority: extra Architecture: any -Pre-Depends: dpkg (>= 1.15.6~) Depends: redeclipse (= ${binary:Version}), ${misc:Depends} Description: debug symbols for the Red Eclipse FPS game This package contains the debugging symbols for the Red Eclipse FPS game. Package: redeclipse-server Architecture: any -Pre-Depends: dpkg (>= 1.15.6~) Depends: ${misc:Depends}, ${shlibs:Depends} Description: server for the Red Eclipse FPS game This package contains the dedicated server for the Red Eclipse FPS game, it @@ -58,7 +57,6 @@ Section: contrib/debug Priority: extra Architecture: any -Pre-Depends: dpkg (>= 1.15.6~) Depends: redeclipse-server (= ${binary:Version}), ${misc:Depends} Description: debug symbols for the Red Eclipse dedicated server This package contains the debugging symbols for the dedicated server of the diff -Nru redeclipse-1.3.1/debian/copyright redeclipse-1.4/debian/copyright --- redeclipse-1.3.1/debian/copyright 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/copyright 2013-03-27 13:52:42.000000000 +0000 @@ -14,8 +14,8 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 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 +Copyright: 2011-2013 Martin Erik Werner License: Zlib License: Zlib @@ -300,25 +114,6 @@ 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 -Nru redeclipse-1.3.1/debian/generate-copyright redeclipse-1.4/debian/generate-copyright --- redeclipse-1.3.1/debian/generate-copyright 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/generate-copyright 2013-03-27 13:52:42.000000000 +0000 @@ -31,6 +31,10 @@ awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: data\//' debian/copyright-new > debian/copyright-temp mv debian/copyright-temp debian/copyright-new +# Remove all records related to game/* +awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: game\//' debian/copyright-new > debian/copyright-temp +mv debian/copyright-temp debian/copyright-new + # Remove record for "Akashi-Font" license awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: Akashi-Font$/' debian/copyright-new > debian/copyright-temp mv debian/copyright-temp debian/copyright-new @@ -43,218 +47,27 @@ 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 "CC-BY-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 +# 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 Enet chunk -awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 ~ /^License: Zlib$/ { print "INSERT_ENET_HERE" } { print }' debian/copyright-new > debian/copyright-temp +# 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 -# Insert Enet chunk -ed -s debian/copyright-new << "EOF" -/INSERT_ENET_HERE/c -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. - -INSERT_DEBIAN_HERE -. -w -EOF - # Debian chunk ed -s debian/copyright-new < +Copyright: 2011-2013 Martin Erik Werner License: Zlib . w diff -Nru redeclipse-1.3.1/debian/patches/build-with-system-enet.patch redeclipse-1.4/debian/patches/build-with-system-enet.patch --- redeclipse-1.3.1/debian/patches/build-with-system-enet.patch 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/patches/build-with-system-enet.patch 2013-03-27 13:52:42.000000000 +0000 @@ -4,18 +4,18 @@ Origin: http://gitorious.org/chakra-packages/games/commit/1aae10c597cf09a281d47570e43c8892531cd9bf Author: Adrián Chaves Fernández (Gallaecio) ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,7 +9,7 @@ - PLATFORM= $(shell uname -s) - PLATFORM_SUFFIX=_native +--- a/src/core.mk ++++ b/src/core.mk +@@ -28,7 +28,7 @@ + CXX_TEMP:=$(CXX) + override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP) + +-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS) ++INCLUDES= -Ishared -Iengine -Igame $(APPFLAGS) --INCLUDES= -Ishared -Iengine -Igame -Ienet/include -+INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include STRIP= - ifeq (,$(findstring -g,$(CXXFLAGS))) -@@ -42,7 +42,7 @@ +@@ -66,7 +66,7 @@ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm else CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` @@ -24,7 +24,7 @@ endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt -@@ -113,7 +113,7 @@ +@@ -137,7 +137,7 @@ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm else SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) @@ -33,7 +33,7 @@ endif SERVER_OBJS= \ shared/crypto-standalone.o \ -@@ -178,13 +178,13 @@ +@@ -202,13 +202,13 @@ $(STRIP) $(WINBIN)/$(APPSERVER).exe endif else diff -Nru redeclipse-1.3.1/debian/patches/desktop-file-don-t-quote-icon-app-name.patch redeclipse-1.4/debian/patches/desktop-file-don-t-quote-icon-app-name.patch --- redeclipse-1.3.1/debian/patches/desktop-file-don-t-quote-icon-app-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ redeclipse-1.4/debian/patches/desktop-file-don-t-quote-icon-app-name.patch 2013-03-27 13:52:42.000000000 +0000 @@ -0,0 +1,25 @@ +From 10da6eef404d0ca0066825e0ba0cec77e418dd5e Mon Sep 17 00:00:00 2001 +From: Martin Erik Werner +Date: Fri, 22 Mar 2013 20:32:21 +0100 +Subject: [PATCH] desktop file: don't quote icon/app name + +--- + src/install/nix/redeclipse.desktop.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/install/nix/redeclipse.desktop.am b/src/install/nix/redeclipse.desktop.am +index e3215c5..de129da 100644 +--- a/src/install/nix/redeclipse.desktop.am ++++ b/src/install/nix/redeclipse.desktop.am +@@ -20,6 +20,6 @@ Comment[gl]=Xogo de tiros en primeira persoa con xogo áxil e editor incorporado + Comment[it]=Sparatutto in prima persona con agile gameplay ed editor incorporato. + Comment[pt]=Jogo de tiros em primeira pessoa com jogabilidade ágil e editor incorporado. + Comment[sv]=Förstapersonsskjutare med rörlig spelstil och inbyggd baneditor. +-Icon="@APPNAME@" +-Exec="@APPNAME@" ++Icon=@APPNAME@ ++Exec=@APPNAME@ + Categories=Game;ActionGame; +-- +1.7.10.4 + diff -Nru redeclipse-1.3.1/debian/patches/don-t-check-for-keymap-when-using-standalone.patch redeclipse-1.4/debian/patches/don-t-check-for-keymap-when-using-standalone.patch --- redeclipse-1.3.1/debian/patches/don-t-check-for-keymap-when-using-standalone.patch 1970-01-01 00:00:00.000000000 +0000 +++ redeclipse-1.4/debian/patches/don-t-check-for-keymap-when-using-standalone.patch 2013-03-27 13:52:42.000000000 +0000 @@ -0,0 +1,23 @@ +Description: don't check for keymap when using standalone + This allows server to start without data content +Author: Quinton Reeves +Origin: upstream, http://redeclipse.net/svn/5504 +Last-Update: 2013-03-26 + +--- a/src/engine/server.cpp ++++ b/src/engine/server.cpp +@@ -1407,11 +1407,13 @@ + chdir(dir); + } + #endif ++#ifndef STANDALONE + loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r")) +- { ++ { // standalone solution to this is: pebkac + if(i != 2) chdir(".."); + else fatal("could not find data directory"); + } ++#endif + addpackagedir("data"); + defformatstring(gamedata)("game/%s", server::gameid()); + addpackagedir(gamedata); diff -Nru redeclipse-1.3.1/debian/patches/series redeclipse-1.4/debian/patches/series --- redeclipse-1.3.1/debian/patches/series 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/patches/series 2013-03-27 13:52:42.000000000 +0000 @@ -1,2 +1,5 @@ windowed-by-default.patch build-with-system-enet.patch +desktop-file-don-t-quote-icon-app-name.patch +system-install-symlink-to-version.cfg-in-server-inst.patch +don-t-check-for-keymap-when-using-standalone.patch diff -Nru redeclipse-1.3.1/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch redeclipse-1.4/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch --- redeclipse-1.3.1/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch 1970-01-01 00:00:00.000000000 +0000 +++ redeclipse-1.4/debian/patches/system-install-symlink-to-version.cfg-in-server-inst.patch 2013-03-27 13:52:42.000000000 +0000 @@ -0,0 +1,17 @@ +Description: system-install: symlink to version.cfg in server install + * This fixes broken server installs, backport material. + Author: Martin Erik Werner "arand" + Origin: upstream, http://redeclipse.net/svn/5503 + Last-Update: 2013-03-25 + +--- a/src/system-install.mk ++++ b/src/system-install.mk +@@ -84,6 +84,8 @@ + -i $(gamesbindir)/$(appname)-server + install -m644 ../$(appgamedir)/version.cfg \ + $(datadir)/$(appname)/version.cfg ++ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/version.cfg \ ++ $(libexecdir)/$(appname)/version.cfg + + system-install-data: + install -d $(datadir)/$(appname) diff -Nru redeclipse-1.3.1/debian/patches/windowed-by-default.patch redeclipse-1.4/debian/patches/windowed-by-default.patch --- redeclipse-1.3.1/debian/patches/windowed-by-default.patch 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/patches/windowed-by-default.patch 2013-03-27 13:52:42.000000000 +0000 @@ -9,7 +9,7 @@ --- a/src/engine/main.cpp +++ b/src/engine/main.cpp -@@ -256,7 +256,7 @@ +@@ -258,7 +258,7 @@ #endif } diff -Nru redeclipse-1.3.1/debian/redeclipse-server.bug-presubj redeclipse-1.4/debian/redeclipse-server.bug-presubj --- redeclipse-1.3.1/debian/redeclipse-server.bug-presubj 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/redeclipse-server.bug-presubj 2013-03-27 13:52:42.000000000 +0000 @@ -15,7 +15,7 @@ Once at the gdb prompt, start the Red Eclipse server via - run -h/tmp/recfg + run -h/tmp/recfg -glog_v4.txt -v4 Once the Red Eclipse server has crashed, type @@ -24,8 +24,5 @@ to obtain the backtrace. Please attach the output when you are reporting a bug about crashes. -Also, please include the log messages leading up to the crash, you can set -maximum log verbosity by running - - redeclipse-server -h/tmp/recfg -v4 - +Also, please include the log messages leading up to the crash, which was +created as /tmp/recfg/log_v4.txt. diff -Nru redeclipse-1.3.1/debian/redeclipse-server.doc-base redeclipse-1.4/debian/redeclipse-server.doc-base --- redeclipse-1.3.1/debian/redeclipse-server.doc-base 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/redeclipse-server.doc-base 2013-03-27 13:52:42.000000000 +0000 @@ -5,5 +5,4 @@ Section: Games/Action Format: Text -Files: /usr/share/doc/redeclipse-server/examples/servexec.cfg - /usr/share/doc/redeclipse-server/examples/servinit.cfg +Files: /usr/share/doc/redeclipse/examples/servinit.cfg diff -Nru redeclipse-1.3.1/debian/redeclipse-server.examples redeclipse-1.4/debian/redeclipse-server.examples --- redeclipse-1.3.1/debian/redeclipse-server.examples 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/redeclipse-server.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tmp/usr/share/doc/redeclipse/examples/* diff -Nru redeclipse-1.3.1/debian/redeclipse-server.install redeclipse-1.4/debian/redeclipse-server.install --- redeclipse-1.3.1/debian/redeclipse-server.install 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/redeclipse-server.install 2013-03-27 13:52:42.000000000 +0000 @@ -1,2 +1,5 @@ usr/games/redeclipse-server usr/lib/games/redeclipse/redeclipse-server +usr/lib/games/redeclipse/version.cfg +usr/share/doc/redeclipse/examples +usr/share/games/redeclipse/version.cfg diff -Nru redeclipse-1.3.1/debian/redeclipse.bug-presubj redeclipse-1.4/debian/redeclipse.bug-presubj --- redeclipse-1.3.1/debian/redeclipse.bug-presubj 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/redeclipse.bug-presubj 2013-03-27 13:52:42.000000000 +0000 @@ -6,10 +6,12 @@ redeclipse -h/tmp/recfg -Please also include the init log, you can get the log by opening a terminal and -running +Please also include the init log, you can get the init log by opening a +terminal and running - redeclipse -h/tmp/recfg -x"quit" + redeclipse -h/tmp/recfg -glog_init.txt -x"quit" + +The log file will be created as /tmp/recfg/log_init.txt. If Red Eclipse crashes on your system, please include a backtrace with your bug @@ -20,7 +22,7 @@ Once at the gdb prompt, start Red Eclipse via - run -h/tmp/recfg -df0 + run -h/tmp/recfg -df0 -glog_v4.txt -v4 Once Red Eclipse has crashed, type @@ -29,8 +31,5 @@ to obtain the backtrace. Please attach the output when you are reporting a bug about crashes. -Also, please include the log messages leading up to the crash, you can set -maximum log verbosity by running - - redeclipse -h/tmp/recfg -v4 - +Also, please include the log messages leading up to the crash, which was +created as /tmp/recfg/log_v4.txt. diff -Nru redeclipse-1.3.1/debian/rules redeclipse-1.4/debian/rules --- redeclipse-1.3.1/debian/rules 2012-09-02 12:43:06.000000000 +0000 +++ redeclipse-1.4/debian/rules 2013-03-27 13:52:42.000000000 +0000 @@ -5,9 +5,6 @@ %: dh $@ --sourcedirectory=src --parallel -override_dh_auto_clean: - dh_auto_clean - override_dh_auto_build: dh_auto_build -- \ CPPFLAGS="$(CPPFLAGS)" \ @@ -23,6 +20,7 @@ override_dh_auto_install: dh_auto_install -- \ CXXFLAGS="$(CXXFLAGS)" \ + ICON="" \ prefix=/usr games=/games gamesbin=/games \ system-install-client system-install-server \ system-install-docs system-install-menus @@ -42,15 +40,16 @@ rm -rf $(DIR) tar -xf $(UTAR) rm -f $(UTAR) - mv redeclipse/ $(DIR) + mv redeclipse-$(VER)/ $(DIR) rm -rf $(DIR)/src/include/ + rm -rf $(DIR)/src/enet/ rm -rf $(DIR)/src/xcode/ rm -rf $(DIR)/src/lib/ - rm -rf $(DIR)/src/lib64/ rm -rf $(DIR)/src/install/win/ rm -rf $(DIR)/bin/ - rm -rf $(DIR)/bin64/ - rm -rf $(DIR)/data/ + rm -rf $(DIR)/data + find $(DIR)/game/ -not -type d -not -iname 'version.cfg' -delete + find $(DIR)/game/ -empty -delete XZ_OPT="-6" tar --create --xz --owner root --group root --mode a+rX \ -f $(TAR) $(DIR) rm -rf $(DIR) diff -Nru redeclipse-1.3.1/debian/scripts/redeclipse redeclipse-1.4/debian/scripts/redeclipse --- redeclipse-1.3.1/debian/scripts/redeclipse 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/scripts/redeclipse 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh -for arg -do - if [ "$arg" = --help ] - then - exec man redeclipse - fi -done - -RE_OPTIONS="" -cd /usr/lib/games/redeclipse || exit 1 -exec ./redeclipse ${RE_OPTIONS} ${1+"$@"} diff -Nru redeclipse-1.3.1/debian/scripts/redeclipse-server redeclipse-1.4/debian/scripts/redeclipse-server --- redeclipse-1.3.1/debian/scripts/redeclipse-server 2012-09-02 10:41:31.000000000 +0000 +++ redeclipse-1.4/debian/scripts/redeclipse-server 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh -for arg -do - if [ "$arg" = --help ] - then - exec man redeclipse-server - fi -done - -RE_OPTIONS="" -cd /usr/lib/games/redeclipse || exit 1 -exec ./redeclipse-server ${RE_OPTIONS} ${1+"$@"} diff -Nru redeclipse-1.3.1/debian/source/lintian-overrides redeclipse-1.4/debian/source/lintian-overrides --- redeclipse-1.3.1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ redeclipse-1.4/debian/source/lintian-overrides 2013-03-27 13:52:42.000000000 +0000 @@ -0,0 +1,4 @@ +# The license is CC-BY-SA-3.0+, meaning "or later", albeit valid, is not a +# recognised license shortname. +# The stand-alone license paragraph has the standard CC-BY-SA-3.0 version. +missing-license-paragraph-in-dep5-copyright cc-by-sa-3.0+ (paragraph at line 75) diff -Nru redeclipse-1.3.1/doc/all-licenses.txt redeclipse-1.4/doc/all-licenses.txt --- redeclipse-1.3.1/doc/all-licenses.txt 2012-08-22 20:40:21.000000000 +0000 +++ redeclipse-1.4/doc/all-licenses.txt 2013-03-20 20:13:40.000000000 +0000 @@ -1,18 +1,19 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Files: bin/* bin64/* src/include/* src/lib/* src/lib64/* src/enet/* src/site/* - src/xcode/* +Files: bin/* src/include/* src/lib/* src/enet/* src/site/* src/xcode/* + game/mek/* Copyright: Omitted License: Omitted 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 @@ -23,7 +24,7 @@ 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 @@ -31,36 +32,85 @@ 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 License: ZLib -Files: data/maps/biolytic* data/maps/darkness* data/maps/mist* data/maps/nova* - data/maps/panic* data/maps/oneiroi* data/maps/processing* - data/maps/tranquility* -Copyright: 2009-2012, Derek "favorito" Ponicki +Files: game/fps/maps/biolytic* game/fps/maps/darkness* game/fps/maps/mist* + game/fps/maps/nova* game/fps/maps/panic* game/fps/maps/oneiroi* + game/fps/maps/processing* game/fps/maps/tranquility* + game/fps/maps/vault* +Copyright: 2009-2013, Derek "favorito" Ponicki License: Zlib -Files: data/maps/ares* data/maps/canals* data/maps/conflict* -Copyright: 2011-2012, Ulukai +Files: game/fps/maps/deadsimple* +Copyright: Jonathan 'Wicked' Roels + 2013 Ulukai +License: CC-BY-SA-3.0 + +Files: game/fps/maps/ares* game/fps/maps/canals* game/fps/maps/conflict* +Copyright: 2011-2013, Ulukai +License: CC-BY-SA-3.0 + +Files: game/fps/maps/keystone2k* game/fps/maps/livefire* +Copyright: 2012-2013, John_III +License: CC-BY-SA-3.0 + +Files: game/fps/maps/fourplex* game/fps/maps/pumpstation* + game/fps/maps/starlibido* +Copyright: 2012-2013 D.a.M.i.E.n. +License: CC-BY-SA-3.0 + +Files: game/fps/maps/neodrive* game/fps/maps/hawk* +Copyright: 2012-2013, Kirill "TristamK" Kolesnikov +License: CC-BY-SA-3.0 + +Files: game/fps/maps/cutec* +Copyright: 2012-2013, Raiden +License: CC-BY-SA-3.0 + +Files: game/fps/maps/erosion* game/fps/maps/suspended* +Copyright: 2012-2013 Matt "greasepirate" Kalt +License: CC-BY-3.0 + +Files: game/fps/maps/battlefield* +Copyright: 2012-2013, Quinton Reeves, Ulukai +License: CC-BY-SA-3.0+ + +Files: game/fps/maps/cyanide* +Copyright: 2013 Ricky Thomson "unixfreak" License: CC-BY-SA-3.0 -Files: data/maps/fourplex* data/maps/pumpstation* data/maps/starlibido* -Copyright: 2012 D.a.M.i.E.n. , +Files: game/fps/maps/steelrat* +Copyright: 2012 Kirill "TristamK" Kolesnikov + 2012-2013 D.a.M.i.E.n. License: CC-BY-SA-3.0 -Files: data/maps/neodrive* data/maps/hawk* -Copyright: 2012, Kirill "TristamK" Kolesnikov +Files: game/fps/maps/venus* +Copyright: 2011-2013, Red Eclipse Team + 2013, Ulukai License: CC-BY-SA-3.0 -Files: data/maps/industrial* data/maps/isolation* data/maps/keystone2k* -Copyright: 2012, John_III +Files: game/fps/maps/bloodlust* +Copyright: 2013 Joseph "ballist1c" Calabria + 2013 Matt "greaserpirate" Kalt License: CC-BY-SA-3.0 +Files: data/misc/light2* +Copyright: 2009 Georges "TRaK" Grondin + 2013 D.a.M.i.E.n. +License: Expat + +Files: data/misc/starllogo* +Copyright: 2009 Georges "TRaK" Grondin + 2012 Julia Petretta + 2013 D.a.M.i.E.n. +License: Expat + Files: data/jwin/* Copyright: JWindecker License: CC-BY-3.0 @@ -73,22 +123,26 @@ Copyright: 2009, 2012, skiingpenguins License: CC-BY-SA-3.0 +Files: data/ulukai/* +Copyright: 2013 Ulukai +License: CC-BY-SA-3.0 + +Files: data/ulukai/redeclipse* +Copyright: 1999 Luc Viatour + 2013 Dratz-C + 2013 Ulukai +License: CC-BY-SA-3.0 +Comment: + sources: https://commons.wikimedia.org/wiki/File:Solar_eclips_1999_4.jpg + http://www.lucnix.be/v/Astronomy/Solar+eclipse+1999+Luc+Viatour.jpg.html + Files: data/crosshairs/* Copyright: 2011, fluxord at License: CC-BY-SA-3.0 Files: data/skyboxes/gradient* data/skyboxes/stars* Copyright: Quinton Reeves -License: public-domain - "gradient" by Quinton Reeves - This set is in the public domain, it was created using the gradient fill - tool in GIMP. - . - "stars" by Quinton Reeves - This set is in the public domain, it was created with Starbox 1.9 by Alex - Grigny de Castro from the included xgStars.txt. - Generation parameters were set to 0'N / 0'E (Sidereal: 18.299266, or 00:00 - July 26th, 2008) which is Red Eclipse's birthday. +License: CC-BY-SA-3.0+ Files: data/skyboxes/sunsetflat* Copyright: 2009, LedIris @@ -98,22 +152,28 @@ Copyright: Pieter Verhoeven License: CC-BY-SA-3.0 -Files: data/particles/bullet.png data/particles/energy.png - data/particles/blob.png data/particles/scorch.png - data/particles/entity.png data/particles/lightning.png +Files: data/particles/entity.png data/particles/lightning.png data/particles/hint.png data/particles/mflare.png data/particles/sflare.png data/particles/spark.png Copyright: Quinton Reeves -License: public-domain - bullet.png, energy.png, scorch.png, blob.png - Public domain sources - . - entity.png, lightning.png, hint.png, mflare.png, sflare.png, spark.png - Created by Quinton Reeves, released into the public domain +License: CC-BY-SA-3.0+ Files: data/skyboxes/interstellar* data/skyboxes/miramar* data/skyboxes/stormydays* Copyright: Jockum "hipshot" Skoglund +License: CC-BY-3.0 + +Files: data/elyvisions/* +Copyright: 2012 3delyvisions +License: CC-BY-3.0 + +Files: data/mayhem/* +Copyright: Mayhem +License: CC-BY-SA (version unclear, probably not 3.0) + +Files: data/philipk/ +Copyright: Philip Klevestav +License: CC-BY-3.0 Files: data/particles/smoke.png data/particles/explosion.png Copyright: RaZgRiZ @@ -143,10 +203,20 @@ Copyright: Mike Ledger ( mikeplus[i] ) License: CC-BY-SA-3.0-AU +Files: data/models/john/* +Copyright: John_III +License: CC-BY-SA-3.0 + Files: data/mayhem/* Copyright: Mayhem License: CC-BY-SA-3.0 +Files: data/fonts/Play*.ttf +Copyright: 2011, Jonas Hecksher, Playtypes, e-types AS (e-types.com) +License: OFL-1.1 +Comment: + Reserved Font Names "Play", "Playtype", "Playtype Sans". + Files: data/fonts/*.png Copyright: 2011, Jonas Hecksher, Playtypes, e-types AS (e-types.com) 2011, Red Eclipse Team @@ -154,7 +224,7 @@ Comment: Reserved Font Names "Play", "Playtype", "Playtype Sans". . - These are regenerated from the fonts-play package at build time + These font image grids are generated from the "Play" font via cube2font. Files: data/textures/lava.jpg Copyright: RaZgRiZ @@ -163,40 +233,28 @@ Licensed publicly for everyone to use, modify and distribute as long as the author is credited for the original work. -Files: data/textures/bloodbath.png data/textures/carnage.png - data/textures/critical.png data/textures/dominate.png - data/textures/firstblood.png data/textures/headshot.png - data/textures/massacre.png data/textures/multi.png - data/textures/revenge.png data/textures/slaughter.png - data/textures/triple.png +Files: data/textures/rewards/* Copyright: Ed Merrit, Ten by Twenty, 2011, Red Eclipse Team -License: Akashi-Font and CC-BY-SA-3.0 +License: Akashi-Font and CC-BY-SA-3.0+ Comment: The Akashi font is used as a basis for the word art in these images. Files: data/textures/logo.png data/luckystrike/pub2* data/luckystrike/pub1* Copyright: Ed Merrit, Ten by Twenty, 2011, Red Eclipse Team -License: Akashi-Font and CC-BY-SA-3.0 and Mark-Policy +License: Akashi-Font and CC-BY-SA-3.0+ and Mark-Policy Comment: The Akashi font is used as a basis for the word art in this image. Files: data/textures/emblem.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: data/torley/* Copyright: 2007-2008, Torley Linden 2010, Red Eclipse Team -License: custom and CC-BY-3.0-US - All Torley Textures are 512x512 in (lossless) PNG format and seamlessly tiling. - Use 'em almost however you want — just don't resell as-is — and let me know if - you make somethin' kewl with 'em. You can also get them in Second Life @ - http://torley.com/here - . - This work is licensed under a Creative Commons Attribution 3.0 United States - License: http://creativecommons.org/licenses/by/3.0/us/ +License: CC-BY-SA-3.0 Files: data/sounds/ambience/* Copyright: Quinton "quin" Reeves, Alex "blackshoe" Anguix @@ -313,6 +371,10 @@ http://www.freesound.org/samplesViewSingle.php?id=34580 http://www.freesound.org/samplesViewSingle.php?id=7292 +Files: data/sounds/ambience/vapour.ogg +Copyright: 2013 D.a.M.i.E.n. +License: CC-BY-SA-3.0 + License: Zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -353,37 +415,82 @@ DEALINGS IN THE SOFTWARE. License: Akashi-Font - http://www.tenbytwenty.com/ + Basically, you can use the fonts for whatever you like, the only + restriction being that: + If the font is a "paid" one, rather than a free one, you should not make + the .ttf file available to the public. . - License Agreement + Other than that I'm happy for you use the font however you like. . - By downloading any product from Ten by Twenty, you agree to the following: + Note: + The "akashi" typeface (available from http://www.tenbytwenty.com/akashi.php) is + made available for free by the author. . - * All products remain property of Ten by Twenty. - * Products may be used by the licensee in any personal or commercial - projects (royalty-free). - * Products may not be resold or redistributed. - * Wordpress themes may be edited and developed for individual use, but - credit links must remain in place and adapted themes may not be - reditributed. + Background: + I ("Arand") contacted Ed Merrit (of Ten by Twenty) via email, requesting a + clarification for the font license, here is a copy of the response: . - Clarification: + Date: Sat, 05 Nov 2011 14:53:39 +0000 + From: Ed Merritt + To: Arand Nash + Subject: Re: Fwd: akashi license . - I ("Arand") contacted Ed Merrit (of Ten by Twenty) via email, requesting a - clarification for the font license and received this response: + Hi Arand, . - > Hi Arand, + Basically, you can use the fonts for whatever you like, the only + restriction being that: + If the font is a "paid" one, rather than a free one, you should not make + the .ttf file available to the public. + . + Other than that I'm happy for you use the font however you like. + . + Ed + . + . + . + . + On 05/11/2011 14:50, Arand Nash wrote: + > Hello, sorry, but would you have time to have a look at these questions? > - > Basically, you can use the fonts for whatever you like, the only restriction - being that: - > If the font is a "paid" one, rather than a free one, you should not make the - .ttf file available to the public. - > Other than that I'm happy for you use the font however you like. + > I noticed that you've released the typeface "Jura" under a SIL license, + > would it be at all feasible, to use the Akashi font under a similar license? + > I completely understand if this is not possible. > - > Ed - . - The "akashi" typeface (available from http://www.tenbytwenty.com/akashi.php) is - made available for free by the author. + > I'm still looking for an answer regarding the current license, though: + > + > -------- Original Message -------- + > Subject: akashi license + > Date: Fri, 14 Oct 2011 01:59:44 +0200 + > From: Arand Nash + > To: ed@edmerritt.com + > + > Hello Ed Merrit, + > + > I've got a few questions about the license, set for the Ten by twenty + > products, in particular for the akashi.ttf font: + > ### + > By downloading any product from Ten by Twenty, you agree to the following: + > + > -All products remain property of Ten by Twenty. + > -Products may be used by the licensee in any personal or commercial + > projects (royalty-free). + > -Products may not be resold or redistributed. + > ### + > It is somewhat unclear in what way it may, and may not be used. + > + > What is meant by the "used by licensee" wording in this context? + > Does it mean strictly personal, "off-line" use only? + > Or displaying (publicly) of the font only (with no access by viewer to + > .ttf file, somehow)? + > + > The "may not be (...) redistributed" seems to imply that one may only + > receive the .ttf file from your site and that any other propagation of + > the font must be in some hardcoded-into-image format? + > + > Is my interpretation of the main intent of your license correct? + > + > -- + > Martin Werner ("arand") License: OFL-1.1 ----------------------------------------------------------- diff -Nru redeclipse-1.3.1/doc/changelog.txt redeclipse-1.4/doc/changelog.txt --- redeclipse-1.3.1/doc/changelog.txt 2012-08-31 13:44:02.000000000 +0000 +++ redeclipse-1.4/doc/changelog.txt 2013-03-21 20:06:33.000000000 +0000 @@ -1,3 +1,213 @@ += Red Eclipse 1.4 = +Gameplay: + * Radar now always tracks players who are dominating you, and shows everyone + else if you are last alive in duel/survivor + * New thirdperson style with camera position to the side (adjust with + /thirdpersondist and /thirdpersonside) + * New default firstperson style with visible legs + * Disabled half-impulses when the impulse meter is close to empty (back to 1.1 + behaviour) + * Added reward for ending killing sprees + * Removed critical hits + * Impulse slide duration increased, maintained speed decreased + * Impulse regeneration now delayed longer, but once started is faster + * Explosion shaking effect reduced + +Weapons: + * Weapons no longer reset gravity acceleration (reduces in-air pinning) + * Projectiles now pass through teleporters and interact with pushers + * Mines, new weapon, primary proximity mine, secondary tripwire mine, + pickup-based (like grenade) + * Melee now only activates if player is airborne or dashing/sliding, and only + in a short window of time + * Pistol secondary changed to fire single particles, firing rate, + secondary damage, secondary stun, secondary hitpush, secondary + particle lifetime and secondary accuracy increased; particle speed and + secondary firing rate decreased + * Sword range halved, attack speed decreased + * Shotgun firing rate decreased + * SMG secondary now sticks to geometry and explodes radially after a short + delay, ricochet speed, clip size, particle lifetime, and secondary damage + increased; reload speed, stun and primary damage decreased + * Plasma primary damage, projectile speed, stun, particle size and reload + speed increased; firing rate and clip size decreased + * Flamer projectile size, projectile speed and secondary explosion radius + increased; damage, primary explosion radius and secondary firing rate + decreased + * Rifle damage, recoil, clip size, and accuracy increased; explosion size, + hitpush, particle size, reload speed and secondary firing rate decreased + * Grenade firing rate increased + * Rocket direct damage increased; flak damage and firing rate decreased + +Modes & Mutators: + * Reduced number of bots in coop to 3/2 of humans + * Enabled multi-coop (one human team and multiple bot teams) + * Removed expert from default set of allowed mutators + * Made duel/survivor enter overtime if a round is in progress when + intermission is scheduled to start + * Changed default mutator to arena (classic pickup play available as + 'classic' mutator) + * Removed ballistic mutator + * Added kaboom mutator (only grenades and mines with reloading ammo, rockets + spawn as normal) + * Added gauntlet mode (one team tries to run to the other side of a map, other + team tries to hinder, switches at half-time) + * Time-trial now spawns with weapons for movement tricks, collisions and + weapons have no effect on opponents + * Passing the bomber-ball now prioritizes players close to crosshair + * Bomber-ball 'hold' now resets bomb fuse when bomb-carrier kills enemies + * Bomber-ball and capture-the-flag 'survivor' and 'duel' now has respawn, no + regenerating health, and resets after score/capture + * Capture-the-flag 'return' is now default, old behaviour where flag returns + instantly is now available as 'quick' + +Maps: + * Assigned map music to all maps + * Canals, updated and added to rotations + * Fourplex, updated to version 1.6 and renamed to "4plex" + * Star Libido, updated to version 1.5 + * Cutec, new map (added from mapversion 1.6) + * Erosion, new map (added from mapversion 1.5) + * Battlefield, new map (added from mapversion 1.1, remake of "Wargrounds" from + Blood Frontier) + * Suspended Apparatus of Doom "suspended", new map (added from mapversion 1.4) + * Conflict, updated + * Blink, removed + * Facility, removed + * Cyanide, new time-trial map + * Dead Simple, updated (retextured) + * Frag Vault "vault", new map + * Steel Rat, new time-trial map (added from mapversion 1.3b) + * Dawn, removed + * Industrial, removed + * Lab, removed + * Wet, updated + * Ghost, updated (retextured, new lighting) + * Isolation, removed + * Live Fire, new map (added from map update 3) + * Forge, updated (retextured) + * Bloodlust, new map + * Tranquility, removed + +Interface & Menus: + * Overall reduced font sizes + * Added variables for scaling text globally and for specific elements + (/{text,con,chatcon,command}scale) + * Added frames around most UI elements + * Revamped score screen + * Added ALT+ENTER/CMD+ENTER fullscreen toggle, and ALT+F4/CMD+Q for closing + the window + * Added "reset selection" button for mutators + * Added variables to control death/kill message content + (/obit{verbose,styles}) + * Removed alternative mouse styles + * IRC improvements, fixed disconnecting properly + * Demos and screenshots are now stored in "demos" and "screenshots" + subdirectories in the homedir, using "