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

[Rafael Laboissiere]

Author: rafael
Date: 2006-04-14 21:46:41 +0000 (Fri, 14 Apr 2006)
New Revision: 572

Added:
   trunk/packages/octave/debian/patches/50_return-deffn.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
   trunk/packages/octave/debian/in/octave2.1-00list
Log:
Debian release octave_2.1.73-7_all.deb


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-04-13 08:32:12 UTC (rev 571)
+++ trunk/packages/octave/debian/changelog	2006-04-14 21:46:41 UTC (rev 572)
@@ -1,3 +1,12 @@
+octave2.1 (1:2.1.73-7) unstable; urgency=low
+
+  * debian/in/PACKAGE-htmldoc.doc-base.lib: Fixed path for HTML files.
+    Really closes Bug #362251.
+  * debian/patches/50_return-deffn.dpatch: Added patch, whcih completely
+    closes Bug #361705.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 14 Apr 2006 19:44:42 +0200
+
 octave2.1 (1:2.1.73-6) unstable; urgency=low
 
   * debian/in/PACKAGE-htmldoc.doc-base.*: Fixed path for documentation

Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib	2006-04-13 08:32:12 UTC (rev 571)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib	2006-04-14 21:46:41 UTC (rev 572)
@@ -9,5 +9,5 @@
 Section: Apps/Math
 
 Format: HTML
-Index: 	/usr/share/doc/@PACKAGE at -htmldoc/lib/index.html
-Files:  /usr/share/doc/@PACKAGE at -htmldoc/lib/*.html
+Index: 	/usr/share/doc/@PACKAGE at -htmldoc/liboctave/index.html
+Files:  /usr/share/doc/@PACKAGE at -htmldoc/liboctave/*.html

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2006-04-13 08:32:12 UTC (rev 571)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2006-04-14 21:46:41 UTC (rev 572)
@@ -2,3 +2,4 @@
 50_incomplete_gamma.dpatch
 50_g++4.1-fixes.dpatch
 50_automatic-replot-docstring
+50_return-deffn

Added: trunk/packages/octave/debian/patches/50_return-deffn.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_return-deffn.dpatch	2006-04-13 08:32:12 UTC (rev 571)
+++ trunk/packages/octave/debian/patches/50_return-deffn.dpatch	2006-04-14 21:46:41 UTC (rev 572)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_return-deffn.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## The "return" keyword will appear in the function index, instead of the
+## variable index
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/doc/interpreter/func.txi
++++ octave2.1-2.1.73/doc/interpreter/func.txi
+@@ -373,12 +373,12 @@
+ without adding extra logic to avoid printing the message if the vector
+ does contain a nonzero element.
+ 
+- at defvr {Keyword} return
++ at deffn {Keyword} return
+ When Octave encounters the keyword @code{return} inside a function or
+ script, it returns control to the caller immediately. At the top level,
+ the return statement is ignored.  A @code{return} statement is assumed
+ at the end of every function definition.
+- at end defvr
++ at end deffn
+ 
+ @DOCSTRING(return_last_computed_value)
+ 


Property changes on: trunk/packages/octave/debian/patches/50_return-deffn.dpatch
___________________________________________________________________
Name: svn:executable
   + *