[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.82.7.1+dfsg1-2-6-gb5ca8b6

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 7ff3e4041b104d4511b997f740ce8f304eeecc48
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue May 3 12:43:54 2011 +0200

    Fix "FTBFS: AAStar.h:70:43: error: 'NULL' was not declared in this scope", add debian/patches/ftbfs-fix-625097.patch from upstream (Closes: #625097)

diff --git a/debian/changelog b/debian/changelog
index b05814d..40a3c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spring (0.82.7.1+dfsg1-3) UNRELEASED; urgency=low
+
+  * Fix "FTBFS: AAStar.h:70:43: error: 'NULL' was not declared in this
+    scope", add debian/patches/ftbfs-fix-625097.patch from upstream (Closes:
+    #625097)
+
+ -- Jan Dittberner <jandd at debian.org>  Tue, 03 May 2011 12:41:53 +0200
+
 spring (0.82.7.1+dfsg1-2) unstable; urgency=low
 
   * upload to unstable
diff --git a/debian/patches/ftbfs-fix-625097.patch b/debian/patches/ftbfs-fix-625097.patch
new file mode 100644
index 0000000..216759f
--- /dev/null
+++ b/debian/patches/ftbfs-fix-625097.patch
@@ -0,0 +1,14 @@
+From: hoijui
+Subject: Patch for FTBFS with g++ 4.6.0
+Bug-Debian: http://bugs.debian.org/625097
+Bug: http://springrts.com/mantis/view.php?id=2415
+--- a/AI/Skirmish/E323AI/AAStar.h
++++ b/AI/Skirmish/E323AI/AAStar.h
+@@ -4,6 +4,7 @@
+ #include <queue>
+ #include <vector>
+ #include <list>
++#include <cstddef> // for NULL
+ 
+ class AAStar {
+ 	public:
diff --git a/debian/patches/series b/debian/patches/series
index 4f71fce..f043922 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0003-fix-cmake-2_8-java-build.patch
 0005-fix-sdl-build.patch
 0006-fix-spelling-error.patch
+ftbfs-fix-625097.patch

-- 
advanced 3D real time strategy game engine