Hi,

Attached is the diff for my enigma 1.01-2.1 NMU.

Note that this NMU may be a sponsored one, so in case of answers,
please also Cc: the sponsoree (mail in the changelog) too.
diff -u enigma-1.01/debian/patches/gcc-4.3-ftbfs.patch 
enigma-1.01/debian/patches/gcc-4.3-ftbfs.patch
--- enigma-1.01/debian/patches/gcc-4.3-ftbfs.patch
+++ enigma-1.01/debian/patches/gcc-4.3-ftbfs.patch
@@ -1,18 +1,9 @@
-# fix some FTBFS with newer, stricter GCCs
+;# fix some FTBFS with newer, stricter GCCs
 # patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413414
 # thanks, Martin Michlmayr
---- src/gui/widgets.cc~        2007-03-04 21:06:31.000000000 +0000
-+++ src/gui/widgets.cc 2007-03-04 21:13:34.000000000 +0000
-@@ -28,6 +28,7 @@
- #include <cassert>
- #include <algorithm>
- #include <iostream>
-+#include <limits.h>
- 
- using namespace enigma::gui;
- using namespace ecl;
---- lib-src/enigma-core/ecl_util.hh~   2007-03-04 20:38:24.000000000 +0000
-+++ lib-src/enigma-core/ecl_util.hh    2007-03-04 20:55:44.000000000 +0000
+diff -Nur enigma-1.01/build-tree/enigma-1.01/lib-src/enigma-core/ecl_util.hh 
enigma-1.01.new/build-tree/enigma-1.01/lib-src/enigma-core/ecl_util.hh
+--- enigma-1.01/lib-src/enigma-core/ecl_util.hh        2006-01-20 
11:12:12.000000000 +0000
++++ enigma-1.01/lib-src/enigma-core/ecl_util.hh        2008-03-18 
04:48:51.000000000 +0000
 @@ -20,6 +20,7 @@
  #define ECL_UTIL_HH_INCLUDED
  
@@ -23,0 +15,33 @@
+diff -Nur enigma-1.01/build-tree/enigma-1.01/src/Utf8ToXML.cc 
enigma-1.01.new/build-tree/enigma-1.01/src/Utf8ToXML.cc
+--- enigma-1.01/src/Utf8ToXML.cc       2006-09-03 19:15:33.000000000 +0000
++++ enigma-1.01/src/Utf8ToXML.cc       2008-03-18 04:49:15.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include "main.hh"
+ #include <xercesc/util/XMLString.hpp>
+ #include <xercesc/util/TransService.hpp>
++#include <cstring>
+ 
+ XERCES_CPP_NAMESPACE_USE
+ 
+diff -Nur enigma-1.01/build-tree/enigma-1.01/src/file.hh 
enigma-1.01.new/build-tree/enigma-1.01/src/file.hh
+--- enigma-1.01/src/file.hh    2007-04-03 23:12:49.000000000 +0000
++++ enigma-1.01/src/file.hh    2008-03-18 04:48:51.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <iosfwd>
+ #include <vector>
+ #include <list>
++#include <memory>
+ #include "ecl_error.hh"
+ 
+ namespace enigma
+diff -Nur enigma-1.01/build-tree/enigma-1.01/src/gui/widgets.cc 
enigma-1.01.new/build-tree/enigma-1.01/src/gui/widgets.cc
+--- enigma-1.01/src/gui/widgets.cc     2007-05-18 13:14:14.000000000 +0000
++++ enigma-1.01/src/gui/widgets.cc     2008-03-18 04:48:51.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <cassert>
+ #include <algorithm>
+ #include <iostream>
++#include <limits.h>
+ 
+ using namespace enigma::gui;
+ using namespace ecl;
diff -u enigma-1.01/debian/changelog enigma-1.01/debian/changelog
--- enigma-1.01/debian/changelog
+++ enigma-1.01/debian/changelog
@@ -1,3 +1,12 @@
+enigma (1.01-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/gcc-4.3-ftbfs.patch:
+    + Refresh patch to provide missing #includes and
+      avoid FTBFS with g++ 4.3. (Closes: #462540)
+  
+ -- Kumar Appaiah <[EMAIL PROTECTED]>  Sun, 23 Mar 2008 11:59:23 +0530
+
 enigma (1.01-2) unstable; urgency=low
 
   * Add Homepage field

Reply via email to