[SCM] WorldForge 3D client (media) branch, master, updated. upstream/0.6.2-17-g13cb76f

Tue Mar 20 01:59:30 UTC 2012

The following commit has been merged in the master branch:
commit 56663d49fadf00a8e8c6d347abc68ea289385844
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sat Mar 10 18:22:53 2012 -0500

    updated standards to 3.9.3

diff --git a/debian/changelog b/debian/changelog
index a024a13..0ee59be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ ember-media (0.6.2.1-1~ppa1) precise; urgency=low
   * New upstream release.
   * new maintainer: Debian games team (closes: #653971)
     - added myself as uploader
-  * Updated Standards-Version to 3.9.2 (no changes required).
+  * Updated Standards-Version to 3.9.3 (no changes required).
   * Converted to use the dh build sequencer.
   * Converted to 3.0 (quilt) source format.
   * Switched to using xz compression.
diff --git a/debian/control b/debian/control
index f34c90b..f0fc834 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.worldforge.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/ember-media.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ember-media.git
diff --git a/debian/copyright b/debian/copyright
index 6ccffbf..e96cf34 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Source: <http://www.worldforge.org/>
 
 Files: *
 Copyright: Copyright 2000-2011 The WorldForge project
-License: GPL-2+
+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
@@ -14,17 +14,26 @@ License: GPL-2+
  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/>.
 .
- 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.
+ 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'.
+ 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'.
 
 Files: media/shared/common/resources/ogre/ogre_scripts/*
-Copyright 2000-2009 Torus Knot Software Ltd
+Copyright: 2000-2009 Torus Knot Software Ltd
 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
@@ -44,3 +53,80 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+Files: media/shared/common/resources/ogre/ogre_scripts/scripts/Bloom2.material
+Copyright: 2007-2008 Dark Sylinc
+License: GPL-2+
+
+Files: media/shared/common/resources/ogre/caelum/core/*.cg
+Copyright: 2008 Caelum team.
+License: LGPL-3
+ Caelum is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ Caelum 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 Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
+
+Files: media/shared/common/resources/ogre/scripts/programs/*.glsl
+Copyright: 2009  Alexey Torkhov
+License: GPL-2+
+
+Files: DejaVuSans*.ttf
+Copyright: 2003 Bitstream, Inc
+License: Bitstream
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+
+License: GPL-2+
+ 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/>.

-- 
WorldForge 3D client (media)

