r46392 - in /packages/nlopt/trunk/debian/patches: configure.patch guile-fix-deprecated-calls.patch spelling-fixes.patch
sk-guest at users.alioth.debian.org
sk-guest at users.alioth.debian.org
Mon Dec 2 08:33:56 UTC 2013
Author: sk-guest
Date: Mon Dec 2 08:33:56 2013
New Revision: 46392
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46392
Log:
Refresh patches for the new upstream release
Modified:
packages/nlopt/trunk/debian/patches/configure.patch
packages/nlopt/trunk/debian/patches/guile-fix-deprecated-calls.patch
packages/nlopt/trunk/debian/patches/spelling-fixes.patch
Modified: packages/nlopt/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/configure.patch?rev=46392&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/configure.patch (original)
+++ packages/nlopt/trunk/debian/patches/configure.patch Mon Dec 2 08:33:56 2013
@@ -8,7 +8,7 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -389,7 +389,7 @@
+@@ -408,7 +408,7 @@
dnl -----------------------------------------------------------------------
Modified: packages/nlopt/trunk/debian/patches/guile-fix-deprecated-calls.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/guile-fix-deprecated-calls.patch?rev=46392&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/guile-fix-deprecated-calls.patch (original)
+++ packages/nlopt/trunk/debian/patches/guile-fix-deprecated-calls.patch Mon Dec 2 08:33:56 2013
@@ -11,7 +11,7 @@
--- a/swig/nlopt-guile.cpp
+++ b/swig/nlopt-guile.cpp
-@@ -1476,8 +1476,8 @@
+@@ -1485,8 +1485,8 @@
std::vector< double > *result = 0 ;
{
@@ -22,7 +22,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1492,7 +1492,7 @@
+@@ -1501,7 +1501,7 @@
arg1 = &temp1;
} else if (SCM_CONSP(argv[0])) {
SCM v = scm_vector(argv[0]);
@@ -31,7 +31,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1539,8 +1539,8 @@
+@@ -1548,8 +1548,8 @@
int _v;
{
/* native sequence? */
@@ -42,7 +42,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -1600,8 +1600,8 @@
+@@ -1609,8 +1609,8 @@
unsigned int result;
{
@@ -53,7 +53,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1616,7 +1616,7 @@
+@@ -1625,7 +1625,7 @@
arg1 = &temp1;
} else if (SCM_CONSP(s_0)) {
SCM v = scm_vector(s_0);
@@ -62,7 +62,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1652,8 +1652,8 @@
+@@ -1661,8 +1661,8 @@
bool result;
{
@@ -73,7 +73,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1668,7 +1668,7 @@
+@@ -1677,7 +1677,7 @@
arg1 = &temp1;
} else if (SCM_CONSP(s_0)) {
SCM v = scm_vector(s_0);
@@ -82,38 +82,38 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -3014,8 +3014,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++) {
-@@ -3030,7 +3030,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++) {
-@@ -3102,8 +3102,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;
-@@ -3949,8 +3949,8 @@
+@@ -3038,8 +3038,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++) {
+@@ -3054,7 +3054,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++) {
+@@ -3126,8 +3126,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;
+@@ -3973,8 +3973,8 @@
arg3 = (void *)SWIG_MustGetPtr(argv[2], NULL, 3, 0);
}
{
@@ -124,7 +124,7 @@
temp4 = std::vector<double >(size);
arg4 = &temp4;
for (unsigned long i=0; i<size; i++) {
-@@ -3965,7 +3965,7 @@
+@@ -3989,7 +3989,7 @@
arg4 = &temp4;
} else if (SCM_CONSP(argv[3])) {
SCM v = scm_vector(argv[3]);
@@ -133,7 +133,7 @@
temp4 = std::vector<double >(size);
arg4 = &temp4;
for (unsigned long i=0; i<size; i++) {
-@@ -4237,8 +4237,8 @@
+@@ -4261,8 +4261,8 @@
arg3 = (void *)SWIG_MustGetPtr(argv[2], NULL, 3, 0);
}
{
@@ -144,7 +144,7 @@
temp4 = std::vector<double >(size);
arg4 = &temp4;
for (unsigned long i=0; i<size; i++) {
-@@ -4253,7 +4253,7 @@
+@@ -4277,7 +4277,7 @@
arg4 = &temp4;
} else if (SCM_CONSP(argv[3])) {
SCM v = scm_vector(argv[3]);
@@ -153,7 +153,7 @@
temp4 = std::vector<double >(size);
arg4 = &temp4;
for (unsigned long i=0; i<size; i++) {
-@@ -4847,8 +4847,8 @@
+@@ -4871,8 +4871,8 @@
arg5 = *argp5;
}
{
@@ -164,7 +164,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -4863,7 +4863,7 @@
+@@ -4887,7 +4887,7 @@
arg6 = &temp6;
} else if (SCM_CONSP(argv[5])) {
SCM v = scm_vector(argv[5]);
@@ -173,7 +173,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -4929,8 +4929,8 @@
+@@ -4953,8 +4953,8 @@
if (_v) {
{
/* native sequence? */
@@ -184,7 +184,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -4996,8 +4996,8 @@
+@@ -5020,8 +5020,8 @@
if (_v) {
{
/* native sequence? */
@@ -195,7 +195,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -5073,8 +5073,8 @@
+@@ -5097,8 +5097,8 @@
arg5 = *argp5;
}
{
@@ -206,7 +206,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -5089,7 +5089,7 @@
+@@ -5113,7 +5113,7 @@
arg6 = &temp6;
} else if (SCM_CONSP(argv[5])) {
SCM v = scm_vector(argv[5]);
@@ -215,7 +215,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -5155,8 +5155,8 @@
+@@ -5179,8 +5179,8 @@
if (_v) {
{
/* native sequence? */
@@ -226,7 +226,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -5222,8 +5222,8 @@
+@@ -5246,8 +5246,8 @@
if (_v) {
{
/* native sequence? */
@@ -237,131 +237,131 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -5402,8 +5402,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++) {
-@@ -5418,7 +5418,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++) {
-@@ -5482,8 +5482,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;
-@@ -5658,8 +5658,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++) {
-@@ -5674,7 +5674,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++) {
-@@ -5738,8 +5738,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;
-@@ -6134,8 +6134,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++) {
-@@ -6150,7 +6150,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++) {
-@@ -6214,8 +6214,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;
-@@ -6690,8 +6690,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++) {
-@@ -6706,7 +6706,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++) {
-@@ -6770,8 +6770,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;
-@@ -6821,8 +6821,8 @@
+@@ -5426,8 +5426,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++) {
+@@ -5442,7 +5442,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++) {
+@@ -5506,8 +5506,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;
+@@ -5682,8 +5682,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++) {
+@@ -5698,7 +5698,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++) {
+@@ -5762,8 +5762,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;
+@@ -6158,8 +6158,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++) {
+@@ -6174,7 +6174,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++) {
+@@ -6238,8 +6238,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;
+@@ -6714,8 +6714,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++) {
+@@ -6730,7 +6730,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++) {
+@@ -6794,8 +6794,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;
+@@ -6845,8 +6845,8 @@
arg1 = (nlopt::opt *)SWIG_MustGetPtr(s_0, SWIGTYPE_p_nlopt__opt, 1, 0);
}
{
@@ -372,7 +372,7 @@
temp2 = std::vector<double >(size);
arg2 = &temp2;
for (unsigned long i=0; i<size; i++) {
-@@ -6837,7 +6837,7 @@
+@@ -6861,7 +6861,7 @@
arg2 = &temp2;
} else if (SCM_CONSP(s_1)) {
SCM v = scm_vector(s_1);
@@ -381,38 +381,38 @@
temp2 = std::vector<double >(size);
arg2 = &temp2;
for (unsigned long i=0; i<size; i++) {
-@@ -6889,8 +6889,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++) {
-@@ -6905,7 +6905,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++) {
-@@ -6978,8 +6978,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;
-@@ -7037,8 +7037,8 @@
+@@ -6913,8 +6913,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++) {
+@@ -6929,7 +6929,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++) {
+@@ -7002,8 +7002,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;
+@@ -7061,8 +7061,8 @@
arg1 = (nlopt::opt *)SWIG_MustGetPtr(s_0, SWIGTYPE_p_nlopt__opt, 1, 0);
}
{
@@ -423,7 +423,7 @@
temp2 = std::vector<double >(size);
arg2 = &temp2;
for (unsigned long i=0; i<size; i++) {
-@@ -7053,7 +7053,7 @@
+@@ -7077,7 +7077,7 @@
arg2 = &temp2;
} else if (SCM_CONSP(s_1)) {
SCM v = scm_vector(s_1);
Modified: packages/nlopt/trunk/debian/patches/spelling-fixes.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/spelling-fixes.patch?rev=46392&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/spelling-fixes.patch (original)
+++ packages/nlopt/trunk/debian/patches/spelling-fixes.patch Mon Dec 2 08:33:56 2013
@@ -9,9 +9,9 @@
--- a/swig/nlopt-python.cpp
+++ b/swig/nlopt-python.cpp
-@@ -4917,7 +4917,7 @@
- if (PyModule_Check( py_obj)) return "module" ;
+@@ -4909,7 +4909,7 @@
if (PyInstance_Check(py_obj)) return "instance" ;
+ #endif
- return "unkown type";
+ return "unknown type";
@@ -20,9 +20,9 @@
/* 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" ;
+@@ -89,7 +89,7 @@
if (PyInstance_Check(py_obj)) return "instance" ;
+ %#endif
- return "unkown type";
+ return "unknown type";
More information about the debian-science-commits
mailing list