[nco] 04/05: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Fri Dec 23 22:55:37 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 23703b014cd83bdd9a379f2d1495e5d3d5164ff6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Dec 23 23:31:12 2016 +0100
Drop patches, applied upstream.
---
debian/changelog | 2 +-
debian/patches/built_sources.patch | 18 ------------
debian/patches/series | 2 --
debian/patches/spelling-errors.patch | 55 ------------------------------------
4 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ffb3d83..c97023f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
nco (4.6.3-1) UNRELEASED; urgency=medium
* New upstream release.
- * Add patch to add ncap_yacc.h to BUILT_SOURCES to build it before using.
+ * Drop patches, applied upstream.
* Don't limit parallel build, FTBFS fixed with BUILT_SOURCES patch.
-- Bas Couwenberg <sebastic at debian.org> Fri, 23 Dec 2016 23:29:54 +0100
diff --git a/debian/patches/built_sources.patch b/debian/patches/built_sources.patch
deleted file mode 100644
index d024c1d..0000000
--- a/debian/patches/built_sources.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Add ncap_yacc.h to BUILT_SOURCES to build it before being used.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/nco/nco/issues/40
-Bug-Debian: https://bugs.debian.org/844865
-Forwarded: https://github.com/nco/nco/pull/41
-Applied-Upstream: https://github.com/nco/nco/commit/5a28c7cb2cc9d74a68c5491dfac1c5a470110dc6
-
---- a/src/nco/Makefile.am
-+++ b/src/nco/Makefile.am
-@@ -26,6 +26,8 @@ else
- bin_PROGRAMS = ${NCAP} ncatted ncbo ncecat ncflint ncks ncpdq ncra ncrename ${NCWA}
- endif
-
-+BUILT_SOURCES = ncap_yacc.h
-+
- AM_YFLAGS = -d --name-prefix=nco_yy
-
- ncap_SOURCES = ncap_utl.c ncap.c ncap_yacc.y ncap_lex.l
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4299800..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-spelling-errors.patch
-built_sources.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 4dfa8f7..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Fix spelling errors.
- * convertable -> convertible
- * supercedes -> supersedes
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/nco/nco/pull/39
-Applied-Upstream: https://github.com/nco/nco/commit/93a943556a953135f5cbb6b626aeb69471d350fd
-
---- 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 <zender at 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
More information about the Pkg-grass-devel
mailing list