[Pkg-voip-commits] r3390 - in libcommoncpp2/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-04-12 17:22:11 +0000 (Thu, 12 Apr 2007)
New Revision: 3390

Added:
   libcommoncpp2/trunk/debian/patches/dbug417329-gcc4.3.dpatch
Modified:
   libcommoncpp2/trunk/debian/changelog
Log:
* Patch from Stephan Suerken fixes
  - threads: isRunning() always returns true (Closes: #410219)
* Patch from Martin Michlmayr fixes:
  - FTBFS with GCC 4.3: missing #includes (Closes: #417329)

Modified: libcommoncpp2/trunk/debian/changelog
===================================================================
--- libcommoncpp2/trunk/debian/changelog	2007-04-12 17:08:24 UTC (rev 3389)
+++ libcommoncpp2/trunk/debian/changelog	2007-04-12 17:22:11 UTC (rev 3390)
@@ -1,9 +1,12 @@
 libcommoncpp2 (1.5.6-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * Patch to fix threads: isRunning() always returns true (Closes: #410219)
+  * Patch from Stephan Suerken fixes
+    - threads: isRunning() always returns true (Closes: #410219)
+  * Patch from Martin Michlmayr fixes:
+    - FTBFS with GCC 4.3: missing #includes (Closes: #417329)
 
- -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 18:07:47 +0100
+ -- Mark Purcell <msp at debian.org>  Thu, 12 Apr 2007 18:18:23 +0100
 
 libcommoncpp2 (1.5.6-1) unstable; urgency=low
 

Added: libcommoncpp2/trunk/debian/patches/dbug417329-gcc4.3.dpatch
===================================================================
--- libcommoncpp2/trunk/debian/patches/dbug417329-gcc4.3.dpatch	2007-04-12 17:08:24 UTC (rev 3389)
+++ libcommoncpp2/trunk/debian/patches/dbug417329-gcc4.3.dpatch	2007-04-12 17:22:11 UTC (rev 3390)
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dbug417329-gcc4.3.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libcommoncpp2-1.5.6~/src/file.cpp libcommoncpp2-1.5.6/src/file.cpp
+--- libcommoncpp2-1.5.6~/src/file.cpp	2007-01-24 09:48:28.000000000 +0000
++++ libcommoncpp2-1.5.6/src/file.cpp	2007-04-12 18:17:38.000000000 +0100
+@@ -60,8 +60,10 @@
+ 
+ #ifdef	__BORLANDC__
+ #include <stdio.h>
++#include <stdlib.h>
+ #else
+ #include <cstdio>
++#include <cstdlib>
+ #endif
+ #include <sys/stat.h>
+ #include <cerrno>
+diff -urNad libcommoncpp2-1.5.6~/src/string.cpp libcommoncpp2-1.5.6/src/string.cpp
+--- libcommoncpp2-1.5.6~/src/string.cpp	2007-02-11 22:18:44.000000000 +0000
++++ libcommoncpp2-1.5.6/src/string.cpp	2007-04-12 18:17:38.000000000 +0100
+@@ -46,9 +46,11 @@
+ #ifdef	__BORLANDC__
+ #include <stdarg.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #else
+ #include <cstdarg>
+ #include <cstdio>
++#include <cstdlib>
+ #endif
+ 
+ #ifdef	CCXX_NAMESPACES
+diff -urNad libcommoncpp2-1.5.6~/src/thread.cpp libcommoncpp2-1.5.6/src/thread.cpp
+--- libcommoncpp2-1.5.6~/src/thread.cpp	2007-02-14 00:03:59.000000000 +0000
++++ libcommoncpp2-1.5.6/src/thread.cpp	2007-04-12 18:17:38.000000000 +0100
+@@ -42,8 +42,10 @@
+ #include <cc++/process.h>
+ #ifdef	__BORLANDC__
+ #include <stdio.h>
++#include <stdlib.h>
+ #else
+ #include <cstdio>
++#include <cstdlib>
+ #endif
+ #include "private.h"
+ 
+diff -urNad libcommoncpp2-1.5.6~/src/xml.cpp libcommoncpp2-1.5.6/src/xml.cpp
+--- libcommoncpp2-1.5.6~/src/xml.cpp	2007-01-24 10:19:04.000000000 +0000
++++ libcommoncpp2-1.5.6/src/xml.cpp	2007-04-12 18:17:38.000000000 +0100
+@@ -50,6 +50,8 @@
+ #include <syslog.h>
+ #endif
+ 
++#include <cstdlib>
++
+ // very ugly, but saves a lot of #ifdefs. To understand this, look at
+ // the private members of XMLRPC.
+ #ifndef HAVE_SSTREAM


Property changes on: libcommoncpp2/trunk/debian/patches/dbug417329-gcc4.3.dpatch
___________________________________________________________________
Name: svn:executable
   + *