[gmt] 06/11: Drop patches applied upstream. Refresh remaining patches.

Bas Couwenberg sebastic at debian.org
Sat Oct 22 11:55:02 UTC 2016 

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

sebastic pushed a commit to branch master
in repository gmt.

commit 86faa66cf2e468090fe29f90ff7e9758fa877b5b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 22 11:05:51 2016 +0200

    Drop patches applied upstream. Refresh remaining patches.
---
 debian/changelog                       |   1 +
 debian/patches/alpha-sighandler.patch  |  16 --
 debian/patches/disable-examples.patch  |   4 +-
 debian/patches/disable-triangle.patch  |  14 +-
 debian/patches/glibc-2.23-ftbfs.patch  |  18 --
 debian/patches/hppa-sighandler.patch   |  17 --
 debian/patches/manpage-section.patch   |  12 +-
 debian/patches/overridden-typo.patch   |  16 --
 debian/patches/series                  |   9 -
 debian/patches/source_date_epoch.patch |  40 -----
 debian/patches/sparc-sighandler.patch  |  20 ---
 debian/patches/spelling-errors.patch   | 293 ---------------------------------
 debian/patches/supported-typo.patch    |  38 -----
 debian/patches/written-typo.patch      |  16 --
 14 files changed, 19 insertions(+), 495 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fd7343..3427f3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gmt (5.3.1+dfsg-1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Update copyright years for copyright holders
     - Add Dongdong Tian to copyright holders
+  * Drop patches applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Oct 2016 10:16:26 +0200
 
diff --git a/debian/patches/alpha-sighandler.patch b/debian/patches/alpha-sighandler.patch
deleted file mode 100644
index f3d2cc6..0000000
--- a/debian/patches/alpha-sighandler.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix build on alpha.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/819
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15281
-
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -77,6 +77,8 @@ void backtrace_symbols_fd(void *const *b
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_RIP])
- # elif defined(__aarch64__) || defined(__mips__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.pc)
-+# elif defined( __alpha__)
-+#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_pc)
- # elif defined( __arm__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
- # elif defined( __hppa__)
diff --git a/debian/patches/disable-examples.patch b/debian/patches/disable-examples.patch
index 7c298fe..e19cbd9 100644
--- a/debian/patches/disable-examples.patch
+++ b/debian/patches/disable-examples.patch
@@ -47,7 +47,7 @@ Forwarded: not-needed
  +------------------+--------------------+---------------------+
  |:ref:`example_25` | :ref:`example_26`  | :ref:`example_27`   |
  |                  |                    |                     |
-@@ -141,9 +141,6 @@ complex illustration.
+@@ -149,9 +149,6 @@ complex illustration.
  .. |ex22| image:: /_images/example_22.*
     :width: 150 px
  
@@ -57,7 +57,7 @@ Forwarded: not-needed
  .. |ex24| image:: /_images/example_24.*
     :width: 150 px
  
-@@ -235,7 +232,6 @@ complex illustration.
+@@ -258,7 +255,6 @@ complex illustration.
     gallery/ex20.rst
     gallery/ex21.rst
     gallery/ex22.rst
