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

[Rafael Laboissiere]

tags 514035 pending
thanks

Author: rafael
Date: 2009-02-04 12:40:06 +0000 (Wed, 04 Feb 2009)
New Revision: 2605

Added:
   octave/trunk/debian/patches/glpk-new-api.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Patch __glpk__.cc such to avoid deprecated __glp_lib_* functions

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-03 21:55:49 UTC (rev 2604)
+++ octave/trunk/debian/changelog	2009-02-04 12:40:06 UTC (rev 2605)
@@ -1,3 +1,11 @@
+octave3.0 (1:3.0.4~rc3-2) UNRELEASED; urgency=low
+
+  * debian/patches/glpk-new-api.dpatch: New patch to avoid calls to
+    deprecated __glp_lib_* functions which are deprecated and have been
+    removed for the GLPK public API since version 4.32 (closes: #514035)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 04 Feb 2009 11:56:17 +0100
+
 octave3.0 (1:3.0.4~rc3-1) experimental; urgency=low
 
   * New upstream release candidate

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-03 21:55:49 UTC (rev 2604)
+++ octave/trunk/debian/in/00list	2009-02-04 12:40:06 UTC (rev 2605)
@@ -17,9 +17,11 @@
 50_fix_handle_for_plotyy.dpatch
 no_pdf_in_print.dpatch
 dont_set_helvetica.dpatch
+glpk-new-api.dpatch
 :][V_3_1:
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch
 dont_set_helvetica-3.1.dpatch
 suitesparse-3.2.0.dpatch
+glpk-new-api.dpatch
 :]

Added: octave/trunk/debian/patches/glpk-new-api.dpatch
===================================================================
--- octave/trunk/debian/patches/glpk-new-api.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/glpk-new-api.dpatch	2009-02-04 12:40:06 UTC (rev 2605)
@@ -0,0 +1,80 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## glpk-new-api.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid calls to deprecated __glp_lib_* functions which are deprecated
+## DP: and have been removed for the GLPK public API since version 4.32.
+## DP:
+## DP: Taken from the Mercurial usptream repostory:
+## DP: http://hg.savannah.gnu.org/hgweb/octave/raw-diff/aaccb1362347/src/DLD-FUNCTIONS/__glpk__.cc
+
+ at DPATCH@
+--- a/src/DLD-FUNCTIONS/__glpk__.cc	Wed Aug 27 09:59:55 2008 -0400
++++ b/src/DLD-FUNCTIONS/__glpk__.cc	Mon Oct 27 14:25:30 2008 -0400
+@@ -45,6 +45,7 @@
+ #include <glpk.h>
+ #endif
+ 
++#if 0
+ #ifdef GLPK_PRE_4_14
+ 
+ #ifndef _GLPLIB_H
+@@ -62,6 +63,7 @@
+ 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);
+ 
++#endif
+ #endif
+ }
+ 
+@@ -137,6 +139,7 @@
+ 
+ static jmp_buf mark;  //-- Address for long jump to jump to
+ 
++#if 0
+ int
+ glpk_fault_hook (void * /* info */, char *msg)
+ {
+@@ -150,6 +153,7 @@
+   message (0, "%s", msg);
+   return 1;
+ }
++#endif
+ 
+ int
+ glpk (int sense, int n, int m, double *c, int nz, int *rn, int *cn,
+@@ -164,6 +168,7 @@
+ 
+   clock_t t_start = clock();
+ 
++#if 0
+ #ifdef GLPK_PRE_4_14
+   lib_set_fault_hook (0, glpk_fault_hook);
+ #else
+@@ -175,6 +180,7 @@
+     lib_set_print_hook (0, glpk_print_hook);
+ #else
+     _glp_lib_print_hook (glpk_print_hook, 0);
++#endif
+ #endif
+ 
+   LPX *lp = lpx_create_prob ();
+@@ -314,11 +320,14 @@
+       break;
+ 
+     default:
++      break;
++#if 0
+ #ifdef GLPK_PRE_4_14
+       insist (method != method);
+ #else
+       static char tmp[] = "method != method";
+       glpk_fault_hook (0, tmp);
++#endif
+ #endif
+     }
+ 
+
+
+
+