[Pkg-octave-commit] [SCM] Debian packaging for octave-nurbs branch, master, updated. debian/1.3.6-1-9-gf294025

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit fcf01179d7b8f96bea70569afce7a27a102e1e7c
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat May 11 02:00:13 2013 +0200

    Drop patches openmp-fix and reduce-test-randomness (applied upstream)

diff --git a/debian/patches/openmp-fix.patch b/debian/patches/openmp-fix.patch
deleted file mode 100644
index 4405d3c..0000000
--- a/debian/patches/openmp-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix compilation of src/bspeval.cc
- The bug is due to a change in the behaviour of openmp in new versions
- of gcc.
-Author: Carlo de Falco <carlo.defalco at gmail.com>
-Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=9946
-Last-Update: 2012-03-30
-
---- octave-nurbs-1.3.6.orig/src/bspeval.cc
-+++ octave-nurbs-1.3.6/src/bspeval.cc
-@@ -44,10 +44,10 @@ DEFUN_DLD(bspeval, args, nargout,"\
-   octave_value_list retval;
-   if (!bspeval_bad_arguments (args))
-     {      
--      int             d = args(0).int_value();
--      const Matrix    c = args(1).matrix_value();
--      const RowVector k = args(2).row_vector_value();
--      const NDArray   u = args(3).array_value();
-+      int       d = args(0).int_value();
-+      Matrix    c = args(1).matrix_value();
-+      RowVector k = args(2).row_vector_value();
-+      NDArray   u = args(3).array_value();
-       
-       octave_idx_type nu = u.length();
-       octave_idx_type mc = c.rows(),
diff --git a/debian/patches/reduce-test-randomness.patch b/debian/patches/reduce-test-randomness.patch
deleted file mode 100644
index b25707a..0000000
--- a/debian/patches/reduce-test-randomness.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Reduce the randomness of test in nrbbasisfun.m
-Author: Carlo de Falco <carlo.defalco at gmail.com>
-Origin: upstream,
-http://octave.svn.sourceforge.net/viewvc/octave?view=revision&revision=9954
-Last-Update: 2012-03-30
-
---- octave-nurbs-1.3.6.orig/inst/nrbbasisfun.m
-+++ octave-nurbs-1.3.6/inst/nrbbasisfun.m
-@@ -125,6 +125,8 @@ end
- %! aux1 = linspace(0,1,m); aux2 = linspace(0,1,n);
- %! nrb = nrbkntins  (nrb, {aux1(2:end-1), aux2(2:end-1)});
- %! u = rand (1, 30); v = rand (1, 10);
-+%! u = u - min (u); u = u / max (u);
-+%! v = v - min (v); v = v / max (v);
- %! [B, N] = nrbbasisfun ({u, v}, nrb);
- %! assert (sum(B, 2), ones(300, 1), 1e-6)
- %! assert (all (all (B<=1)), true)
diff --git a/debian/patches/series b/debian/patches/series
index 0a24ded..392bb99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 autoload-yes.diff
-openmp-fix.patch
-reduce-test-randomness.patch
 

-- 
Debian packaging for octave-nurbs