r3182 - in packages/trunk/moagg/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-07-02 15:18:10 +0000 (Mon, 02 Jul 2007)
New Revision: 3182

Added:
   packages/trunk/moagg/debian/patches/gcc-4.2.diff
Modified:
   packages/trunk/moagg/debian/changelog
Log:
+  * Apply Mark Brown's patch to fix FTBFS with gcc 4.2 (Closes: #361404)
+   + add gcc-4.2.diff


Modified: packages/trunk/moagg/debian/changelog
===================================================================
--- packages/trunk/moagg/debian/changelog	2007-07-02 14:50:24 UTC (rev 3181)
+++ packages/trunk/moagg/debian/changelog	2007-07-02 15:18:10 UTC (rev 3182)
@@ -1,10 +1,14 @@
-moagg (0.18-5) UNRELEASED; urgency=low
+moagg (0.18-5) unstable; urgency=low
 
   [ Eddy Petrișor ]
   * fixed Homepage semifield
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Wed, 26 Jul 2006 03:33:10 +0300
+  [ Gonéri Le Bouder ]
+  * Apply Mark Brown's patch to fix FTBFS with gcc 4.2 (Closes: #361404)
+   + add gcc-4.2.diff
 
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon,  2 Jul 2007 17:18:59 +0200
+
 moagg (0.18-4) unstable; urgency=low
 
   * Adopted package and moved it to the Debian Games Team repository.

Added: packages/trunk/moagg/debian/patches/gcc-4.2.diff
===================================================================
--- packages/trunk/moagg/debian/patches/gcc-4.2.diff	                        (rev 0)
+++ packages/trunk/moagg/debian/patches/gcc-4.2.diff	2007-07-02 15:18:10 UTC (rev 3182)
@@ -0,0 +1,32 @@
+Index: moagg-0.18/libMoaggCore/include/MathTools.h
+===================================================================
+--- moagg-0.18.orig/libMoaggCore/include/MathTools.h	2007-07-01 14:18:14.000000000 +0100
++++ moagg-0.18/libMoaggCore/include/MathTools.h	2007-07-01 14:19:47.000000000 +0100
+@@ -63,6 +63,9 @@
+         double m_y;
+     };
+ 
++    Vector operator+(const Vector &v1, const Vector &v2);
++    Vector operator-(const Vector &v1, const Vector &v2);
++
+ 
+     //------------------------------------------------------------------------
+     /**
+Index: moagg-0.18/libMoaggCore/include/Tools.h
+===================================================================
+--- moagg-0.18.orig/libMoaggCore/include/Tools.h	2007-07-01 14:15:39.000000000 +0100
++++ moagg-0.18/libMoaggCore/include/Tools.h	2007-07-01 14:15:43.000000000 +0100
+@@ -34,13 +34,8 @@
+ 
+ 
+ //----------------------------------------------------------------------------
+-#if defined __GNUC__ && ! defined __LINT__
+-#define MIN(X, Y) ((X) <? (Y))
+-#define MAX(X, Y) ((X) >? (Y))
+-#else
+ #define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
+ #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+-#endif //!__GNUC__
+ 
+ //----------------------------------------------------------------------------
+ #define ZAP_POINTER(p) delete p; p = NULL;