r45542 - in /packages/nlopt/trunk/debian/patches: 01_manpage_fixes.patch 02_spelling_fixes.patch 03_guile_fix_deprecated_calls.patch 04-python-includes.patch configure.patch swig.patch
sk-guest at users.alioth.debian.org
sk-guest at users.alioth.debian.org
Mon Jan 21 09:58:08 UTC 2013
Author: sk-guest
Date: Mon Jan 21 09:58:08 2013
New Revision: 45542
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45542
Log:
Unfuzz patches with "quilt refresh -pab --no-index --no-timestamps --diffstat"
Modified:
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
packages/nlopt/trunk/debian/patches/04-python-includes.patch
packages/nlopt/trunk/debian/patches/configure.patch
packages/nlopt/trunk/debian/patches/swig.patch
Modified: 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=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch (original)
+++ packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch Mon Jan 21 09:58:08 2013
@@ -35,7 +35,7 @@
a C++ compiler, in order to link the C++ standard libraries).
.TP
.B NLOPT_LN_NELDERMEAD
-@@ -517,7 +517,7 @@
+@@ -520,7 +520,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
Modified: 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=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch (original)
+++ packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch Mon Jan 21 09:58:08 2013
@@ -9,7 +9,7 @@
--- a/swig/nlopt-python.cpp
+++ b/swig/nlopt-python.cpp
-@@ -4491,7 +4491,7 @@
+@@ -4917,7 +4917,7 @@
if (PyModule_Check( py_obj)) return "module" ;
if (PyInstance_Check(py_obj)) return "instance" ;
Modified: 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=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch (original)
+++ packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch Mon Jan 21 09:58:08 2013
@@ -11,7 +11,7 @@
--- a/swig/nlopt-guile.cpp
+++ b/swig/nlopt-guile.cpp
-@@ -1475,8 +1475,8 @@
+@@ -1476,8 +1476,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++) {
-@@ -1491,7 +1491,7 @@
+@@ -1492,7 +1492,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++) {
-@@ -1538,8 +1538,8 @@
+@@ -1539,8 +1539,8 @@
int _v;
{
/* native sequence? */
@@ -42,7 +42,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -1599,8 +1599,8 @@
+@@ -1600,8 +1600,8 @@
unsigned int result;
{
@@ -53,7 +53,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1615,7 +1615,7 @@
+@@ -1616,7 +1616,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++) {
-@@ -1651,8 +1651,8 @@
+@@ -1652,8 +1652,8 @@
bool result;
{
@@ -73,7 +73,7 @@
temp1 = std::vector<double >(size);
arg1 = &temp1;
for (unsigned long i=0; i<size; i++) {
-@@ -1667,7 +1667,7 @@
+@@ -1668,7 +1668,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++) {
-@@ -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 @@
+@@ -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 @@
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++) {
-@@ -3949,7 +3949,7 @@
+@@ -3965,7 +3965,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++) {
-@@ -4221,8 +4221,8 @@
+@@ -4237,8 +4237,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++) {
-@@ -4237,7 +4237,7 @@
+@@ -4253,7 +4253,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++) {
-@@ -4831,8 +4831,8 @@
+@@ -4847,8 +4847,8 @@
arg5 = *argp5;
}
{
@@ -164,7 +164,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -4847,7 +4847,7 @@
+@@ -4863,7 +4863,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++) {
-@@ -4913,8 +4913,8 @@
+@@ -4929,8 +4929,8 @@
if (_v) {
{
/* native sequence? */
@@ -184,7 +184,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -4980,8 +4980,8 @@
+@@ -4996,8 +4996,8 @@
if (_v) {
{
/* native sequence? */
@@ -195,7 +195,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -5057,8 +5057,8 @@
+@@ -5073,8 +5073,8 @@
arg5 = *argp5;
}
{
@@ -206,7 +206,7 @@
temp6 = std::vector<double >(size);
arg6 = &temp6;
for (unsigned long i=0; i<size; i++) {
-@@ -5073,7 +5073,7 @@
+@@ -5089,7 +5089,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++) {
-@@ -5139,8 +5139,8 @@
+@@ -5155,8 +5155,8 @@
if (_v) {
{
/* native sequence? */
@@ -226,7 +226,7 @@
if (size == 0) {
/* an empty sequence can be of any type */
_v = 1;
-@@ -5206,8 +5206,8 @@
+@@ -5222,8 +5222,8 @@
if (_v) {
{
/* native sequence? */
@@ -237,131 +237,131 @@
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 @@
+@@ -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 @@
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++) {
-@@ -6821,7 +6821,7 @@
+@@ -6837,7 +6837,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++) {
-@@ -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 @@
+@@ -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 @@
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++) {
-@@ -7037,7 +7037,7 @@
+@@ -7053,7 +7053,7 @@
arg2 = &temp2;
} else if (SCM_CONSP(s_1)) {
SCM v = scm_vector(s_1);
Modified: packages/nlopt/trunk/debian/patches/04-python-includes.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/04-python-includes.patch?rev=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/04-python-includes.patch (original)
+++ packages/nlopt/trunk/debian/patches/04-python-includes.patch Mon Jan 21 09:58:08 2013
@@ -3,10 +3,12 @@
important as Python versions increase (and include paths change).
Author: Tim Gardner <tim.gardner at canonical.com>
-Index: nlopt-2.3+dfsg/configure.ac
-===================================================================
---- nlopt-2.3+dfsg.orig/configure.ac 2013-01-07 13:10:33.142903763 -0700
-+++ nlopt-2.3+dfsg/configure.ac 2013-01-07 13:11:44.192255658 -0700
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
@@ -163,9 +163,9 @@
AM_PATH_PYTHON([],[have_python=yes],[have_python=no])
if test $have_python = yes; then
Modified: packages/nlopt/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/configure.patch?rev=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/configure.patch (original)
+++ packages/nlopt/trunk/debian/patches/configure.patch Mon Jan 21 09:58:08 2013
@@ -1,11 +1,13 @@
Description: update configure script
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Index: nlopt-2.2.1/configure.ac
-===================================================================
---- nlopt-2.2.1.orig/configure.ac 2011-01-20 10:55:46.000000000 +0100
-+++ nlopt-2.2.1/configure.ac 2011-01-20 10:56:19.000000000 +0100
-@@ -417,7 +417,7 @@
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -389,7 +389,7 @@
dnl -----------------------------------------------------------------------
Modified: packages/nlopt/trunk/debian/patches/swig.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/swig.patch?rev=45542&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/swig.patch (original)
+++ packages/nlopt/trunk/debian/patches/swig.patch Mon Jan 21 09:58:08 2013
@@ -1,10 +1,12 @@
Description: fixes FTBS when building with multiples python versions
Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Index: nlopt-2.2.4/swig/Makefile.am
-===================================================================
---- nlopt-2.2.4.orig/swig/Makefile.am 2011-06-17 15:34:42.000000000 +0200
-+++ nlopt-2.2.4/swig/Makefile.am 2011-01-20 10:21:48.000000000 +0100
+---
+ swig/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/swig/Makefile.am
++++ b/swig/Makefile.am
@@ -11,7 +11,7 @@
libnlopt at NLOPT_SUFFIX@_guile_la_SOURCES = nlopt-guile.cpp
libnlopt at NLOPT_SUFFIX@_guile_la_LIBADD = ../libnlopt at NLOPT_SUFFIX@.la
More information about the debian-science-commits
mailing list