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

Thomas Weber thomas-guest at alioth.debian.org
Wed May 21 10:50:26 UTC 2008


tags 477349 pending
tags 477556 pending
tags 478271 pending
tags 478677 pending
thanks

Author: thomas-guest
Date: 2008-05-21 10:50:26 +0000 (Wed, 21 May 2008)
New Revision: 1972

Added:
   octave/trunk/debian/patches/50_add_syspath.dpatch
   octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch
   octave/trunk/debian/patches/no_pdf_in_print.dpatch
   octave/trunk/debian/patches/randn_doc.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.conf
   octave/trunk/debian/in/octave3.0-00list
Log:
Bug fixing, mostly documentation: #477556 #477349 #478677 #478271


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-05-21 09:13:07 UTC (rev 1971)
+++ octave/trunk/debian/changelog	2008-05-21 10:50:26 UTC (rev 1972)
@@ -1,3 +1,20 @@
+octave3.0 (1:3.0.1-4) UNRELEASED; urgency=low
+
+  * New patches:
+    - 50_add_syspath.dpatch: Prepend library path again in the loadpath
+      (closes: #477556). Thanks to Kim Hansen <kimhanse at gmail.com> for the
+      patch.
+    - randn_doc.dpatch: better explanation of randn()'s return value 
+      (closes: #477349)
+    - no_pdf_in_print.dpatch: explain that PDF generation is not possible with
+      packaged gnuplot (closes: #478677)
+    - imshow_only_handles_octave_images.dpatch: documentation patch, imshow
+      only handles Octave's image format (closes: #478271)
+
+  * debian/in/PACKAGE.conf: Remove explicit library path addition.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 21 May 2008 10:18:43 +0200
+
 octave3.0 (1:3.0.1-3) unstable; urgency=low
 
   [ Rafael Laboissiere ]

Modified: octave/trunk/debian/in/PACKAGE.conf
===================================================================
--- octave/trunk/debian/in/PACKAGE.conf	2008-05-21 09:13:07 UTC (rev 1971)
+++ octave/trunk/debian/in/PACKAGE.conf	2008-05-21 10:50:26 UTC (rev 1972)
@@ -12,9 +12,6 @@
 :]
 
 [V_3_0:
-## Force the lib path into the loadpath. Work-around for #477556)
-addpath (genpath ("/usr/lib/octave/@VERSION@/oct/"), "-begin");
-
 ## Configure readline using the file inputrc in the Octave startup
 ## directory.
 

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-05-21 09:13:07 UTC (rev 1971)
+++ octave/trunk/debian/in/octave3.0-00list	2008-05-21 10:50:26 UTC (rev 1972)
@@ -1,3 +1,6 @@
 50_octave-bug-tempfile
 50_include-cstring-mxarray
 50_fix_handle_for_plotyy.dpatch
+50_add_syspath.dpatch
+randn_doc.dpatch
+no_pdf_in_print.dpatch

Added: octave/trunk/debian/patches/50_add_syspath.dpatch
===================================================================
--- octave/trunk/debian/patches/50_add_syspath.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_add_syspath.dpatch	2008-05-21 10:50:26 UTC (rev 1972)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Put library path in loadpath (bug fix for #477556)
+## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc
+--- octave3.0-3.0.1~/src/load-path.cc	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/src/load-path.cc	2008-05-21 10:20:38.000000000 +0200
+@@ -382,7 +382,7 @@
+     xpath += dir_path::path_sep_str + tpath;
+ 
+   if (! sys_path.empty ())
+-    xpath += sys_path;
++    xpath += dir_path::path_sep_str + sys_path;
+ 
+   do_set (xpath, false);
+ }
+diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig


Property changes on: octave/trunk/debian/patches/50_add_syspath.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch
===================================================================
--- octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch	2008-05-21 10:50:26 UTC (rev 1972)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## imshow_only_handles_octave_images.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: imshow can only handle Octave's native image for the time being
+## DP: #478271
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.1~/scripts/image/imshow.m octave3.0-3.0.1/scripts/image/imshow.m
+--- octave3.0-3.0.1~/scripts/image/imshow.m	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/scripts/image/imshow.m	2008-05-21 13:49:19.000000000 +0200
+@@ -37,7 +37,7 @@
+ ## image using the supplied color map.
+ ##
+ ## If a file name is given instead of an image, the file will be read and
+-## shown.
++## shown. The file must be in Octave's native image format.
+ ##
+ ## If given, the parameter @var{string_param1} has value
+ ## @var{value1}. @var{string_param1} can be any of the following:


Property changes on: octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: octave/trunk/debian/patches/no_pdf_in_print.dpatch
===================================================================
--- octave/trunk/debian/patches/no_pdf_in_print.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/no_pdf_in_print.dpatch	2008-05-21 10:50:26 UTC (rev 1972)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_pdf_in_print.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Warning about missing pdflib
+## DP: #478677
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.1~/scripts/plot/print.m octave3.0-3.0.1/scripts/plot/print.m
+--- octave3.0-3.0.1~/scripts/plot/print.m	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/scripts/plot/print.m	2008-05-21 12:17:20.000000000 +0200
+@@ -93,6 +93,9 @@
+ ##     Scalable vector graphics
+ ##   @item pdf
+ ##     Portable document format
++##
++##     NOTE: The gnuplot binary as shipped by Debian cannot create PDF files, see http://bugs.debian.org/478677
++##
+ ##   @end table
+ ##
+ ##   Other devices are supported by "convert" from ImageMagick.  Type


Property changes on: octave/trunk/debian/patches/no_pdf_in_print.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: octave/trunk/debian/patches/randn_doc.dpatch
===================================================================
--- octave/trunk/debian/patches/randn_doc.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/randn_doc.dpatch	2008-05-21 10:50:26 UTC (rev 1972)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## randn_doc.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Better explanation of randn()'s return value (fix for #477349)
+
+ at DPATCH@
+diff -urNad octave3.0-3.0.1~/src/DLD-FUNCTIONS/rand.cc octave3.0-3.0.1/src/DLD-FUNCTIONS/rand.cc
+--- octave3.0-3.0.1~/src/DLD-FUNCTIONS/rand.cc	2008-04-21 18:00:20.000000000 +0200
++++ octave3.0-3.0.1/src/DLD-FUNCTIONS/rand.cc	2008-05-21 12:09:44.000000000 +0200
+@@ -471,8 +471,9 @@
+ @deftypefnx {Loadable Function} {} randn (@var{n}, @var{m})\n\
+ @deftypefnx {Loadable Function} {} randn (\"state\", @var{x})\n\
+ @deftypefnx {Loadable Function} {} randn (\"seed\", @var{x})\n\
+-Return a matrix with normally distributed random elements. The\n\
+-arguments are handled the same as the arguments for @code{rand}.\n\
++Return a matrix with normally distributed pseudo-random\n\
++elements having zero mean and variance one. The arguments are\n\
++handled the same as the arguments for @code{rand}.\n\
+ \n\
+ By default, @code{randn} uses a Marsaglia and Tsang Ziggurat technique to\n\
+ transform from a uniform to a normal distribution. (G. Marsaglia and\n\


Property changes on: octave/trunk/debian/patches/randn_doc.dpatch
___________________________________________________________________
Name: svn:executable
   + *




More information about the Pkg-octave-commit mailing list