[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. 7b1eb0b2dc66af33a86959daf66d352ffd006567

[Thomas Weber]

The following commit has been merged in the master branch:
commit bbb55ad1e655998a20afdb7432c1b1a3eb77ccea
Author: Thomas Weber <tweber at debian.org>
Date:   Sat May 15 20:17:07 2010 +0200

    Drop patch remove_outdated_dmult

diff --git a/debian/changelog b/debian/changelog
index 775693c..07438dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ octave-statistics (1.0.10-1) UNRELEASED; urgency=low
   * Switch to dpkg-source 3.0 (quilt) format
   * Dropped patches (applied upstream):
     - fix_bug_with_sprintf
+    - remove_outdated_dmult
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:55:41 +0100
 
diff --git a/debian/patches/remove_outdated_dmult b/debian/patches/remove_outdated_dmult
deleted file mode 100644
index 623aa97..0000000
--- a/debian/patches/remove_outdated_dmult
+++ /dev/null
@@ -1,14 +0,0 @@
-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 a4824fe..68a7154 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-remove_outdated_dmult
 data-files-for-tests.diff

-- 
octave-statistics