[nlopt] 04/06: Fix some spelling warnings from lintian

Sergey Kirpichev sk-guest at moszumanska.debian.org
Sat Jul 8 13:20:06 UTC 2017


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

sk-guest pushed a commit to branch master
in repository nlopt.

commit 483180cca567b842271168293f07544bc6dcb2ad
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Sat Jul 8 12:28:23 2017 +0000

    Fix some spelling warnings from lintian
---
 debian/patches/spelling-fixes.patch | 80 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch
index d3a5003..fdc46ec 100644
--- a/debian/patches/spelling-fixes.patch
+++ b/debian/patches/spelling-fixes.patch
@@ -3,13 +3,14 @@ Author: Sergey B Kirpichev
 Forwarded: no
 
 ---
+ direct/DIRect.c       |   20 ++++++++++----------
  swig/nlopt-python.cpp |    2 +-
  swig/numpy.i          |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 12 insertions(+), 12 deletions(-)
 
 --- a/swig/nlopt-python.cpp
 +++ b/swig/nlopt-python.cpp
-@@ -4909,7 +4909,7 @@
+@@ -4895,7 +4895,7 @@ SWIG_AsVal_unsigned_SS_int (PyObject * o
      if (PyInstance_Check(py_obj)) return "instance"    ;
  #endif
  
@@ -29,3 +30,78 @@ Forwarded: no
    }
  
    /* Given a NumPy typecode, return a string describing the type.
+--- a/direct/DIRect.c
++++ b/direct/DIRect.c
+@@ -162,17 +162,17 @@
+ /* |            for the function within the hyper-box.                     | */
+ /* |                                                                       | */
+ /* |    minf -- The value of the function at x.                            | */
+-/* |  Ierror -- Error flag. If Ierror is lower 0, an error has occured. The| */
+-/* |            values of Ierror mean                                      | */
++/* |  Ierror -- Error flag. If Ierror is lower 0, an error has occurred.   | */
++/* |            The values of Ierror mean                                  | */
+ /* |            Fatal errors :                                             | */
+ /* |             -1   u(i) <= l(i) for some i.                             | */
+ /* |             -2   maxf is too large.                                   | */
+ /* |             -3   Initialization in DIRpreprc failed.                  | */
+ /* |             -4   Error in DIRSamplepoints, that is there was an error | */
+ /* |                  in the creation of the sample points.                | */
+-/* |             -5   Error in DIRSamplef, that is an error occured while  | */
++/* |             -5   Error in DIRSamplef, that is an error occurred while | */
+ /* |                  the function was sampled.                            | */
+-/* |             -6   Error in DIRDoubleInsert, that is an error occured   | */
++/* |             -6   Error in DIRDoubleInsert, that is an error occurred  | */
+ /* |                  DIRECT tried to add all hyperrectangles with the same| */
+ /* |                  size and function value at the center. Either        | */
+ /* |                  increase maxdiv or use our modification (Jones = 1). | */
+@@ -355,7 +355,7 @@
+ 	    algmethod, &MAXFUNC, &MAXDEEP, fglobal, fglper, ierror, &epsfix, &
+ 		      iepschange, volper, sigmaper);
+ /* +-----------------------------------------------------------------------+ */
+-/* | If an error has occured while writing the header (we do some checking | */
++/* | If an error has occurred while writing the header (we do some checking| */
+ /* | of variables there), return to the main program.                      | */
+ /* +-----------------------------------------------------------------------+ */
+     if (*ierror < 0) {
+@@ -383,7 +383,7 @@
+     direct_dirinitlist_(anchor, &ifree, point, f, &MAXFUNC, &MAXDEEP);
+ /* +-----------------------------------------------------------------------+ */
+ /* | Call the routine to initialise the mapping of x from the n-dimensional| */
+-/* | unit cube to the hypercube given by u and l. If an error occured,     | */
++/* | unit cube to the hypercube given by u and l. If an error occurred,    | */
+ /* | give out a error message and return to the main program with the error| */
+ /* | flag set.                                                             | */
+ /* | JG 07/16/01 Changed call to remove unused data.                       | */
+@@ -413,12 +413,12 @@
+     if (*ierror < 0) {
+ 	if (*ierror == -4) {
+ 	    if (logfile)
+-		 fprintf(logfile, "WARNING: Error occured in routine DIRsamplepoints.\n");
++		 fprintf(logfile, "WARNING: Error occurred in routine DIRsamplepoints.\n");
+ 	    goto cleanup;
+ 	}
+ 	if (*ierror == -5) {
+ 	    if (logfile)
+-		 fprintf(logfile, "WARNING: Error occured in routine DIRsamplef..\n");
++		 fprintf(logfile, "WARNING: Error occurred in routine DIRsamplef..\n");
+ 	    goto cleanup;
+ 	}
+ 	if (*ierror == -102) goto L100;
+@@ -535,7 +535,7 @@
+ 			MAXDEEP, &oops);
+ 		if (oops > 0) {
+ 		    if (logfile)
+-			 fprintf(logfile, "WARNING: Error occured in routine DIRsamplepoints.\n");
++			 fprintf(logfile, "WARNING: Error occurred in routine DIRsamplepoints.\n");
+ 		    *ierror = -4;
+ 		    goto cleanup;
+ 		}
+@@ -558,7 +558,7 @@
+ 		}
+ 		if (oops > 0) {
+ 		    if (logfile)
+-			 fprintf(logfile, "WARNING: Error occured in routine DIRsamplef.\n");
++			 fprintf(logfile, "WARNING: Error occurred in routine DIRsamplef.\n");
+ 		    *ierror = -5;
+ 		    goto cleanup;
+ 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nlopt.git



More information about the debian-science-commits mailing list