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

Federico Di Gregorio fog at initd.org
Sat May 23 19:11:22 UTC 2009 

The following commit has been merged in the master branch:
commit 64e42058c303dbd9149d5d3c01708ccae3556a3c
Author: Federico Di Gregorio <fog at initd.org>
Date:   Thu Mar 19 00:14:56 2009 +0100

    Fixed build problems related to 1.6.1 (extra Samples)

diff --git a/debian/changelog b/debian/changelog
index 84026be..97ea0cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ogre-contrib (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bumped Standard-Versions to 3.8.1.
+
+ -- Federico Di Gregorio <fog at debian.org>  Tue, 17 Mar 2009 12:47:46 +0100
+
 ogre-contrib (1.4.9-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index cb04f85..bb4241e 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.9), libogre-dev (<< 1.4.10)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.6.1), libogre-dev (<< 1.6.2)
+Standards-Version: 3.8.1
 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/patches/autotools.diff b/debian/patches/autotools.diff
index 88897b8..20ad48a 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,5 +1,34 @@
---- a/acinclude.m4.bak	2007-08-31 01:25:58.000000000 -0400
-+++ b/acinclude.m4	2007-08-31 01:28:15.000000000 -0400
+Index: ogre-contrib-1.6.1/Makefile.am
+===================================================================
+--- ogre-contrib-1.6.1.orig/Makefile.am	2008-06-12 16:10:57.000000000 +0200
++++ ogre-contrib-1.6.1/Makefile.am	2009-03-17 12:53:52.940401706 +0100
+@@ -1,6 +1,3 @@
+-SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests
++SUBDIRS = PlugIns
+ ACLOCAL_AMFLAGS = -I Scripts/m4
+ AUTOMAKE_OPTIONS = foreign
+-
+-pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = OGRE.pc
+Index: ogre-contrib-1.6.1/PlugIns/Makefile.am
+===================================================================
+--- ogre-contrib-1.6.1.orig/PlugIns/Makefile.am	2009-03-17 12:47:45.479876635 +0100
++++ ogre-contrib-1.6.1/PlugIns/Makefile.am	2009-03-17 14:30:52.303917250 +0100
+@@ -1,9 +1,2 @@
+-SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager PCZSceneManager OctreeZone
++SUBDIRS = CgProgramManager
+ 
+-if BUILD_CGPLUGIN
+-SUBDIRS += CgProgramManager
+-endif
+-
+-if BUILD_EXRPLUGIN
+-SUBDIRS += EXRCodec
+-endif
+Index: ogre-contrib-1.6.1/acinclude.m4
+===================================================================
+--- ogre-contrib-1.6.1.orig/acinclude.m4	2009-03-17 12:47:45.487876255 +0100
++++ ogre-contrib-1.6.1/acinclude.m4	2009-03-17 12:53:52.940401706 +0100
 @@ -305,19 +305,7 @@
                [build_exr=$enableval],
                [build_exr=no])
@@ -44,9 +73,11 @@
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
  
---- 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 @@
+Index: ogre-contrib-1.6.1/configure.in
+===================================================================
+--- ogre-contrib-1.6.1.orig/configure.in	2009-03-17 12:47:45.495875736 +0100
++++ ogre-contrib-1.6.1/configure.in	2009-03-17 12:54:49.888030105 +0100
+@@ -78,8 +78,8 @@
  AC_SUBST(ZZIPLIB_LIBS)
  
  dnl Get the GL and Platform libs for target build
@@ -57,7 +88,7 @@
  
  dnl Find the optional components we should build
  OGRE_CHECK_GUI
-@@ -120,135 +120,10 @@
+@@ -122,150 +122,10 @@
  
  dnl Create the makefiles
  AC_CONFIG_FILES([Makefile \
@@ -72,13 +103,19 @@
 -    PlugIns/BSPSceneManager/include/Makefile \
      PlugIns/CgProgramManager/Makefile \
      PlugIns/CgProgramManager/src/Makefile \
-     PlugIns/CgProgramManager/include/Makefile \
+-    PlugIns/CgProgramManager/include/Makefile \
 -    PlugIns/OctreeSceneManager/Makefile \
 -    PlugIns/OctreeSceneManager/src/Makefile \
 -    PlugIns/OctreeSceneManager/include/Makefile \
+-    PlugIns/OctreeZone/Makefile \
+-    PlugIns/OctreeZone/src/Makefile \
+-    PlugIns/OctreeZone/include/Makefile \
 -    PlugIns/ParticleFX/Makefile \
 -    PlugIns/ParticleFX/src/Makefile \
 -    PlugIns/ParticleFX/include/Makefile \
+-    PlugIns/PCZSceneManager/Makefile \
+-    PlugIns/PCZSceneManager/src/Makefile \
+-    PlugIns/PCZSceneManager/include/Makefile \
 -    RenderSystems/Makefile \
 -    RenderSystems/GL/Makefile \
 -    RenderSystems/GL/src/Makefile \
@@ -175,6 +212,13 @@
 -    Samples/Instancing/Makefile \
 -    Samples/Instancing/src/Makefile \
 -    Samples/Instancing/include/Makefile \
+-    Samples/Isosurf/Makefile \
+-    Samples/Isosurf/src/Makefile \
+-    Samples/ParticleGS/Makefile \
+-    Samples/ParticleGS/src/Makefile \
+-    Samples/PCZTestApp/Makefile \
+-    Samples/PCZTestApp/src/Makefile \
+-    Samples/PCZTestApp/include/Makefile \
 -    Tests/Makefile \
 -    Tests/src/Makefile \
 -    Tools/Makefile \
@@ -186,14 +230,17 @@
 -    Tools/XMLConverter/Makefile \
 -    Tools/XMLConverter/src/Makefile \
 -    Tools/XMLConverter/include/Makefile \
+-    Tools/rcapsdump/Makefile \
+-    Tools/rcapsdump/src/Makefile \
 -    Tools/LightwaveConverter/Makefile \
 -    Tools/LightwaveConverter/src/Makefile \
 -    Tools/LightwaveConverter/include/Makefile \
 -    OGRE.pc
++    PlugIns/CgProgramManager/include/Makefile
      ])
  
  AC_OUTPUT
-@@ -269,7 +144,6 @@
+@@ -287,7 +147,6 @@
  echo "    Use FreeImage                   : $build_freeimage"
  echo "    Use DevIL                       : $build_il"
  echo "    Build OGRE demos                : $build_ogre_demos"
@@ -201,26 +248,3 @@
  echo "    Build CEGUI demos               : $build_cegui_sample"
  echo "    Build the OpenEXR plugin        : $build_exr"
  echo "    Build the Cg plugin             : $build_cg"
---- 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
- ACLOCAL_AMFLAGS = -I Scripts/m4
- AUTOMAKE_OPTIONS = foreign
--
--pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = OGRE.pc
---- 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 
--
--if BUILD_CGPLUGIN
--SUBDIRS += CgProgramManager
--endif
--
--if BUILD_EXRPLUGIN
--SUBDIRS += EXRCodec
--endif
-+SUBDIRS = CgProgramManager

-- 
Packaging for ogre-contrib

More information about the Pkg-games-commits mailing list