[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b
Jordi Gutiérrez Hermoso
jordigh at gmail.com
Mon Jan 3 03:41:18 UTC 2011
tags 607071 pending
thanks
The following commit has been merged in the master branch:
commit a718b53403d9f164f8c2a3df521385a01d28a11b
Author: Jordi Gutiérrez Hermoso <jordigh at gmail.com>
Date: Sun Jan 2 21:34:09 2011 -0600
Import patches up to upstream svn revision 8033 in order to squash RC bug
diff --git a/debian/changelog b/debian/changelog
index 412334c..9c02b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+octave-symbolic (1.0.9-3) unstable; urgency=low
+
+ * debian/control: Add myself to uploaders
+ * debian/patches: Grab svn fixes (closes: #607071). Many thanks to David
+ Bremner of #debian-mentors in OFTC.
+ + svn-Call-symbols-on-package-load-to-ensure-types-are-reg.patch
+ + svn-replace-list-functions-like-nth-append-which-became-.patch
+ + svn-Fix-texinfo-bugs.patch
+ + svn-Use-instead-of.patch
+
+ -- Jordi Gutiérrez Hermoso <jordigh at gmail.com> Sun, 02 Jan 2011 19:43:44 -0600
+
octave-symbolic (1.0.9-2) UNRELEASED; urgency=low
* debian/control:
diff --git a/debian/control b/debian/control
index 4599c83..b963db7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: octave-symbolic
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
-Uploaders: Thomas Weber <thomas.weber.mail at gmail.com>
+Uploaders: Thomas Weber <thomas.weber.mail at gmail.com>, Jordi Gutiérrez Hermoso <jordigh at gmail.com>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.7.0),
libginac-dev, pkg-config, quilt
diff --git a/debian/patches/series b/debian/patches/series
index 8d1c8b6..6e17c76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,5 @@
+svn-Call-symbols-on-package-load-to-ensure-types-are-reg.patch
+svn-replace-list-functions-like-nth-append-which-became-.patch
+svn-Fix-texinfo-bugs.patch
+svn-Use-instead-of.patch
diff --git a/debian/patches/svn-Call-symbols-on-package-load-to-ensure-types-are-reg.patch b/debian/patches/svn-Call-symbols-on-package-load-to-ensure-types-are-reg.patch
new file mode 100644
index 0000000..3b88d24
--- /dev/null
+++ b/debian/patches/svn-Call-symbols-on-package-load-to-ensure-types-are-reg.patch
@@ -0,0 +1,22 @@
+From ef2b86915985da20a20af177f71419c955cfbc1f Mon Sep 17 00:00:00 2001
+From: hauberg <hauberg at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
+Date: Mon, 5 Oct 2009 18:49:21 +0000
+Subject: [PATCH 1/4] Call 'symbols' on package load to ensure types are registrered
+
+git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@6293 416fae20-06d0-4450-9b69-c6c34d4b5f03
+---
+ PKG_ADD | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/PKG_ADD b/PKG_ADD
+index a8fe021..a38fb1f 100644
+--- a/PKG_ADD
++++ b/PKG_ADD
+@@ -41,3 +41,4 @@ autoload ("numden", fullfile (fileparts (mfilename ("fullpath")), "symbols.oct")
+ autoload ("syminfo", fullfile (fileparts (mfilename ("fullpath")), "symbols.oct"));
+ autoload ("symlsolve", fullfile (fileparts (mfilename ("fullpath")), "symbols.oct"));
+ autoload ("sumterms", fullfile (fileparts (mfilename ("fullpath")), "symbols.oct"));
++symbols ();
+--
+1.7.2.3
+
diff --git a/debian/patches/svn-Fix-texinfo-bugs.patch b/debian/patches/svn-Fix-texinfo-bugs.patch
new file mode 100644
index 0000000..0f0d877
--- /dev/null
+++ b/debian/patches/svn-Fix-texinfo-bugs.patch
@@ -0,0 +1,49 @@
+From dbef895048b3a70ecf22ae224f20f15eddd7fd69 Mon Sep 17 00:00:00 2001
+From: hauberg <hauberg at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
+Date: Wed, 22 Dec 2010 08:07:53 +0000
+Subject: [PATCH 3/4] Fix texinfo bugs
+
+git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@8032 416fae20-06d0-4450-9b69-c6c34d4b5f03
+---
+ inst/poly2sym.m | 2 +-
+ inst/sym2poly.m | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/inst/poly2sym.m b/inst/poly2sym.m
+index 50d9afa..17d6a6c 100644
+--- a/inst/poly2sym.m
++++ b/inst/poly2sym.m
+@@ -28,7 +28,7 @@
+ ## symbols
+ ## x=sym("x"); y=sym("y");
+ ## p = poly2sym ([2,5,-3]); # p = 2*x^2+5*x-3
+-## c = poly2sym ({2*y,5,-3},x); # p = 2*y*x^2+5*x-3
++## c = poly2sym (@{2*y,5,-3@},x); # p = 2*y*x^2+5*x-3
+ ## @end example
+ ##
+ ## @end deftypefn
+diff --git a/inst/sym2poly.m b/inst/sym2poly.m
+index fa9afc4..96fd268 100644
+--- a/inst/sym2poly.m
++++ b/inst/sym2poly.m
+@@ -29,7 +29,7 @@
+ ## symbols
+ ## x=sym("x"); y=sym("y");
+ ## c = sym2poly (x^2+3*x-4); # c = [1,3,-4]
+-## c = sym2poly (x^2+y*x,x); # c = {2,y,0}
++## c = sym2poly (x^2+y*x,x); # c = @{2,y,0@}
+ ## @end example
+ ##
+ ## If @var{p} is not a polynomial the result has no warranty.
+@@ -71,7 +71,7 @@ if isempty(pvars)
+ endif
+ nvars = length(pvars);
+
+-if nvars>1 & exist("x")!=1
++if nvars>1 && exist("x")!=1
+ error("Symbolic expression has more than 1 free variable; no variable specified.")
+ elseif exist("x")!=1
+ x = pvars{1};
+--
+1.7.2.3
+
diff --git a/debian/patches/svn-Use-instead-of.patch b/debian/patches/svn-Use-instead-of.patch
new file mode 100644
index 0000000..a1893a3
--- /dev/null
+++ b/debian/patches/svn-Use-instead-of.patch
@@ -0,0 +1,28 @@
+From a5011d3d13eb25505ee39f809541e902321c5b13 Mon Sep 17 00:00:00 2001
+From: hauberg <hauberg at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
+Date: Wed, 22 Dec 2010 08:15:40 +0000
+Subject: [PATCH 4/4] Use || instead of |
+
+git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@8033 416fae20-06d0-4450-9b69-c6c34d4b5f03
+---
+ inst/symfsolve.m | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/inst/symfsolve.m b/inst/symfsolve.m
+index 5d252da..c7ca1e2 100644
+--- a/inst/symfsolve.m
++++ b/inst/symfsolve.m
+@@ -78,8 +78,8 @@ function [ x,inf,msg ] = symfsolve (varargin)
+ arg_count = 0;
+ for i=1:nargin
+ tmp = disp(varargin{i});
+- if( iscell(varargin{i}) | ...
+- all(isalnum(tmp) | tmp=="_" | tmp==",") | ...
++ if( iscell(varargin{i}) || ...
++ all(isalnum(tmp) || tmp=="_" || tmp==",") || ...
+ !strcmp(typeinfo(varargin{i}),"ex") )
+ break;
+ endif
+--
+1.7.2.3
+
diff --git a/debian/patches/svn-replace-list-functions-like-nth-append-which-became-.patch b/debian/patches/svn-replace-list-functions-like-nth-append-which-became-.patch
new file mode 100644
index 0000000..0f69de8
--- /dev/null
+++ b/debian/patches/svn-replace-list-functions-like-nth-append-which-became-.patch
@@ -0,0 +1,82 @@
+From 3c0a2f677db61f4d51698257e8eb77bae6de9de2 Mon Sep 17 00:00:00 2001
+From: schloegl <schloegl at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
+Date: Fri, 21 May 2010 10:01:35 +0000
+Subject: [PATCH 2/4] replace list functions like nth(), append(), which became obsolete with 3.4 etc.
+
+git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@7327 416fae20-06d0-4450-9b69-c6c34d4b5f03
+---
+ inst/symfsolve.m | 6 +++---
+ src/symbols.cc | 3 ++-
+ src/symlsolve.cc | 4 ++--
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/inst/symfsolve.m b/inst/symfsolve.m
+index 564589d..5d252da 100644
+--- a/inst/symfsolve.m
++++ b/inst/symfsolve.m
+@@ -83,7 +83,7 @@ function [ x,inf,msg ] = symfsolve (varargin)
+ !strcmp(typeinfo(varargin{i}),"ex") )
+ break;
+ endif
+- eqns=append(eqns,varargin{i});
++ eqns{end+1} = varargin{i};
+ arg_count = arg_count+1;
+ endfor
+ endif
+@@ -117,7 +117,7 @@ function [ x,inf,msg ] = symfsolve (varargin)
+ for i=(arg_count+1):2:nargin
+ tmp = disp(varargin{i});
+ if all(isalnum(tmp) | tmp=="_" | tmp==",")
+- vars=append(vars,varargin{i});
++ vars{end+1} = varargin{i};
+ X0((i-arg_count+1)/2)=varargin{i+1};
+ else
+ error("Error in symbol-value pair arguments.")
+@@ -133,7 +133,7 @@ function [ x,inf,msg ] = symfsolve (varargin)
+ # cell-array of relations - this should work for a list of strings ("x==3") too.
+ for i=1:nvars
+ tmp = disp(varargin{arg_count+1}{i});
+- vars = append(vars,sym(strtok(tmp,"==")));
++ vars{end+1} = {sym(strtok(tmp,"=="))};
+ X0(i) = str2num(tmp((findstr(tmp,"==")+2):length(tmp)));
+ endfor
+ else
+diff --git a/src/symbols.cc b/src/symbols.cc
+index 977525e..8c6c662 100644
+--- a/src/symbols.cc
++++ b/src/symbols.cc
+@@ -373,7 +373,8 @@ w = subs (f,@{x,y@},@{1,vpa(1/3)@})\n\
+ gripe_wrong_type_arg ("subs",args(0));
+ return retval;
+ }
+- if (!(args(1).is_list() || args(1).is_cell())) {
++ //if (!(args(1).is_list() || args(1).is_cell())) {
++ if (!(args(1).is_cell())) {
+ if (!get_symbol (args(1), the_sym)) {
+ gripe_wrong_type_arg("subs",args(1));
+ return retval;
+diff --git a/src/symlsolve.cc b/src/symlsolve.cc
+index d993269..d3e5703 100644
+--- a/src/symlsolve.cc
++++ b/src/symlsolve.cc
+@@ -46,7 +46,7 @@ symbolic solutions corresponding in order to @var{vars}.\n\
+ }
+
+ try {
+- if(args(0).is_list() || args(0).is_cell()) {
++ if(args(0).is_cell()) {
+ octave_value_list oct_eqn_list(args(0).list_value());
+ for(i=0;i<oct_eqn_list.length();i++) {
+ if(!get_relation(oct_eqn_list(i),relation)) {
+@@ -67,7 +67,7 @@ symbolic solutions corresponding in order to @var{vars}.\n\
+ eqns.append(relation);
+ }
+
+- if(args(1).is_list() || args(1).is_cell()) {
++ if(args(1).is_cell()) {
+ octave_value_list oct_vars(args(1).list_value());
+ for(i=0;i<oct_vars.length();i++) {
+ if(!get_symbol(oct_vars(i),expression)) {
+--
+1.7.2.3
+
--
octave-symbolic
More information about the Pkg-octave-commit
mailing list