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

[Rafael Laboissiere]

tags 452560 pending
thanks

Author: rafael
Date: 2008-02-23 09:52:12 +0000 (Sat, 23 Feb 2008)
New Revision: 1225

Added:
   octave/trunk/debian/patches/50_clean-doc.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave3.0-00list
Log:
Added 50_clean-doc dpatch

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-23 09:37:42 UTC (rev 1224)
+++ octave/trunk/debian/changelog	2008-02-23 09:52:12 UTC (rev 1225)
@@ -8,8 +8,11 @@
     from one branches to another.
   * debian/rules: Process all debian/in* files through slice
   * debian/in/octave{2.1,3.0}-watch: Updated URLs
+  * debian/patches/50_clean-doc.dpatch: Improve documentation of clean
+    command (patch suggested by Thomas Weber and applied upstream,
+    closes: #452560)
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 09:53:30 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 10:49:01 +0100
 
 octave2.1 (1:2.1.73-17) unstable; urgency=low
 

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-02-23 09:37:42 UTC (rev 1224)
+++ octave/trunk/debian/in/octave3.0-00list	2008-02-23 09:52:12 UTC (rev 1225)
@@ -1,3 +1,4 @@
 50_octave-bug-tempfile
 50_drop-lo-manpages
 50_include-cstring-mxarray
+50_clean-doc

Added: octave/trunk/debian/patches/50_clean-doc.dpatch
===================================================================
--- octave/trunk/debian/patches/50_clean-doc.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/50_clean-doc.dpatch	2008-02-23 09:52:12 UTC (rev 1225)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_clean-doc.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Improve documentation of clean command. Patch suggested by
+## DP: Thomas Weber in the mailing list octave-maintainers and applied
+## DP: upstream by John W. Eaton, see
+## DP: http://www.nabble.com/Implementation-of-clear%28%29-to14497170.html#a14558608
+
+ at DPATCH@
+
+--- octave3.0-3.0.0.orig/src/variables.cc
++++ octave3.0-3.0.0/src/variables.cc
+@@ -2392,7 +2392,7 @@
+ 
+ DEFCMD (clear, args, ,
+   "-*- texinfo -*-\n\
+- at deffn {Command} clear [-x] pattern @dots{}\n\
++ at deffn {Command} clear [options] pattern @dots{}\n\
+ Delete the names matching the given patterns from the symbol table.  The\n\
+ pattern may contain the following special characters:\n\
+ \n\
+@@ -2430,7 +2430,24 @@
+ @code{foo} as a function.  Executing @kbd{clear foo} a second time will\n\
+ clear the function definition.\n\
+ \n\
+-With -x, clear the variables that don't match the patterns.\n\
++The following options are available in both long and short form\n\
++ at table @code\n\
++ at item -all, -a\n\
++Clears all local and global user-defined variables and all functions\n\
++from the symbol table.\n\
++\n\
++ at item -exclusive, -x\n\
++Clears the variables that don't match the following pattern.\n\
++\n\
++ at item -functions, -f\n\
++Clears the function names and the built-in symbols names.\n\
++ at item -global, -g\n\
++Clears the global symbol names.\n\
++ at item -variables, -v\n\
++Clears the local variable names.\n\
++ at end table\n\
++With the execption of @code{exclusive}, all long options can be used \n\
++without the dash as well.\n\
+ @end deffn")
+ {
+   octave_value_list retval;