r47084 - in /packages/nlopt/trunk/debian: changelog patches/octave-4.0.patch patches/series

[sebastien at users.alioth.debian.org]

Author: sebastien
Date: Mon Jul 20 18:06:18 2015
New Revision: 47084

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47084
Log:
Fix FTBFS against Octave 4.0

Added:
    packages/nlopt/trunk/debian/patches/octave-4.0.patch
Modified:
    packages/nlopt/trunk/debian/changelog
    packages/nlopt/trunk/debian/patches/series

Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=47084&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog	(original)
+++ packages/nlopt/trunk/debian/changelog	Mon Jul 20 18:06:18 2015
@@ -1,3 +1,11 @@
+nlopt (2.4.2+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/p/octave-4.0.patch: new patch, fixes FTBFS against Octave 4.0.
+    (Closes: #792826)
+
+ -- Sébastien Villemot <sebastien at debian.org>  Mon, 20 Jul 2015 20:03:29 +0200
+
 nlopt (2.4.2+dfsg-1) unstable; urgency=low
 
   * Install Octave files into private directories (Closes: #734044,

Added: packages/nlopt/trunk/debian/patches/octave-4.0.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/octave-4.0.patch?rev=47084&op=file
==============================================================================
--- packages/nlopt/trunk/debian/patches/octave-4.0.patch	(added)
+++ packages/nlopt/trunk/debian/patches/octave-4.0.patch	Mon Jul 20 18:06:18 2015
@@ -0,0 +1,66 @@
+Description: Fix FTBFS against Octave 4.0
+ Replace Octave_map by octave_map.
+Origin: upstream, https://github.com/stevengj/nlopt/commit/131148eb02b770da0e5c1049b4e82c78e4a50fa2
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792826
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2015-07-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/octave/nlopt_optimize-oct.cc b/octave/nlopt_optimize-oct.cc
+index 4e08421..a66da8e 100644
+--- a/octave/nlopt_optimize-oct.cc
++++ b/octave/nlopt_optimize-oct.cc
+@@ -29,7 +29,7 @@
+ #include "nlopt.h"
+ #include "nlopt_optimize_usage.h"
+ 
+-static int struct_val_default(Octave_map &m, const std::string& k,
++static int struct_val_default(octave_map &m, const std::string& k,
+ 				 int dflt)
+ {
+   if (m.contains(k)) {
+@@ -39,7 +39,7 @@ static int struct_val_default(Octave_map &m, const std::string& k,
+   return dflt;
+ }
+ 
+-static double struct_val_default(Octave_map &m, const std::string& k,
++static double struct_val_default(octave_map &m, const std::string& k,
+ 				 double dflt)
+ {
+   if (m.contains(k)) {
+@@ -49,7 +49,7 @@ static double struct_val_default(Octave_map &m, const std::string& k,
+   return dflt;
+ }
+ 
+-static Matrix struct_val_default(Octave_map &m, const std::string& k,
++static Matrix struct_val_default(octave_map &m, const std::string& k,
+ 				 Matrix &dflt)
+ {
+   if (m.contains(k)) {
+@@ -140,7 +140,7 @@ static double user_function1(unsigned n, const double *x,
+ 
+ #define CHECK1(cond, msg) if (!(cond)) { fprintf(stderr, msg "\n\n"); nlopt_destroy(opt); nlopt_destroy(local_opt); return NULL; }
+ 
+-nlopt_opt make_opt(Octave_map &opts, int n)
++nlopt_opt make_opt(octave_map &opts, int n)
+ {
+   nlopt_opt opt = NULL, local_opt = NULL;
+ 
+@@ -195,7 +195,7 @@ nlopt_opt make_opt(Octave_map &opts, int n)
+     CHECK1(opts.contents("local_optimizer").length() == 1 
+ 	  && (opts.contents("local_optimizer"))(0).is_map(),
+ 	  "opt.local_optimizer must be a structure");
+-    Octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
++    octave_map local_opts = (opts.contents("local_optimizer"))(0).map_value();
+     CHECK1((local_opt = make_opt(local_opts, n)), 
+ 	  "error initializing local optimizer");
+     nlopt_set_local_optimizer(opt, local_opt);
+@@ -216,7 +216,7 @@ DEFUN_DLD(nlopt_optimize, args, nargout, NLOPT_OPTIMIZE_USAGE)
+   CHECK(args.length() == 2 && nargout <= 3, "wrong number of args");
+ 
+   CHECK(args(0).is_map(), "opt must be structure")
+-  Octave_map opts = args(0).map_value();
++  octave_map opts = args(0).map_value();
+ 
+   CHECK(args(1).is_real_matrix() || args(1).is_real_scalar(),
+ 	"x must be real vector");

Modified: packages/nlopt/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/series?rev=47084&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/series	(original)
+++ packages/nlopt/trunk/debian/patches/series	Mon Jul 20 18:06:18 2015
@@ -1,2 +1,3 @@
 configure.patch
 spelling-fixes.patch
+octave-4.0.patch