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

sebastic pushed a commit to branch master
in repository nco.

commit b3f301a5d000d333b2fc27f7184ef808de55ca9c
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Sep 11 12:27:28 2015 +0200

    Drop typo patch, applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 -
 debian/patches/unofficial-typo.patch | 16 ----------------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dadf5b4..20fd1d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ nco (4.5.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update upstream metadata for GitHub repo move.
+  * Drop typo patch, applied upstream.
 
  -- Bas Couwenberg <sebas...@debian.org>  Fri, 11 Sep 2015 12:23:20 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 686281a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-unofficial-typo.patch
diff --git a/debian/patches/unofficial-typo.patch 
b/debian/patches/unofficial-typo.patch
deleted file mode 100644
index 493232f..0000000
--- a/debian/patches/unofficial-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'unoffical' typo, replace with 'unofficial'.
-Author: Bas Couwenberg <sebas...@debian.org>
-Forwarded: https://github.com/czender/nco/pull/14
-Applied-Upstream: 
https://github.com/czender/nco/commit/3e7c6995b30541c5b2fa251de41fd85502697cb4
-
---- a/src/nco/nco_cnv_csm.c
-+++ b/src/nco/nco_cnv_csm.c
-@@ -55,7 +55,7 @@ nco_cnv_ccm_ccsm_cf_inq /* O [fnc] Check
-       (void)fprintf(stderr,"%s: CONVENTION File \"%s\" attribute is 
\"%s\"\n",nco_prg_nm_get(),cnv_sng,att_val);
-       if(cnv_sng == cnv_sng_LC) (void)fprintf(stderr,"%s: WARNING: This file 
uses a non-standard attribute (\"%s\") to indicate the netCDF convention. The 
correct attribute is \"%s\".\n",nco_prg_nm_get(),cnv_sng_LC,cnv_sng_UC);
-       /* Only warn in arithmetic operators where conventions change behavior 
*/
--      if(nco_dbg_lvl_get() >= nco_dbg_fl && nco_dbg_lvl_get() != nco_dbg_dev 
&& nco_is_rth_opr(nco_prg_id_get())) (void)fprintf(stderr,"%s: INFO NCO 
attempts to abide by many official and unoffical metadata conventions including 
ARM, CCM, CCSM, and CF. To adhere to these conventions, NCO implements 
variable-specific exceptions in certain operators, e.g., ncbo will not subtract 
variables named \"date\" or \"gw\", and many operators will always leave 
coordinate variables unchanged. The fu [...]
-+      if(nco_dbg_lvl_get() >= nco_dbg_fl && nco_dbg_lvl_get() != nco_dbg_dev 
&& nco_is_rth_opr(nco_prg_id_get())) (void)fprintf(stderr,"%s: INFO NCO 
attempts to abide by many official and unofficial metadata conventions 
including ARM, CCM, CCSM, and CF. To adhere to these conventions, NCO 
implements variable-specific exceptions in certain operators, e.g., ncbo will 
not subtract variables named \"date\" or \"gw\", and many operators will always 
leave coordinate variables unchanged. The f [...]
-     } /* endif dbg */
-     att_val=(char *)nco_free(att_val);
-   } /* endif */

-- 
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

Reply via email to