tags 358221 + pending
thanks
I've uploaded the following NMU to delayed-2.
diff -u ogre-1.0.6/debian/changelog ogre-1.0.6/debian/changelog
--- ogre-1.0.6/debian/changelog
+++ ogre-1.0.6/debian/changelog
@@ -1,3 +1,11 @@
+ogre (1.0.6-1.4) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * patches/10_gcc_4.1_mips: Don't use "mips" as a variable name. Thanks
+ to Brian M. Carlson for the patch. (Closes: #358221)
+
+ -- Martin Michlmayr <[EMAIL PROTECTED]> Fri, 26 May 2006 20:11:18 +0200
+
ogre (1.0.6-1.3) unstable; urgency=high
* Non-maintainer upload.
only in patch2:
unchanged:
--- ogre-1.0.6.orig/debian/patches/10_gcc_4.1_mips
+++ ogre-1.0.6/debian/patches/10_gcc_4.1_mips
@@ -0,0 +1,29 @@
+--- ./ogre-free/OgreMain/src/OgreMaterialSerializer.cpp.orig 2006-05-13
05:05:19.000000000 +0000
++++ ./ogre-free/OgreMain/src/OgreMaterialSerializer.cpp 2006-05-13
05:06:16.000000000 +0000
+@@ -606,7 +606,7 @@
+ context);
+ }
+ TextureType tt = TEX_TYPE_2D;
+- int mips = -1; // When passed to TextureManager::load, this
means default to default number of mipmaps
++ int mipmaps = -1; // When passed to TextureManager::load, this
means default to default number of mipmaps
+ if (vecparams.size() >= 2)
+ {
+ StringUtil::toLowerCase(vecparams[1]);
+@@ -637,14 +637,14 @@
+ StringUtil::toLowerCase(vecparams[2]);
+ if (vecparams[2] == "unlimited")
+ {
+- mips = MIP_UNLIMITED;
++ mipmaps = MIP_UNLIMITED;
+ }
+ else
+ {
+- mips = StringConverter::parseInt(vecparams[2]);
++ mipmaps =
StringConverter::parseInt(vecparams[2]);
+ }
+ }
+- context.textureUnit->setTextureName(vecparams[0], tt, mips);
++ context.textureUnit->setTextureName(vecparams[0], tt, mipmaps);
+ return false;
+ }
+ //-----------------------------------------------------------------------
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
