r5931 - in packages/trunk/adanaxisgpl/debian: . patches

[Cyril Brulebois]

Author: kibi-guest
Date: 2008-02-28 21:28:00 +0000 (Thu, 28 Feb 2008)
New Revision: 5931

Added:
   packages/trunk/adanaxisgpl/debian/patches/20_fix_FTBFS_with_gcc-4.3.diff
Modified:
   packages/trunk/adanaxisgpl/debian/changelog
   packages/trunk/adanaxisgpl/debian/patches/series
Log:
Fix FTBFS with gcc-4.3 (Closes: #463741). Minor ponctuation nitpick.

Modified: packages/trunk/adanaxisgpl/debian/changelog
===================================================================
--- packages/trunk/adanaxisgpl/debian/changelog	2008-02-28 21:24:48 UTC (rev 5930)
+++ packages/trunk/adanaxisgpl/debian/changelog	2008-02-28 21:28:00 UTC (rev 5931)
@@ -10,9 +10,13 @@
      + 10_try_more_cache_paths.diff
 
   [ Alexander Schmehl ]
-  * readded data-adanaxis/About_Adanaxis.doc as "source" of the shipped pdf
-    documentation
+  * Readd data-adanaxis/About_Adanaxis.doc as "source" of the shipped pdf
+    documentation.
 
+  [ Cyril Brulebois ]
+  * Fix FTBFS with gcc-4.3 (Closes: #463741). Add patch:
+     + 20_fix_FTBFS_with_gcc-4.3.diff
+
  -- Barry deFreese <bddebian at comcast.net>  Thu, 07 Feb 2008 22:38:44 +0100
 
 adanaxisgpl (1.2.2-1) unstable; urgency=low

Added: packages/trunk/adanaxisgpl/debian/patches/20_fix_FTBFS_with_gcc-4.3.diff
===================================================================
--- packages/trunk/adanaxisgpl/debian/patches/20_fix_FTBFS_with_gcc-4.3.diff	                        (rev 0)
+++ packages/trunk/adanaxisgpl/debian/patches/20_fix_FTBFS_with_gcc-4.3.diff	2008-02-28 21:28:00 UTC (rev 5931)
@@ -0,0 +1,55 @@
+# Copyright 2008 Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+--- a/src/MushFile/MushFileAccessor.cpp
++++ b/src/MushFile/MushFileAccessor.cpp
+@@ -43,6 +43,8 @@
+ #include "MushFileDirEntry.h"
+ #include "MushFileKeys.h"
+ 
++#include <cstring>
++
+ using namespace Mushware;
+ using namespace std;
+ 
+--- a/src/MushFile/MushFileFile.cpp
++++ b/src/MushFile/MushFileFile.cpp
+@@ -39,6 +39,8 @@
+ 
+ #include "MushFileLibrary.h"
+ 
++#include <cstring>
++
+ using namespace Mushware;
+ using namespace std;
+ 
+--- a/src/MushGL/MushGLTexture.cpp
++++ b/src/MushGL/MushGLTexture.cpp
+@@ -105,6 +105,8 @@
+ #include "MushGLUtil.h"
+ #include "MushGLV.h"
+ 
++#include <cstring>
++
+ using namespace Mushware;
+ using namespace std;
+ 
+--- a/src/Mushcore/MushcoreBison.cpp
++++ b/src/Mushcore/MushcoreBison.cpp
+@@ -127,6 +127,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #ifndef __cplusplus
+ #ifndef __STDC__
+--- a/src/Mushcore/MushcoreFlex.cpp
++++ b/src/Mushcore/MushcoreFlex.cpp
+@@ -46,6 +46,7 @@
+ #define YY_FLEX_MINOR_VERSION 5
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ 
+ /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */

Modified: packages/trunk/adanaxisgpl/debian/patches/series
===================================================================
--- packages/trunk/adanaxisgpl/debian/patches/series	2008-02-28 21:24:48 UTC (rev 5930)
+++ packages/trunk/adanaxisgpl/debian/patches/series	2008-02-28 21:28:00 UTC (rev 5931)
@@ -1 +1,2 @@
 10_try_more_cache_paths.diff
+20_fix_FTBFS_with_gcc-4.3.diff