[Pkg-octave-commit] [SCM] Debian packaging for octave-octgpr branch, master, updated. f0b1a78c7e7ef87e6d938f71fbb6a98c32bfa118

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 4b6d47bab014a12991bc1fcdd055636274f3eac4
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Thu Mar 22 22:07:38 2012 +0100

    Drop patch let_package_compile_with_3.2 (not needed with Octave 3.6)

diff --git a/debian/patches/let_package_compile_with_3.2 b/debian/patches/let_package_compile_with_3.2
deleted file mode 100644
index 00021b5..0000000
--- a/debian/patches/let_package_compile_with_3.2
+++ /dev/null
@@ -1,39 +0,0 @@
-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 689d383..a3a5526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-let_package_compile_with_3.2
 autoload-yes.diff
 octave-octgpr_sh4_support.diff

-- 
Debian packaging for octave-octgpr