[nco] 04/06: Drop spelling-errors.patch, applied upstream.
Bas Couwenberg
sebastic at debian.org
Wed Nov 16 18:36:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nco.
commit deb857b1f889e85855e34141429a31c0ebfcc91e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Nov 16 19:09:33 2016 +0100
Drop spelling-errors.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/spelling-errors.patch | 29 -----------------------------
3 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cedd672..44c79c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nco (4.6.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop libgsl0-dev alternative dependency.
+ * Drop spelling-errors.patch, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Wed, 16 Nov 2016 19:06:19 +0100
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 38edaa7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 9193a92..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix spelling errors.
- rquested -> requested
- specifiying -> specifying
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/nco/nco/pull/26
-Applied-Upstream: https://github.com/nco/nco/commit/a0957856d28ecebe5c1c638a07d31fba8db1094c
-
---- a/src/nco++/fmc_gsl_cls.cc
-+++ b/src/nco++/fmc_gsl_cls.cc
-@@ -2887,7 +2887,7 @@ var_sct *gsl_cls::hnd_fnc_uerx(bool& is_
- if( ui64p[idx]>INT_MAX ) {
- // bomb out if necessary
- ostringstream os;
-- os<<"Possible integer overflow. You have rquested the generation of integers up to the value of " <<ui64p[idx]<<" .This is greater than "<<INT_MAX<<" - the maximum value that can be stored in the netcdf datatype NC_INT. Consider using another random number generator e.g., ran0,fishman18 or knuthran. Consult the GSL manual for details. Alternatively recompile nco for netcdf4 and set the compile flag NCO_TYP_GSL_UINT=NC_UINT\n";
-+ os<<"Possible integer overflow. You have requested the generation of integers up to the value of " <<ui64p[idx]<<" .This is greater than "<<INT_MAX<<" - the maximum value that can be stored in the netcdf datatype NC_INT. Consider using another random number generator e.g., ran0,fishman18 or knuthran. Consult the GSL manual for details. Alternatively recompile nco for netcdf4 and set the compile flag NCO_TYP_GSL_UINT=NC_UINT\n";
- err_prn(sfnm,os.str());
- }
-
---- a/src/nco/nco_omp.c
-+++ b/src/nco/nco_omp.c
-@@ -77,7 +77,7 @@ nco_openmp_ini /* [fnc] Initialize OpenM
-
- if(thr_nbr == 0)
- if(nco_dbg_lvl_get() >= nco_dbg_scl && nco_dbg_lvl_get() != nco_dbg_dev )
-- (void)fprintf(fp_stderr,"%s: INFO User did not specify thread request > 0 on command line. NCO will automatically assign threads based on OMP_NUM_THREADS environment and machine capabilities.\nHINT: Not specifiying any --thr_nbr (or specifying --thr_nbr=0) causes NCO to try to pick the optimal thread number. Specifying --thr_nbr=1 tells NCO to execute in Uni-Processor (UP) (i.e., single-threaded) mode.\n",nco_prg_nm_get());
-+ (void)fprintf(fp_stderr,"%s: INFO User did not specify thread request > 0 on command line. NCO will automatically assign threads based on OMP_NUM_THREADS environment and machine capabilities.\nHINT: Not specifying any --thr_nbr (or specifying --thr_nbr=0) causes NCO to try to pick the optimal thread number. Specifying --thr_nbr=1 tells NCO to execute in Uni-Processor (UP) (i.e., single-threaded) mode.\n",nco_prg_nm_get());
-
- if(thr_nbr > 0) USR_SPC_THR_RQS=True;
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git
More information about the Pkg-grass-devel
mailing list