[Pkg-octave-commit] [SCM] octave-octgpr branch, master, updated. 73e29ba31da734edc2517b88c844e428a84b3bbf

[Thomas Weber]

The following commit has been merged in the master branch:
commit 049e5253a9e08b0b733d6f6a0654fe00500a5bdf
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Sep 4 09:22:21 2010 +0200

    New patch: let_package_compile_with_3.2

diff --git a/debian/changelog b/debian/changelog
index f48231d..b8aedf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ octave-octgpr (1.2.0-1) UNRELEASED; urgency=low
   * debian/control: 
     - Remove Rafael Laboissiere from Uploaders (Closes: #571859)
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
+  * New patch: let_package_compile_with_3.2: rip out upstream rev 7189, which
+    only works with Octave's 3.3 development branch.
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:43:32 +0100
 
diff --git a/debian/patches/let_package_compile_with_3.2 b/debian/patches/let_package_compile_with_3.2
new file mode 100644
index 0000000..00021b5
--- /dev/null
+++ b/debian/patches/let_package_compile_with_3.2
@@ -0,0 +1,39 @@
+From: Thomas Weber <tweber at debian.org>
+Subject: Let package compile with 3.2
+
+* Upstream switched to the development version of Octave. As such, this package
+  does not compile anymore against octave3.2. We rip out the corresponding
+  patch (so the URL given here is the reverse of the patch we apply)
+
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/octgpr/src/pdist2_mw.cc?r1=7189&r2=7188&pathrev=7189
+
+--- a/src/pdist2_mw.cc
++++ b/src/pdist2_mw.cc
+@@ -158,11 +158,11 @@
+ 
+ template<typename T>
+ Matrix
+-get_dist_matrix (const MArray<T>& X, bool ssq, double p = 0)
++get_dist_matrix (const MArray2<T>& X, bool ssq, double p = 0)
+ {
+   Matrix D(X.rows (), X.rows ());
+ 
+-  MArray<T> XT = X.transpose ();
++  MArray2<T> XT = X.transpose ();
+ 
+   if (ssq)
+     fill_dist_matrix (XT.rows (), XT.cols (),
+@@ -185,11 +185,11 @@
+ 
+ template<typename T>
+ Matrix
+-get_dist_matrix (const MArray<T>& X, const MArray<T>& Y, bool ssq, double p = 0)
++get_dist_matrix (const MArray2<T>& X, const MArray2<T>& Y, bool ssq, double p = 0)
+ {
+   Matrix D(X.rows (), Y.rows ());
+ 
+-  MArray<T> XT = X.transpose (), YT = Y.transpose ();
++  MArray2<T> XT = X.transpose (), YT = Y.transpose ();
+ 
+   if (ssq)
+     fill_dist_matrix (XT.rows (), XT.cols (), YT.cols (),
diff --git a/debian/patches/series b/debian/patches/series
index a3a5526..689d383 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+let_package_compile_with_3.2
 autoload-yes.diff
 octave-octgpr_sh4_support.diff

-- 
octave-octgpr