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

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-21 04:35:09 +0100 (Wed, 21 Feb 2007)
New Revision: 846

Added:
   trunk/packages/octave/debian/patches/50_parse-inline-brackets.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Debian release octave2.9_2.9.9-9

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2007-02-20 15:00:44 UTC (rev 845)
+++ trunk/packages/octave/debian/changelog	2007-02-21 03:35:09 UTC (rev 846)
@@ -1,14 +1,18 @@
-octave2.9 (2.9.9-9) unstable; urgency=low
+octave2.9 (2.9.9-9) experimental; 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)
+  * Since glpk 4.15 is stuck in the NEW queue, this version of octave2.9 is
+    released to experimental
 
- --
+  * debian/patches/50_parse-inline-brackets.dpatch: Fix a parsing problem
+    in function handles and inlines were brackets are present.  This patch
+    has been applied upstream in CVS. See
+    http://www.cae.wisc.edu/pipermail/bug-octave/2006-October/000903.html
 
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 20 Feb 2007 23:04:38 +0100
+
 octave2.9 (2.9.9-8) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2007-02-20 15:00:44 UTC (rev 845)
+++ trunk/packages/octave/debian/in/control	2007-02-21 03:35:09 UTC (rev 846)
@@ -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 (>= 4.15),
+ less, dpatch, slice[V_2_9:, libpcre3-dev, flex, libglpk-dev (>= 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-20 15:00:44 UTC (rev 845)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2007-02-21 03:35:09 UTC (rev 846)
@@ -10,3 +10,4 @@
 50_print-imagemagick-extensions
 50_correct_test
 50_glpk-api-v4.15
+50_parse-inline-brackets

Added: trunk/packages/octave/debian/patches/50_parse-inline-brackets.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_parse-inline-brackets.dpatch	2007-02-20 15:00:44 UTC (rev 845)
+++ trunk/packages/octave/debian/patches/50_parse-inline-brackets.dpatch	2007-02-21 03:35:09 UTC (rev 846)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_parse-inline-brackets.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix a parsing problem in function handles and inlines were brackets
+## DP: are present.  This patch has been applied upstream in CVS. See
+## DP: https://www.cae.wisc.edu/pipermail/bug-octave/2006-October/000903.html 
+
+ at DPATCH@
+
+--- octave2.9-2.9.9.orig/src/pt-cell.cc
++++ octave2.9-2.9.9/src/pt-cell.cc
+@@ -110,7 +110,7 @@
+     {
+       tree_argument_list *elt = *p;
+ 
+-      append (elt ? elt->dup (sym_tab) : 0);
++      new_cell->append (elt ? elt->dup (sym_tab) : 0);
+     }
+ 
+   new_cell->copy_base (*this);
+--- octave2.9-2.9.9.orig/src/pt-mat.cc
++++ octave2.9-2.9.9/src/pt-mat.cc
+@@ -942,7 +942,7 @@
+     {
+       tree_argument_list *elt = *p;
+ 
+-      append (elt ? elt->dup (sym_tab) : 0);
++      new_matrix->append (elt ? elt->dup (sym_tab) : 0);
+     }
+ 
+   new_matrix->copy_base (*this);


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