Dear maintainer,

I've prepared an NMU for megaglest (versioned as 3.6.0.3-1.1). It is available
at [1] and the debdiff is attached. 

Regards.

[1] 
http://mentors.debian.net/debian/pool/main/m/megaglest/megaglest_3.6.0.3-1.1.dsc

diff -Nru megaglest-3.6.0.3/debian/changelog megaglest-3.6.0.3/debian/changelog
--- megaglest-3.6.0.3/debian/changelog  2012-02-03 10:30:11.000000000 +0100
+++ megaglest-3.6.0.3/debian/changelog  2012-05-14 11:16:21.000000000 +0200
@@ -1,3 +1,10 @@
+megaglest (3.6.0.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/gcc4.7.patch: Fix FTBFS with g++ 4.7. (Closes: #672014).
+
+ -- Sebastian Ramacher <s.ramac...@gmx.at>  Mon, 14 May 2012 11:16:09 +0200
+
 megaglest (3.6.0.3-1) unstable; urgency=low
 
   [ Mark Vejvoda ]
diff -Nru megaglest-3.6.0.3/debian/patches/gcc4.7.patch 
megaglest-3.6.0.3/debian/patches/gcc4.7.patch
--- megaglest-3.6.0.3/debian/patches/gcc4.7.patch       1970-01-01 
01:00:00.000000000 +0100
+++ megaglest-3.6.0.3/debian/patches/gcc4.7.patch       2012-05-13 
10:45:00.000000000 +0200
@@ -0,0 +1,35 @@
+Description: Fix build failures with g++ 4.7
+Author: Sebastian Ramacher <s.ramac...@gmx.at>
+Last-Update: 2012-05-13
+
+Index: megaglest-3.6.0.3/source/shared_lib/sources/util/util.cpp
+===================================================================
+--- megaglest-3.6.0.3.orig/source/shared_lib/sources/util/util.cpp     
2012-05-13 00:18:02.000000000 +0200
++++ megaglest-3.6.0.3/source/shared_lib/sources/util/util.cpp  2012-05-13 
00:18:02.000000000 +0200
+@@ -33,6 +33,7 @@
+ #ifndef WIN32
+ #include <errno.h>
+ #endif
++#include <unistd.h>
+ 
+ #include "leak_dumper.h"
+ 
+Index: megaglest-3.6.0.3/source/shared_lib/include/graphics/math_util.h
+===================================================================
+--- megaglest-3.6.0.3.orig/source/shared_lib/include/graphics/math_util.h      
2011-12-14 08:40:48.000000000 +0100
++++ megaglest-3.6.0.3/source/shared_lib/include/graphics/math_util.h   
2012-05-13 00:23:50.000000000 +0200
+@@ -184,10 +184,10 @@
+ 
+       Rect2<T> computeBoundingRect() const{
+               return Rect2i(
+-                      min(p[0].x, p[1].x), 
+-                      min(p[0].y, p[2].y), 
+-                      max(p[2].x, p[3].x), 
+-                      max(p[1].y, p[3].y));
++                      std::min(p[0].x, p[1].x), 
++                      std::min(p[0].y, p[2].y), 
++                      std::max(p[2].x, p[3].x), 
++                      std::max(p[1].y, p[3].y));
+       }
+ 
+       bool isInside(const Vec2<T> &pt) const{
diff -Nru megaglest-3.6.0.3/debian/patches/series 
megaglest-3.6.0.3/debian/patches/series
--- megaglest-3.6.0.3/debian/patches/series     1970-01-01 01:00:00.000000000 
+0100
+++ megaglest-3.6.0.3/debian/patches/series     2012-05-13 00:18:02.000000000 
+0200
@@ -0,0 +1 @@
+gcc4.7.patch



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to