[Pkg-octave-commit] [SCM] octave-nurbs branch, master, updated. 7f99f46d31594a47abe1bc77b62740368acdd33a

[Thomas Weber]

The following commit has been merged in the master branch:
commit 0484722626be3d4ed13f228ae845c477b4b53f8d
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Wed Dec 30 09:50:24 2009 +0100

    Remove patches applied upstream
    
    - basisfunder-succeed-test.diff
    - numbasisfun-succeed-test.diff

diff --git a/debian/changelog b/debian/changelog
index 2e619fe..a0414ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
 octave-nurbs (1.0-2) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * 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.
+  * Removed patches (applied upstream): 
+    + basisfunder-succeed-test.diff
+    + numbasisfun-succeed-test.diff
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 21:06:54 +0200
 
diff --git a/debian/patches/basisfunder-succeed-test.diff b/debian/patches/basisfunder-succeed-test.diff
deleted file mode 100644
index 0329c57..0000000
--- a/debian/patches/basisfunder-succeed-test.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Patch for making the test of basisfunder succeed
-
-The test of basisfunder was failing due a wrong conversion between matrix and vector.
-This patch was taken from the upstream SVN repository at:
-http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/extra/nurbs/src/low_level_functions.cc?r1=5806&r2=5861&diff_format=u
-
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 May 2009 11:33:35 +0200
-
---- a/src/low_level_functions.cc
-+++ b/src/low_level_functions.cc
-@@ -57,9 +57,9 @@
- {
-   octave_value_list retval;
- 
--  const RowVector i = args(0).row_vector_value ();
-+  const NDArray i = args(0).array_value ();
-   int pl = args(1).int_value ();
--  const RowVector u = args(2).row_vector_value ();
-+  const NDArray u = args(2).array_value ();
-   const RowVector U = args(3).row_vector_value ();
-   int nd = args(4).int_value ();
- 
diff --git a/debian/patches/numbasisfun-succeed-test.diff b/debian/patches/numbasisfun-succeed-test.diff
deleted file mode 100644
index 7000aa4..0000000
--- a/debian/patches/numbasisfun-succeed-test.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Transpose the matrix used as reference in an assert test, otherwise the
-test for numbasisfun fails.
-
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 May 2009 02:18:36 +0200
-
---- a/inst/numbasisfun.m
-+++ b/inst/numbasisfun.m
-@@ -43,6 +43,6 @@
- %!  s = findspan (n, p, u, U); 
- %!  Bref = [0   0   0   0   0   1   1   1   1   1
- %!          1   1   1   1   1   2   2   2   2   2
--%!          2   2   2   2   2   3   3   3   3   3];
-+%!          2   2   2   2   2   3   3   3   3   3].';
- %!  B = numbasisfun (s, u, p, U);
- %!  assert (B, Bref)
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 41a5953..6f889c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 autoload-yes.diff
-numbasisfun-succeed-test.diff
-basisfunder-succeed-test.diff

-- 
octave-nurbs