From: Rafael L. <rla...@us...> - 2004-05-11 12:51:40
|
Update of /cvsroot/plplot/plplot/debian/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17823/patches Modified Files: octave-2.1.53-demos.dpatch warn-empty-list-elements.dpatch Log Message: * debian/changelog: Debian release 5.3.0.cvs.20040430-3. * debian/patches/octave-2.1.53-demos.dpatch: Added patches for Octave demos x13c.m, x14c.m, and x17c.m. The whole set of examples for the Octave bindings work now with Octave version 2.1.57. * debian/patches/warn-empty-list-elements.dpatch: Added patches for shade.m and __pl_contour.m. The demos p*.m work now with Octave version 2.1.57 (except demos p6.m, p17.m, and p20.m). * debian/rules (install-stamp): Install the file debian/struct_contains.m before the calls to dh_movefiles, such that struct_contains.m really goes into octave-plplot the package. Index: warn-empty-list-elements.dpatch =================================================================== RCS file: /cvsroot/plplot/plplot/debian/patches/warn-empty-list-elements.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- warn-empty-list-elements.dpatch 8 May 2004 18:08:29 -0000 1.1 +++ warn-empty-list-elements.dpatch 11 May 2004 12:51:23 -0000 1.2 @@ -66,3 +66,81 @@ + end_unwind_protect endfunction +diff -u -r1.13 shade.m +--- plplot-orig/bindings/octave/PLplot/shade.m 30 Dec 2003 03:19:15 -0000 1.13 ++++ plplot/bindings/octave/PLplot/shade.m 11 May 2004 11:52:18 -0000 +@@ -25,8 +25,11 @@ + global __pl + strm = __pl_init; + +- old_empty_list_elements_ok = empty_list_elements_ok; +- empty_list_elements_ok = 1; ++ old_empty_list_elements_ok = warn_empty_list_elements; ++ ++ unwind_protect ++ ++ warn_empty_list_elements = 0; + + if (nargin == 1 && is_matrix(x)) + levels = 20; +@@ -98,7 +101,6 @@ + __pl_plenv(xm, xM, ym, yM, 0, -2); + else + if (columns(__pl.axis(strm,:)) != 6) +- empty_list_elements_ok = old_empty_list_elements_ok; + error("You must contour/shade plot something before entering hold mode"); + endif + xmm = xm = __pl.axis(strm,1); xM = __pl.axis(strm,2); +@@ -167,6 +169,12 @@ + + plflush; + __pl.items(strm) = 1; # for now! +- empty_list_elements_ok = old_empty_list_elements_ok; ++ ++ unwind_protect_cleanup ++ ++ warn_empty_list_elements = old_empty_list_elements_ok; ++ ++ end_unwind_protect ++ + + endfunction +diff -u -r1.8 __pl_contour.m +--- plplot-orig/bindings/octave/PLplot/support/__pl_contour.m 30 Dec 2003 03:19:15 -0000 1.8 ++++ plplot/bindings/octave/PLplot/support/__pl_contour.m 11 May 2004 11:52:18 -0000 +@@ -17,8 +17,12 @@ + global __pl + + strm = plgstrm+1; +- old_empty_list_elements_ok = empty_list_elements_ok; +- empty_list_elements_ok = 1; ++ ++ old_empty_list_elements_ok = warn_empty_list_elements; ++ ++ unwind_protect ++ ++ warn_empty_list_elements = 0; + + grid = 0; + if (__pl.grid(strm)) +@@ -61,7 +65,6 @@ + __pl_plenv(xm, xM, ym, yM, 0, grid); + else + if (columns(__pl.axis(strm,:)) != 6) +- empty_list_elements_ok = old_empty_list_elements_ok; + error("You must contour/shade plot something before entering hold mode"); + endif + xm = __pl.axis(strm,1); xM = __pl.axis(strm,2); +@@ -106,6 +109,11 @@ + plflush; + + __pl.items(strm) = 1; # for now! +- empty_list_elements_ok = old_empty_list_elements_ok; ++ ++ unwind_protect_cleanup ++ ++ warn_empty_list_elements = old_empty_list_elements_ok; ++ ++ end_unwind_protect + + endfunction Index: octave-2.1.53-demos.dpatch =================================================================== RCS file: /cvsroot/plplot/plplot/debian/patches/octave-2.1.53-demos.dpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- octave-2.1.53-demos.dpatch 18 Feb 2004 18:17:02 -0000 1.1 +++ octave-2.1.53-demos.dpatch 11 May 2004 12:51:23 -0000 1.2 @@ -68,10 +68,19 @@ endfunction -diff -u -w -r1.6 x13c.m +diff -u -r1.6 x13c.m --- plplot-orig/bindings/octave/demos/x13c.m 11 Dec 2002 17:12:28 -0000 1.6 -+++ plplot/bindings/octave/demos/x13c.m 14 Feb 2004 13:35:25 -0000 -@@ -68,9 +68,9 @@ ++++ plplot/bindings/octave/demos/x13c.m 11 May 2004 07:37:09 -0000 +@@ -51,6 +51,8 @@ + theta0 = 0.; + dthet = 2 * pi / 500; + for i=0:4 ++ x = []; ++ y = []; + j = 0; + x(j+1) = 5.; + y(j+1) = 5.; +@@ -68,9 +70,9 @@ plpsty(rem((i + 3), 8) + 1); x(j+1:rows(x))=[]; y(j+1:rows(y))=[]; @@ -83,6 +92,42 @@ just = (theta0 + theta1) / 2.; dx = .25 * cos(just); dy = .25 * sin(just); if ((just < pi / 2) || (just > 3 * pi / 2) ) +diff -u -r1.9 x14c.m +--- plplot-orig/bindings/octave/demos/x14c.m 28 Jan 2004 17:39:29 -0000 1.9 ++++ plplot/bindings/octave/demos/x14c.m 11 May 2004 07:37:09 -0000 +@@ -166,12 +166,12 @@ + ## Plot the data points */ + + plcol(9); +- plpoin(xs, ys, 9); ++ plpoin(xs', ys', 9); + + ## Draw the line through the data */ + + plcol(4); +- plline(x, y); ++ plline(x', y'); + plflush;#pleop(); + + endfunction +@@ -200,7 +200,7 @@ + ## Draw the line */ + + plcol(3); +- plline(x, y); ++ plline(x', y'); + plflush;#pleop(); + endfunction + +@@ -240,7 +240,7 @@ + endfor + + plcol(4); +- plline(x, y); ++ plline(x', y'); + plflush;#pleop(); + + endfunction diff -u -w -r1.5 x15c.m --- plplot-orig/bindings/octave/demos/x15c.m 11 Dec 2002 17:12:28 -0000 1.5 +++ plplot/bindings/octave/demos/x15c.m 14 Feb 2004 13:35:25 -0000 @@ -122,6 +167,18 @@ shade_min, shade_max, sh_cmap, sh_color, sh_width, min_color, min_width, max_color, max_width,1,tr); +diff -u -r1.5 x17c.m +--- plplot-orig/bindings/octave/demos/x17c.m 11 Dec 2002 17:12:30 -0000 1.5 ++++ plplot/bindings/octave/demos/x17c.m 11 May 2004 07:37:09 -0000 +@@ -71,7 +71,7 @@ + xlab, ylab, + autoy, acc, + colbox, collab, +- colline, styline, "sum", "sin", "sin*noi", "sin+noi", ++ colline', styline', "sum", "sin", "sin*noi", "sin+noi", + "t", "pois", "Strip chart demo"); + + ## This is to represent a loop over time */ diff -u -w -r1.6 x18c.m --- plplot-orig/bindings/octave/demos/x18c.m 11 Dec 2002 17:12:30 -0000 1.6 +++ plplot/bindings/octave/demos/x18c.m 14 Feb 2004 13:35:25 -0000 @@ -146,3 +203,15 @@ endfor endfor +diff -u -r1.6 stripc.m +--- plplot-orig/bindings/octave/PLplot/stripc.m 19 Mar 2003 19:20:20 -0000 1.6 ++++ plplot/bindings/octave/PLplot/stripc.m 11 May 2004 11:52:18 -0000 +@@ -51,7 +51,7 @@ + xmin, xmax, xjump, ymin, ymax, + __pl.legend_xpos(strm), __pl.legend_ypos(strm), + autoy, acc, 15, 15, +- colline, styline, leg1, leg2, leg3, leg4, ++ colline', styline', leg1, leg2, leg3, leg4, + tdeblank(__pl.xlabel(strm,:)), + tdeblank(__pl.ylabel(strm,:)), + tdeblank(__pl.tlabel(strm,:))); |