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

[Thomas Weber]

tags 474826 pending
thanks

Author: thomas-guest
Date: 2008-04-08 07:50:21 +0000 (Tue, 08 Apr 2008)
New Revision: 1603

Added:
   matwrap/trunk/debian/patches/use_iostream_for_iostream.h
Modified:
   matwrap/trunk/debian/changelog
   matwrap/trunk/debian/control
   matwrap/trunk/debian/patches/series
   matwrap/trunk/debian/watch
Log:
bug fix for 474826, drop trunk for vcs-browser field

Modified: matwrap/trunk/debian/changelog
===================================================================
--- matwrap/trunk/debian/changelog	2008-04-07 21:05:50 UTC (rev 1602)
+++ matwrap/trunk/debian/changelog	2008-04-08 07:50:21 UTC (rev 1603)
@@ -5,10 +5,12 @@
     his request
 
   [ Thomas Weber ]
-  * debian/control: Vcs-fields point to the trunk/ directory
+  * debian/control: Vcs-fields point to the trunk/ directory for SVN 
   * Switch to quilt as patch system 
+  * New patch: use_iostream_for_iostream.h: <iostream.h> replaced by <iostream>
+    for gcc-4.3 and qualify cout by std::cout (closes: #474826)
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 23 Mar 2008 09:58:33 +0100
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 08 Apr 2008 09:45:46 +0200
 
 matwrap (0.57-9) unstable; urgency=low
 

Modified: matwrap/trunk/debian/control
===================================================================
--- matwrap/trunk/debian/control	2008-04-07 21:05:50 UTC (rev 1602)
+++ matwrap/trunk/debian/control	2008-04-08 07:50:21 UTC (rev 1603)
@@ -9,7 +9,7 @@
 Build-Depends-Indep: octave2.1-headers (>= 1:2.1.73-14) | octave3.0-headers
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/matwrap/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/matwrap/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/matwrap/
 
 Package: matwrap
 Architecture: all

Modified: matwrap/trunk/debian/patches/series
===================================================================
--- matwrap/trunk/debian/patches/series	2008-04-07 21:05:50 UTC (rev 1602)
+++ matwrap/trunk/debian/patches/series	2008-04-08 07:50:21 UTC (rev 1603)
@@ -3,3 +3,4 @@
 install.pl-get-manpage.diff
 library-path-gcc-4.diff
 makefile-build-target.diff
+use_iostream_for_iostream.h

Added: matwrap/trunk/debian/patches/use_iostream_for_iostream.h
===================================================================
--- matwrap/trunk/debian/patches/use_iostream_for_iostream.h	                        (rev 0)
+++ matwrap/trunk/debian/patches/use_iostream_for_iostream.h	2008-04-08 07:50:21 UTC (rev 1603)
@@ -0,0 +1,76 @@
+Bug fix for #474826 (FTBFS with gcc-4.3)
+--- a/share/matwrap/Examples/simple/simple.h
++++ b/share/matwrap/Examples/simple/simple.h
+@@ -1,4 +1,4 @@
+-#include <iostream.h>
++#include <iostream>
+ #include <ctype.h>
+ 
+ //
+@@ -17,7 +17,7 @@
+ //
+ // Just print out a number and return it.
+ //
+-inline numtype print_num(numtype num) { cout << num << '\n'; return num; }
++inline numtype print_num(numtype num) { std::cout << num << '\n'; return num; }
+ 
+ 
+ //
+@@ -28,7 +28,7 @@
+ {
+   for (unsigned idx = 0; idx < n; ++idx)
+   {
+-    cout << idx << ' ' << v[idx] << '\n';
++    std::cout << idx << ' ' << v[idx] << '\n';
+     v_out[idx] = v[idx];
+   }
+ } //%input v(n)
+@@ -43,7 +43,7 @@
+   for (unsigned j_idx = 0; j_idx < n; ++j_idx)
+     for (unsigned i_idx = 0; i_idx < m; ++i_idx)
+     {
+-      cout << '(' << i_idx << ',' << j_idx << "): "
++      std::cout << '(' << i_idx << ',' << j_idx << "): "
+ 	   << mat[i_idx+j_idx*m] << '\n';
+       mat_out[i_idx+j_idx*m] = mat[i_idx+j_idx*m];
+     }
+@@ -59,7 +59,7 @@
+   for (unsigned j_idx = 0; j_idx < n; ++j_idx)
+     for (unsigned i_idx = 0; i_idx < m; ++i_idx)
+     {
+-      cout << '(' << i_idx << ',' << j_idx << "): "
++      std::cout << '(' << i_idx << ',' << j_idx << "): "
+ 	   << mat[i_idx+j_idx*m] << '\n';
+       mat_out[i_idx+j_idx*m] = mat[i_idx+j_idx*m];
+     }
+@@ -87,7 +87,7 @@
+ void
+ print_str(const char *str)
+ {
+-  cout << str << '\n';
++  std::cout << str << '\n';
+ }
+ 
+ extern "C" {
+--- a/share/matwrap/Examples/single_axon/hodgkin_huxley.cxx
++++ b/share/matwrap/Examples/single_axon/hodgkin_huxley.cxx
+@@ -5,7 +5,7 @@
+ //
+ #include "hodgkin_huxley.h"
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ //
+ // The various activation and inactivation functions.  These are tabulated.
+--- a/share/matwrap/Examples/single_axon/single_axon.cxx
++++ b/share/matwrap/Examples/single_axon/single_axon.cxx
+@@ -5,7 +5,7 @@
+ // Written by: Gary Holt  14 May 1997.
+ //
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "single_axon.h"
+ 
+ //


Property changes on: matwrap/trunk/debian/patches/use_iostream_for_iostream.h
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate LastChangedRevision LastChangedBy Id
Name: svn:eol-style
   + native

Modified: matwrap/trunk/debian/watch
===================================================================
--- matwrap/trunk/debian/watch	2008-04-07 21:05:50 UTC (rev 1602)
+++ matwrap/trunk/debian/watch	2008-04-08 07:50:21 UTC (rev 1603)
@@ -1,2 +1,2 @@
 version=3
-http://lnc.usc.edu/~holt/matwrap/ matwrap-([\d+\.]+|\d+)\.tar\.gz
\ No newline at end of file
+http://lnc.usc.edu/~holt/matwrap/ matwrap-([\d+\.]+|\d+)\.tar\.gz