[SCM] Packaging for ogre branch, master, updated. upstream/1.4.9.dfsg1-107-gfbacc08

[Federico Di Gregorio]

The following commit has been merged in the master branch:
commit ec33f659e2256dc609b68a36c8443584eb20177f
Author: Federico Di Gregorio <fog at debian.org>
Date:   Sun Mar 15 21:06:22 2009 +0100

    Updated patch to remove extra Samples

diff --git a/debian/patches/disable_samples.diff b/debian/patches/disable_samples.diff
index 9f1aab7..782e1d4 100644
--- a/debian/patches/disable_samples.diff
+++ b/debian/patches/disable_samples.diff
@@ -1,5 +1,7 @@
---- a/acinclude.m4.bak	2007-08-28 22:44:31.000000000 -0400
-+++ b/acinclude.m4	2007-08-28 22:53:48.000000000 -0400
+Index: ogre.git/acinclude.m4
+===================================================================
+--- ogre.git.orig/acinclude.m4	2009-03-15 21:02:03.513330703 +0100
++++ ogre.git/acinclude.m4	2009-03-15 21:04:23.813334051 +0100
 @@ -450,14 +450,12 @@
          AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \
                           Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc
@@ -18,9 +20,24 @@
      fi
      AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
  ])
---- a/configure.in.bak    2007-12-30 16:05:11.000000000 -0500
-+++ b/configure.in        2007-12-30 16:06:36.000000000 -0500
-@@ -154,86 +154,6 @@
+Index: ogre.git/Samples/Common/Makefile.am
+===================================================================
+--- ogre.git.orig/Samples/Common/Makefile.am	2009-03-15 21:02:03.509330962 +0100
++++ ogre.git/Samples/Common/Makefile.am	2009-03-15 21:04:23.817330928 +0100
+@@ -1,5 +1,5 @@
+-SUBDIRS = include bin
+-
++CEGUI_SUBDIR = CEGUIRenderer
+ if HAVE_CEGUI
+-SUBDIRS += CEGUIRenderer
++INCLUDE_CEGUI = $(CEGUI_SUBDIR)
+ endif
++SUBDIRS = $(INCLUDE_CEGUI)
+Index: ogre.git/configure.in
+===================================================================
+--- ogre.git.orig/configure.in	2009-03-15 21:02:03.541331542 +0100
++++ ogre.git/configure.in	2009-03-15 21:04:23.817330928 +0100
+@@ -162,93 +162,6 @@
      RenderSystems/Direct3D9/include/Makefile \
      Samples/Makefile \
      Samples/Common/Makefile \
@@ -104,10 +121,17 @@
 -    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 \
-@@ -269,7 +189,6 @@
+@@ -287,7 +200,6 @@
  echo "    Use FreeImage                   : $build_freeimage"
  echo "    Use DevIL                       : $build_il"
  echo "    Build OGRE demos                : $build_ogre_demos"
@@ -115,27 +139,18 @@
  echo "    Build CEGUI demos               : $build_cegui_sample"
  echo "    Build the OpenEXR plugin        : $build_exr"
  echo "    Build the Cg plugin             : $build_cg"
---- a/Samples/Common/Makefile.am.bak	2007-08-28 16:27:47.000000000 -0400
-+++ b/Samples/Common/Makefile.am	2007-08-28 17:04:04.000000000 -0400
-@@ -1,5 +1,5 @@
--SUBDIRS = include bin
--
-+CEGUI_SUBDIR = CEGUIRenderer
- if HAVE_CEGUI
--SUBDIRS += CEGUIRenderer
-+INCLUDE_CEGUI = $(CEGUI_SUBDIR)
- endif
-+SUBDIRS = $(INCLUDE_CEGUI)
---- a/Samples/Makefile.am.bak	2007-08-28 16:31:00.000000000 -0400
-+++ b/Samples/Makefile.am	2007-08-28 17:05:34.000000000 -0400
-@@ -1,12 +1 @@
+Index: ogre.git/Samples/Makefile.am
+===================================================================
+--- ogre.git.orig/Samples/Makefile.am	2009-03-15 21:02:03.509330962 +0100
++++ ogre.git/Samples/Makefile.am	2009-03-15 21:04:51.845832382 +0100
+@@ -1,12 +1,2 @@
  SUBDIRS = Common
--
+ 
 -if OGRE_BUILDING_DEMOS
 - SUBDIRS += SkeletalAnimation BezierPatch EnvMapping Transpacency Lighting \
 -            ParticleFX TextureFX SkyDome BSP SkyPlane SkyBox CameraTrack Terrain \
 -            RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel \
--            DynTex VolumeTex Grass DeferredShading
+-            DynTex VolumeTex Grass DeferredShading Isosurf ParticleGS PCZTestApp
 -
 -if HAVE_CEGUI
 - SUBDIRS += Gui FacialAnimation OceanDemo Compositor Shadows Instancing

-- 
Packaging for ogre