[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-41-g3203194

Mon Apr 23 00:54:20 UTC 2012

The following commit has been merged in the master branch:
commit e4993461cb6ee7f614aa52f30b9195f141272a18
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Apr 22 11:26:56 2012 -0400

    debian/copyright: add additional clauses

diff --git a/debian/copyright b/debian/copyright
index e07da50..f821572 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,19 +2,20 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Source: https://github.com/worldforge/ember
 
 Files: *
-Copyright: (C) 2001-2009 Hans Häggström <zzorn at iki.fi>
-                         Tim Enderling <T.Enderling at web.de>
-                         Lakin Wecker <nikal at nucleus.com>
+Copyright: (C) 2001-2011 Adam Gregory <Adammgregory at yahoo.com>
+                         Alexey Torkhov <atorkhov at gmail.com>
                          Alistair Davidson <lord_inh at yahoo.co.uk>
-                         Miguel Guzmán <aglanor at telefonica.net>
+                         Erik Ogenvik <erik at ogenvik.org>
+                         Hans Häggström <zzorn at iki.fi>
+                         Lakin Wecker <nikal at nucleus.com>
                          Lee Begg <llnz at paradise.net.nz>
-                         Adam Gregory <Adammgregory at yahoo.com>
                          Martin Pollard <circlemaster at blueyonder.co.uk>
-                         Erik Hjortsberg <erik.hjortsberg at iteam.se>
+                         Miguel Guzmán <aglanor at telefonica.net>
+                         Rômulo Fernandes Machado Leitão <abra185 at gmail.com>
                          Sean Ryan <sryan at evercrack.com>
-                         Alexey Torkhov <atorkhov at gmail.com>
+                         Simon Goodall
                          Tamas Bates <rhymer at gmail.com>
-                         Rômulo Fernandes Machado Leitão <abra185 at gmail.com>
+                         Tim Enderling <T.Enderling at web.de>
 License: GPL-2+
 
 Files: debian/*
@@ -26,6 +27,51 @@ Files: src/framework/tinyxml/*
 Copyright: 2000-2006 Lee Thomason (www.grinninglizard.com)
 License: zlib/png
 
+Files: src/framework/osdir.h
+Copyright: 2002 Bart Vanhauwaert
+License:
+ Permission to use, copy, modify, distribute and sell this software
+ for any purpose is hereby granted without fee. This license
+ includes (but is not limited to) standalone compilation or as part
+ of a larger project.
+ .
+ This software is provided "as is" without express or implied warranty.
+ .
+ The "library", below, refers to the collection of software functions
+ and/or data contained in this file, prepared so as to be conveniently
+ compiled and linked with application programs (which use some of those
+ functions and data) to form executables.
+ .
+ 1. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+ WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+ EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+ OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+ KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+ LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+ THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ . 
+ 2. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+ AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+ FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+ LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+ RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGES.
+
+Files: src/framework/float_cast.h
+Copyright: 2001 Erik de Castro Lopo <erikd at mega-nerd.com>
+License:
+ Permission to use, copy, modify, distribute, and sell this file for any 
+ purpose is hereby granted without fee, provided that the above copyright 
+ and this permission notice appear in all copies.  No representations are
+ made about the suitability of this software for any purpose.  It is 
+ provided "as is" without express or implied warranty.
+
 Files: src/components/ogre/environment/pagedgeometry/*
 Copyright: 2006      John Judnich
            2008-2010 Erik Hjortsberg
@@ -41,9 +87,15 @@ Copyright: 1997-2002 Makoto Matsumoto and Takuji Nishimura
            2000-2009 Richard J. Wagner
 License: BSD-2-clause
 
+Files: src/components/ogre/EmberOgreFileSystem.h
+Copyright: 2000-2006 Torus Knot Software Ltd
+           2008      Erik Hjortsberg <erik.hjortsberg at gmail.com>
+License: GPL-2+
+
 Files: src/components/ogre/SceneManagers/EmberPagingSceneManager/*
 Copyright: 2003-2006 Jose A. Milan and Tuan Kuranes
            2004      Jon Anderson
+           2009      Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
            2000-2006 The OGRE Team
 License: LGPL-2.1+
 
@@ -51,6 +103,11 @@ Files: src/components/ogre/environment/caelum/*
 Copyright: 2006-2008 Caelum team
 License: LGPL-3+
 
+Files: src/components/ogre/gui/RenderedColourStringTextComponent.cpp
+Copyright: 2011      Erik Ogenvik
+           2004-2009 Paul D Turner & The CEGUI Development Team
+License: GPL-2+ and expat
+ 
 Files: src/components/lua/luaobject.*
 Copyright: 2008 by Nigel Atkinson <suprapilot+LuaCode at gmail.com>
 License: LGPL-3+
@@ -174,4 +231,22 @@ License: zlib/png
  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.

-- 
WorldForge 3D client

