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

[Rafael Laboissiere]

Author: rafael
Date: 2007-03-29 10:33:11 +0000 (Thu, 29 Mar 2007)
New Revision: 867

Added:
   octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch
Modified:
   octave/trunk/debian/changelog
Log:
* debian/patches/50_glpk-pre-ifdef-logic.dpatch: Fixed #ifdef logic
  around macro GLPK_PRE_4_14, which was causing an extra closing brace
  to be introduced for the extern "C"  declaration when GLPK_PRE_4_14
  was not defined.  This patch has been sent to bug at octave.org.


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-03-28 00:52:36 UTC (rev 866)
+++ octave/trunk/debian/changelog	2007-03-29 10:33:11 UTC (rev 867)
@@ -2,9 +2,13 @@
 
   NOT YET RELEASED!
 
-  [ Rafael Laboissiere ]
-  * New upstream release.  The emacs/octave-inf.el file correctly calls
-    the pwd command (closes: #416048).
+  * New upstream release:
+    + The emacs/octave-inf.el file correctly calls the pwd command
+      (closes: #416048).
+    + debian/patches/50_glpk-pre-ifdef-logic.dpatch: Fixed #ifdef logic
+      around macro GLPK_PRE_4_14, which was causing an extra closing brace
+      to be introduced for the extern "C"  declaration when GLPK_PRE_4_14
+      was not defined.  This patch has been sent to bug at octave.org.
 
   * Removed dpatches (applied upstream):
     + 50_mkoctifle-man-indent-option
@@ -19,9 +23,9 @@
     + 50_parse-inline-brackets
     + 50_sparse_constructors
 
-  * debian/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields
+  * debian/in/control: Added XS-Vcs-Svn and XS-Vcs-Browser fields
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 28 Mar 2007 02:50:33 +0200
+ --
 
 octave2.9 (2.9.9-9) experimental; urgency=low
 

Added: octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch
===================================================================
--- octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch	2007-03-28 00:52:36 UTC (rev 866)
+++ octave/trunk/debian/patches/50_glpk-pre-ifdef-logic.dpatch	2007-03-29 10:33:11 UTC (rev 867)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_glpk-pre-ifdef-logic.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fixed #ifdef logic around macro GLPK_PRE_4_14, which was causing 
+## DP: an extra closing brace to be introduced for the extern "C" 
+## DP: declaration when GLPK_PRE_4_14 was not defined.  This patch has been 
+## DP: sent to bug at octave.org.
+ 
+
+ at DPATCH@
+
+--- octave2.9-2.9.10.orig/src/DLD-FUNCTIONS/__glpk__.cc
++++ octave2.9-2.9.10/src/DLD-FUNCTIONS/__glpk__.cc
+@@ -53,17 +53,14 @@
+ #ifndef lib_set_print_hook
+ #define lib_set_print_hook lib_print_hook
+ #endif
+-}
+ 
+ #else
+ 
+-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);
+-}
+ 
+ #endif
++}
+ 
+ #define NIntP 17
+ #define NRealP 10


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