Bug#454828: diff for 1.3.6-1.1 NMU

[Pierre Habouzit]

Hi,

Attached is the diff for my mm3d 1.3.6-1.1 NMU.

diff -u mm3d-1.3.6/debian/changelog mm3d-1.3.6/debian/changelog
--- mm3d-1.3.6/debian/changelog
+++ mm3d-1.3.6/debian/changelog
@@ -1,3 +1,10 @@
+mm3d (1.3.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix g++-4.3 FTBFS thanks to Cyril Brulebois (Closes: 454828).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Sun, 16 Mar 2008 22:40:22 +0000
+
 mm3d (1.3.6-1) unstable; urgency=low
 
   * New upstream version.
only in patch2:
unchanged:
--- mm3d-1.3.6.orig/src/mm3dcore/prefparse.cc
+++ mm3d-1.3.6/src/mm3dcore/prefparse.cc
@@ -7,6 +7,8 @@
 #include "prefs.h"
 #include "prefparse.h"
 
+#include <cstring>
+
 class PrefParser
 {
    public:
only in patch2:
unchanged:
--- mm3d-1.3.6.orig/src/mm3dcore/prefs.cc
+++ mm3d-1.3.6/src/mm3dcore/prefs.cc
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <string>
 
+#include <cstring>
+
 using std::map;
 using std::vector;
 
only in patch2:
unchanged:
--- mm3d-1.3.6.orig/src/mm3dcore/sysconf.cc
+++ mm3d-1.3.6/src/mm3dcore/sysconf.cc
@@ -45,6 +45,9 @@
 
 #include <unistd.h>
 
+#include <cstdlib>
+#include <cstring>
+
 static std::string s_mm3dHomeDir;
 static std::string s_docDir;
 static std::string s_i18nDir;
only in patch2:
unchanged:
--- mm3d-1.3.6.orig/src/implui/qttex.cc
+++ mm3d-1.3.6/src/implui/qttex.cc
@@ -37,6 +37,8 @@
 
 #include <qstring.h>
 
+#include <cstdlib>
+
 using std::list;
 using std::string;