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

Fri Mar 24 14:22:25 UTC 2006

Author: thomas-guest
Date: 2006-03-24 14:22:24 +0000 (Fri, 24 Mar 2006)
New Revision: 534

Added:
   trunk/packages/octave/debian/patches/50_incomplete_gamma.dpatch
   trunk/packages/octave/debian/patches/50_lgamma_doc.dpatch
Removed:
   trunk/packages/octave/debian/patches/50_g++4.1.dpatch
   trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch
   trunk/packages/octave/debian/patches/50_octave-mod-bind-m-bs-2.1.dpatch
   trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch
Modified:
   trunk/packages/octave/debian/README.Debian
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.1-00list
Log:
preparation for release of 2.1.73: 
  - drop all patches - applied upstream 
  - introduce fixes for #335195 and #335373


Modified: trunk/packages/octave/debian/README.Debian
===================================================================

--- trunk/packages/octave/debian/README.Debian	2006-03-23 13:49:29 UTC (rev 533)
+++ trunk/packages/octave/debian/README.Debian	2006-03-24 14:22:24 UTC (rev 534)
@@ -1,11 +1,10 @@
 
-The octave-doc package contains extra documentation in postscript form which
+The octave-doc package contains extra documentation in PDF form which
 can be found in the directory /usr/share/doc/octave-doc once this supplementary
 package is installed. 
 
 Further information on Octave, the Octave mailing-lists and the Octave 
-source archive can be found at http://www.che.wisc.edu/octave/.
+source archive can be found at http://www.octave.org
 
  -- Dirk Eddelbuettel <edd at debian.org>  Tue, 25 Mar 1997 23:16:54 -0500
 
-

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-03-23 13:49:29 UTC (rev 533)
+++ trunk/packages/octave/debian/changelog	2006-03-24 14:22:24 UTC (rev 534)
@@ -1,12 +1,22 @@
-octave2.1 (2.1.72-13) unstable; urgency=low
+octave2.1 (1:2.1.73-1) unstable; urgency=low
 
    NOT YET RELEASED!
 
   [ Thomas Weber ]
+  * New upstream release
   * debian/rules: Add octave2.X.1.gz link for man page which makes lintian
     happy
+  * removed patches (applied upstream):
+    - 50_g++4.1.dpatch
+    - 50_inferior-octave-resync-dirs.dpatch
+    - 50_octave-value-list-resize-2.1.dpatch (not applied upstream, but it was
+      only a work-around for a gcc bug)
+    - 50_octave-mod-bind-m-bs-2.1.dpatch
+  * new patches:
+    - 50_lgamma_doc.dpatch (Closes: #335373)
+    - 50_incomplete_gamma.dpatch (Closes: #335195)
 
- --
+ -- 
 
 octave2.9 (2.9.4-13+b1) unstable; urgency=low
 

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2006-03-23 13:49:29 UTC (rev 533)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2006-03-24 14:22:24 UTC (rev 534)
@@ -1,4 +1,2 @@
-50_inferior-octave-resync-dirs
-50_octave-value-list-resize-2.1
-50_octave-mod-bind-m-bs-2.1
-50_g++4.1
\ No newline at end of file
+50_lgamma_doc.dpatch
+50_incomplete_gamma.dpatch

Deleted: trunk/packages/octave/debian/patches/50_g++4.1.dpatch

Added: trunk/packages/octave/debian/patches/50_incomplete_gamma.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_incomplete_gamma.dpatch	2006-03-23 13:49:29 UTC (rev 533)
+++ trunk/packages/octave/debian/patches/50_incomplete_gamma.dpatch	2006-03-24 14:22:24 UTC (rev 534)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_incomplete_gamma.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for #335195, taken from Octave 2.9;
+##     it enhances the documentation of the gammainc function
+
+ at DPATCH@
+diff -urNad octave-2.1.73~/src/DLD-FUNCTIONS/gammainc.cc octave-2.1.73/src/DLD-FUNCTIONS/gammainc.cc
+--- octave-2.1.73~/src/DLD-FUNCTIONS/gammainc.cc	2005-05-02 13:17:21.000000000 +0200
++++ octave-2.1.73/src/DLD-FUNCTIONS/gammainc.cc	2006-03-24 14:29:33.000000000 +0100
+@@ -36,7 +36,7 @@
+ DEFUN_DLD (gammainc, args, ,
+   "-*- texinfo -*-\n\
+ @deftypefn {Mapping Function} {} gammainc (@var{x}, @var{a})\n\
+-Computes the incomplete gamma function,\n\
++Compute the normalized incomplete gamma function,\n\
+ @iftex\n\
+ @tex\n\
+ $$\n\
+@@ -53,15 +53,18 @@
+                   gamma (a)    /\n\
+                             t=0\n\
+ @end smallexample\n\
++\n\
+ @end ifinfo\n\
++with the limiting value of 1 as @var{x} approaches infinity.\n\
++The standard notation is @math{P(a,x)}, e.g. Abramowitz and Stegun (6.5.1).\n\
+ \n\
+ If @var{a} is scalar, then @code{gammainc (@var{x}, @var{a})} is returned\n\
+ for each element of @var{x} and vice versa.\n\
+ \n\
+ If neither @var{x} nor @var{a} is scalar, the sizes of @var{x} and\n\
+ @var{a} must agree, and @var{gammainc} is applied element-by-element.\n\
+- at end deftypefn\n\
+- at seealso{gamma and lgamma}")
++ at seealso{gamma, lgamma}\n\
++ at end deftypefn")
+ {
+   octave_value retval;
+ 


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

Deleted: trunk/packages/octave/debian/patches/50_inferior-octave-resync-dirs.dpatch

Added: trunk/packages/octave/debian/patches/50_lgamma_doc.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_lgamma_doc.dpatch	2006-03-23 13:49:29 UTC (rev 533)
+++ trunk/packages/octave/debian/patches/50_lgamma_doc.dpatch	2006-03-24 14:22:24 UTC (rev 534)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_lgamma_doc.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for #335373; this was applied upstream only for Octave 2.9;
+##     it fixes the documentation of th lgamma mapper function
+
+ at DPATCH@
+diff -urNad octave-2.1.73~/src/mappers.cc octave-2.1.73/src/mappers.cc
+--- octave-2.1.73~/src/mappers.cc	2005-05-02 13:17:13.000000000 +0200
++++ octave-2.1.73/src/mappers.cc	2006-03-24 13:47:00.000000000 +0100
+@@ -537,8 +537,8 @@
+ 
+   DEFUN_MAPPER (lgamma, 0, 0, 0, xlgamma, 0, 0, 0.0, 0.0, 0, 0,
+     "-*- texinfo -*-\n\
+- at deftypefn {Mapping Function} {} lgamma (@var{a}, @var{x})\n\
+- at deftypefnx {Mapping Function} {} gammaln (@var{a}, @var{x})\n\
++ at deftypefn {Mapping Function} {} lgamma (@var{x})\n\
++ at deftypefnx {Mapping Function} {} gammaln (@var{x})\n\
+ Return the natural logarithm of the gamma function.\n\
+ @end deftypefn\n\
+ @seealso{gamma and gammai}");


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

Deleted: trunk/packages/octave/debian/patches/50_octave-mod-bind-m-bs-2.1.dpatch

Deleted: trunk/packages/octave/debian/patches/50_octave-value-list-resize-2.1.dpatch


