[SCM] Packaging for ogre branch, master, updated. upstream/1.4.8.dfsg2-94-gd56d234

[Andres Mejia]

The following commit has been merged in the master branch:
commit d56d2340feb4f3c7ab24812e1c0bfb89c51bac02
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jul 20 00:28:49 2008 -0400

    Removing nvidia_fbo_fix.patch. Applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 531529d..57853de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ ogre (1.4.9.dfsg1-1) unstable; urgency=low
   * Add note about correct Wings3D homepage in libogre-dev README.Debian file.
   * Fixing debian-watch-file-should-mangle-version lintian warning.
   * Making patches compatible with quilt 3.0.
+  * Removing nvidia_fbo_fix.patch. Applied upstream.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 20 Jul 2008 00:22:32 -0400
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 20 Jul 2008 00:27:43 -0400
 
 ogre (1.4.8.dfsg1-1) unstable; urgency=low
 
diff --git a/debian/patches/nvidia_fbo_fix.patch b/debian/patches/nvidia_fbo_fix.patch
deleted file mode 100644
index 5a83dbb..0000000
--- a/debian/patches/nvidia_fbo_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch that fixes problem using nvidia 169.12 drivers on Linux
-=====================================================================
---- a/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp.bak	2008-05-19 00:52:46.000000000 -0400
-+++ b/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp	2008-05-19 00:56:12.000000000 -0400
-@@ -308,7 +308,9 @@
-                     {
-                         // Packed depth/stencil format
- 
--#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-+// #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-+// It now seems as if this workaround now *breaks* nvidia cards on Linux with the 169.12 drivers on Linux
-+#if 0
-                         // Only query packed depth/stencil formats for 32-bit
-                         // non-floating point formats (ie not R32!) 
-                         // Linux nVidia driver segfaults if you query others
diff --git a/debian/patches/series b/debian/patches/series
index 3d5dedd..92deb67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 disable_samples.diff
 fix_rpath.diff
 fix_distclean.patch
-nvidia_fbo_fix.patch

-- 
Packaging for ogre