diff --git a/debian/patches/disable-triangle.patch b/debian/patches/disable-triangle.patch
index 21d7ea6..c4fac4a 100644
--- a/debian/patches/disable-triangle.patch
+++ b/debian/patches/disable-triangle.patch
@@ -4,9 +4,9 @@ Forwarded: not-needed
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -217,15 +217,15 @@ endif (DO_EXAMPLES OR DO_TESTS AND NOT D
- # These lines are temporarily here for the beta release
- set (GMT_DEMOS_SRCS testapi.c testgmt5.c testgmtio.c testgrdio.c testio.c)
+@@ -231,15 +231,15 @@ if (DO_API_TESTS)
+ 	set (GMT_DEMOS_SRCS testapi.c testpsl.c testgmt5.c testgmtio.c testgrdio.c testio.c testapiconv.c example1.c testapi_matrix.c testapi_vector.c test_JL.c test_walter.c)
+ endif (DO_API_TESTS)
  
 -if (NOT LICENSE_RESTRICTED) # off
 -	# enable Shewchuk's triangle routine
@@ -25,10 +25,10 @@ Forwarded: not-needed
 -endif (NOT LICENSE_RESTRICTED)
 +#endif (NOT LICENSE_RESTRICTED)
  
+ # Note: Developers can set EXTRA_MODULES in ConfigUser.cmake to test new modules
  set (GMT_PROGS_SRCS blockmean.c blockmedian.c blockmode.c filter1d.c
- 	fitcircle.c gmt2kml.c gmtconvert.c gmtlogo.c gmtmath.c gmtselect.c gmtsimplify.c
-@@ -261,7 +261,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
- 	gmt_plot.h gmt_project.h gmt_prototypes.h gmt_ps.h gmt_shore.h
+@@ -276,7 +276,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
+ 	gmt_plot.h gmt_project.h gmt_prototypes.h gmt_psl.h gmt_shore.h
  	gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h
  	gmt_types.h gmt_unique.h gmt_version.h gshhg_version.h postscriptlight.h
 -	s_rint.h triangle.h gmt.h gmt_resources.h gmt_private.h
@@ -36,7 +36,7 @@ Forwarded: not-needed
  	gmt_error_codes.h gmt_api.c gmt_bcr.c gmt_calclock.c gmt_cdf.c gmt_compat.c
  	gmt_customio.c gmt_dcw.c gmt_error.c gmt_fft.c gmt_grdio.c gmt_io.c
  	gmt_memory.c gmt_nc.c gmt_notposix.c gmt_proj.c gmt_shore.c gmt_sph.c
-@@ -363,11 +363,6 @@ configure_file (gmt-config.in gmt-config
+@@ -378,11 +378,6 @@ configure_file (gmt-config.in gmt-config
  # gmtprogram
  set (GMT_PROGRAM ${GMT_SOURCE_DIR}/src/gmtprogram.c)
  
diff --git a/debian/patches/glibc-2.23-ftbfs.patch b/debian/patches/glibc-2.23-ftbfs.patch
deleted file mode 100644
index 1e219ec..0000000
--- a/debian/patches/glibc-2.23-ftbfs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS with glibc 2.23.
- Fixed bug in setting and reporting n_empty using NaN or proxy
-Author: Paul Wessel
-Origin: https://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15261
-Bug: https://gmt.soest.hawaii.edu/issues/877
-Bug-Debian: https://bugs.debian.org/818807
-
---- a/src/xyz2grd.c
-+++ b/src/xyz2grd.c
-@@ -749,7 +749,7 @@ int GMT_xyz2grd (void *V_API, int mode,
- 		if (GMT_is_verbose (GMT, GMT_MSG_VERBOSE)) {
- 			char line[GMT_BUFSIZ], e_value[GMT_LEN32];
- 			sprintf (line, "%s\n", GMT->current.setting.format_float_out);
--			(GMT_is_dnan (GMT->common.d.active[GMT_IN])) ? sprintf (e_value, "NaN") : sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]);
-+			(GMT->common.d.active[GMT_IN]) ? sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]) : sprintf (e_value, "NaN");
- 			GMT_Report (API, GMT_MSG_VERBOSE, "Data records read: %" PRIu64 "  used: %" PRIu64 "  nodes filled: %" PRIu64 " nodes empty: %" PRIu64 " [set to %s]\n",
- 				n_read, n_used, n_filled, n_empty, e_value);
- 			if (n_bad) GMT_Report (API, GMT_MSG_VERBOSE, "%" PRIu64 " records unreadable\n", n_bad);
diff --git a/debian/patches/hppa-sighandler.patch b/debian/patches/hppa-sighandler.patch
deleted file mode 100644
index 6049fb1..0000000
--- a/debian/patches/hppa-sighandler.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build on HPPA.
-Author: John David Anglin <dave.anglin at bell.net>
-Bug-Debian: https://bugs.debian.org/805731
-Forwarded: http://gmt.soest.hawaii.edu/issues/818
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15265
-
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -79,6 +79,8 @@ void backtrace_symbols_fd(void *const *b
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.pc)
- # elif defined( __arm__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.arm_pc)
-+# elif defined( __hppa__)
-+#  define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_iaoq[0])
- # elif defined(__s390__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.psw.addr)
- # else
diff --git a/debian/patches/manpage-section.patch b/debian/patches/manpage-section.patch
index df4dd15..b844321 100644
--- a/debian/patches/manpage-section.patch
+++ b/debian/patches/manpage-section.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/doc/rst/conf.py.in
 +++ b/doc/rst/conf.py.in
-@@ -232,138 +232,138 @@ latex_elements = {
+@@ -232,141 +232,141 @@ latex_elements = {
  # One entry per manual page. List of tuples
  # (source start file, name, description, authors, manual section).
  man_pages = [
@@ -77,6 +77,7 @@ Forwarded: not-needed
 -('pshistogram', 'pshistogram', 'Calculate and plot histograms', '', 1),
 -('psimage', 'psimage', 'Place images or EPS files on maps', '', 1),
 -('pslegend', 'pslegend', 'Plot legends on maps', '', 1),
+-('pssolar', 'pssolar', 'Plot day-light terminators and other sunlight parameters', '', 1),
 -('postscriptlight', 'postscriptlight', 'A PostScript based plotting library', '', 3),
 -('psmask', 'psmask', 'Use data tables to clip or mask map areas with no coverage', '', 1),
 -('psrose', 'psrose', 'Plot a polar histogram (rose, sector, windrose diagrams)', '', 1),
@@ -114,6 +115,7 @@ Forwarded: not-needed
 -('supplements/misc/dimfilter', 'dimfilter', 'Directional filtering of 2-D gridded files in the space (or time) domain', '', 1),
 -('supplements/potential/gmtflexure', 'gmtflexure', 'Compute flexural deformation of 2-D loads, forces, bending and moments', '', 1),
 -('supplements/potential/gmtgravmag3d', 'gmtgravmag3d', 'Compute the gravity/magnetic effect of a body by the method of Okabe', '', 1),
+-('supplements/potential/gpsgridder', 'gpsgridder', 'Interpolate GPS strain vectors using Green\'s functions for elastic deformation', '', 1),
 -('supplements/potential/gravfft', 'gravfft', 'Compute gravitational attraction of 3-D surfaces in the wavenumber (or frequency) domain', '', 1),
 -('supplements/potential/grdflexure', 'grdflexure', 'Compute flexural deformation of 3-D surfaces for various rheologies', '', 1),
 -('supplements/potential/grdgravmag3d', 'grdgravmag3d', 'Compute the gravity effect of a grid by the method of Okabe', '', 1),
@@ -125,7 +127,8 @@ Forwarded: not-needed
 -('supplements/segy/pssegyz', 'pssegyz', 'Create imagemasked postscript from SEGY file', '', 1),
 -('supplements/segy/segy2grd', 'segy2grd', 'Converting SEGY data to a GMT grid', '', 1),
 -('supplements/spotter/backtracker', 'backtracker', 'Generate forward and backward flowlines and hotspot tracks', '', 1),
--('supplements/spotter/grdpmodeler', 'grdpmodeler', 'Evaluate a plate model on a geographic grid', '', 1),
+-('supplements/spotter/gmtpmodeler', 'gmtpmodeler', 'Evaluate a plate motion model at given locations', '', 1),
+-('supplements/spotter/grdpmodeler', 'grdpmodeler', 'Evaluate a plate motion model on a geographic grid', '', 1),
 -('supplements/spotter/grdrotater', 'grdrotater', 'Finite rotation reconstruction of geographic grid', '', 1),
 -('supplements/spotter/grdspotter', 'grdspotter', 'Create CVA image from a gravity or topography grid', '', 1),
 -('supplements/spotter/hotspotter', 'hotspotter', 'Create CVA image from seamount locations', '', 1),
@@ -209,6 +212,7 @@ Forwarded: not-needed
 +('pshistogram', 'pshistogram', 'Calculate and plot histograms', '', '1gmt'),
 +('psimage', 'psimage', 'Place images or EPS files on maps', '', '1gmt'),
 +('pslegend', 'pslegend', 'Plot legends on maps', '', '1gmt'),
++('pssolar', 'pssolar', 'Plot day-light terminators and other sunlight parameters', '', '1gmt'),
 +('postscriptlight', 'postscriptlight', 'A PostScript based plotting library', '', '3gmt'),
 +('psmask', 'psmask', 'Use data tables to clip or mask map areas with no coverage', '', '1gmt'),
 +('psrose', 'psrose', 'Plot a polar histogram (rose, sector, windrose diagrams)', '', '1gmt'),
@@ -246,6 +250,7 @@ Forwarded: not-needed
 +('supplements/misc/dimfilter', 'dimfilter', 'Directional filtering of 2-D gridded files in the space (or time) domain', '', '1gmt'),
 +('supplements/potential/gmtflexure', 'gmtflexure', 'Compute flexural deformation of 2-D loads, forces, bending and moments', '', '1gmt'),
 +('supplements/potential/gmtgravmag3d', 'gmtgravmag3d', 'Compute the gravity/magnetic effect of a body by the method of Okabe', '', '1gmt'),
++('supplements/potential/gpsgridder', 'gpsgridder', 'Interpolate GPS strain vectors using Green\'s functions for elastic deformation', '', '1gmt'),
 +('supplements/potential/gravfft', 'gravfft', 'Compute gravitational attraction of 3-D surfaces in the wavenumber (or frequency) domain', '', '1gmt'),
 +('supplements/potential/grdflexure', 'grdflexure', 'Compute flexural deformation of 3-D surfaces for various rheologies', '', '1gmt'),
 +('supplements/potential/grdgravmag3d', 'grdgravmag3d', 'Compute the gravity effect of a grid by the method of Okabe', '', '1gmt'),
@@ -257,7 +262,8 @@ Forwarded: not-needed
 +('supplements/segy/pssegyz', 'pssegyz', 'Create imagemasked postscript from SEGY file', '', '1gmt'),
 +('supplements/segy/segy2grd', 'segy2grd', 'Converting SEGY data to a GMT grid', '', '1gmt'),
 +('supplements/spotter/backtracker', 'backtracker', 'Generate forward and backward flowlines and hotspot tracks', '', '1gmt'),
-+('supplements/spotter/grdpmodeler', 'grdpmodeler', 'Evaluate a plate model on a geographic grid', '', '1gmt'),
++('supplements/spotter/gmtpmodeler', 'gmtpmodeler', 'Evaluate a plate motion model at given locations', '', '1gmt'),
++('supplements/spotter/grdpmodeler', 'grdpmodeler', 'Evaluate a plate motion model on a geographic grid', '', '1gmt'),
 +('supplements/spotter/grdrotater', 'grdrotater', 'Finite rotation reconstruction of geographic grid', '', '1gmt'),
 +('supplements/spotter/grdspotter', 'grdspotter', 'Create CVA image from a gravity or topography grid', '', '1gmt'),
 +('supplements/spotter/hotspotter', 'hotspotter', 'Create CVA image from seamount locations', '', '1gmt'),
diff --git a/debian/patches/overridden-typo.patch b/debian/patches/overridden-typo.patch
deleted file mode 100644
index 74e7790..0000000
--- a/debian/patches/overridden-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'overrided' typo, replace with 'overridden'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/855
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578
-
---- a/src/grdtrack.c
-+++ b/src/grdtrack.c
-@@ -808,7 +808,7 @@ int GMT_grdtrack (void *V_API, int mode,
- 		if (GMT_is_geographic (GMT, GMT_IN)) {	/* Convert to km if geographic or degrees if arc-units */
- 			if (!GMT->current.map.dist[GMT_MAP_DIST].arc) Ctrl->E.step *= GMT->current.proj.DIST_M_PR_DEG;	/* Convert from degrees to meters or from min/secs to degrees */
- 			Ctrl->E.step *= GMT->current.map.dist[GMT_MAP_DIST].scale;	/* Scale to chosen unit */
--			GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Default sampling interval in -E is %g %c (may be overrided by -E modifiers).\n", Ctrl->E.step, Ctrl->E.unit);
-+			GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Default sampling interval in -E is %g %c (may be overridden by -E modifiers).\n", Ctrl->E.step, Ctrl->E.unit);
- 		}
- 		if (Ctrl->G.n_grids == 1) {	/* May use min/max for a single grid */
- 			GMT_grd_minmax (GMT, GC[0].G, xyz);
diff --git a/debian/patches/series b/debian/patches/series
index 0274e8c..637a358 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,3 @@
 disable-triangle.patch
 disable-examples.patch
 manpage-section.patch
-hppa-sighandler.patch
-alpha-sighandler.patch
-supported-typo.patch
-overridden-typo.patch
-written-typo.patch
-sparc-sighandler.patch
-spelling-errors.patch
-source_date_epoch.patch
-glibc-2.23-ftbfs.patch
diff --git a/debian/patches/source_date_epoch.patch b/debian/patches/source_date_epoch.patch
deleted file mode 100644
index 8c01904..0000000
--- a/debian/patches/source_date_epoch.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Use SOURCE_DATE_EPOCH instead of current date.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/905
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/16437
-
---- a/cmake/modules/ConfigCMake.cmake
-+++ b/cmake/modules/ConfigCMake.cmake
-@@ -77,16 +77,23 @@ set (GMT_VERSION_STRING "${GMT_PACKAGE_N
- set (GMT_LONG_VERSION_STRING "${GMT_PACKAGE_NAME} - ${GMT_PACKAGE_DESCRIPTION_SUMMARY}, Version ${GMT_PACKAGE_VERSION_WITH_SVN_REVISION}")
- 
- # Get date
--try_run (_exit_today _compiled_today
--	${CMAKE_BINARY_DIR}/CMakeTmp
--	${CMAKE_MODULE_PATH}/today.c
--	CMAKE_FLAGS
--	RUN_OUTPUT_VARIABLE _today)
-+if(DEFINED ENV{SOURCE_DATE_EPOCH})
-+	EXECUTE_PROCESS(
-+	  COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y;%m;%d;%B"
-+	  OUTPUT_VARIABLE _today
-+	  OUTPUT_STRIP_TRAILING_WHITESPACE)
-+else(DEFINED ENV{SOURCE_DATE_EPOCH})
-+	try_run (_exit_today _compiled_today
-+		${CMAKE_BINARY_DIR}/CMakeTmp
-+		${CMAKE_MODULE_PATH}/today.c
-+		CMAKE_FLAGS
-+		RUN_OUTPUT_VARIABLE _today)
- 
--if (NOT _compiled_today OR _exit_today EQUAL -1)
--	message (WARNING "Date not implemented, please file a bug report.")
--	set(_today "1313;13;13;Undecember")
--endif (NOT _compiled_today OR _exit_today EQUAL -1)
-+	if (NOT _compiled_today OR _exit_today EQUAL -1)
-+		message (WARNING "Date not implemented, please file a bug report.")
-+		set(_today "1313;13;13;Undecember")
-+	endif (NOT _compiled_today OR _exit_today EQUAL -1)
-+endif(DEFINED ENV{SOURCE_DATE_EPOCH})
- 
- list(GET _today 0 YEAR)
- list(GET _today 1 MONTH)
diff --git a/debian/patches/sparc-sighandler.patch b/debian/patches/sparc-sighandler.patch
deleted file mode 100644
index 5596ff0..0000000
--- a/debian/patches/sparc-sighandler.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix build on sparc64.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/857
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15739
-
---- a/src/common_sighandler.c
-+++ b/src/common_sighandler.c
-@@ -85,6 +85,12 @@ void backtrace_symbols_fd(void *const *b
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_iaoq[0])
- # elif defined(__s390__)
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.psw.addr)
-+# elif defined(__sparc__)
-+#  if defined (__arch64__)
-+#   define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_gregs[MC_PC])
-+#  else
-+#   define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_PC])
-+#  endif
- # else
- #  define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_EIP])
- # endif
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index a12cab6..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-Description: Fix spelling errors.
- formated  -> formatted
- Evalute   -> Evaluate
- auxillary -> auxiliary
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/886
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/16240
-
---- a/src/gmt_api.c
-+++ b/src/gmt_api.c
-@@ -3945,12 +3945,12 @@ int GMTAPI_Colors2CPT (struct GMTAPI_CTR
- 	GMT_strtok (*str, ",", &pos, last);	/* Get first color entry */
- 	strncpy (first, last, GMT_LEN64);	/* Make this the first color */
- 	if (GMT_getrgb (API->GMT, first, rgb)) {
--		GMT_Report (API, GMT_MSG_NORMAL, "Badly formated color entry: %s\n", first);
-+		GMT_Report (API, GMT_MSG_NORMAL, "Badly formatted color entry: %s\n", first);
- 		return (GMT_NOTSET);
- 	}
- 	while (GMT_strtok (*str, ",", &pos, last)) {	/* Get next color entry */
- 		if (GMT_getrgb (API->GMT, last, rgb)) {
--			GMT_Report (API, GMT_MSG_NORMAL, "Badly formated color entry: %s\n", last);
-+			GMT_Report (API, GMT_MSG_NORMAL, "Badly formatted color entry: %s\n", last);
- 			return (GMT_NOTSET);
- 		}
- 		fprintf (fp, "%g\t%s\t%g\t%s\n", z, first, z+1.0, last);
---- a/src/gmtregress.c
-+++ b/src/gmtregress.c
-@@ -330,7 +330,7 @@ int GMT_gmtregress_parse (struct GMT_CTR
- }
- 
- double model (double x, double *par)
--{	/* Evalute the model given the parameters in par */
-+{	/* Evaluate the model given the parameters in par */
- 	return (par[GMTREGRESS_SLOPE] * x + par[GMTREGRESS_ICEPT]);
- }
- 
---- a/src/grd2sph.c.template
-+++ b/src/grd2sph.c.template
-@@ -16,7 +16,7 @@
-  *	Contact info: gmt.soest.hawaii.edu
-  *--------------------------------------------------------------------*/
- /*
-- * grd2sph evalutes a grid using a spherical harmonics model
-+ * grd2sph evaluates a grid using a spherical harmonics model
-  *
-  * Author:	Paul Wessel
-  * Date:	10-FEB-2015
---- a/src/postscriptlight.c
-+++ b/src/postscriptlight.c
-@@ -1050,7 +1050,7 @@ void psl_computeBezierControlPoints (str
- 		r[i] = r[i] - m*r[i-1];
- 	}
- 
--	/* Evalute p1 */
-+	/* Evaluate p1 */
- 	p1[n-1] = r[n-1] / b[n-1];
- 	for (i = n - 2; i >= 0; --i)
- 		p1[i] = (r[i] - c[i] * p1[i+1]) / b[i];
---- a/src/potential/grdseamount.c
-+++ b/src/potential/grdseamount.c
-@@ -744,7 +744,7 @@ int GMT_grdseamount (void *V_API, int mo
- 						phi_curr = phi_solver (in, f, v_curr, Ctrl->E.active);
- 						phi_prev = phi_solver (in, f, v_prev, Ctrl->E.active);
- 						h0 = (Ctrl->E.active) ? in[5] : in[3];
--						switch (Ctrl->C.mode) {	/* Given the phi values, evalute the corresponding heights */
-+						switch (Ctrl->C.mode) {	/* Given the phi values, evaluate the corresponding heights */
- 							case SHAPE_CONE:  h_curr = h0 * (1 - phi_curr) / (1 - f); h_prev = h0 * (1 - phi_prev) / (1 - f); break;
- 							case SHAPE_PARA:  h_curr = h0 * (1 - phi_curr * phi_curr) / (1 - f * f); h_prev = h0 * (1 - phi_prev * phi_prev) / (1 - f * f); break;
- 							case SHAPE_GAUS:  h_curr = h0 * exp (4.5 * (f*f - phi_curr * phi_curr)); h_prev = h0 * exp (4.5 * (f*f - phi_prev * phi_prev)); break;
-@@ -787,7 +787,7 @@ int GMT_grdseamount (void *V_API, int mo
- 						r = r_km;
- 						if (map) r *= DEG_PR_KM;	/* Was in km so now it is in degrees, same units as grid coordinates */
- 						f = -4.5 / (r_km * r_km);	/* So we can take exp (f * radius_in_km^2) */
--						A = f * (e2 * ca2 + sa2);	/* Elliptical components A, B, C needed to evalute radius(az) */
-+						A = f * (e2 * ca2 + sa2);	/* Elliptical components A, B, C needed to evaluate radius(az) */
- 						B = -f * (sa * ca * (1.0 - e2));
- 						C = f * (e2 * sa2 + ca2);
- 						r_in = in[3];			/* Semi-major axis in user units (Cartesian or km)*/
---- a/src/sph2grd.c
-+++ b/src/sph2grd.c
-@@ -16,7 +16,7 @@
-  *	Contact info: gmt.soest.hawaii.edu
-  *--------------------------------------------------------------------*/
- /*
-- * sph2grd evalutes a grid using a spherical harmonics model
-+ * sph2grd evaluates a grid using a spherical harmonics model
-  *
-  * Author:	Paul Wessel
-  * Date:	1-JUN-2013
---- a/src/spotter/grdpmodeler.c
-+++ b/src/spotter/grdpmodeler.c
-@@ -369,7 +369,7 @@ int GMT_grdpmodeler (void *V_API, int mo
- 		}
- 		/* Just need on common set of x/y arrays; select G_mod[0] as our template */
- 		G = G_mod[0];
--		GMT_Report (API, GMT_MSG_VERBOSE, "Evalute %d model prediction grids based on %s\n", Ctrl->S.n_items, Ctrl->E.file);
-+		GMT_Report (API, GMT_MSG_VERBOSE, "Evaluate %d model prediction grids based on %s\n", Ctrl->S.n_items, Ctrl->E.file);
- 	}
- 	else {	/* No output grids, must have input age grid to rely on */
- 		G = G_age;
-@@ -383,7 +383,7 @@ int GMT_grdpmodeler (void *V_API, int mo
- 		if (GMT_Begin_IO (API, GMT_IS_DATASET, GMT_OUT, GMT_HEADER_ON) != GMT_OK) {	/* Enables data output and sets access mode */
- 			Return (API->error);
- 		}
--		GMT_Report (API, GMT_MSG_VERBOSE, "Evalute %d model predictions based on %s\n", Ctrl->S.n_items, Ctrl->E.file);
-+		GMT_Report (API, GMT_MSG_VERBOSE, "Evaluate %d model predictions based on %s\n", Ctrl->S.n_items, Ctrl->E.file);
- 	}
- 	
- 	grd_x  = GMT_memory (GMT, NULL, G->header->nx, double);
---- a/src/mgd77/mgd77.c
-+++ b/src/mgd77/mgd77.c
-@@ -2039,7 +2039,7 @@ static int MGD77_Read_Data_cdf (struct G
- 		c  = F->order[col].set;			/* Determine set */
- 		if (!(c == MGD77_M77_SET && F->use_corrections[c])) continue;	/* Do not apply any corrections for this set */
- 		id = F->order[col].item;			/* Determine item */
--		/* Need to determine which auxillary columns (e.g., lon, lat) are needed and if they are not part of the requested output columns
-+		/* Need to determine which auxiliary columns (e.g., lon, lat) are needed and if they are not part of the requested output columns
- 		 * then they need to be secured separately.  Once these are all obtained we can apply the corrections */
- 		if (S->H.info[c].col[id].adjust) E.apply_corrections = true;	/* So we know if anything needs to be done in the next loop */
- 		switch (S->H.info[c].col[id].adjust) {
-@@ -2094,7 +2094,7 @@ static int MGD77_Read_Data_cdf (struct G
- 	if (E.apply_corrections) {	/* One or more of the depth, faa, and mag columns needs to be recomputed */
- 		int nc_id[N_E77_AUX_FIELDS] = {NCPOS_TIME,NCPOS_LAT,NCPOS_LON,NCPOS_TWT,NCPOS_MTF1,NCPOS_GOBS,NCPOS_EOT};
- 		char *abbrev[N_E77_AUX_FIELDS] = {"time","lat","lon","twt","mtf1","gobs","eot"};
--		/* First make sure the auxillary data fields are set */
-+		/* First make sure the auxiliary data fields are set */
- 		for (i = 0; i < N_E77_AUX_FIELDS; i++) {
- 			if (!E.needed[i]) continue;	/* Dont need this particular column */
- 			if (E.got_it[nc_id[i]]) {	/* This aux is actually one of the output columns so we have already read it - just use a pointer */
-@@ -2109,7 +2109,7 @@ static int MGD77_Read_Data_cdf (struct G
- 				E.needed[i] = 2;	/* So we know which aux columns to deallocate when done */
- 			}
- 		}
--		/* Now E.aux[i] points to the correct array of values for each auxillary column that is needed */
-+		/* Now E.aux[i] points to the correct array of values for each auxiliary column that is needed */
- 
- 		if (E.correction_requested[E77_CORR_FIELD_TWT]) {	/* Must correct twt for wraps */
- 			bool has_prev_twt = false;
---- a/src/mgd77/mgd77.h
-+++ b/src/mgd77/mgd77.h
-@@ -303,7 +303,7 @@ struct MGD77_CM4 {	/* For use with cm4fi
- 
- /* We may want to output columns that themselves are not stored in the MGD77[+] files but
-  * rather are computed based on data that are stored in the file.  We consider such information
-- * as AUXILLARY columns and insert them between the observed columns when needed.  The following
-+ * as AUXILIARY columns and insert them between the observed columns when needed.  The following
-  * structures are used to facilitate this process. */
- 
- #ifdef USE_CM4
---- a/src/mgd77/mgd77list.c
-+++ b/src/mgd77/mgd77list.c
-@@ -683,7 +683,7 @@ int separate_aux_columns (struct MGD77_C
- 			k++;
- 		}
- 		else
--		{	/* Found a request for an auxillary column  */
-+		{	/* Found a request for an auxiliary column  */
- 			aux[n_aux].type = auxlist[this_aux].type;
- 			aux[n_aux].text = auxlist[this_aux].text;
- 			aux[n_aux].pos = k;
-@@ -702,7 +702,7 @@ int augment_aux_columns (int n_items, ch
- 	for (i = k = 0, n = n_aux; i < n_items; i++) {
- 		for (j = 0, this_aux = MGD77_NOT_SET; j < N_MGD77_AUX && this_aux == MGD77_NOT_SET; j++)
- 			if (!strcmp (auxlist[j].name, item_name[i])) this_aux = j;
--		if (this_aux != MGD77_NOT_SET && !auxlist[this_aux].requested) {	/* Found a request for an auxillary column not yet requested  */
-+		if (this_aux != MGD77_NOT_SET && !auxlist[this_aux].requested) {	/* Found a request for an auxiliary column not yet requested  */
- 			aux[n].type = auxlist[this_aux].type;
- 			aux[n].text = auxlist[this_aux].text;
- 			aux[n].pos = k;
-@@ -842,9 +842,9 @@ int GMT_mgd77list (void *V_API, int mode
- 	n_out_columns = M.n_out_columns;				/* This is the total number of columns in the final output */
- 	if (MGD77_Get_Column (GMT, "depth", &M) == MGD77_NOT_SET) negative_depth = false;	/* Just so we don't accidently access dvalue[z_col] further down in the loop */
- 	if (MGD77_Get_Column (GMT, "msd", &M) == MGD77_NOT_SET) negative_msd = false;	/* Just so we don't accidently access dvalue[m_col] further down in the loop */
--	n_aux = separate_aux_columns (&M, fx_setting, aux, auxlist);				/* Determine which auxillary columns are requested (if any) */
-+	n_aux = separate_aux_columns (&M, fx_setting, aux, auxlist);				/* Determine which auxiliary columns are requested (if any) */
- 	if (Ctrl->L.active) {
--		n_aux = augment_aux_columns ((int)n_items, item_names, aux, auxlist, (int)n_aux);	/* Determine which auxillary columns are needed by -L */
-+		n_aux = augment_aux_columns ((int)n_items, item_names, aux, auxlist, (int)n_aux);	/* Determine which auxiliary columns are needed by -L */
- 		for (kk = 0; kk < n_items; kk++) GMT_free (GMT, item_names[kk]);
- 		if (n_items) GMT_free (GMT, item_names);
- 		MGD77_Free_Table (GMT, n_items, item_names);
-@@ -853,9 +853,9 @@ int GMT_mgd77list (void *V_API, int mode
- 	aux_tvalue[MGD77_AUX_DA] = GMT_memory (GMT, NULL, GMT_LEN64, char);	/* Just in case */
- 	use = (M.original) ? MGD77_ORIG : MGD77_REVISED;
- 	
--	/* Most auxillary columns depend on values in the data columns.  If the user did not specify the
-+	/* Most auxiliary columns depend on values in the data columns.  If the user did not specify the
- 	   required data columns then we must append them to make sure we have access to the values we need
--	   to calculate the auxillary values. Also, so limit tests on data records (e.g., distances, region,
-+	   to calculate the auxiliary values. Also, so limit tests on data records (e.g., distances, region,
- 	   or time) also implies the need for certain data columns such as time, lon, and lat.
- 	 */
- 	 
-@@ -867,7 +867,7 @@ int GMT_mgd77list (void *V_API, int mode
- 	need_lonlat = (auxlist[MGD77_AUX_MG].requested || auxlist[MGD77_AUX_GR].requested || auxlist[MGD77_AUX_CT].requested || Ctrl->A.code[ADJ_MG] > 1 || Ctrl->A.code[ADJ_DP] & 4 || Ctrl->A.code[ADJ_CT] >= 2 || Ctrl->A.code[ADJ_GR] > 1 || Ctrl->A.fake_times || Ctrl->A.cable_adjust);	/* Need lon, lat to calculate reference fields or Carter correction */
- 	need_time = (auxlist[MGD77_AUX_YR].requested || auxlist[MGD77_AUX_MO].requested || auxlist[MGD77_AUX_DY].requested || auxlist[MGD77_AUX_HR].requested || auxlist[MGD77_AUX_MI].requested || auxlist[MGD77_AUX_SC].requested \
- 		|| auxlist[MGD77_AUX_DM].requested || auxlist[MGD77_AUX_HM].requested || auxlist[MGD77_AUX_DA].requested || auxlist[MGD77_AUX_MG].requested || Ctrl->A.code[ADJ_MG] > 1);
--	n_sub = 0;	/* This value will hold the number of columns that we will NOT printout (they are only needed to calculate auxillary values) */
-+	n_sub = 0;	/* This value will hold the number of columns that we will NOT printout (they are only needed to calculate auxiliary values) */
- 	if (need_distances || need_lonlat) {	/* Must make sure we get lon,lat if they are not already requested */
- 		 if (MGD77_Get_Column (GMT, "lat", &M) == MGD77_NOT_SET) strcat (fx_setting, ",lat"), n_sub++;	/* Append lat to requested list */
- 		 if (MGD77_Get_Column (GMT, "lon", &M) == MGD77_NOT_SET) strcat (fx_setting, ",lon"), n_sub++;	/* Append lon to requested list */
-@@ -896,7 +896,7 @@ int GMT_mgd77list (void *V_API, int mode
- 	else if (Ctrl->A.cable_adjust)
- 		 if (MGD77_Get_Column (GMT, "mtf1", &M) == MGD77_NOT_SET) strcat (fx_setting, ",mtf1"), n_sub++;	/* Must append mtf1 to requested list */
- 
--	/* If logical tests are specified we must make sure the required columns are included as auxillary */
-+	/* If logical tests are specified we must make sure the required columns are included as auxiliary */
- 	for (kk = 0; kk < M.n_constraints; kk++) {
- 		if (MGD77_Get_Column (GMT, M.Constraint[kk].name, &M) != MGD77_NOT_SET) continue;	/* OK, already included */
- 		strcat (fx_setting, ",");
-@@ -1028,7 +1028,7 @@ int GMT_mgd77list (void *V_API, int mode
- 			first_warning = false;
- 		}
- 		for (kk = kx = pos = 0; pos < n_out_columns; kk++, pos++) {	/* Prepare GMT output formatting machinery */
--			while (kx < n_aux && aux[kx].pos == kk) {	/* Insert formatting for auxillary column (none are special) */
-+			while (kx < n_aux && aux[kx].pos == kk) {	/* Insert formatting for auxiliary column (none are special) */
- 				GMT->current.io.col_type[GMT_OUT][pos] = GMT_IS_FLOAT;
- 				pos++, kx++;
- 			}
-@@ -1049,7 +1049,7 @@ int GMT_mgd77list (void *V_API, int mode
- 		if (first_cruise && !GMT->common.b.active[GMT_OUT] && GMT->current.setting.io_header[GMT_OUT]) {	/* Write out header record */
- 			fprintf (GMT->session.std[GMT_OUT], "# ");
- 			for (kk = kx = pos = 0; pos < n_out_columns; kk++, pos++) {
--				while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxillary column */
-+				while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxiliary column */
- 					fprintf (GMT->session.std[GMT_OUT], "%s", auxlist[aux[kx].type].header);
- 					if ((pos+1) < n_out_columns) fprintf (GMT->session.std[GMT_OUT], "%s", GMT->current.setting.io_col_separator);
- 					pos++, kx++;
-@@ -1228,7 +1228,7 @@ int GMT_mgd77list (void *V_API, int mode
- 
- 			/* This record will now be printed out */
- 		
--			if (need_time) {	/* Need auxillary time columns such as year, days etc, hence we get the calendar first, then use MGD77_cal_to_fyear */
-+			if (need_time) {	/* Need auxiliary time columns such as year, days etc, hence we get the calendar first, then use MGD77_cal_to_fyear */
- 				MGD77_gcal_from_dt (GMT, &M, dvalue[t_col][rec], &cal);	/* No adjust for TZ; this is GMT UTC time */
- 				aux_dvalue[MGD77_AUX_YR] = (double)cal.year;
- 				aux_dvalue[MGD77_AUX_MO] = (double)cal.month;
-@@ -1442,7 +1442,7 @@ int GMT_mgd77list (void *V_API, int mode
- 			
- 			if (string_output) {	/* Must do it col by col and deal with the requested string(s) */
- 				for (kk = kx = pos = 0; pos < n_out_columns; kk++, pos++) {
--					while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxillary column */
-+					while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxiliary column */
- 						if (aux[kx].text)
- 							fprintf (GMT->session.std[GMT_OUT], "%s", aux_tvalue[aux[kx].type]);
- 						else
-@@ -1478,7 +1478,7 @@ int GMT_mgd77list (void *V_API, int mode
- 			}
- 			else {	/* Use GMT output machinery which can handle binary output, if requested */
- 				for (kk = kx = pos = 0; pos < n_out_columns; kk++, pos++) {
--					while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxillary column */
-+					while (kx < n_aux && aux[kx].pos == kk) {	/* Insert auxiliary column */
- 						out[pos] = aux_dvalue[aux[kx].type];
- 						pos++, kx++;
- 					}
---- a/src/x2sys/x2sys.c
-+++ b/src/x2sys/x2sys.c
-@@ -1901,7 +1901,7 @@ unsigned int separate_aux_columns2 (stru
- 	/* Based on what item_name contains, we copy over info on the 3 aux fields (dist, azim, vel) from auxlist to aux */
- 	for (i = k = n_aux = 0; i < n_items; i++) {
- 		for (j = 0, this_aux = MGD77_NOT_SET; j < N_GENERIC_AUX && this_aux == MGD77_NOT_SET; j++) if (!strcmp (auxlist[j].name, item_name[i])) this_aux = j;
--		if (this_aux != MGD77_NOT_SET) {	/* Found a request for an auxillary column  */
-+		if (this_aux != MGD77_NOT_SET) {	/* Found a request for an auxiliary column  */
- 			aux[n_aux].type = auxlist[this_aux].type;
- 			aux[n_aux].text = auxlist[this_aux].text;
- 			aux[n_aux].pos = k;
-@@ -1914,7 +1914,7 @@ unsigned int separate_aux_columns2 (stru
- 
- void x2sys_get_corrtable (struct GMT_CTRL *GMT, struct X2SYS_INFO *S, char *ctable, uint64_t ntracks, char **trk_name, char *column, struct MGD77_AUX_INFO *aux, struct MGD77_AUXLIST *auxlist, struct MGD77_CORRTABLE ***CORR)
- {	/* Load an ephemeral correction table */
--	/* Pass aux as NULL if the auxillary columns do not matter (only used by x2sys_datalist) */
-+	/* Pass aux as NULL if the auxiliary columns do not matter (only used by x2sys_datalist) */
- 	unsigned int i, n_items, n_aux = 0, n_cols, missing;
- 	int ks;
- 	char path[GMT_BUFSIZ] = {""}, **item_names = NULL, **col_name = NULL, **aux_name = NULL;
-@@ -1944,14 +1944,14 @@ void x2sys_get_corrtable (struct GMT_CTR
- 		for (i = 0; i < n_cols; i++) col_name[i] = strdup (S->info[S->out_order[i]].name);
- 	}
- 	n_items = MGD77_Scan_Corrtable (GMT, ctable, trk_name, (unsigned int)ntracks, n_cols, col_name, &item_names, 0);
--	if (aux && (n_aux = separate_aux_columns2 (GMT, n_items, item_names, aux, auxlist)) != 0) {	/* Determine which auxillary columns are requested (if any) */
-+	if (aux && (n_aux = separate_aux_columns2 (GMT, n_items, item_names, aux, auxlist)) != 0) {	/* Determine which auxiliary columns are requested (if any) */
- 		aux_name = GMT_memory (GMT, NULL, n_aux, char *);
- 		for (i = 0; i < n_aux; i++) aux_name[i] = strdup (auxlist[aux[i].type].name);
- 	}
- 	for (i = missing = 0; i < n_items; i++) {
- 		if (MGD77_Match_List (GMT, item_names[i], n_cols, col_name) == MGD77_NOT_SET) {	/* Requested column not among data cols */
- 			if ((ks = MGD77_Match_List (GMT, item_names[i], n_aux, aux_name)) == MGD77_NOT_SET) {
--				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "X2SYS Correction table (%s) requires a column (%s) not present in COE database or auxillary columns\n", ctable, item_names[i]);
-+				GMT_Report (GMT->parent, GMT_MSG_NORMAL, "X2SYS Correction table (%s) requires a column (%s) not present in COE database or auxiliary columns\n", ctable, item_names[i]);
- 				missing++;
- 			}
- 			else
diff --git a/debian/patches/supported-typo.patch b/debian/patches/supported-typo.patch
deleted file mode 100644
index ff72488..0000000
--- a/debian/patches/supported-typo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix 'suported' typo, replace with 'supported'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/855
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578
-
---- a/src/gmt_customio.c
-+++ b/src/gmt_customio.c
-@@ -1746,7 +1746,7 @@ int GMT_gdal_read_grd (struct GMT_CTRL *
- 			for (j = 0; j < header->size; j++)
- 				grid[j] = (float)from_gdalread->Int32.data[j+i];
- 		else {
--			GMT_Report (GMT->parent, GMT_MSG_NORMAL, "ERROR data type not suported with gdalread in gmt_customio.\n");
-+			GMT_Report (GMT->parent, GMT_MSG_NORMAL, "ERROR data type not supported with gdalread in gmt_customio.\n");
- 			return (GMT_GRDIO_OPEN_FAILED);
- 		}
- 	}
---- a/src/gmt_gdalwrite.c
-+++ b/src/gmt_gdalwrite.c
-@@ -100,7 +100,7 @@ int GMT_gdalwrite (struct GMT_CTRL *GMT,
- 		n_byteOffset = 4;
- 	}
- 	else {
--		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "GMT_gdalwrite: Unsuported input data class!\n");
-+		GMT_Report (GMT->parent, GMT_MSG_NORMAL, "GMT_gdalwrite: Unsupported input data class!\n");
- 		return(-1);
- 	}
- 
---- a/src/psconvert.c
-+++ b/src/psconvert.c
-@@ -870,7 +870,7 @@ int GMT_psconvert (void *V_API, int mode
- 	    Ctrl->T.device == GS_DEV_JPGG || Ctrl->T.device == GS_DEV_TIF ||
- 	    Ctrl->T.device == GS_DEV_TIFG || Ctrl->T.device == GS_DEV_PNG ||
- 	    Ctrl->T.device == GS_DEV_TPNG || Ctrl->T.device == GS_DEV_PNGG) ) {
--		GMT_Report (API, GMT_MSG_NORMAL, "Error: As far as we know selected raster type is unsuported by GE.\n");
-+		GMT_Report (API, GMT_MSG_NORMAL, "Error: As far as we know selected raster type is unsupported by GE.\n");
- 	}
- 
- 	if (Ctrl->W.active) {	/* Implies -P and -A (unless -A- is set ) */
diff --git a/debian/patches/written-typo.patch b/debian/patches/written-typo.patch
deleted file mode 100644
index c459cb1..0000000
--- a/debian/patches/written-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'writen' typo, replace with 'written'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/855
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578
-
---- a/doc/rst/source/gmtget.rst
-+++ b/doc/rst/source/gmtget.rst
-@@ -27,7 +27,7 @@ Required Arguments
- 
- PARAMETER
-     Provide one or several parameters of interest. The current value of
--    those parameters will be writen to *stdout*. For a complete listing
-+    those parameters will be written to *stdout*. For a complete listing
-     of available parameters and their meaning, see the :doc:`gmt.conf` man page.
- 
- Optional Arguments

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

More information about the Pkg-grass-devel mailing list