[Pkg-ocaml-maint-commits] r5696 - in /trunk/packages/felix/trunk/debian: changelog patches/00list patches/01_gcc43.dpatch

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Tue May 27 08:54:51 2008
New Revision: 5696

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5696
Log:
Acknowledge NMU: Add missing <cstring> include to flx_gc.pak
and fix FTBFS with g++ 4.3.

Added:
    trunk/packages/felix/trunk/debian/patches/01_gcc43.dpatch
Modified:
    trunk/packages/felix/trunk/debian/changelog
    trunk/packages/felix/trunk/debian/patches/00list

Modified: trunk/packages/felix/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/changelog?rev=5696&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/changelog (original)
+++ trunk/packages/felix/trunk/debian/changelog Tue May 27 08:54:51 2008
@@ -1,8 +1,20 @@
 felix (1.1.3-4) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 16:49:58 +0100
+  [ Stephane Glondu ]
+  * Acknowledge NMU.
+
+ -- Stephane Glondu <steph at glondu.net>  Tue, 27 May 2008 10:52:45 +0200
+
+felix (1.1.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add missing <cstring> include to flx_gc.pak
+    and fix FTBFS with g++ 4.3. (Closes: #472561)
+
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Mon, 31 Mar 2008 09:32:56 +0530
 
 felix (1.1.3-3) unstable; urgency=low
 

Modified: trunk/packages/felix/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/patches/00list?rev=5696&op=diff
==============================================================================
--- trunk/packages/felix/trunk/debian/patches/00list (original)
+++ trunk/packages/felix/trunk/debian/patches/00list Tue May 27 08:54:51 2008
@@ -1,0 +1,1 @@
+01_gcc43.dpatch

Added: trunk/packages/felix/trunk/debian/patches/01_gcc43.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/felix/trunk/debian/patches/01_gcc43.dpatch?rev=5696&op=file
==============================================================================
--- trunk/packages/felix/trunk/debian/patches/01_gcc43.dpatch (added)
+++ trunk/packages/felix/trunk/debian/patches/01_gcc43.dpatch Tue May 27 08:54:51 2008
@@ -1,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc43.dpatch by  <akumar at ee.iitm.ac.in>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch by Kumar Appaiah to fix FTBFS with g++ 4.3
+
+ at DPATCH@
+diff -urNad felix-1.1.3~/lpsrc/flx_gc.pak felix-1.1.3/lpsrc/flx_gc.pak
+--- felix-1.1.3~/lpsrc/flx_gc.pak	2008-03-31 09:59:09.000000000 +0530
++++ felix-1.1.3/lpsrc/flx_gc.pak	2008-03-31 10:00:08.000000000 +0530
+@@ -80,6 +80,7 @@
+ #define __FLX_GC_H__
+ 
+ #include <cstdlib>
++#include <cstring>
+ #include "flx_gc_config.hpp"
+ 
+ // we use an STL set to hold the collection of roots
+@@ -705,6 +706,7 @@
+ 
+ @select(tangler('rtl/flx_collector.cpp'))
+ #include <cstdlib>
++#include <cstring>
+ #include <map>
+ #include <limits.h>
+ #include <cassert>
+diff -urNad felix-1.1.3~/lpsrc/flx_posixtimer_demux.ipk felix-1.1.3/lpsrc/flx_posixtimer_demux.ipk
+--- felix-1.1.3~/lpsrc/flx_posixtimer_demux.ipk	2007-04-18 13:06:21.000000000 +0530
++++ felix-1.1.3/lpsrc/flx_posixtimer_demux.ipk	2008-03-31 09:59:34.000000000 +0530
+@@ -54,6 +54,7 @@
+ 
+ #include <queue>    // stl seems to have a prio_queue
+ #include <sys/time.h> // gettimeofday for calculating "now"
++#include <cstdio>
+ 
+ //using namespace flx::pthread;
+ namespace flx { namespace demux {
+diff -urNad felix-1.1.3~/lpsrc/flx_rtl.pak felix-1.1.3/lpsrc/flx_rtl.pak
+--- felix-1.1.3~/lpsrc/flx_rtl.pak	2008-03-31 09:59:09.000000000 +0530
++++ felix-1.1.3/lpsrc/flx_rtl.pak	2008-03-31 10:01:02.000000000 +0530
+@@ -3384,6 +3384,7 @@
+ 
+ @select(tangler('rtl/flx_ioutil.cpp'))
+ #include <cstdio>
++#include <cstring>
+ #include <string>
+ #include "flx_ioutil.hpp"
+ namespace flx { namespace rtl { namespace ioutil {
+@@ -3523,6 +3524,7 @@
+ @doc()
+ 
+ @select(tangler('rtl/flx_strutil.cpp'))
++#include <cstdlib>
+ #include "flx_strutil.hpp"
+ 
+ namespace flx { namespace rtl { namespace strutil {