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

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-16 09:58:52 +0000 (Wed, 16 Nov 2005)
New Revision: 326

Added:
   trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.9.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Debian release 2.9.4-2

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-16 08:26:46 UTC (rev 325)
+++ trunk/packages/octave/debian/changelog	2005-11-16 09:58:52 UTC (rev 326)
@@ -1,3 +1,14 @@
+octave2.9 (2.9.4-2) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/patches/50_octave-value-list-resize-2.9.dpatch: Added patch for
+    the 2.9.* branch (see below)
+  * debian/in/control: Generate an unversioned, virtual octave package
+    only for the 2.1 branch, which is the recommended one
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Wed, 16 Nov 2005 09:54:15 +0100
+
 octave2.1 (2.1.72-2) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2005-11-16 08:26:46 UTC (rev 325)
+++ trunk/packages/octave/debian/in/control	2005-11-16 09:58:52 UTC (rev 326)
@@ -103,15 +103,18 @@
  octave documentation which is needed for the 'help -i foo' command within
  Octave.
 
+[V_2_1:
 Package: octave
 Architecture: any
-Depends: octave[V_2_1:2.1:][V_2_9:2.9:] (>= ${Source-Version})
-Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Depends: octave2.1 (>= ${Source-Version})
+Description: GNU Octave language for numerical computations (2.1 branch)
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
  intended for numerical computations. It provides a convenient command-line
  interface for solving linear and nonlinear problems numerically.
  .
  This package is an empty 'virtual' package whose sole purpose is to
- install the current Octave version from the [V_2_1:2.1:][V_2_9:2.9:] branch.
+ install the current Octave version from the 2.1 branch (the recommended
+ testing branch) .
  .
- Once you have the octave[V_2_1:2.1:][V_2_9:2.9:] package installed, you can remove this package.
+ Once you have the octave2.1 package installed, you can remove this package.
+:]
\ No newline at end of file

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2005-11-16 08:26:46 UTC (rev 325)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2005-11-16 09:58:52 UTC (rev 326)
@@ -1,2 +1,3 @@
 50_mkoctfile.1-no-negative
 50_install-liboctinterp
+50_octave-value-list-resize-2.9

Added: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.9.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.9.dpatch	2005-11-16 08:26:46 UTC (rev 325)
+++ trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.9.dpatch	2005-11-16 09:58:52 UTC (rev 326)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_octave-value-list-resize-2.9.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid crashes in the octave_value_list destructor.  This patch was
+## DP: posted by J. W. Eaton in the help-octave mailing list.
+## DP: See http://www.octave.org/mailing-lists/help-octave/2005/4266
+## DP: (this patch only applies to octave2.9)
+
+ at DPATCH@
+
+--- octave2.9-2.9.4.orig/src/oct-obj.h
++++ octave2.9-2.9.4/src/oct-obj.h
+@@ -96,7 +96,20 @@
+ 
+   void resize (octave_idx_type n) { data.resize (n); }
+ 
+-  void resize (octave_idx_type n, const octave_value& val);
++  void octave_value_list::resize (octave_idx_type n, const octave_value& val)
++  {
++    octave_idx_type len = length ();
++  
++    if (n > len)
++      {
++        data.resize (n);
++  
++        for (octave_idx_type i = len; i < n; i++)
++  	data[i] = val;
++      }
++    else if (n < len)
++      data.resize (n);
++  }
+ 
+   octave_value_list& prepend (const octave_value& val);
+ 
+--- octave2.9-2.9.4.orig/src/oct-obj.cc
++++ octave2.9-2.9.4/src/oct-obj.cc
+@@ -43,22 +43,6 @@
+   return true;
+ }
+ 
+-void
+-octave_value_list::resize (octave_idx_type n, const octave_value& val)
+-{
+-  octave_idx_type len = length ();
+-
+-  if (n > len)
+-    {
+-      data.resize (n);
+-
+-      for (octave_idx_type i = len; i < n; i++)
+-	data[i] = val;
+-    }
+-  else if (n < len)
+-    data.resize (n);
+-}
+-
+ octave_value_list&
+ octave_value_list::prepend (const octave_value& val)
+ {


Property changes on: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.9.dpatch
___________________________________________________________________
Name: svn:executable
   + *