[critterding] 02/04: Imported Debian patch 1.0-beta12.1-1.2

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository critterding.

commit 47d0c5083f977137abd4c9c9d61053d63e3ac682
Author: Jonathan Wiltshire <jmw at debian.org>
Date:   Sun May 13 15:38:27 2012 +0100

    Imported Debian patch 1.0-beta12.1-1.2
---
 debian/changelog                   |  8 ++++++++
 debian/patches/20fix_ftbfs_gcc_4.7 | 15 +++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9281f5b..fc32641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 --git a/debian/patches/20fix_ftbfs_gcc_4.7 b/debian/patches/20fix_ftbfs_gcc_4.7
new file mode 100644
index 0000000..25fb271
--- /dev/null
+++ b/debian/patches/20fix_ftbfs_gcc_4.7
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 2b9e82f..3351fed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00fontandiconpath
 10uninitialized_constant
 11const_cast
+20fix_ftbfs_gcc_4.7

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/critterding.git