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

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-19 02:37:03 +0100 (Mon, 19 Feb 2007)
New Revision: 844

Added:
   trunk/packages/octave/debian/patches/50_glpk-api-v4.15.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
  * debian/patches/50_glpk-api-v4.15.dpatch: Adapt the glpk binding to the
    new API for GLPK 4.15, as well as the autoconf check
  * debian/in/control: Build-depends on libglpk0 (>= 4.15)


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2007-02-17 11:17:33 UTC (rev 843)
+++ trunk/packages/octave/debian/changelog	2007-02-19 01:37:03 UTC (rev 844)
@@ -1,3 +1,14 @@
+octave2.9 (2.9.9-9) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Rafael Laboissiere ]
+  * debian/patches/50_glpk-api-v4.15.dpatch: Adapt the glpk binding to the
+    new API for GLPK 4.15, as well as the autoconf check
+  * debian/in/control: Build-depends on libglpk0 (>= 4.15)
+
+ --
+
 octave2.9 (2.9.9-8) unstable; urgency=low
 
   [ Rafael Laboissiere ]
@@ -15,7 +26,7 @@
 
   * debian/in/control: Changed wording of octave*-headers description.
     Thanks to Reuben Thomas for the suggestion (closes: #399190).
-  * debian/patches/50_plot-doc.dpatch:Fixes a long-standing documentation
+  * debian/patches/50_plot-doc.dpatch: Fixes a long-standing documentation
     bug in Octave, regarding the plot function.  Thanks to Francesco
     Potortì for the patch, which has been also applied to the 2.9 branch
     upstream (closes: #398935).

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2007-02-17 11:17:33 UTC (rev 843)
+++ trunk/packages/octave/debian/in/control	2007-02-19 01:37:03 UTC (rev 844)
@@ -8,7 +8,7 @@
  libhdf5-serial-dev (>= 1.6.5) | libhdf5-lam-dev (>= 1.6.5)
  | libhdf5-mpich-dev (>= 1.6.5), refblas3-dev | atlas3-base-dev,
  lapack3-dev | atlas3-base-dev, gnuplot-nox, fftw3-dev, dejagnu, texi2html,
- less, dpatch, slice[V_2_9:, libpcre3-dev, flex, glpk, libglpk0,
+ less, dpatch, slice[V_2_9:, libpcre3-dev, flex, glpk, libglpk0 (>= 4.15),
  libufsparse-dev:]
 Standards-Version: 3.7.2
 

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2007-02-17 11:17:33 UTC (rev 843)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2007-02-19 01:37:03 UTC (rev 844)
@@ -9,3 +9,4 @@
 50_plot-doc
 50_print-imagemagick-extensions
 50_correct_test
+50_glpk-api-v4.15

Added: trunk/packages/octave/debian/patches/50_glpk-api-v4.15.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_glpk-api-v4.15.dpatch	2007-02-17 11:17:33 UTC (rev 843)
+++ trunk/packages/octave/debian/patches/50_glpk-api-v4.15.dpatch	2007-02-19 01:37:03 UTC (rev 844)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_glpk-api-v4.15.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Adapt __glpk__.cc to the new API for GLPK 4.15, as well as the
+## DP: autoconf check 
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/configure.in
++++ octave2.9-2.9.9/configure.in
+@@ -535,12 +535,20 @@
+ 
+ GLPK_LIBS=
+ if test -n "$glpk_lib"; then
+-  AC_CHECK_LIB($glpk_lib, glp_lpx_simplex, [
++  AC_CHECK_LIB($glpk_lib, _glp_lpx_simplex, [GLPK_LIBS="-l$glpk_lib"], [])
++  if test -n "$GLPK_LIBS"; then
+     AC_CHECK_HEADERS(glpk.h, [
+       GLPK_LIBS="-l$glpk_lib"
+-      AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])])])
++      AC_DEFINE(HAVE_GLPK, 1, [Define if GLPK is available.])], [
++        GLPK_LIBS=
++        glpk_missing=yes])
++  fi
+ fi
+ AC_SUBST(GLPK_LIBS)
++if test "$glpk_missing" = yes; then
++  warn_glpk="GLPK library not found.  The glpk function for solving linear programs will be disabled."
++fi
++
+ 
+ OCTAVE_IEEE754_DATA_FORMAT
+ 
+--- octave2.9-2.9.9.orig/src/DLD-FUNCTIONS/__glpk__.cc
++++ octave2.9-2.9.9/src/DLD-FUNCTIONS/__glpk__.cc
+@@ -38,8 +38,10 @@
+ 
+ #if defined (HAVE_GLPK)
+ 
+-extern "C" {
+ #include <glpk.h>
++extern "C" {
++void _glp_lib_print_hook(int (*func)(void *info, char *buf), void *info);
++void _glp_lib_fault_hook(int (*func)(void *info, char *buf), void *info);
+ }
+ 
+ #define NIntP 17
+@@ -141,10 +143,10 @@
+ 
+   clock_t t_start = clock();
+ 
+-  lib_set_fault_hook (NULL, glpk_fault_hook);
++  _glp_lib_fault_hook (glpk_fault_hook, NULL);
+ 
+   if (lpxIntParam[0] > 1)
+-    lib_set_print_hook (NULL, glpk_print_hook);
++    _glp_lib_print_hook (glpk_print_hook, NULL);
+ 
+   LPX *lp = lpx_create_prob ();
+ 
+@@ -277,7 +279,7 @@
+       break;
+ 
+     default:
+-      insist (method != method);
++      glpk_fault_hook (NULL, "method != method");
+     }
+ 
+   /*  errnum assumes the following results:
+@@ -342,7 +344,8 @@
+ 	}
+ 
+       *time = (clock () - t_start) / CLOCKS_PER_SEC;
+-      *mem = (lib_env_ptr () -> mem_tpeak);
++      /* currently there is no way to determine memory usage */
++      *mem = 0;
+ 
+       lpx_delete_prob (lp);
+       return 0;


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