[SCM] WorldForge 3D client (media) branch, master, updated. upstream/0.6.2.1-20-ga230cea

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit fca4803461f032f956613a01a9d37f142a6e8fd1
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Apr 11 10:38:49 2012 -0400

    debian/copyright: split dual license into two separate clauses

diff --git a/debian/copyright b/debian/copyright
index a4574ed..dd715c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,33 +4,7 @@ Source: <http://www.worldforge.org/>
 
 Files: *
 Copyright: Copyright 2000-2011 The WorldForge project
-License: dual-GPL-2+-GFDL-1.1
- 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 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, see <http://www.gnu.org/licenses/>.
- .
- Additionally, permission is granted to copy, distribute and/or modify
- this document under the terms of the GNU Free Documentation License,
- Version 1.1 or any later version published by the Free Software
- Foundation; with no Invariant Sections, with no Front-Cover Texts and
- with no Back-Cover Texts.
- .
- As a courtesy, we request that you license any derivative works under
- this same dual license.
- .
- 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'
- and the full text of the current version of the GFDL may be found in the file
- '/usr/share/common-licenses/GFDL'.
+License: GPL-2+ or GFDL-NIV-1.1+
 
 Files: media/shared/common/resources/ogre/ogre_scripts/*
 Copyright: 2000-2009 Torus Knot Software Ltd
@@ -130,3 +104,12 @@ License: GPL-2+
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+License: GFDL-NIV-1.1+
+ Permission is granted to copy, distribute and/or modify
+ this document under the terms of the GNU Free Documentation License,
+ Version 1.1 or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the full text of the current version of the GNU Free
+ Documentation License may be found in the file '/usr/share/common-licenses/GFDL'.

-- 
WorldForge 3D client (media)