Bug#667143: critterding: diff for NMU version 1.0-beta12.1-1.2

[Jonathan Wiltshire]

tags 667143 + pending
thanks

Dear maintainer,

I've prepared an NMU for critterding (versioned as 1.0-beta12.1-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.


diff -Nru critterding-1.0-beta12.1/debian/changelog critterding-1.0-beta12.1/debian/changelog
--- critterding-1.0-beta12.1/debian/changelog	2011-10-23 15:19:10.000000000 +0100
+++ critterding-1.0-beta12.1/debian/changelog	2012-05-13 15:38:30.000000000 +0100
@@ -1,3 +1,11 @@
+critterding (1.0-beta12.1-1.2) unstable; urgency=low
+
+  [ Cyril Brulebois ]
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc 4.7 due to missing <unistd.h> include (Closes: #667143).
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 13 May 2012 15:38:27 +0100
+
 critterding (1.0-beta12.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru critterding-1.0-beta12.1/debian/patches/20fix_ftbfs_gcc_4.7 critterding-1.0-beta12.1/debian/patches/20fix_ftbfs_gcc_4.7
--- critterding-1.0-beta12.1/debian/patches/20fix_ftbfs_gcc_4.7	1970-01-01 01:00:00.000000000 +0100
+++ critterding-1.0-beta12.1/debian/patches/20fix_ftbfs_gcc_4.7	2012-05-13 15:38:23.000000000 +0100
@@ -0,0 +1,15 @@
+--- a/src/scenes/evolution.cpp
++++ b/src/scenes/evolution.cpp
+@@ -1,10 +1,9 @@
+-#ifdef _WIN32
+-	#include <unistd.h>
+-#endif
++#include <unistd.h>
+ #include "evolution.h"
+ 
+ # include <math.h>
+ 
++
+ Evolution::Evolution()
+ {
+ 	cmd = Commands::Instance();
diff -Nru critterding-1.0-beta12.1/debian/patches/series critterding-1.0-beta12.1/debian/patches/series
--- critterding-1.0-beta12.1/debian/patches/series	2011-10-23 15:18:02.000000000 +0100
+++ critterding-1.0-beta12.1/debian/patches/series	2012-05-13 15:38:23.000000000 +0100
@@ -1,3 +1,4 @@
 00fontandiconpath
 10uninitialized_constant
 11const_cast
+20fix_ftbfs_gcc_4.7