This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nco.
commit 1f1cb2fc3c071e813cef4226a7d8d635fc4e1a99
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Nov 16 19:24:30 2016 +0100
Add patch to fix spelling errors.
---
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/spelling-errors.patch | 54 ++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 44c79c9..13d0d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ nco (4.6.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop libgsl0-dev alternative dependency.
* Drop spelling-errors.patch, applied upstream.
+ * Add patch to fix spelling errors.
-- Bas Couwenberg <sebas...@debian.org> Wed, 16 Nov 2016 19:06:19 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..38edaa7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch
b/debian/patches/spelling-errors.patch
new file mode 100644
index 0000000..461c77a
--- /dev/null
+++ b/debian/patches/spelling-errors.patch
@@ -0,0 +1,54 @@
+Description: Fix spelling errors.
+ * convertable -> convertible
+ * supercedes -> supersedes
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: https://github.com/nco/nco/pull/39
+
+--- a/src/nco/nco_fl_utl.c
++++ b/src/nco/nco_fl_utl.c
+@@ -433,7 +433,7 @@ nco_fl_lst_mk /* [fnc] Create file list
+ 3. \n allows entries to be separated by carriage returns */
+ while(((cnv_nbr=fscanf(fp_in,fmt_sng,bfr_in)) != EOF) && (fl_lst_in_lng
< FL_LST_IN_MAX_LNG)){
+ if(cnv_nbr == 0){
+- (void)fprintf(stdout,"%s: ERROR stdin input not convertable to
filename. HINT: Maximum length for input filenames is %d characters. HINT:
Separate filenames with whitespace. Carriage returns are automatically stripped
out.\n",nco_prg_nm_get(),FL_NM_IN_MAX_LNG);
++ (void)fprintf(stdout,"%s: ERROR stdin input not convertible to
filename. HINT: Maximum length for input filenames is %d characters. HINT:
Separate filenames with whitespace. Carriage returns are automatically stripped
out.\n",nco_prg_nm_get(),FL_NM_IN_MAX_LNG);
+ nco_exit(EXIT_FAILURE);
+ } /* endif err */
+ fl_nm_lng=strlen(bfr_in);
+--- a/doc/ChangeLog
++++ b/doc/ChangeLog
+@@ -6637,10 +6637,10 @@
+ 2011-06-26 Charlie Zender <zen...@uci.edu>
+
+ * Remove UDUNITS section of configure.in because it was overly
+- complex to maintain with UDUNITS2 which supercedes it
++ complex to maintain with UDUNITS2 which supersedes it
+
+ * Remove DAP-OPENDAP section of configure.in because it was overly
+- complex to maintain with DAP-NETCDF which supercedes it
++ complex to maintain with DAP-NETCDF which supersedes it
+
+ * Re-introduce ENABLE_NETCDF4
+
+--- a/doc/highlights_old.shtml
++++ b/doc/highlights_old.shtml
+@@ -242,7 +242,7 @@ Improve IRIX 6.5 support</li>
+ <li><b>NCO 3.2.0</b>: More forgiving exclusion list (<tt>-x -v
<i>var_nm</i></tt>) <a href="http://nco.sf.net/nco.html#xcl";>handling</a>; Fix
<tt>rmssdn</tt> normalization; Support Mac OS X on Intel; Documentation
bugfixes</li>
+ <li><b>NCO 3.1.9</b>: <tt>ncap2</tt> in RPM packages; Quieter output; AIX
<tt>configure</tt> supports <tt>ncap2</tt>; Update to DAP for netCDF 3.6.2; Fix
<tt>nc[erw]a</tt> for coordinate min/max/ttl; <tt>ncecat</tt> allows files to
differ in record dimension size</li>
+ <li><b>NCO 3.1.8</b>: Support <tt>_FillValue</tt> with compile-time switch;
Debian package synchronized, includes <tt>ncap2</tt></li>
+-<li><b>NCO 3.1.7</b>: <tt>ncap2</tt> “double-parsing”, array
initialization, supercedes <tt>ncap</tt></li>
++<li><b>NCO 3.1.7</b>: <tt>ncap2</tt> “double-parsing”, array
initialization, supersedes <tt>ncap</tt></li>
+ <li><b>NCO 3.1.6</b>: Support <a
href="http://nco.sf.net/nco.html#srd";>stride</a> in all hyperslabbing
operators; change more WARNINGs to INFOs</li>
+ <li><b>NCO 3.1.5</b>: New <tt>ncap2</tt> array and hyperslab features; change
some WARNINGs to INFOs, add Pathscale and update PGI and Intel compiler
support</li>
+ <li><b>NCO 3.1.4</b>: Fix <tt>ncbo</tt> memory problem; report timer
results</li>
+--- a/man/ncap2.1
++++ b/man/ncap2.1
+@@ -35,7 +35,7 @@ ncap2 [\-3] [\-4] [\-6] [\-7] [\-A] [\-\
+ .SH DESCRIPTION
+ .PP
+ .B ncap2
+-supercedes and is backwards-compatible with
++supersedes and is backwards-compatible with
+ .B ncap
+ which is now deprecated.
+ Both operators arithmetically process netCDF files.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/nco.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
