This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit 312c40afa64064d737837da46dd6e2b9bb2f7a5e
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Jun 9 22:43:46 2015 +0200
Add patches for various typos.
---
debian/changelog | 1 +
debian/patches/algorithm-typo.patch | 25 ++++++++++++++
debian/patches/endianness-typo.patch | 27 +++++++++++++++
debian/patches/length-typo.patch | 47 +++++++++++++++++++++++++
debian/patches/output-typo.patch | 67 ++++++++++++++++++++++++++++++++++++
debian/patches/palette-typo.patch | 14 ++++++++
debian/patches/series | 6 ++++
debian/patches/software-typo.patch | 25 ++++++++++++++
8 files changed, 212 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a90c650..4389a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ gmt (5.1.2+dfsg1-1) UNRELEASED; urgency=medium
* Use packaged jquery.js & underscore.js instead of embedded sphinx copies.
* Move /usr/share/gmt to architecture-independent gmt-common package.
* Recompress the manpages to not use timestamped gzip.
+ * Add patches for various typos.
-- Bas Couwenberg <sebas...@debian.org> Sun, 07 Jun 2015 12:06:29 +0200
diff --git a/debian/patches/algorithm-typo.patch
b/debian/patches/algorithm-typo.patch
new file mode 100644
index 0000000..46df1b2
--- /dev/null
+++ b/debian/patches/algorithm-typo.patch
@@ -0,0 +1,25 @@
+Description: Fix 'algoritm' typo, replace with 'algorithm'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -11534,7 +11534,7 @@
+ * psxyz.c: Vector attributes can now be scaled down proportional
to length
+
+ 1992-02-07
+- * xyz2grd.c: Now use same algoritm as block_eman to get i,j
++ * xyz2grd.c: Now use same algorithm as block_eman to get i,j
+
+ 1992-02-07
+ * grd2xyz.c: Now prints out correct x/y for pixel files
+--- a/src/triangulate.c
++++ b/src/triangulate.c
+@@ -280,7 +280,7 @@ int GMT_triangulate (void *V_API, int mo
+ /*---------------------------- This is the triangulate main code
----------------------------*/
+
+ GMT_Report (API, GMT_MSG_VERBOSE, "Processing input table data\n");
+- GMT_Report (API, GMT_MSG_LONG_VERBOSE, "%s triangulation algoritm
selected\n", tri_algorithm[GMT->current.setting.triangulate]);
++ GMT_Report (API, GMT_MSG_LONG_VERBOSE, "%s triangulation algorithm
selected\n", tri_algorithm[GMT->current.setting.triangulate]);
+
+ if (Ctrl->G.active) {
+ if ((Grid = GMT_Create_Data (API, GMT_IS_GRID, GMT_IS_SURFACE,
GMT_GRID_HEADER_ONLY, NULL, NULL, Ctrl->I.inc, \
diff --git a/debian/patches/endianness-typo.patch
b/debian/patches/endianness-typo.patch
new file mode 100644
index 0000000..eee19f2
--- /dev/null
+++ b/debian/patches/endianness-typo.patch
@@ -0,0 +1,27 @@
+Description: Fix 'endianess' typo, replace with 'endianness'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/src/gmt_esri_io.c
++++ b/src/gmt_esri_io.c
+@@ -75,7 +75,7 @@ int GMT_is_esri_grid (struct GMT_CTRL *G
+ GMT_fclose (GMT, fp);
+
+ if (!strncmp (record, "BYTEORDER", 4) ) {
+- sscanf (record, "%*s %c", &header->flags[0]);
/* Store the endianess flag here */
++ sscanf (record, "%*s %c", &header->flags[0]);
/* Store the endianness flag here */
+ strncpy (header->title, file,
GMT_GRID_TITLE_LEN80);
+ }
+ else if (!strncmp (record, "ncols ", 6) ) { /* Ah.
A Arc/Info float binary file with a separate .hdr */
+@@ -349,10 +349,10 @@ int read_esri_info (struct GMT_CTRL *GMT
+
+ if (fpBAK) { /* Case of Arc/Info binary file with a separate
header file. We still have things to do. */
+ char tmp[16];
+- /* Read an extra record containing the endianess info */
++ /* Read an extra record containing the endianness info */
+ GMT_fgets (GMT, record, GMT_BUFSIZ, fp);
+ if (sscanf (record, "%*s %s", tmp) != 1) {
+- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Arc/Info
BINARY Grid: Error decoding endianess record\n");
++ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Arc/Info
BINARY Grid: Error decoding endianness record\n");
+ return (GMT_GRDIO_READ_FAILED);
+ }
+ header->flags[0] = (tmp[0] == 'L') ? 'L' : 'B';
diff --git a/debian/patches/length-typo.patch b/debian/patches/length-typo.patch
new file mode 100644
index 0000000..75cf828
--- /dev/null
+++ b/debian/patches/length-typo.patch
@@ -0,0 +1,47 @@
+Description: Fix 'lenght' typo, replace with 'length'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -402,7 +402,7 @@
+ 2013-03-26 pwessel
+ * psxy[z]: The -S= geovector now has modifiers
+o<plon>/<plat> for
+ specifying small circle geovectors; input is
then just
+- lenght in km. Also +q to say input is rotation
angles 1 and 2.
++ length in km. Also +q to say input is rotation
angles 1 and 2.
+
+ 2013-03-25 pwessel
+ * greenspline.c: Enhanced -Cv option to set desired level of
variance explained.
+--- a/doc/rst/source/sphtriangulate.rst
++++ b/doc/rst/source/sphtriangulate.rst
+@@ -84,7 +84,7 @@ Optional Arguments
+
+ **-T**
+ Write the unique arcs of the construction [Default writes fillable
+- triangles or polygons]. When used with **-A** we store arc lenght in
++ triangles or polygons]. When used with **-A** we store arc length in
+ the segment header in chosen unit (see **-L**).
+
+ .. |Add_-V| unicode:: 0x20 .. just an invisible code
+--- a/src/gmt_support.c
++++ b/src/gmt_support.c
+@@ -9420,7 +9420,7 @@ int GMT_init_custom_symbol (struct GMT_C
+ }
+ }
+ else {
+- for (k = 0; k < head->n_required; k++)
head->type[k] = GMT_IS_DIMENSION; /* Default is lenghts */
++ for (k = 0; k < head->n_required; k++)
head->type[k] = GMT_IS_DIMENSION; /* Default is lengths */
+ }
+ continue;
+ }
+--- a/src/gmt_vector.c
++++ b/src/gmt_vector.c
+@@ -1270,7 +1270,7 @@ uint64_t gmt_resample_path_spherical (st
+ }
+
+ if (mode < GMT_TRACK_SAMPLE_FIX) {
+- if (GMT->current.map.dist[GMT_MAP_DIST].arc) /* Gave an
increment in arc lenght (degree, min, sec) */
++ if (GMT->current.map.dist[GMT_MAP_DIST].arc) /* Gave an
increment in arc length (degree, min, sec) */
+ step_out /= GMT->current.map.dist[GMT_MAP_DIST].scale;
/* Get degrees */
+ else /* Gave increment in spatial distance (km, meter, etc.)
*/
+ step_out = (step_out /
GMT->current.map.dist[GMT_MAP_DIST].scale) / GMT->current.proj.DIST_M_PR_DEG;
/* Get degrees */
diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch
new file mode 100644
index 0000000..2db07e3
--- /dev/null
+++ b/debian/patches/output-typo.patch
@@ -0,0 +1,67 @@
+Description: Fix 'ouput' typo, replace with 'output'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/src/gmt_api.c
++++ b/src/gmt_api.c
+@@ -2648,7 +2648,7 @@ int GMTAPI_Export_Grid (struct GMTAPI_CT
+ break;
+
+ case GMT_IS_DUPLICATE: /* Duplicate GMT grid and header to a
GMT_GRID container object. Subset allowed */
+- if (S_obj->resource) return (GMTAPI_report_error (API,
GMT_PTR_NOT_NULL)); /* The ouput resource pointer must be NULL */
++ if (S_obj->resource) return (GMTAPI_report_error (API,
GMT_PTR_NOT_NULL)); /* The output resource pointer must be NULL */
+ if (mode & GMT_GRID_HEADER_ONLY) return
(GMTAPI_report_error (API, GMT_NOT_A_VALID_MODE));
+ GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Duplicating
grid data to GMT_GRID memory location\n");
+ if (!S_obj->region) { /* No subset, possibly same
padding */
+--- a/src/gmt_io.h
++++ b/src/gmt_io.h
+@@ -134,7 +134,7 @@ enum GMT_lon_enum {
+ /* How to handle NaNs in records */
+
+ enum GMT_io_nan_enum {
+- GMT_IO_NAN_OK = 0, /* NaNs are fine; just ouput the record as is */
++ GMT_IO_NAN_OK = 0, /* NaNs are fine; just output the record as is
*/
+ GMT_IO_NAN_SKIP, /* -s[cols] : Skip records with z == NaN in
selected cols [z-col only] */
+ GMT_IO_NAN_KEEP, /* -sr : Skip records with z != NaN */
+ GMT_IO_NAN_ONE}; /* -sa : Skip records with at least
one NaN */
+--- a/src/gmt_plot.c
++++ b/src/gmt_plot.c
+@@ -3688,7 +3688,7 @@ int GMT_contlabel_save_begin (struct GMT
+ sprintf (record, "# %s%s%s%slabel", xname[kind],
GMT->current.setting.io_col_separator, yname[kind],
GMT->current.setting.io_col_separator);
+ if ((G->fp = GMT_fopen (GMT, G->label_file, GMT->current.io.w_mode)) ==
NULL) {
+ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Error: Unable to
create/open file %s\n", G->label_file);
+- return (GMT_ERROR_ON_FOPEN); /* Establishes data ouput */
++ return (GMT_ERROR_ON_FOPEN); /* Establishes data output */
+ }
+ fprintf (G->fp, "%s\n", record); /* Write hte header record */
+ for (seg = 0; seg < G->n_segments; seg++) {
+--- a/src/mgd77/mgd77.c
++++ b/src/mgd77/mgd77.c
+@@ -3934,7 +3934,7 @@ int MGD77_Select_Columns (struct GMT_CTR
+ if (option & MGD77_RESET_EXACT) F->n_exact = 0;
+ all_exact = (option & MGD77_SET_ALLEXACT);
+
+- i = pos = 0; /* Start at the first ouput column */
++ i = pos = 0; /* Start at the first output column */
+ while ((GMT_strtok (cstring, ",", &pos, p))) { /* Until we run out of
abbreviations */
+ /* Must check if we need to break this word into
flag[=|<=|>=|<|>value] */
+ for (k = constraint = 0; p[k] && constraint == 0; k++) {
+@@ -4016,7 +4016,7 @@ int MGD77_Select_Columns (struct GMT_CTR
+
+ F->n_out_columns = i;
+
+- i = pos = 0; /* Start at the first ouput column */
++ i = pos = 0; /* Start at the first output column */
+ while ((GMT_strtok (bstring, ",", &pos, p))) { /* Until we run out of
abbreviations */
+ if (p[0] == '+')
+ F->Bit_test[i].match = 1;
+--- a/src/trend1d.c
++++ b/src/trend1d.c
+@@ -591,7 +591,7 @@ int GMT_trend1d_parse (struct GMT_CTRL *
+ }
+ n_errors += GMT_check_condition (GMT, Ctrl->n_outputs == 0, "Syntax
error -F option: Must specify at least one output columns \n");
+ n_errors += GMT_check_condition (GMT, Ctrl->n_outputs > 1 &&
Ctrl->model_parameters,
+- "Syntax error -F option: When selecting
model parameters, it must be the only ouput\n");
++ "Syntax error -F option: When selecting
model parameters, it must be the only output\n");
+
+ return (n_errors ? GMT_PARSE_ERROR : GMT_OK);
+ }
diff --git a/debian/patches/palette-typo.patch
b/debian/patches/palette-typo.patch
new file mode 100644
index 0000000..faeb593
--- /dev/null
+++ b/debian/patches/palette-typo.patch
@@ -0,0 +1,14 @@
+Description: Fix 'pallette' typo, replace with 'palette'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/doc/rst/source/gmtcolors.rst
++++ b/doc/rst/source/gmtcolors.rst
+@@ -13,7 +13,7 @@ Description
+
+ Colors can be specified in GMT as arguments to commands, generally
+ as part of the **-G** or **-W** options to select polygon fill or
+-outline pen. Colors are also used in color pallette tables (cpt files)
++outline pen. Colors are also used in color palette tables (cpt files)
+ that help convert numerical values to colors.
+
+ GMT allows several ways to represent a color:
diff --git a/debian/patches/series b/debian/patches/series
index 592ba6b..694a445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,8 @@
disable-triangle.patch
disable-examples.patch
+endianness-typo.patch
+software-typo.patch
+output-typo.patch
+algorithm-typo.patch
+length-typo.patch
+palette-typo.patch
diff --git a/debian/patches/software-typo.patch
b/debian/patches/software-typo.patch
new file mode 100644
index 0000000..e5873ed
--- /dev/null
+++ b/debian/patches/software-typo.patch
@@ -0,0 +1,25 @@
+Description: Fix 'softwares' typo, replace with 'software'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/doc/rst/source/ps2raster.rst
++++ b/doc/rst/source/ps2raster.rst
+@@ -149,7 +149,7 @@ Optional Arguments
+
+ **-W**\ [**+g**][**+t**\ *docname*][**+n**\ *layername*][**+o**\
*foldername*][**+a**\ *altmode*\ [*alt*]][**+l**\ *minLOD/maxLOD*][**+f**\
*minfade/maxfade*][**+u**\ *URL*]
+ Write a ESRI type world file suitable to make (e.g) .tif files be
+- recognized as geotiff by softwares that know how to do it. Be aware,
++ recognized as geotiff by software that know how to do it. Be aware,
+ however, that different results are obtained depending on the image
+ contents and if the **-B** option has been used or not. The trouble
+ with the **-B** option is that it creates a frame and very likely
+--- a/src/ps2raster.c
++++ b/src/ps2raster.c
+@@ -417,7 +417,7 @@ int GMT_ps2raster_usage (struct GMTAPI_C
+ GMT_Message (API, GMT_TIME_NONE, "\t gdal_translate command, in case
you want to use this program\n");
+ GMT_Message (API, GMT_TIME_NONE, "\t to create a geoTIFF file.\n");
+ GMT_Message (API, GMT_TIME_NONE, "\t-W Write a ESRI type world file
suitable to make (e.g.,) .tif files be\n");
+- GMT_Message (API, GMT_TIME_NONE, "\t recognized as geotiff by
softwares that know how to do it. Be aware,\n");
++ GMT_Message (API, GMT_TIME_NONE, "\t recognized as geotiff by
software that know how to do it. Be aware,\n");
+ GMT_Message (API, GMT_TIME_NONE, "\t however, that different results
are obtained depending on the image\n");
+ GMT_Message (API, GMT_TIME_NONE, "\t contents and if the -B option
has been used or not. The trouble with\n");
+ GMT_Message (API, GMT_TIME_NONE, "\t -B is that it creates a frame
and very likely its annotations and\n");
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gmt.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
