[med-svn] r7051 - in trunk/packages/mgltools/geomutils/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2011-06-16 20:13:54 +0000 (Thu, 16 Jun 2011)
New Revision: 7051

Added:
   trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_compilation_error.patch
Removed:
   trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_error.patch
Modified:
   trunk/packages/mgltools/geomutils/trunk/debian/changelog
   trunk/packages/mgltools/geomutils/trunk/debian/patches/series
Log:
<cstring> is needed on my system. Will inform upstream.


Modified: trunk/packages/mgltools/geomutils/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/geomutils/trunk/debian/changelog	2011-06-16 20:06:15 UTC (rev 7050)
+++ trunk/packages/mgltools/geomutils/trunk/debian/changelog	2011-06-16 20:13:54 UTC (rev 7051)
@@ -1,26 +1,7 @@
-mgltools-geomutils (1.5.6~rc1+cvs.20110615-1) UNRELEASED; urgency=low
+mgltools-geomutils (1.5.6~rc1+cvs.20110615-1) unstable; urgency=low
 
   * New upstream version.
   * debian/control: added myseld to Uploaders:
-  * debian/patches/series: strcmp_error.patch not needed anymore
-
-It is ...
-
-cc1plus: warning: command line option ‘-Wstrict-prototypes’ is valid for Ada/C/ObjC but not for C++ [enabled by default]
-src/geomAlgorithms/objfile.cpp: In function ‘bool detectObjFileContent(const char*, char (*)[256], unsigned int*, char (*)[256], unsigned int*, char (*)[256], unsigned int*)’:
-src/geomAlgorithms/objfile.cpp:29:43: error: ‘strcpy’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:66:84: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:79:47: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:111:47: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp: In function ‘bool readObjFileGroup(const char*, const char*, char (*)[256], unsigned int*, float (*)[3], unsigned int*, int (*)[3], unsigned int*, float (*)[2], unsigned int*, int (*)[3], unsigned int*, int*, unsigned int*)’:
-src/geomAlgorithms/objfile.cpp:199:49: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:233:51: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:245:47: error: ‘strcmp’ was not declared in this scope
-src/geomAlgorithms/objfile.cpp:194:16: warning: unused variable ‘lNumOfTriangleMaterialIndices’ [-Wunused-variable]
-error: command 'g++' failed with exit status 1
-
-
-
   * debian/copyright: word copyright needed now
 
  -- Thorsten Alteholz <debian at alteholz.de>  Wed, 15 Jun 2011 21:43:37 +0200

Modified: trunk/packages/mgltools/geomutils/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/geomutils/trunk/debian/patches/series	2011-06-16 20:06:15 UTC (rev 7050)
+++ trunk/packages/mgltools/geomutils/trunk/debian/patches/series	2011-06-16 20:13:54 UTC (rev 7051)
@@ -1 +1 @@
-#strcmp_error.patch
+strcmp_compilation_error.patch

Added: trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_compilation_error.patch
===================================================================
--- trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_compilation_error.patch	                        (rev 0)
+++ trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_compilation_error.patch	2011-06-16 20:13:54 UTC (rev 7051)
@@ -0,0 +1,11 @@
+Index: mgltools-geomutils-1.5.6~rc1+cvs.20110615/src/geomAlgorithms/objfile.cpp
+===================================================================
+--- mgltools-geomutils-1.5.6~rc1+cvs.20110615.orig/src/geomAlgorithms/objfile.cpp	2011-06-16 22:08:15.935498470 +0200
++++ mgltools-geomutils-1.5.6~rc1+cvs.20110615/src/geomAlgorithms/objfile.cpp	2011-06-16 22:08:24.087538898 +0200
+@@ -1,5 +1,6 @@
+ #include <assert.h>
+ #include <fstream>
++#include <cstring>
+ 
+ #include "objfile.h"
+ 

Deleted: trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_error.patch
===================================================================
--- trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_error.patch	2011-06-16 20:06:15 UTC (rev 7050)
+++ trunk/packages/mgltools/geomutils/trunk/debian/patches/strcmp_error.patch	2011-06-16 20:13:54 UTC (rev 7051)
@@ -1,11 +0,0 @@
-Index: mgltools-geomutils-1.5.4.cvs.20100912/src/geomAlgorithms/objfile.cpp
-===================================================================
---- mgltools-geomutils-1.5.4.cvs.20100912.orig/src/geomAlgorithms/objfile.cpp	2010-09-12 00:43:25.148516818 +0200
-+++ mgltools-geomutils-1.5.4.cvs.20100912/src/geomAlgorithms/objfile.cpp	2010-09-12 00:47:35.056608267 +0200
-@@ -1,5 +1,6 @@
- #include <assert.h>
- #include <fstream>
-+#include <cstring>
- 
- #include "objfile.h"
-