[nco] 07/09: Drop typos.patch, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository nco.

commit 9fe7c36a7fd5806e5f0c0fc2e19817e9e2c8e963
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 27 18:19:37 2016 +0100

    Drop typos.patch, applied upstream.
---
 debian/changelog           |  1 +
 debian/patches/series      |  1 -
 debian/patches/typos.patch | 49 ----------------------------------------------
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 634119e..e69df49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ nco (4.5.5-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.7, no changes.
   * Update Vcs-Git URL to use HTTPS.
   * Use GitHub for upstream sources.
+  * Drop typos.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Feb 2016 18:12:33 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 002796a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-typos.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
deleted file mode 100644
index 21eb654..0000000
--- a/debian/patches/typos.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix typos.
- * differnet -> different
- * postive   -> positive
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/nco/nco/pull/23
-Applied-Upstream: https://github.com/nco/nco/commit/bb650c3ae35a274cb88ce8bbf23bbb324b3315a4
-
---- a/doc/ChangeLog
-+++ b/doc/ChangeLog
-@@ -4768,7 +4768,7 @@
- 	Eliminate pre-emptive check in nco_var_dmn_rdr_mtd() for condition
- 	which was not illegal yet led to exit() anyway.
- 	All that was necessary was to eliminate the exit() call.
--	False-postive errors were produced for variables that were record
-+	False-positive errors were produced for variables that were record
- 	in input, fixed in output, and themselves lacked the record
- 	dimension, i.e., they became fixed (were neutered?) because record
- 	dimension had to be fixed to satisfy re-ordering of other variables.
---- a/src/nco++/ncap2_utl.cc
-+++ b/src/nco++/ncap2_utl.cc
-@@ -1620,7 +1620,7 @@ ncap_var_var_op   /* [fnc] Add two varia
-     if( (var1->has_dpl_dmn ==-1 || var2->has_dpl_dmn==-1) && var1->sz >1 && var2->sz>1){  
-       if(var1->sz != var2->sz) {
- 	std::ostringstream os;
--	os<<"Hyperslabbed variable:"<<var1->nm <<" and variable:"<<var2->nm <<" have differnet number of elements, so cannot perform arithmetic operation.";
-+	os<<"Hyperslabbed variable:"<<var1->nm <<" and variable:"<<var2->nm <<" have different number of elements, so cannot perform arithmetic operation.";
- 	err_prn(fnc_nm,os.str());
-       }
-       if( nco_shp_chk(var1,var2)==False){ 
---- a/src/nco/nco_ppc.c
-+++ b/src/nco/nco_ppc.c
-@@ -216,7 +216,7 @@ nco_ppc_set_dflt /* Set PPC value for al
-     ppc_val=(int)strtol(ppc_arg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
-     if(*sng_cnv_rcd) nco_sng_cnv_err(ppc_arg,"strtol",sng_cnv_rcd);
-     if(ppc_val <= 0){
--      (void)fprintf(stdout,"%s ERROR Number of Significant Digits (NSD) must be postive. Default is specified as %d. HINT: Decimal Significant Digit (DSD) rounding does accept negative arguments (number of digits in front of the decimal point). However, the DSD argument must be prefixed by a period or \"dot\", e.g., \"--ppc foo=.-2\", to distinguish it from NSD quantization.\n",nco_prg_nm_get(),ppc_val);
-+      (void)fprintf(stdout,"%s ERROR Number of Significant Digits (NSD) must be positive. Default is specified as %d. HINT: Decimal Significant Digit (DSD) rounding does accept negative arguments (number of digits in front of the decimal point). However, the DSD argument must be prefixed by a period or \"dot\", e.g., \"--ppc foo=.-2\", to distinguish it from NSD quantization.\n",nco_prg_nm_get(),ppc_val);
-       nco_exit(EXIT_FAILURE);
-     } /* endif */    
-   } /* end if */
-@@ -259,7 +259,7 @@ nco_ppc_set_var
-     ppc_val=(int)strtol(ppc_arg,&sng_cnv_rcd,NCO_SNG_CNV_BASE10);
-     if(*sng_cnv_rcd) nco_sng_cnv_err(ppc_arg,"strtol",sng_cnv_rcd);
-     if(ppc_val <= 0){
--      (void)fprintf(stdout,"%s ERROR Number of Significant Digits (NSD) must be postive. Specified value for %s is %d. HINT: Decimal Significant Digit (DSD) rounding does accept negative arguments (number of digits in front of the decimal point). However, the DSD argument must be prefixed by a period or \"dot\", e.g., \"--ppc foo=.-2\", to distinguish it from NSD quantization.\n",nco_prg_nm_get(),var_nm,ppc_val);
-+      (void)fprintf(stdout,"%s ERROR Number of Significant Digits (NSD) must be positive. Specified value for %s is %d. HINT: Decimal Significant Digit (DSD) rounding does accept negative arguments (number of digits in front of the decimal point). However, the DSD argument must be prefixed by a period or \"dot\", e.g., \"--ppc foo=.-2\", to distinguish it from NSD quantization.\n",nco_prg_nm_get(),var_nm,ppc_val);
-       nco_exit(EXIT_FAILURE);
-     } /* endif */    
-   } /* end else */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git