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

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-28 15:37:33 +0000 (Sat, 28 Jan 2006)
New Revision: 477

Added:
   trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Debian release octave2.9_2.9.4-12


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-01-26 17:39:11 UTC (rev 476)
+++ trunk/packages/octave/debian/changelog	2006-01-28 15:37:33 UTC (rev 477)
@@ -1,3 +1,11 @@
+octave2.9 (2.9.4-12) unstable; urgency=low
+
+  * debian/patches/50_glpk-sparse.dpatch: Patch to make glpk work with
+    sparse matrices (thanks to Kim Hansen <k-reportbug at oek.dk>,
+    closes: 350230)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 28 Jan 2006 15:23:55 +0100
+
 octave2.9 (2.9.4-11) unstable; urgency=low
 
   * debian/patches/70_octave-mod-honor-auto-indent.dpatch: Upstream patch

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-01-26 17:39:11 UTC (rev 476)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-01-28 15:37:33 UTC (rev 477)
@@ -1,5 +1,6 @@
 50_mkoctfile.1-no-negative
 50_install-liboctinterp
 50_octave-value-list-resize-2.9
+50_glpk-sparse
 50_octave-mod-bind-m-bs-2.9
-70_octave-mod-honor-auto-indent
\ No newline at end of file
+70_octave-mod-honor-auto-indent

Added: trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch	2006-01-26 17:39:11 UTC (rev 476)
+++ trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch	2006-01-28 15:37:33 UTC (rev 477)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_glpk-sparse.dpatch by  <root at laboiss2.intra.mpipf-muenchen.mpg.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave2.9 2.9.4-11 diff.gz
+
+ at DPATCH@
+
+--- octave2.9-2.9.4.orig/src/DLD-FUNCTIONS/__glpk__.cc
++++ octave2.9-2.9.4/src/DLD-FUNCTIONS/__glpk__.cc
+@@ -482,7 +482,7 @@
+     }
+   else
+     {
+-      SparseMatrix A (args(1).matrix_value ()); // get the sparse matrix
++      SparseMatrix A = args(1).sparse_matrix_value (); // get the sparse matrix
+ 
+       if (error_state)
+ 	{
+@@ -509,7 +509,7 @@
+ 	    nz++;
+ 	    rn(nz) = A.ridx(i) + 1;
+ 	    cn(nz) = j + 1;
+-	    a(nz) = A(i,j);
++	    a(nz) = A.data(i);
+ 	  }
+     }
+ 


Property changes on: trunk/packages/octave/debian/patches/50_glpk-sparse.dpatch
___________________________________________________________________
Name: svn:executable
   + *