[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg1-81-ge5e9921

Sat Jun 21 03:27:39 UTC 2008

The following commit has been merged in the master branch:
commit e5e99216e0508981356d8994adda67b8e1eed35e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Jun 20 23:27:32 2008 -0400

    Fix copyright file some more

diff --git a/debian/changelog b/debian/changelog
index f2e5b09..4c194ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ogre (1.4.8.dfsg1-2) unstable; urgency=low
 
   * Fix copyright file. Using proposal found in
     http://wiki.debian.org/Proposals/CopyrightFormat.
+  * Bumped to Standards-Version 3.8.0.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 08 Jun 2008 23:07:57 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Wed, 18 Jun 2008 17:24:19 -0400
 
 ogre (1.4.8.dfsg1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4cc48a5..6d967b0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>, Federico Di Gregorio <fog at debian.org>
 Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev (>= 0.5.0), libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libxrandr-dev, libxxf86vm-dev, libxaw7-dev, libxt-dev, libz-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://ogre3d.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/ogre.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre.git
diff --git a/debian/copyright b/debian/copyright
index 5e03913..2a93661 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,11 +17,13 @@ Packaged-Date: Mon, 20 Sep 2004 23:04:34 +0200
 
 Original-Source-Location: http://www.ogre3d.org/
 
-Original-Source-Command: ./debian/ogre-get-orig-source
-
 Files: *
-Copyright: Copyright © 2002-2008 by The OGRE Team
+Copyright: Copyright © 2002-2008 Torus Knot Software Ltd
 License: LGPL-2.1+
+Comment: Even though the README, AUTHORS, and ReadMe.html file say the
+ copyright belongs to the "OGRE Team", the correct and legal copyright should
+ read "Torus Knot Software Ltd". Please see the following link.
+ http://www.ogre3d.org/phpBB2/viewtopic.php?t=42021&highlight=copyright
 
 Files: debian/*
 Copyright: Federico Di Gregorio <fog at debian.org>
@@ -30,8 +32,192 @@ Copyright: Federico Di Gregorio <fog at debian.org>
  Andres Mejia <mcitadel at gmail.com>
 License: LGPL-2.1+
 
-Files: Mac/Ogre/include/macBundlePath.h, Mac/Ogre/include/macPlugins.h,
- Mac/Ogre/src/macPlugins.cpp
+Files: OgreMain/src/OgreMemoryManager.cpp
+ OgreMain/include/OgreMemoryManager.h
+ OgreMain/include/OgreMemoryMacros.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+ Copyright 2000, Paul Nettle. All rights reserved.
+License: LGPL-2.1+
+Comment: The previous copyright header stated the following.
+ Copyright 2000, Paul Nettle. All rights reserved.
+ .
+ You are free to use this source code in any commercial or non-commercial
+ product.
+ .
+ mmgr.cpp - Memory manager & tracking software
+ .
+ The most recent version of this software can be found at:
+ ftp://ftp.GraphicsPapers.com/pub/ProgrammingTools/MemoryManagers/
+
+Files: OgreMain/src/OgreConvexBody.cpp
+ OgreMain/src/OgreShadowCameraSetupFocused.cpp
+ OgreMain/src/OgreShadowCameraSetupLiSPSM.cpp
+ OgreMain/src/OgrePolygon.cpp
+ OgreMain/include/OgreConvexBody.h
+ OgreMain/include/OgrePolygon.h
+ OgreMain/include/OgreShadowCameraSetupLiSPSM.h
+Copyright: Copyright (c) 2006  Torus Knot Software Ltd
+ Copyright (c) 2006 Matthias Fink, netAllied GmbH <matthias.fink at web.de>
+License: LGPL-2.1+
+
+Files: OgreMain/src/WIN32/winres.h
+Copyright: Copyright (C) 2000 Francois Gouget
+License: LGPL-2.1+
+
+Files: OgreMain/src/OgreProgressiveMesh.cpp
+ OgreMain/include/OgreProgressiveMesh.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: The algorithm in this file is based heavily on:
+ .
+ Progressive Mesh type Polygon Reduction Algorithm
+ by Stan Melax (c) 1998
+
+Files: OgreMain/src/OgreQuaternion.cpp
+ OgreMain/include/OgreQuaternion.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: NOTE THAT THIS FILE IS BASED ON MATERIAL FROM:
+ .
+ Magic Software, Inc.
+ http://www.geometrictools.com
+ Copyright (c) 2000, All Rights Reserved
+ .
+ Source code from Magic Software is supplied under the terms of a license
+ agreement and may not be copied or disclosed except in accordance with the
+ terms of that agreement.  The various license agreements may be found at
+ the Magic Software web site.  This file is subject to the license
+ .
+ FREE SOURCE CODE
+ http://www.geometrictools.com/License/WildMagic3License.pdf
+
+Files: OgreMain/include/OgreSingleton.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: Original version Copyright (C) Scott Bilas, 2000.
+ All rights reserved worldwide.
+ .
+ This software is provided "as is" without express or implied
+ warranties. You may freely copy and compile this source into
+ applications you distribute provided that the copyright text
+ below is included in the resulting source code, for example:
+ "Portions Copyright (C) Scott Bilas, 2000"
+
+Files: OgreMain/include/OgreAny.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: -- Based on boost::any, original copyright information follows --
+ Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
+ .
+ Distributed under the Boost Software License, Version 1.0. (See
+ accompAnying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+ -- End original copyright --
+
+
+Files: OgreMain/include/stl_user_config.h
+Copyright: Copyright (c) 1999 Boris Fomitchev
+License: other
+ This material is provided "as is", with absolutely no warranty expressed
+ or implied. Any use is at your own risk.
+ .
+ Permission to use or copy this software for any purpose is hereby granted 
+ without fee, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is granted,
+ provided the above notices are retained, and a notice that the code was
+ modified is included with the above copyright notice.
+
+Files: OgreMain/include/OgreMovablePlane.h
+ OgreMain/include/OgrePlane.h
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: Original free version by:
+ Magic Software, Inc.
+ http://www.geometrictools.com/
+ Copyright (c) 2000, All Rights Reserved
+
+Files: OgreMain/include/OgreUTFString.h
+Copyright: Copyright © 2002-2008 Torus Knot Software Ltd
+License: Modified from OpenGUI under lenient license
+ Original copyright details and licensing below:
+ OpenGUI (http://opengui.sourceforge.net)
+ This source code is released under the BSD License
+ .
+ Permission is given to the Ogre project to use the contents of file within its
+ source and binary applications, as well as any derivative works, in accordance
+ with the terms of any license under which Ogre is or will be distributed.
+ .
+ Ogre may relicense its copy of this file, as well as any OpenGUI released
+ updates to this file, under any terms that it deems fit, and is not required to
+ maintain the original BSD licensing terms of this file, however OpenGUI retains
+ the right to present its copy of this file under the terms of any license under
+ which OpenGUI is distributed.
+ .
+ Ogre is not required to release to OpenGUI any future changes that it makes to
+ this file, and understands and agrees that any such changes that are released
+ back to OpenGUI will become available under the terms of any license under
+ which OpenGUI is distributed.
+ .
+ For brevity, this permission text may be removed from this file if desired.
+ The original record kept within the SourceForge (http://sourceforge.net/)
+ tracker is sufficient.
+ .
+ - Eric Shorkey (zero/zeroskill) <opengui at rightbracket.com> [January 20th, 2007]
+
+Files: RenderSystems/GL/src/glew.cpp
+ RenderSystems/GL/include/GL/glew.h
+Copyright: Copyright (C) 2002-2005, Milan Ikits <milan ikits[]ieee org>
+ Copyright (C) 2002-2005, Marcelo E. Magallon <mmagallo[]debian org>
+ Copyright (C) 2002, Lev Povalahev
+License: other
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+ * The name of the author may be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: RenderSystems/GL/src/win32/OgreGLUtil.h
+ RenderSystems/GL/src/OSX/OgreGLUtil.h
+ RenderSystems/GL/src/SDL/OgreGLUtil.h
+ RenderSystems/GL/src/GLX/OgreGLUtil.h
+Copyright: Copyright (c) 2000-2003 Steven J. Streeting
+License: GPL-2+
+
+Files: RenderSystems/GL/src/nvparse/*
+Copyright: © NVIDIA Corporation
+License: other
+ All files in this distribution can be used however you want.
+Comment: These files are found in NVParse which is available from NVIDIA at
+ http://developer.nvidia.com/object/nvparse.html.
+
+Files: RenderSystems/GL/src/nvparse/*parser.h
+ RenderSystems/GL/src/nvparse/*parser.cpp
+Copyright: Copyright (c) 2000-2006 Torus Knot Software Ltd
+License: LGPL-2.1+
+Comment: Skeleton parsers for Yacc-like parsing with Bison,
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Distributed under the GPL-2+.
+
+
+
+
 
 
 Copyright:
diff --git a/debian/ogre-get-orig-source b/debian/ogre-get-orig-source
index f0e723f..a60a9ac 100755
--- a/debian/ogre-get-orig-source
+++ b/debian/ogre-get-orig-source
@@ -4,9 +4,9 @@
 # distributed through Debian.
 
 # Some variables to make maintaining this script easier
-OGRE_VERSION=1.4.8.dfsg1
-OGRE_TARBALL=ogre-v1-4-8.tar.bz2
-OGRE_TARBALL_CHECKSUM=c9034bdbd4c7cd79a4dd38811765262a
+OGRE_VERSION="1.4.8.dfsg1"
+OGRE_TARBALL="ogre-v1-4-8.tar.bz2"
+OGRE_TARBALL_CHECKSUM="c9034bdbd4c7cd79a4dd38811765262a"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
diff --git a/debian/rules b/debian/rules
index 6f50b60..79fc21a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,5 +155,8 @@ endif
 	dh_md5sums -a
 	dh_builddeb -a
 
+get-orig-source:
+	$($(dir) $_)ogre-get-orig-source
+
 binary: binary-arch binary-indep
 .PHONY: configure build clean binary-indep binary-arch binary install

-- 
Packaging for ogre

