r45139 - in /packages/nlopt/trunk/debian: changelog control libnlopt-dev.install patches/01_manpage_fixes.patch patches/02_spelling_fixes.patch patches/03_guile_fix_deprecated_calls.patch patches/series rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Jun 27 08:49:08 UTC 2012
Author: trophime-guest
Date: Wed Jun 27 08:49:07 2012
New Revision: 45139
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45139
Log:
add patches from Sergey B Kirpichev
Added:
packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch
packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch
packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch
Modified:
packages/nlopt/trunk/debian/changelog
packages/nlopt/trunk/debian/control
packages/nlopt/trunk/debian/libnlopt-dev.install
packages/nlopt/trunk/debian/patches/series
packages/nlopt/trunk/debian/rules
Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=45139&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog (original)
+++ packages/nlopt/trunk/debian/changelog Wed Jun 27 08:49:07 2012
@@ -1,3 +1,18 @@
+nlopt (2.2.4+dfsg-2) UNRELEASED; urgency=low
+
+ [Sergey B Kirpichev]
+ * Add patches to get bindings runnings
+
+ * debian/control:
+ - add Sergey B Kirpichev to maintainers
+ - change C Trophime email adress
+ - add dh-autoreconf to Build-Depends
+ * debian/rules:
+ - set octave paths with octave-config
+
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Wed, 27 Jun 2012 10:24:19 +0200
+
nlopt (2.2.4+dfsg-1) unstable; urgency=low
* Initial release (Closes: #610623)
Modified: packages/nlopt/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/control?rev=45139&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/control (original)
+++ packages/nlopt/trunk/debian/control Wed Jun 27 08:49:07 2012
@@ -1,12 +1,12 @@
Source: nlopt
Section: devel
Priority: extra
-Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: quilt, debhelper (>= 8), autotools-dev, libtool, automake,
+Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, Sergey B Kirpichev <skirpichev at gmail.com>
+Build-Depends: quilt, debhelper (>= 8), dh-autoreconf, autotools-dev,
gcc (>= 4.2), g++ (>= 4.2), octave-pkg-dev (>= 0.7.0),
python-all-dev (>= 2.6.6-3~), python-numpy,
guile-1.8, guile-1.8-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
X-Python-Version: >= 2.5
Homepage: http://ab-initio.mit.edu/wiki/index.php/NLopt
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/nlopt
@@ -55,7 +55,7 @@
Architecture: any
Section: python
X-Python-Version: ${python:Versions}
-Depends: libnlopt0, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Depends: libnlopt0 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: python bindings for nlopt
NLopt is a free/open-source library for nonlinear optimization, providing
@@ -76,7 +76,7 @@
Package: octave-nlopt
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Depends: libnlopt0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
Description: nlopt for octave
NLopt is a free/open-source library for nonlinear optimization, providing
a common interface for a number of different free optimization routines
Modified: packages/nlopt/trunk/debian/libnlopt-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt-dev.install?rev=45139&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt-dev.install (original)
+++ packages/nlopt/trunk/debian/libnlopt-dev.install Wed Jun 27 08:49:07 2012
@@ -1,3 +1,4 @@
usr/include
usr/lib/libnlopt.so
usr/lib/libnlopt.a
+usr/lib/pkgconfig/nlopt.pc
Added: packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch?rev=45139&op=file
==============================================================================
--- packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch (added)
+++ packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch Wed Jun 27 08:49:07 2012
@@ -1,0 +1,45 @@
+Description: minor manpage fixes
+Author: Sergey B Kirpichev <skirpichev at gmail.com>
+
+---
+ api/nlopt.3 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/api/nlopt.3
++++ b/api/nlopt.3
+@@ -23,7 +23,7 @@
+ set parameters of the optimization, constraints, and stopping
+ criteria. Here, \fBnlopt_set_ftol_rel\fR is merely an example of a
+ possible stopping criterion. You should link the resulting program
+-with the linker flags -lnlopt -lm on Unix.
++with the linker flags \-lnlopt \-lm on Unix.
+ .fi
+ .SH DESCRIPTION
+ NLopt is a library for nonlinear optimization. It attempts to
+@@ -177,7 +177,7 @@
+ (unconstrained, i.e. a bound of infinity); it is possible to have
+ lower bounds but not upper bounds or vice versa. Alternatively, the
+ user can call one of the above functions and explicitly pass a lower
+-bound of -HUGE_VAL and/or an upper bound of +HUGE_VAL for some design
++bound of \-HUGE_VAL and/or an upper bound of +HUGE_VAL for some design
+ variables to make them have no lower/upper bound, respectively.
+ (HUGE_VAL is the standard C constant for a floating-point infinity,
+ found in the math.h header file.)
+@@ -350,7 +350,7 @@
+ .BR NLOPT_GD_STOGO_RAND ,
+ which is a randomized version of the StoGO search scheme. The StoGO
+ algorithms are only available if NLopt is compiled with C++ code
+-enabled, and should be linked via -lnlopt_cxx instead of -lnlopt (via
++enabled, and should be linked via \-lnlopt_cxx instead of \-lnlopt (via
+ a C++ compiler, in order to link the C++ standard libraries).
+ .TP
+ .B NLOPT_LN_NELDERMEAD
+@@ -517,7 +517,7 @@
+ .I stopval
+ is found: stop minimizing when a value <= \fIstopval\fR is found, or
+ stop maximizing when a value >= \fIstopval\fR is found. (Setting
+-\fIstopval\fR to -HUGE_VAL for minimizing or +HUGE_VAL for maximizing
++\fIstopval\fR to \-HUGE_VAL for minimizing or +HUGE_VAL for maximizing
+ disables this stopping criterion.)
+ .TP
+ .BI "nlopt_result nlopt_set_ftol_rel(nlopt_opt " "opt" ,
Added: packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch?rev=45139&op=file
==============================================================================
--- packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch (added)
+++ packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch Wed Jun 27 08:49:07 2012
@@ -1,0 +1,30 @@
+Descriptions: spelling fixes to make lintian happy
+Author: Sergey B Kirpichev
+
+---
+ swig/nlopt-python.cpp | 2 +-
+ swig/numpy.i | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/swig/nlopt-python.cpp
++++ b/swig/nlopt-python.cpp
+@@ -4491,7 +4491,7 @@
+ if (PyModule_Check( py_obj)) return "module" ;
+ if (PyInstance_Check(py_obj)) return "instance" ;
+
+- return "unkown type";
++ return "unknown type";
+ }
+
+ /* Given a NumPy typecode, return a string describing the type.
+--- a/swig/numpy.i
++++ b/swig/numpy.i
+@@ -145,7 +145,7 @@
+ if (PyModule_Check( py_obj)) return "module" ;
+ if (PyInstance_Check(py_obj)) return "instance" ;
+
+- return "unkown type";
++ return "unknown type";
+ }
+
+ /* Given a NumPy typecode, return a string describing the type.
Added: packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch?rev=45139&op=file
==============================================================================
--- packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch (added)
+++ packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch Wed Jun 27 08:49:07 2012
@@ -1,0 +1,433 @@
+Description: Fix some deprecated calls in autogenerated nlopt-guile.cpp
+Author: Sergey B Kirpichev <skirpichev at gmail.com>
+
+ SCM_VECTORP is deprecated. Use scm_is_vector instead.
+ SCM_VECTOR_LENGTH is deprecated. Use scm_c_vector_length instead.
+
+---
+ swig/nlopt-guile.cpp | 134 +++++++++++++++++++++++++--------------------------
+ 1 file changed, 67 insertions(+), 67 deletions(-)
+
+--- a/swig/nlopt-guile.cpp
++++ b/swig/nlopt-guile.cpp
+@@ -1475,8 +1475,8 @@
+ std::vector< double > *result = 0 ;
+
+ {
+- if (SCM_VECTORP(argv[0])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[0]);
++ if (scm_is_vector(argv[0])) {
++ unsigned long size = scm_c_vector_length(argv[0]);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -1491,7 +1491,7 @@
+ arg1 = &temp1;
+ } else if (SCM_CONSP(argv[0])) {
+ SCM v = scm_vector(argv[0]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -1538,8 +1538,8 @@
+ int _v;
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[0])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[0]);
++ if (scm_is_vector(argv[0])) {
++ unsigned int size = scm_c_vector_length(argv[0]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -1599,8 +1599,8 @@
+ unsigned int result;
+
+ {
+- if (SCM_VECTORP(s_0)) {
+- unsigned long size = SCM_VECTOR_LENGTH(s_0);
++ if (scm_is_vector(s_0)) {
++ unsigned long size = scm_c_vector_length(s_0);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -1615,7 +1615,7 @@
+ arg1 = &temp1;
+ } else if (SCM_CONSP(s_0)) {
+ SCM v = scm_vector(s_0);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -1651,8 +1651,8 @@
+ bool result;
+
+ {
+- if (SCM_VECTORP(s_0)) {
+- unsigned long size = SCM_VECTOR_LENGTH(s_0);
++ if (scm_is_vector(s_0)) {
++ unsigned long size = scm_c_vector_length(s_0);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -1667,7 +1667,7 @@
+ arg1 = &temp1;
+ } else if (SCM_CONSP(s_0)) {
+ SCM v = scm_vector(s_0);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp1 = std::vector<double >(size);
+ arg1 = &temp1;
+ for (unsigned long i=0; i<size; i++) {
+@@ -2998,8 +2998,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -3014,7 +3014,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -3086,8 +3086,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -3933,8 +3933,8 @@
+ arg3 = (void *)SWIG_MustGetPtr(argv[2], NULL, 3, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[3])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[3]);
++ if (scm_is_vector(argv[3])) {
++ unsigned long size = scm_c_vector_length(argv[3]);
+ temp4 = std::vector<double >(size);
+ arg4 = &temp4;
+ for (unsigned long i=0; i<size; i++) {
+@@ -3949,7 +3949,7 @@
+ arg4 = &temp4;
+ } else if (SCM_CONSP(argv[3])) {
+ SCM v = scm_vector(argv[3]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp4 = std::vector<double >(size);
+ arg4 = &temp4;
+ for (unsigned long i=0; i<size; i++) {
+@@ -4221,8 +4221,8 @@
+ arg3 = (void *)SWIG_MustGetPtr(argv[2], NULL, 3, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[3])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[3]);
++ if (scm_is_vector(argv[3])) {
++ unsigned long size = scm_c_vector_length(argv[3]);
+ temp4 = std::vector<double >(size);
+ arg4 = &temp4;
+ for (unsigned long i=0; i<size; i++) {
+@@ -4237,7 +4237,7 @@
+ arg4 = &temp4;
+ } else if (SCM_CONSP(argv[3])) {
+ SCM v = scm_vector(argv[3]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp4 = std::vector<double >(size);
+ arg4 = &temp4;
+ for (unsigned long i=0; i<size; i++) {
+@@ -4831,8 +4831,8 @@
+ arg5 = *argp5;
+ }
+ {
+- if (SCM_VECTORP(argv[5])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[5]);
++ if (scm_is_vector(argv[5])) {
++ unsigned long size = scm_c_vector_length(argv[5]);
+ temp6 = std::vector<double >(size);
+ arg6 = &temp6;
+ for (unsigned long i=0; i<size; i++) {
+@@ -4847,7 +4847,7 @@
+ arg6 = &temp6;
+ } else if (SCM_CONSP(argv[5])) {
+ SCM v = scm_vector(argv[5]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp6 = std::vector<double >(size);
+ arg6 = &temp6;
+ for (unsigned long i=0; i<size; i++) {
+@@ -4913,8 +4913,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[3])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[3]);
++ if (scm_is_vector(argv[3])) {
++ unsigned int size = scm_c_vector_length(argv[3]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -4980,8 +4980,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[5])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[5]);
++ if (scm_is_vector(argv[5])) {
++ unsigned int size = scm_c_vector_length(argv[5]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -5057,8 +5057,8 @@
+ arg5 = *argp5;
+ }
+ {
+- if (SCM_VECTORP(argv[5])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[5]);
++ if (scm_is_vector(argv[5])) {
++ unsigned long size = scm_c_vector_length(argv[5]);
+ temp6 = std::vector<double >(size);
+ arg6 = &temp6;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5073,7 +5073,7 @@
+ arg6 = &temp6;
+ } else if (SCM_CONSP(argv[5])) {
+ SCM v = scm_vector(argv[5]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp6 = std::vector<double >(size);
+ arg6 = &temp6;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5139,8 +5139,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[3])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[3]);
++ if (scm_is_vector(argv[3])) {
++ unsigned int size = scm_c_vector_length(argv[3]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -5206,8 +5206,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[5])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[5]);
++ if (scm_is_vector(argv[5])) {
++ unsigned int size = scm_c_vector_length(argv[5]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -5386,8 +5386,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5402,7 +5402,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5466,8 +5466,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -5642,8 +5642,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5658,7 +5658,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -5722,8 +5722,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -6118,8 +6118,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6134,7 +6134,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6198,8 +6198,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -6674,8 +6674,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6690,7 +6690,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6754,8 +6754,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -6805,8 +6805,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(s_0, SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(s_1)) {
+- unsigned long size = SCM_VECTOR_LENGTH(s_1);
++ if (scm_is_vector(s_1)) {
++ unsigned long size = scm_c_vector_length(s_1);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6821,7 +6821,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(s_1)) {
+ SCM v = scm_vector(s_1);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6873,8 +6873,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(argv[0], SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(argv[1])) {
+- unsigned long size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned long size = scm_c_vector_length(argv[1]);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6889,7 +6889,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(argv[1])) {
+ SCM v = scm_vector(argv[1]);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -6962,8 +6962,8 @@
+ if (_v) {
+ {
+ /* native sequence? */
+- if (SCM_VECTORP(argv[1])) {
+- unsigned int size = SCM_VECTOR_LENGTH(argv[1]);
++ if (scm_is_vector(argv[1])) {
++ unsigned int size = scm_c_vector_length(argv[1]);
+ if (size == 0) {
+ /* an empty sequence can be of any type */
+ _v = 1;
+@@ -7021,8 +7021,8 @@
+ arg1 = (nlopt::opt *)SWIG_MustGetPtr(s_0, SWIGTYPE_p_nlopt__opt, 1, 0);
+ }
+ {
+- if (SCM_VECTORP(s_1)) {
+- unsigned long size = SCM_VECTOR_LENGTH(s_1);
++ if (scm_is_vector(s_1)) {
++ unsigned long size = scm_c_vector_length(s_1);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
+@@ -7037,7 +7037,7 @@
+ arg2 = &temp2;
+ } else if (SCM_CONSP(s_1)) {
+ SCM v = scm_vector(s_1);
+- unsigned long size = SCM_VECTOR_LENGTH(v);
++ unsigned long size = scm_c_vector_length(v);
+ temp2 = std::vector<double >(size);
+ arg2 = &temp2;
+ for (unsigned long i=0; i<size; i++) {
Modified: packages/nlopt/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/series?rev=45139&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/series (original)
+++ packages/nlopt/trunk/debian/patches/series Wed Jun 27 08:49:07 2012
@@ -1,2 +1,5 @@
swig.patch
configure.patch
+02_spelling_fixes.patch
+01_manpage_fixes.patch
+03_guile_fix_deprecated_calls.patch
Modified: packages/nlopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/rules?rev=45139&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/rules (original)
+++ packages/nlopt/trunk/debian/rules Wed Jun 27 08:49:07 2012
@@ -1,7 +1,11 @@
#!/usr/bin/make -f
+export AUTOMAKE = automake1.10
+export LIBTOOLIZE = true
+
-PYVERS := $(shell pyversions -vr debian/control)
+override_dh_makeshlibs:
+ dh_makeshlibs -X/usr/lib/python2.7/dist-packages
# The directories below are versioned. We only support the packages for the
# stable version of Octave
@@ -11,9 +15,11 @@
BUILDDIR = $(CURDIR)/debian/build
%:
- dh $@ --buildsystem=autoconf --builddirectory=$(BUILDDIR) --with python2
+ dh $@ --buildsystem=autoconf --builddirectory=$(BUILDDIR) --with autotools_dev --with python2
override_dh_auto_reconf:
+ dh-autoreconf
+ dh_autotools-dev_updateconfig
[ -e bin/scripts ] || mkdir -p bin/scripts
cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub bin/scripts
libtoolize --automake
@@ -25,12 +31,15 @@
for v in $(PYVERS); do \
rm -rf $(BUILDDIR)$$v; \
done
- -rm bin/scripts/config.guess bin/scripts/config.sub
- -rm ltmain.sh octave/nlopt_optimize-oct.o m4/ltversion.m4 m4/libtool.m4 m4/ltoptions.m4 m4/lt~obsolete.m4
- -rm aclocal.m4
- -rm -rf autom4te.cache
- -rm configure
- find . -name Makefile.in | xargs -r rm
+ dh-autoreconf_clean
+ dh_autotools-dev_restoreconfig
+ dh_auto_clean
+ #-rm bin/scripts/config.guess bin/scripts/config.sub
+ #-rm ltmain.sh octave/nlopt_optimize-oct.o m4/ltversion.m4 m4/libtool.m4 m4/ltoptions.m4 m4/lt~obsolete.m4
+ #-rm aclocal.m4
+ #-rm -rf autom4te.cache
+ #-rm configure
+ #find . -name Makefile.in | xargs -r rm
override_dh_auto_configure: override_dh_auto_reconf
for v in $(PYVERS); do \
More information about the debian-science-commits
mailing list