tags 461678 + patch
thanks
Hi,
Attached is the diff for my fam 2.7.0-13.2 NMU.
Cheers,
Moritz
diff -u fam-2.7.0/debian/changelog fam-2.7.0/debian/changelog
--- fam-2.7.0/debian/changelog
+++ fam-2.7.0/debian/changelog
@@ -1,3 +1,10 @@
+fam (2.7.0-13.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix GCC 4.3 compatibility (Closes: #461678)
+
+ -- Moritz Muehlenhoff <[EMAIL PROTECTED]> Thu, 20 Mar 2008 23:20:14 +0100
+
fam (2.7.0-13.1) unstable; urgency=low
* Non-maintainer uploaded to fix release goal issue.
only in patch2:
unchanged:
--- fam-2.7.0.orig/debian/patches/11-gcc43.patch
+++ fam-2.7.0/debian/patches/11-gcc43.patch
@@ -0,0 +1,20 @@
+Only in fam-2.7.0/lib: #Client.c++#
+diff -aur fam-2.7.0.orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
+--- fam-2.7.0.orig/lib/Client.c++ 2003-01-18 15:18:12.000000000 +0100
++++ fam-2.7.0/lib/Client.c++ 2008-03-20 23:18:09.000000000 +0100
+@@ -29,12 +29,12 @@
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_clnt.h>
+ #include <rpc/pmap_prot.h>
+-#include <string.h> // for memset
++#include <cstring> // for memset
+ #include <ctype.h>
+ #include <syslog.h>
+ #include <errno.h>
+
+-#include <iostream.h>
++#include <iostream>
+
+ #include "fam.h"
+ #include "Client.h"
+Only in fam-2.7.0/lib: Client.c++~
only in patch2:
unchanged:
--- fam-2.7.0.orig/debian/patches/12-gcc43.patch
+++ fam-2.7.0/debian/patches/12-gcc43.patch
@@ -0,0 +1,13 @@
+diff -aur fam-2.7.0.orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
+--- fam-2.7.0.orig/src/IMon.c++ 2003-01-18 15:18:12.000000000 +0100
++++ fam-2.7.0/src/IMon.c++ 2008-03-20 23:30:25.000000000 +0100
+@@ -40,7 +40,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++#include <memory>
+
+ int IMon::imonfd = -2;
+ IMon::EventHandler IMon::ehandler = NULL;
+Only in fam-2.7.0/src: IMon.c++~
only in patch2:
unchanged:
--- fam-2.7.0.orig/debian/patches/13-gcc43.patch
+++ fam-2.7.0/debian/patches/13-gcc43.patch
@@ -0,0 +1,13 @@
+diff -aur fam-2.7.0.orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0.orig/src/DNotify.c++ 2008-03-20 23:31:08.000000000 +0100
++++ fam-2.7.0/src/DNotify.c++ 2008-03-20 23:38:28.000000000 +0100
+@@ -41,7 +41,7 @@
+ #include "Interest.h"
+ #include "Log.h"
+ #include "Scheduler.h"
+-#include "alloc.h"
++#include <memory>
+
+
+ int DNotify::pipe_write_fd = -2;
+Only in fam-2.7.0/src: DNotify.c++~