headers update, apply patch from upstream for gcc 4.6

diff --git a/debian/patches/fix_checks b/debian/patches/fix_checks
index bfdbc51fe5fb23ac8563759a056ab0935db2237a..f1b82b27e897dae5d3346487fbe00e09328ebd35 100644 (file)
--- a/debian/patches/fix_checks
+++ b/debian/patches/fix_checks
@@ -1,3 +1,9 @@
+Subject:  command time not found when using shell
+
+ * scripts/common/check/check_make_unix.sh: use bash and remove exec usage
+
+Author: Olivier Sallou <olivier.sallou@irisa.fr>
+Last-Update: 2011-05-03
 --- a/scripts/common/check/check_make_unix.sh
 +++ b/scripts/common/check/check_make_unix.sh
 @@ -503,8 +503,8 @@

diff --git a/debian/patches/fix_gcc46_include_error b/debian/patches/fix_gcc46_include_error
index f95711d17d503585fcc2c28d61e5a5dbb28ff2f4..374c4ac2575b538ab0b14ef44563295fd98d61d3 100644 (file)
--- a/debian/patches/fix_gcc46_include_error
+++ b/debian/patches/fix_gcc46_include_error
@@ -1,10 +1,16 @@
---- a/src/corelib/ncbi_stack_linux.cpp
-+++ b/src/corelib/ncbi_stack_linux.cpp
-@@ -32,6 +32,7 @@
- #include <ncbi_pch.hpp>
- #include <execinfo.h>
- #if NCBI_COMPILER_VERSION >= 310
-+#  include<stddef.h>
- #  include <cxxabi.h>
- #endif
- #include <vector>
+Subject: GCC 4.6 compilation error due to missing def
+
+ * include/corelib/ncbistre.hpp: Add stddef definition required by gcc4.6
+
+Author: Olivier Sallou <olivier.sallou@irisa.fr>
+Last-Update: 2011-05-03
+--- a/include/corelib/ncbistre.hpp
++++ b/include/corelib/ncbistre.hpp
+@@ -116,6 +116,7 @@
+ #define SEEKOFF         PUBSEEKOFF
+ 
+ #include <string>
++#include <stddef.h>
+ 
+ 
+ // (BEGIN_NCBI_SCOPE must be followed by END_NCBI_SCOPE later in this file)