diff -u glom-1.6.14/debian/changelog glom-1.6.14/debian/changelog --- glom-1.6.14/debian/changelog +++ glom-1.6.14/debian/changelog @@ -1,3 +1,9 @@ +glom (1.6.14-0ubuntu2) intrepid; urgency=low + + * Add fix_gcc43_FTBFS.patch, fixes FTBFS (LP: #244712). + + -- Alessio Treglia Sun, 27 Jul 2008 20:21:53 +0200 + glom (1.6.14-0ubuntu1) hardy; urgency=low * New upstream release only in patch2: unchanged: --- glom-1.6.14.orig/debian/patches/fix_gcc43_FTBFS.patch +++ glom-1.6.14/debian/patches/fix_gcc43_FTBFS.patch @@ -0,0 +1,57 @@ +diff -Nurp glom-1.6.14/glom/libglom/connectionpool.cc glom-1.6.14.new/glom/libglom/connectionpool.cc +--- glom-1.6.14/glom/libglom/connectionpool.cc 2008-04-10 11:25:33.000000000 +0200 ++++ glom-1.6.14.new/glom/libglom/connectionpool.cc 2008-07-27 19:56:21.000000000 +0200 +@@ -40,7 +40,7 @@ + #include //For sockaddr_in + + #include //To catch segfaults +- ++#include // for memset + #include "gst-package.h" + + namespace Glom +diff -Nurp glom-1.6.14/glom/libglom/data_structure/glomconversions.cc glom-1.6.14.new/glom/libglom/data_structure/glomconversions.cc +--- glom-1.6.14/glom/libglom/data_structure/glomconversions.cc 2007-12-20 22:12:45.000000000 +0100 ++++ glom-1.6.14.new/glom/libglom/data_structure/glomconversions.cc 2008-07-27 19:57:37.000000000 +0200 +@@ -30,7 +30,7 @@ + #include // for struct tm + #include // for cout, endl + #include +- ++#include // for strlen, memset, strcmp + + namespace Glom + { +diff -Nurp glom-1.6.14/glom/libglom/document/document_glom.h glom-1.6.14.new/glom/libglom/document/document_glom.h +--- glom-1.6.14/glom/libglom/document/document_glom.h 2008-04-10 11:16:16.000000000 +0200 ++++ glom-1.6.14.new/glom/libglom/document/document_glom.h 2008-07-27 19:59:01.000000000 +0200 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include // for numeric_limits + + namespace Glom + { +diff -Nurp glom-1.6.14/glom/libglom/utils.cc glom-1.6.14.new/glom/libglom/utils.cc +--- glom-1.6.14/glom/libglom/utils.cc 2007-12-02 20:15:03.000000000 +0100 ++++ glom-1.6.14.new/glom/libglom/utils.cc 2008-07-27 19:59:47.000000000 +0200 +@@ -37,6 +37,7 @@ + #include + #endif + ++#include // for strchr + #include //For stringstream + + #include +diff -Nurp glom-1.6.14/glom/translation/window_translations.cc glom-1.6.14.new/glom/translation/window_translations.cc +--- glom-1.6.14/glom/translation/window_translations.cc 2007-11-13 11:22:24.000000000 +0100 ++++ glom-1.6.14.new/glom/translation/window_translations.cc 2008-07-27 20:00:38.000000000 +0200 +@@ -26,6 +26,7 @@ + #include "glom/libglom/utils.h" + + #include ++#include // for memset + + // To read the .po files + #include