[SCM] Packaging for ogre-contrib branch, master, updated. debian/1.4.8-1-3-g21eb5e6

Andres Mejia mcitadel at gmail.com
Tue Jul 22 01:12:03 UTC 2008 

The following commit has been merged in the master branch:
commit cbcb98254c1f2a3895cf69b27b6852ec71280e68
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 21 18:57:29 2008 -0400

    create packaging for 1.4.9

diff --git a/debian/changelog b/debian/changelog
index 9b07fc1..84026be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ogre-contrib (1.4.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix lintian warning for patching and watch file.
+  * Updated copyright file.
+  * Bumped Standard-Versions to 3.8.0.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Mon, 21 Jul 2008 18:44:14 -0400
+
 ogre-contrib (1.4.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 47a5399..cb04f85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Priority: optional
 Section: contrib/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, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.8), libogre-dev (<< 1.4.9)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.9), libogre-dev (<< 1.4.10)
+Standards-Version: 3.8.0
 Homepage: http://ogre3d.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/ogre-contrib.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre-contrib.git
diff --git a/debian/copyright b/debian/copyright
index e0bf857..810e39f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,172 @@
-This package was debianized on Mon Dec 27 22:21:58 CET 2004 by:
-
-  Federico Di Gregorio <fog at debian.org>
-  Andres Mejia <mcitadel at gmail.com>
-
-Original sources were downloaded from:
-
-   http://www.ogre3d.org/.
-
-The ogre-contrib-gen.sh script found under the diff.gz file was used to build
-the ogre-contrib tarball.
-
-Upstream Authors:
-
-  Steve Streeting
-  Adrian Cearnau
-  Thomas Muldowney
-
-Copyright:
-
-  Most code from Ogre is copyright (c) 2002-2004 by The Ogre Team with
-  these expections:
-
-    Parts of the emitter code is copyright (c) 2002 by Tels
-    (http://bloodgate.com).
-
-    The GLUtil code is copyright (c) 2000-2003 by Steven J. Streeting.
-
-    Parts of the memory manager are copyright (c) 2000 by Paul Nettle.
-
-    The OgreQuake3Types are copyright (c) 1999-2000 by Id Software, Inc.
-
-    The original version of the OgreSingleton is copyright (c) 2000 by Scott
-    Bilas.
-
-    The unzip code is copyright (c) 1998 Gilles Volant.
-
-    Some of the Python helper scripts are copyright (c) 2002 by Adrian
-    Cearnau.
- 
-    d3dutil is copyright (c) 1997-1998 Microsoft Corporation.
-
-    The GL includes are copyright (c) 1991-2002 Silicon Graphics Inc.
-
-    The 3D Studio Max exporter is copyright (c) 2002 John Martin.
-
-    The Blender exporter is copyright (c) 2004 by Michael Reimpell and
-    copyright (c) 2003 by Jens Hoffman and Jean-Baptiste LAMY.
-
-    The Maya exporter is copyright (c) 2003 by Fifty1 Software Inc, Bytelords.
-
-  As a whole Ogre is licensed under the terms of LGPL.
-  On Debian Systems it can be found in /usr/share/common-licenses/LGPL.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+
+Upstream-Author: Steve Streeting <sinbad at ogre3d.org>
+ Justin Walsh <justinwalsh at ogre3d.org>
+ Brian 'praetor' Johnstone <praetor at ogre3d.org>
+ Assaf Raman <assaframan at ogre3d.org>
+ Thomas Muldowney <temas at ogre3d.org>
+ James O'Sullivan <mental at ogre3d.org>
+ Wladimir J. van der Laan <wumpus at ogre3d.org>
+
+Packaged-By: Federico Di Gregorio <fog at debian.org>
+ Moritz Muehlenhoff <jmm at inutil.org>
+ Christer Stenbrenden <christer at uggwar.net>
+ Andres Mejia <mcitadel at gmail.com>
+
+Packaged-Date: Mon, 20 Sep 2004 23:04:34 +0200
+
+Original-Source-Location: http://www.ogre3d.org/
+
+Files: *
+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>
+ Moritz Muehlenhoff <jmm at inutil.org>
+ Christer Stenbrenden <christer at uggwar.net>
+ Andres Mejia <mcitadel at gmail.com>
+License: LGPL-2.1+
+
+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
+ Tools/MilkshapeExport/misc/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]
+
+License: LGPL-2.1+
+ See /usr/share/common-licenses/LGPL-2.1
+
+License: LGPL-2+
+ See /usr/share/common-licenses/LGPL-2
diff --git a/debian/ogre-contrib-get-orig-source b/debian/ogre-contrib-get-orig-source
index 8e7f290..dec43c7 100755
--- a/debian/ogre-contrib-get-orig-source
+++ b/debian/ogre-contrib-get-orig-source
@@ -4,9 +4,9 @@
 # distributed through Debian.
 
 # Some variables to make maintaining this script easier
