[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. 9340b8d92a3656d8adf7198b7d7d01f7ae86b4da

[Thomas Weber]

The following commit has been merged in the master branch:
commit 1d8bdf6f6ae5d056162e01e0275d31b5fc3c8787
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Wed Jan 13 00:56:30 2010 +0100

    New patch: remove_outdated_dmult

diff --git a/debian/changelog b/debian/changelog
index 42b1de5..b84475c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,19 @@
-octave-statistics (1.0.9-1) UNRELEASED; urgency=low
+octave-statistics (1.0.9-1) unstable; urgency=low
 
   [ Rafael Laboissiere ]
   * debian/patches/fix-pdist-test.diff: Add patch for making the tests of
     function pdist succeed
   * debian/control: Build-depend on octave-pkg-dev >= 0.7.0, such that the
     package is built against octave3.2
-  
+
   [ Thomas Weber ]
   * New upstream release 
   * Drop patch fix-pdist-test.diff, applied upstream
+  * New patches: 
+    + remove_outdated_dmult: Replace the call to the outdated dmult(). This
+      fixes a test failure. Taken from upstream, SVN rev 6725
 
- -- Rafael Laboissiere <rafael at debian.org>  Mon, 01 Jun 2009 09:32:02 +0200
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Wed, 16 Dec 2009 19:08:53 +0100
 
 octave-statistics (1.0.8-1) unstable; urgency=low
 
diff --git a/debian/patches/remove_outdated_dmult b/debian/patches/remove_outdated_dmult
new file mode 100644
index 0000000..623aa97
--- /dev/null
+++ b/debian/patches/remove_outdated_dmult
@@ -0,0 +1,14 @@
+From: Søren Hauberg <soren at hauberg.org>
+Subject: Replace obsolete call to dmult and fixes a subsequent test failure
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/statistics/inst/linkage.m?r1=6725&r2=6724&pathrev=6725
+--- a/inst/linkage.m
++++ b/inst/linkage.m
+@@ -108,7 +108,7 @@
+ 	    "centroid"; "median"; "ward" },
+    "distfunc", {(@(x) min(x))				     # single
+ 		(@(x) max(x))				     # complete
+-		(@(x,i,j,w) sum(dmult(q=w([i,j]),x))/sum(q)) # average
++		(@(x,i,j,w) sum(diag(q=w([i,j]))*x)/sum(q)) # average
+ 		(@(x) mean(x))				     # weighted
+ 		(@massdist)				     # centroid
+ 		(@(x,i) massdist(x,i))			     # median
diff --git a/debian/patches/series b/debian/patches/series
index 68a7154..a4824fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+remove_outdated_dmult
 data-files-for-tests.diff

-- 
octave-statistics