Hi,

Attached is the diff for my log4cxx 0.9.7-6.1 NMU.
diff -u log4cxx-0.9.7/debian/changelog log4cxx-0.9.7/debian/changelog
--- log4cxx-0.9.7/debian/changelog
+++ log4cxx-0.9.7/debian/changelog
@@ -1,3 +1,11 @@
+log4cxx (0.9.7-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patches/70-gcc-4.3.dpatch to fix FTBFS with gcc-4.3, thanks to Brian
+    M. Carlson (Closes: 455134).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Sun, 16 Mar 2008 21:33:00 +0100
+
 log4cxx (0.9.7-6) unstable; urgency=low
 
   * debian/patches: added descriptions to the patch files
diff -u log4cxx-0.9.7/debian/patches/00list log4cxx-0.9.7/debian/patches/00list
--- log4cxx-0.9.7/debian/patches/00list
+++ log4cxx-0.9.7/debian/patches/00list
@@ -3,0 +4 @@
+70-gcc-4.3.dpatch
only in patch2:
unchanged:
--- log4cxx-0.9.7.orig/debian/patches/70-gcc-4.3.dpatch
+++ log4cxx-0.9.7/debian/patches/70-gcc-4.3.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-gcc-4.3.dpatch by "brian m. carlson" <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build issue with gcc 4.3
+
[EMAIL PROTECTED]@
+diff -ur log4cxx.old/src/socketoutputstream.cpp 
log4cxx-0.9.7/src/socketoutputstream.cpp
+--- log4cxx.old/src/socketoutputstream.cpp     2004-05-10 12:38:06.000000000 
+0000
++++ log4cxx-0.9.7/src/socketoutputstream.cpp   2007-12-21 18:17:06.000000000 
+0000
+@@ -17,6 +17,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/loglog.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff -ur log4cxx.old/src/stringtokenizer.cpp 
log4cxx-0.9.7/src/stringtokenizer.cpp
+--- log4cxx.old/src/stringtokenizer.cpp        2004-05-10 12:38:08.000000000 
+0000
++++ log4cxx-0.9.7/src/stringtokenizer.cpp      2007-12-21 18:21:50.000000000 
+0000
+@@ -15,6 +15,7 @@
+  */
+  
+ #include <log4cxx/helpers/stringtokenizer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+diff -ur log4cxx.old/src/timezone.cpp log4cxx-0.9.7/src/timezone.cpp
+--- log4cxx.old/src/timezone.cpp       2004-05-10 12:38:13.000000000 +0000
++++ log4cxx-0.9.7/src/timezone.cpp     2007-12-21 18:24:32.000000000 +0000
+@@ -16,6 +16,7 @@
+  
+ #include <log4cxx/helpers/timezone.h>
+ #include <locale>
++#include <string.h>
+ 
+ 
+ int getYear(int64_t date)
+diff -ur log4cxx.old/src/xmlsocketappender.cpp 
log4cxx-0.9.7/src/xmlsocketappender.cpp
+--- log4cxx.old/src/xmlsocketappender.cpp      2004-05-10 12:38:16.000000000 
+0000
++++ log4cxx-0.9.7/src/xmlsocketappender.cpp    2007-12-21 18:51:30.000000000 
+0000
+@@ -22,6 +22,7 @@
+ #include <log4cxx/xml/xmllayout.h>
+ #include <log4cxx/level.h>
+ #include <log4cxx/helpers/transform.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;

Reply via email to