[Pkg-octave-commit] r1153 - in octave2.1-forge/trunk/debian: . patches

[Thomas Weber]

tags 454157 pending
thanks

Author: thomas-guest
Date: 2008-01-09 21:17:43 +0000 (Wed, 09 Jan 2008)
New Revision: 1153

Added:
   octave2.1-forge/trunk/debian/patches/fix-pwelch.patch
Modified:
   octave2.1-forge/trunk/debian/changelog
Log:
Bug fix for #454157


Modified: octave2.1-forge/trunk/debian/changelog
===================================================================
--- octave2.1-forge/trunk/debian/changelog	2008-01-08 09:23:43 UTC (rev 1152)
+++ octave2.1-forge/trunk/debian/changelog	2008-01-09 21:17:43 UTC (rev 1153)
@@ -1,7 +1,5 @@
 octave2.1-forge (2006.03.17+dfsg1-5) unstable; urgency=high
 
-  NOT YET RELEASED!
-
   [ Cyril Brulebois ]
   * debian/control:
     + Switched B-D from gfortran to gfortran-4.1, since gfortran now
@@ -10,8 +8,13 @@
       Urgency set to ``high'' accordingly.
     + Added myself to the Uploaders.
 
- --
+  [ Thomas Weber ]
+  * New patch debian/patches/fix-pwelch:
+    Allow using default arguments in pwelch.m; thanks Francesco Potorti.
+    (Closes: #454157)
 
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 09 Jan 2008 23:25:54 +0100
+
 octave2.1-forge (2006.03.17+dfsg1-4) unstable; urgency=low
 
   * debian/control:
@@ -904,16 +907,3 @@
 
  -- Dirk Eddelbuettel <edd at debian.org>  Sun, 25 Feb 2001 20:43:08 -0600
 
-Local Variables:
-eval: (progn
-  (make-local-hook 'debian-changelog-add-version-hook)
-  (add-hook
-    'debian-changelog-add-version-hook
-      (lambda ()
-      (save-excursion
-        (forward-line -1)
-        (beginning-of-line)
-        (insert "\n  NOT YET RELEASED!\n\n  [ "
-          (or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
-    nil t))
-End:

Added: octave2.1-forge/trunk/debian/patches/fix-pwelch.patch
===================================================================
--- octave2.1-forge/trunk/debian/patches/fix-pwelch.patch	                        (rev 0)
+++ octave2.1-forge/trunk/debian/patches/fix-pwelch.patch	2008-01-09 21:17:43 UTC (rev 1153)
@@ -0,0 +1,65 @@
+diff -Nur octave2.1-forge-2006.03.17+dfsg1/main/signal/pwelch.m octave2.1-forge-2006.03.17+dfsg1.new/main/signal/pwelch.m
+--- octave2.1-forge-2006.03.17+dfsg1/main/signal/pwelch.m	2005-09-08 04:00:18.000000000 +0200
++++ octave2.1-forge-2006.03.17+dfsg1.new/main/signal/pwelch.m	2008-01-09 23:22:26.000000000 +0100
+@@ -14,7 +14,8 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-## usage: [Pxx, w] = pwelch(x,n,Fs,window,overlap,ci,range,units,trend)
++## usage: pwelch(x,n,Fs,window,overlap,ci,range,units,trend)
++##	  [Pxx, w] = pwelch(x,n,Fs,window,overlap,ci,range,units,trend)
+ ##        [Pxx, Pci, w] = pwelch(x,n,Fs,window,overlap,ci,range,units,trend)
+ ##
+ ## Estimate power spectrum of a stationary signal. This chops the signal
+@@ -22,6 +23,7 @@
+ ## transform to determine the frequency components at that slice. The
+ ## magnitudes of these slices are then averaged to produce the estimate Pxx.
+ ## The confidence interval around the estimate is returned in Pci.
++## When no return values are requested, plot Pxx versus frequency x.
+ ##
+ ## x: vector of samples
+ ## n: size of fourier transform window, or [] for default=256
+@@ -35,8 +37,10 @@
+ ##    passed as 0, then no confidence intervals will be computed.
+ ## range: 'whole',  or [] for default='half'
+ ##    show all frequencies, or just half of the frequencies
+-## units: 'squared', or [] for default='db'
+-##    show results as magnitude squared or as log magnitude squared
++## units: 'squared', 'db', or [] for default
++##    default is log magnitude squared ('db') when plotting (apart from cohere)
++##    default is magnitude squared ('squared') when returning values
++##    
+ ## trend: 'mean', 'linear', or [] for default='none'
+ ##    remove trends from the data slices before computing spectral estimates
+ ##
+@@ -142,6 +146,15 @@
+     elseif pos == 4
+       ci = arg;
+       pos++;
++    elseif pos == 5
++      whole = arg;
++      pos++;
++    elseif pos == 6
++      use_dB = arg;
++      pos++;
++    elseif pos == 6
++      trend = arg;
++      pos++;
+     else
+       usage(usagestr);
+     endif
+@@ -315,10 +328,10 @@
+       	plot(f, P, ";;");
+       endif
+     unwind_protect_cleanup
+-      grid("off");
+-      title("");
+-      xlabel("");
+-      ylabel("");
++#       grid("off");
++#       title("");
++#       xlabel("");
++#       ylabel("");
+     end_unwind_protect
+   endif
+