[Pkg-octave-commit] rev 506 - in trunk/packages/octave/debian: . patches

Mon Mar 13 11:20:51 UTC 2006

Author: rafael
Date: 2006-03-13 11:20:50 +0000 (Mon, 13 Mar 2006)
New Revision: 506

Added:
   trunk/packages/octave/debian/patches/50_g++4.1.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
Log:
Debian release octave2.1_2.1.72-11

Modified: trunk/packages/octave/debian/changelog
===================================================================

--- trunk/packages/octave/debian/changelog	2006-03-08 10:22:52 UTC (rev 505)
+++ trunk/packages/octave/debian/changelog	2006-03-13 11:20:50 UTC (rev 506)
@@ -1,3 +1,20 @@
+octave2.1 (1:2.1.72-11) unstable; urgency=low
+
+   [ Rafael Laboissiere ]
+  
+  * debian/patches/50_g++4.1.dpatch: Added patch proposed by John W. Eaton
+    to allow compilation with g++ 4.1.
+  * debian/patches/50_octave-value-list-resize-2.1.dpatch: Adjusted patch
+    for compilation with g++ 4.1 (thanks to Martin Michlmayr)
+  * With the two changes above, closes: #355980
+
+  * N.B.: the present version of the package was compiled with g++ 4.0,
+    because this is the version of the GCC suite in sid.  However, the
+    changes were tested with g++ 4.1 available from experimental, and it
+    worked.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 13 Mar 2006 10:04:42 +0100
+
 octave2.9 (2.9.4-12) unstable; urgency=low
 
   * debian/patches/50_glpk-sparse.dpatch: Patch to make glpk work with

Added: trunk/packages/octave/debian/patches/50_g++4.1.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_g++4.1.dpatch	2006-03-08 10:22:52 UTC (rev 505)
+++ trunk/packages/octave/debian/patches/50_g++4.1.dpatch	2006-03-13 11:20:50 UTC (rev 506)
@@ -0,0 +1,121 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_g++4.1.dpatch by  <rafael at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave2.1 2.1.72-11 diff.gz
+
+ at DPATCH@
+
+--- octave2.1-2.1.72.orig/liboctave/CMatrix.h
++++ octave2.1-2.1.72/liboctave/CMatrix.h
+@@ -204,17 +204,6 @@
+ 
+   ComplexMatrix expm (void) const;
+ 
+-  // column vector by row vector -> matrix operations
+-
+-  friend ComplexMatrix operator * (const ColumnVector& a,
+-				   const ComplexRowVector& b);
+-
+-  friend ComplexMatrix operator * (const ComplexColumnVector& a,
+-				   const RowVector& b);
+-
+-  friend ComplexMatrix operator * (const ComplexColumnVector& a,
+-				   const ComplexRowVector& b);
+-
+   // matrix by diagonal matrix -> matrix operations
+ 
+   ComplexMatrix& operator += (const DiagMatrix& a);
+@@ -290,6 +279,17 @@
+ ComplexMatrix Sylvester (const ComplexMatrix&, const ComplexMatrix&,
+ 			 const ComplexMatrix&);
+ 
++// column vector by row vector -> matrix operations
++
++ComplexMatrix
++operator * (const ColumnVector& a, const ComplexRowVector& b);
++
++ComplexMatrix
++operator * (const ComplexColumnVector& a, const RowVector& b);
++
++ComplexMatrix
++operator * (const ComplexColumnVector& a, const ComplexRowVector& b);
++
+ extern ComplexMatrix operator * (const Matrix&,        const ComplexMatrix&);
+ extern ComplexMatrix operator * (const ComplexMatrix&, const Matrix&);
+ extern ComplexMatrix operator * (const ComplexMatrix&, const ComplexMatrix&);
+--- octave2.1-2.1.72.orig/liboctave/dColVector.h
++++ octave2.1-2.1.72/liboctave/dColVector.h
+@@ -103,6 +103,11 @@
+   ColumnVector (double *d, int l) : MArray<double> (d, l) { }
+ };
+ 
++// Publish externally used friend functions.
++
++extern ColumnVector real (const ComplexColumnVector& a);
++extern ColumnVector imag (const ComplexColumnVector& a);
++
+ MARRAY_FORWARD_DEFS (MArray, ColumnVector, double)
+ 
+ #endif
+--- octave2.1-2.1.72.orig/liboctave/dMatrix.h
++++ octave2.1-2.1.72/liboctave/dMatrix.h
+@@ -181,10 +181,6 @@
+ 
+   boolMatrix operator ! (void) const;
+ 
+-  // column vector by row vector -> matrix operations
+-
+-  friend Matrix operator * (const ColumnVector& a, const RowVector& b);
+-
+   // other operations
+ 
+   Matrix map (d_d_Mapper f) const;
+@@ -235,6 +231,15 @@
+   Matrix (double *d, int r, int c) : MArray2<double> (d, r, c) { }
+ };
+ 
++// Publish externally used friend functions.
++
++extern Matrix real (const ComplexMatrix& a);
++extern Matrix imag (const ComplexMatrix& a);
++
++// column vector by row vector -> matrix operations
++
++extern Matrix operator * (const ColumnVector& a, const RowVector& b);
++
+ extern Matrix Givens (double, double);
+ 
+ extern Matrix Sylvester (const Matrix&, const Matrix&, const Matrix&);
+--- octave2.1-2.1.72.orig/liboctave/dNDArray.h
++++ octave2.1-2.1.72/liboctave/dNDArray.h
+@@ -131,6 +131,11 @@
+   NDArray (double *d, const dim_vector& dv) : MArrayN<double> (d, dv) { }
+ };
+ 
++// Publish externally used friend functions.
++
++extern NDArray real (const ComplexNDArray& a);
++extern NDArray imag (const ComplexNDArray& a);
++
+ extern NDArray min (double d, const NDArray& m);
+ extern NDArray min (const NDArray& m, double d);
+ extern NDArray min (const NDArray& a, const NDArray& b);
+--- octave2.1-2.1.72.orig/src/ov.h
++++ octave2.1-2.1.72/src/ov.h
+@@ -814,6 +814,15 @@
+   octave_value *nil_rep (void) const;
+ };
+ 
++// Publish externally used friend functions.
++
++extern octave_value
++do_unary_op (octave_value::unary_op op, const octave_value& a);
++
++extern octave_value
++do_binary_op (octave_value::binary_op op,
++	      const octave_value& a, const octave_value& b);
++
+ #define OV_UNOP_FN(name) \
+   inline octave_value \
+   name (const octave_value& a) \


Property changes on: trunk/packages/octave/debian/patches/50_g++4.1.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch	2006-03-08 10:22:52 UTC (rev 505)
+++ trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch	2006-03-13 11:20:50 UTC (rev 506)
@@ -15,7 +15,7 @@
    void resize (int n) { data.resize (n); }
  
 -  void resize (int n, const octave_value& val);
-+  void octave_value_list::resize (int n, const octave_value& val)
++  void resize (int n, const octave_value& val)
 +  {
 +    int len = length ();
 +    