-OGRE_VERSION=1.4.8
-OGRE_TARBALL=ogre-v1-4-8.tar.bz2
-OGRE_TARBALL_CHECKSUM=c9034bdbd4c7cd79a4dd38811765262a
+OGRE_VERSION="1.4.9"
+OGRE_TARBALL="ogre-v1-4-9.tar.bz2"
+OGRE_TARBALL_CHECKSUM="8a73fbcf42fd6b156b2567839d0cd125"
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
diff --git a/debian/patches/autotools.diff b/debian/patches/autotools.diff
index 9753c28..88897b8 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,5 +1,5 @@
---- ./acinclude.m4.bak	2007-08-31 01:25:58.000000000 -0400
-+++ ./acinclude.m4	2007-08-31 01:28:15.000000000 -0400
+--- a/acinclude.m4.bak	2007-08-31 01:25:58.000000000 -0400
++++ b/acinclude.m4	2007-08-31 01:28:15.000000000 -0400
 @@ -305,19 +305,7 @@
                [build_exr=$enableval],
                [build_exr=no])
@@ -44,8 +44,8 @@
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
  
---- ./configure.in.bak	2008-04-04 00:12:19.000000000 -0400
-+++ ./configure.in	2008-04-04 00:12:32.000000000 -0400
+--- a/configure.in.bak	2008-04-04 00:12:19.000000000 -0400
++++ b/configure.in	2008-04-04 00:12:32.000000000 -0400
 @@ -79,8 +79,8 @@
  AC_SUBST(ZZIPLIB_LIBS)
  
@@ -201,8 +201,8 @@
  echo "    Build CEGUI demos               : $build_cegui_sample"
  echo "    Build the OpenEXR plugin        : $build_exr"
  echo "    Build the Cg plugin             : $build_cg"
---- ./Makefile.am.bak	2007-08-31 01:26:12.000000000 -0400
-+++ ./Makefile.am	2007-08-31 01:34:09.000000000 -0400
+--- a/Makefile.am.bak	2007-08-31 01:26:12.000000000 -0400
++++ b/Makefile.am	2007-08-31 01:34:09.000000000 -0400
 @@ -1,6 +1,3 @@
 -SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests
 +SUBDIRS = PlugIns
@@ -211,8 +211,8 @@
 -
 -pkgconfigdir = $(libdir)/pkgconfig
 -pkgconfig_DATA = OGRE.pc
---- ./PlugIns/Makefile.am.bak	2007-08-31 01:26:39.000000000 -0400
-+++ ./PlugIns/Makefile.am	2007-08-31 01:31:18.000000000 -0400
+--- a/PlugIns/Makefile.am.bak	2007-08-31 01:26:39.000000000 -0400
++++ b/PlugIns/Makefile.am	2007-08-31 01:31:18.000000000 -0400
 @@ -1,9 +1 @@
 -SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager 
 -
diff --git a/debian/patches/change_pkglibdir_path.patch b/debian/patches/change_pkglibdir_path.patch
index 6ee15b6..47096a3 100644
--- a/debian/patches/change_pkglibdir_path.patch
+++ b/debian/patches/change_pkglibdir_path.patch
@@ -1,7 +1,7 @@
 Change path plugin gets installed to a directory based on ogre version.
 =====================================================================
---- PlugIns/CgProgramManager/src/Makefile.am.bak	2008-05-18 00:49:50.000000000 -0400
-+++ PlugIns/CgProgramManager/src/Makefile.am	2008-05-18 00:50:02.000000000 -0400
+--- a/PlugIns/CgProgramManager/src/Makefile.am.bak	2008-05-18 00:49:50.000000000 -0400
++++ b/PlugIns/CgProgramManager/src/Makefile.am	2008-05-18 00:50:02.000000000 -0400
 @@ -1,5 +1,6 @@
  INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/PlugIns/CgProgramManager/include -I$(top_srcdir)/OgreMain/include
  
diff --git a/debian/watch b/debian/watch
index 1ee589c..43bc0d6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -2,12 +2,11 @@
 version=3
 
 # Ogre source download link from sourceforge.net
-opts=uversionmangle=s/\.\?.*// \
+opts=uversionmangle=s/\.\?.*//;s/-/\./g \
 http://downloads.sourceforge.net/ogre \
-     http://downloads.sourceforge.net/ogre/ogre-v(.*)\.tar\.bz2(.*) \
-     1-4-8
+     http://downloads.sourceforge.net/ogre/ogre-v(.*)\.tar\.bz2(.*)
 
 # Different check for ogre source, provided by uscan man page
+opts=uversionmangle=s/-/\./g \
 http://sf.net/ogre/ \
-     ogre-v(.*)\.tar\.bz2 \
-     1-4-8
+     ogre-v(.*)\.tar\.bz2

-- 
Packaging for ogre-contrib

More information about the Pkg-games-commits mailing list