[Pkg-octave-commit] r1803 - in matwrap/trunk/debian: . patches

[Thomas Weber]

tags 477041 pending
thanks

Author: thomas-guest
Date: 2008-04-27 14:29:00 +0000 (Sun, 27 Apr 2008)
New Revision: 1803

Added:
   matwrap/trunk/debian/patches/new_declaration_of_strcmp
Modified:
   matwrap/trunk/debian/changelog
   matwrap/trunk/debian/patches/series
Log:
bug fix for 477041

Modified: matwrap/trunk/debian/changelog
===================================================================
--- matwrap/trunk/debian/changelog	2008-04-26 10:49:53 UTC (rev 1802)
+++ matwrap/trunk/debian/changelog	2008-04-27 14:29:00 UTC (rev 1803)
@@ -1,3 +1,10 @@
+matwrap (0.57-11) UNRELEASED; urgency=low
+
+  * New patch: new_declaration_of_strcmp, using the declaration of strcmp()
+    from /usr/include/strings.h (closes: #477041) 
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 27 Apr 2008 17:36:10 +0200
+
 matwrap (0.57-10) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Added: matwrap/trunk/debian/patches/new_declaration_of_strcmp
===================================================================
--- matwrap/trunk/debian/patches/new_declaration_of_strcmp	                        (rev 0)
+++ matwrap/trunk/debian/patches/new_declaration_of_strcmp	2008-04-27 14:29:00 UTC (rev 1803)
@@ -0,0 +1,14 @@
+Copy declaration from /usr/include/string.h into simple.h
+Bug fix for #477041
+--- a/share/matwrap/Examples/simple/simple.h
++++ b/share/matwrap/Examples/simple/simple.h
+@@ -91,7 +91,8 @@
+ }
+ 
+ extern "C" {
+-extern int strcmp(const char *, const char *); //%name real_strcmp
++extern int strcmp(const char *, const char *)
++     __THROW __attribute_pure__ __nonnull ((1, 2)); //%name real_strcmp
+ 				// Call the real strcmp function from matlab,
+ 				// not the hacked one that returns 0 or 1,
+ 				// but one that returns -1, 0, 1.

Modified: matwrap/trunk/debian/patches/series
===================================================================
--- matwrap/trunk/debian/patches/series	2008-04-26 10:49:53 UTC (rev 1802)
+++ matwrap/trunk/debian/patches/series	2008-04-27 14:29:00 UTC (rev 1803)
@@ -4,3 +4,4 @@
 library-path-gcc-4.diff
 makefile-build-target.diff
 use_iostream_for_iostream.h
+new_declaration_of_strcmp