tags 667131 + pending thanks Hi Michael
I'm going trough some RC bugs for wheezy, and where on cbmc. I've prepared an NMU for cbmc (versioned as 4.1-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. I can cancel the upload in case you would like to do it. Please simply let me know! Regards Salvatore
diff -Nru cbmc-4.1/debian/changelog cbmc-4.1/debian/changelog --- cbmc-4.1/debian/changelog 2012-05-12 10:44:18.000000000 +0200 +++ cbmc-4.1/debian/changelog 2012-05-13 14:25:55.000000000 +0200 @@ -1,3 +1,13 @@ +cbmc (4.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add fix-FTBFS-with-gcc-4.7.patch patch. + Fix FTBFS with gcc 4.7. Fix missing <unistd.h> includes and add 'this->' + where needed. + Thanks to Cyril Brulebois <k...@debian.org> for the patch. (Closes: #667131) + + -- Salvatore Bonaccorso <car...@debian.org> Sun, 13 May 2012 14:25:21 +0200 + cbmc (4.1-1) unstable; urgency=low * New upstream release (all code patches merged, only build system adaptions diff -Nru cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch --- cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch 2012-05-13 14:25:55.000000000 +0200 @@ -0,0 +1,59 @@ +Description: Fix FTBFS with gcc 4.7 + Fix missing <unistd.h> includes and add 'this->' where needed. +Origin: vendor +Bug-Debian: http://bugs.debian.org/667131 +Forwarded: no +Author: Cyril Brulebois <k...@debian.org> +Last-Update: 2012-05-13 + +--- a/src/ansi-c/c_preprocess.cpp ++++ b/src/ansi-c/c_preprocess.cpp +@@ -10,7 +10,7 @@ + #include <stdlib.h> + #include <string.h> + +-#ifdef __LINUX__ ++#ifdef __linux__ + #include <unistd.h> + #endif + +--- a/src/solvers/smt1/smt1_dec.cpp ++++ b/src/solvers/smt1/smt1_dec.cpp +@@ -16,6 +16,7 @@ + #include <i2string.h> + #include <string2int.h> + #include <prefix.h> ++#include <unistd.h> + + #include "smt1_dec.h" + +--- a/src/solvers/smt2/smt2_dec.cpp ++++ b/src/solvers/smt2/smt2_dec.cpp +@@ -14,6 +14,7 @@ + #include <tempfile.h> + #include <arith_tools.h> + #include <i2string.h> ++#include <unistd.h> + + #include "smt2_dec.h" + +--- a/src/util/numbering.h ++++ b/src/util/numbering.h +@@ -28,7 +28,7 @@ + + if(result.second) // inserted? + { +- push_back(a); ++ this->push_back(a); + assert(this->size()==numbers.size()); + } + +@@ -64,7 +64,7 @@ + + if(result.second) // inserted? + { +- push_back(a); ++ this->push_back(a); + assert(this->size()==numbers.size()); + } + diff -Nru cbmc-4.1/debian/patches/series cbmc-4.1/debian/patches/series --- cbmc-4.1/debian/patches/series 2012-05-12 10:44:18.000000000 +0200 +++ cbmc-4.1/debian/patches/series 2012-05-13 14:25:55.000000000 +0200 @@ -1,2 +1,3 @@ top-makefile minisat-debian +fix-FTBFS-with-gcc-4.7.patch
signature.asc
Description: Digital signature
