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

[Rafael Laboissiere]

Author: rafael
Date: 2009-01-05 22:04:33 +0000 (Mon, 05 Jan 2009)
New Revision: 2573

Added:
   octave/trunk/debian/patches/suitesparse-3.2.0.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
   octave/trunk/debian/in/control
Log:
Adapt for compilation with SuiteSparse 3.2.0

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-01-05 16:33:42 UTC (rev 2572)
+++ octave/trunk/debian/changelog	2009-01-05 22:04:33 UTC (rev 2573)
@@ -4,7 +4,9 @@
     polyfit.m taken from the Mercurial upstream repository.  This version
     has a new algorithm that improves the numerical stability of the
     results for ill-conditioned input values (closes: #510577).
-  * debian/in/control: Synch with the lenny branch
+  * debian/in/control:
+    + Synch with the lenny branch
+    + Build-depend on libsuitesparse-dev >= 3.2.0
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 03 Jan 2009 12:28:47 +0100
 
@@ -102,12 +104,12 @@
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Jul 2008 00:50:49 +0200
 
 octave3.0 (1:3.0.1-6lenny1) unstable; urgency=low
-  
+
   * Allow libhdf5-openmpi-dev to satisfy Octave's hdf5 dependency (closes:
     #494139)
-  
+
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Tue, 12 Aug 2008 22:28:01 +0000
-  
+
 octave3.1 (3.1.50-1) experimental; urgency=low
 
   * New upstream release (development branch)

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-01-05 16:33:42 UTC (rev 2572)
+++ octave/trunk/debian/in/00list	2009-01-05 22:04:33 UTC (rev 2573)
@@ -18,6 +18,7 @@
 no_pdf_in_print.dpatch
 dont_set_helvetica.dpatch
 polyfit-scaling.dpatch
+suitesparse-3.2.0.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch

Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control	2009-01-05 16:33:42 UTC (rev 2572)
+++ octave/trunk/debian/in/control	2009-01-05 22:04:33 UTC (rev 2573)
@@ -13,7 +13,7 @@
  libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6) | libhdf5-openmpi-dev (>= 1.6.6),
  libblas-dev, liblapack-dev, gnuplot-nox, libfftw3-dev, texi2html,
  less, dpatch, slice[V_3_1:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libsuitesparse-dev (>= 3.1.0-2), gawk, ghostscript, libcurl4-dev,
+ libsuitesparse-dev (>= 3.2.0), gawk, ghostscript, libcurl4-dev,
  libqhull-dev, desktop-file-utils:], libfltk1.1-dev, libgl1-mesa-swx11-dev,
  libglu1-mesa-dev, libgraphicsmagick++1-dev:][V_2_1:, dejagnu:]
 Standards-Version: 3.8.0

Added: octave/trunk/debian/patches/suitesparse-3.2.0.dpatch
===================================================================
--- octave/trunk/debian/patches/suitesparse-3.2.0.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/suitesparse-3.2.0.dpatch	2009-01-05 22:04:33 UTC (rev 2573)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## polyfit-scaling.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Addapt SparseCholError prototype to SuiteSparse 3.2.0
+
+ at DPATCH@
+--- octave3.0-3.0.3.orig/liboctave/sparse-util.cc
++++ octave3.0-3.0.3/liboctave/sparse-util.cc
+@@ -31,7 +31,7 @@
+ #include "sparse-util.h"
+ 
+ void
+-SparseCholError (int status, char *file, int line, char *message)
++SparseCholError (int status, const char *file, int line, const char *message)
+ {
+   (*current_liboctave_warning_handler)("warning %i, at line %i in file %s",
+ 				     status, line, file);
+--- octave3.0-3.0.3.orig/liboctave/sparse-util.h
++++ octave3.0-3.0.3/liboctave/sparse-util.h
+@@ -24,7 +24,7 @@
+ #if !defined (octave_sparse_util_h)
+ #define octave_sparse_util_h 1
+ 
+-extern OCTAVE_API void SparseCholError (int status, char *file, int line, char *message);
++extern OCTAVE_API void SparseCholError (int status, const char *file, int line, const char *message);
+ extern OCTAVE_API int SparseCholPrint (const char *fmt, ...);
+ 
+ #endif