[Pkg-octave-commit] [octave-nurbs] 02/04: d/p/compilation-with-octave-4.0.patch: Drop patch (applied upstream)

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-nurbs.

commit 4ec9af454bc007675903b9bc9e5d47391932305a
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat Sep 12 12:38:12 2015 -0300

    d/p/compilation-with-octave-4.0.patch: Drop patch (applied upstream)
---
 debian/patches/compilation-with-octave-4.0.patch | 26 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/compilation-with-octave-4.0.patch b/debian/patches/compilation-with-octave-4.0.patch
deleted file mode 100644
index ffe3357..0000000
--- a/debian/patches/compilation-with-octave-4.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Allow compilation with Octave 4.0
-Author: Rafael Laboissiere <rafael at labosisiere.net>
-Origin: upstream, http://sourceforge.net/p/octave/code/12785/
-Bug: https://savannah.gnu.org/bugs/?44651
-Last-Update: 2015-05-02
-
---- octave-nurbs-1.3.8.orig/src/nrbsurfderiveval.cc
-+++ octave-nurbs-1.3.8/src/nrbsurfderiveval.cc
-@@ -120,7 +120,7 @@ DEFUN_DLD(nrbsurfderiveval, args, nargou
-       
-       Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':'));	 
-       idx (0) = idx_vector (3);
--      Matrix weights (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
-+      Matrix weights (NDArray (coefs.index (idx).squeeze ()));
- 
-       for (octave_idx_type iu(0); iu<uv.cols (); iu++)
- 	{
-@@ -132,7 +132,7 @@ DEFUN_DLD(nrbsurfderiveval, args, nargou
- 	    {
- 
- 	      Matrix Aders; idx(0) = idx_vector (idim);
--	      Matrix P (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
-+	      Matrix P (NDArray (coefs.index (idx).squeeze ()));
- 	      surfderiveval (n, p, knotsu, m, q, knotsv, P, uv(0,iu), uv(1,iu), d, Aders);;      
- 	      
- 	      for (octave_idx_type k(0); k<=d; k++)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b4fa55b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-compilation-with-octave-4.0.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-nurbs.git