[Pkg-octave-commit] r1229 - in semidef-oct/trunk/debian: . patches

[Rafael Laboissiere]

tags 461719 pending
thanks

Author: rafael
Date: 2008-02-23 12:14:18 +0000 (Sat, 23 Feb 2008)
New Revision: 1229

Added:
   semidef-oct/trunk/debian/patches/60_iostream-g++-4.3.dpatch
Modified:
   semidef-oct/trunk/debian/changelog
   semidef-oct/trunk/debian/patches/00list
Log:
Add dpatch for making the package build with GCC 4.3 

Modified: semidef-oct/trunk/debian/changelog
===================================================================
--- semidef-oct/trunk/debian/changelog	2008-02-23 12:06:29 UTC (rev 1228)
+++ semidef-oct/trunk/debian/changelog	2008-02-23 12:14:18 UTC (rev 1229)
@@ -14,8 +14,10 @@
   * debian/copyright: Add more comments about the licensing terms of the
     different parts of the package
   * debian/rules: Add test suite
+  * debian/patches/50_strstream-namespace-std.dpatch: Make the package
+    build with GCC 4.3 (closes: #461719)
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 12:34:03 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 13:13:13 +0100
 
 semidef-oct (1:2003-5) unstable; urgency=low
 

Modified: semidef-oct/trunk/debian/patches/00list
===================================================================
--- semidef-oct/trunk/debian/patches/00list	2008-02-23 12:06:29 UTC (rev 1228)
+++ semidef-oct/trunk/debian/patches/00list	2008-02-23 12:14:18 UTC (rev 1229)
@@ -1,2 +1,3 @@
 50_strstream-namespace-std
 50_src-makefile
+60_iostream-g++-4.3

Added: semidef-oct/trunk/debian/patches/60_iostream-g++-4.3.dpatch
===================================================================
--- semidef-oct/trunk/debian/patches/60_iostream-g++-4.3.dpatch	                        (rev 0)
+++ semidef-oct/trunk/debian/patches/60_iostream-g++-4.3.dpatch	2008-02-23 12:14:18 UTC (rev 1229)
@@ -0,0 +1,108 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_iostream-g++-4.3.dpatch by Rafael Labossiere <rafael at debian.org>
+##
+## DP: Include iostream instead of iostream.h and use namespace std:: for
+## DP: ends and ostream.  This makes the package buid correctly with GCC 4.3
+
+ at DPATCH@
+
+--- semidef-oct-2003.orig/SRC/sp.cc
++++ semidef-oct-2003/SRC/sp.cc
+@@ -7,7 +7,7 @@
+ //#define DEBUG_INPUT_PARAMETERS
+ 
+ #include <octave/config.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include <string.h>
+ #include <strstream.h>
+@@ -440,7 +440,7 @@
+     #endif
+     infostr << "error occurred in sp"; 
+   }
+-  infostr << ends;
++  infostr << std::ends;
+ 
+   // time
+   ColumnVector time_data(3);
+--- semidef-oct-2003.orig/SRC/get_real_scalar.cc
++++ semidef-oct-2003/SRC/get_real_scalar.cc
+@@ -16,7 +16,7 @@
+   if ( !( arg.is_real_type() && arg.is_scalar_type() ) )
+   {
+     errmesg << caller  << "argument " << argnum 
+-	<< " must be a real scalar" << ends;
++	<< " must be a real scalar" << std::ends;
+     error(errmesg.str());
+     errflg = 1;
+     return retval;
+@@ -29,7 +29,7 @@
+     {
+       errmesg << caller  << "argument " << argnum
+ 	<< " = " << retval 
+-        << " must be a nonnegative real scalar" << ends;
++        << " must be a nonnegative real scalar" << std::ends;
+       error(errmesg.str());
+       errflg = 1;
+     }
+@@ -39,7 +39,7 @@
+     {
+       errmesg << caller  << "argument " << argnum
+ 	<< " = " << retval 
+-        << " must be a positive real scalar" << ends;
++        << " must be a positive real scalar" << std::ends;
+       error(errmesg.str());
+       errflg = 1;
+     }
+--- semidef-oct-2003.orig/SRC/get_matrix.cc
++++ semidef-oct-2003/SRC/get_matrix.cc
+@@ -19,7 +19,7 @@
+   {
+     ostrstream errmesg;
+     errmesg << caller << "expecting real matrix for argument" 
+-	<< argnum << ends;
++            << argnum << std::ends;
+     error(errmesg.str());
+     errflg = 1;
+     return retval;
+--- semidef-oct-2003.orig/SRC/get_vector.cc
++++ semidef-oct-2003/SRC/get_vector.cc
+@@ -30,7 +30,7 @@
+   )
+   {
+     errmesg << caller << "expecting real vector for argument " 
+-	<< argnum << ends;
++	<< argnum << std::ends;
+     error(errmesg.str());
+     errflg = 1;
+     return retval;
+@@ -39,7 +39,7 @@
+   {
+     errmesg << caller << "argument " << argnum << " (" 
+ 	<< arg.rows() << "x" << arg.columns() << ") must be a vector" 
+-	<< ends;
++	<< std::ends;
+     error(errmesg.str());
+     errflg = 1;
+     return retval;
+--- semidef-oct-2003.orig/SRC/ocst.h
++++ semidef-oct-2003/SRC/ocst.h
+@@ -5,7 +5,7 @@
+ 
+ #include <octave/config.h>
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ #include <string.h>
+ #include <strstream.h>
+@@ -66,7 +66,7 @@
+ {
+   return (mat.rows() == mat.columns()) ? true : false;
+ }
+-ostream& operator<<(ostream&,const string_vector&);
++std::ostream& operator<<(std::ostream&,const string_vector&);
+ Octave_map pack(const ColumnVector&, const string_vector&, const string_vector&,
+ 	double tsam=1);						//FIR
+ Octave_map pack(const Matrix&, const Matrix&, const Matrix&, const Matrix&,