[grass] 06/11: Drop patches applied upstream. Refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Apr 18 22:16:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository grass.
commit b3c91be6175ef65e8894023ebf5ceff0b6151e68
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Apr 18 23:06:15 2016 +0200
Drop patches applied upstream. Refresh remaining patches.
---
debian/changelog | 2 +-
debian/patches/hicolor-icons.patch | 46 ---
debian/patches/pager | 2 +-
debian/patches/series | 5 -
debian/patches/spelling-errors.patch | 101 ------
debian/patches/various-typos.patch | 523 ---------------------------
debian/patches/various-typos2.patch | 660 -----------------------------------
debian/patches/various-typos3.patch | 62 ----
8 files changed, 2 insertions(+), 1399 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5f86c8c..1eb81ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ grass (7.0.4~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Add template for x-grass7.
- * Add patch to fix various spelling errors.
* Drop explicit python-numpy dependency, included in ${python:Depends}
via dh_numpy.
* Have dh_python & dh_numpy act on specific packages only.
@@ -13,6 +12,7 @@ grass (7.0.4~rc1-1) UNRELEASED; urgency=medium
* Update copyright file, changes:
- Add Jachym Ceppicky to copyright holders
- Add license & copyright for mapcalc.tab.{c,h}
+ * Drop patches applied upstream. Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 18 Apr 2016 22:28:07 +0200
diff --git a/debian/patches/hicolor-icons.patch b/debian/patches/hicolor-icons.patch
deleted file mode 100644
index 483f963..0000000
--- a/debian/patches/hicolor-icons.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Install additional hicolor icon sizes.
- Debian Policy requires at least 22x22 PNG icons.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2988
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/68265
- https://trac.osgeo.org/grass/changeset/68266
-
---- a/gui/icons/Makefile
-+++ b/gui/icons/Makefile
-@@ -20,10 +20,36 @@ HTMLDIRS = \
- default: $(ETCICONS) $(HTMLICONS)
- $(MKDIR) $(ARCH_DISTDIR)/share/applications
- $(INSTALL_DATA) grass.desktop $(ARCH_DISTDIR)/share/applications
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps
-+ $(INSTALL_DATA) grass-8x8.png $(ARCH_DISTDIR)/share/icons/hicolor/8x8/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps
-+ $(INSTALL_DATA) grass-16x16.png $(ARCH_DISTDIR)/share/icons/hicolor/16x16/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps
-+ $(INSTALL_DATA) grass-22x22.png $(ARCH_DISTDIR)/share/icons/hicolor/22x22/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps
-+ $(INSTALL_DATA) grass-24x24.png $(ARCH_DISTDIR)/share/icons/hicolor/24x24/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps
-+ $(INSTALL_DATA) grass-32x32.png $(ARCH_DISTDIR)/share/icons/hicolor/32x32/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps
-+ $(INSTALL_DATA) grass-36x36.png $(ARCH_DISTDIR)/share/icons/hicolor/36x36/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps
-+ $(INSTALL_DATA) grass-40x40.png $(ARCH_DISTDIR)/share/icons/hicolor/40x40/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps
-+ $(INSTALL_DATA) grass-42x42.png $(ARCH_DISTDIR)/share/icons/hicolor/42x42/apps/grass70.png
- $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps
- $(INSTALL_DATA) grass-48x48.png $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass70.png
- $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps
- $(INSTALL_DATA) grass-64x64.png $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps
-+ $(INSTALL_DATA) grass-72x72.png $(ARCH_DISTDIR)/share/icons/hicolor/72x72/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps
-+ $(INSTALL_DATA) grass-80x80.png $(ARCH_DISTDIR)/share/icons/hicolor/80x80/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps
-+ $(INSTALL_DATA) grass-96x96.png $(ARCH_DISTDIR)/share/icons/hicolor/96x96/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps
-+ $(INSTALL_DATA) grass-128x128.png $(ARCH_DISTDIR)/share/icons/hicolor/128x128/apps/grass70.png
-+ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps
-+ $(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass70.png
- $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps
- $(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
- $(MKDIR) $(ARCH_DISTDIR)/share/appdata
diff --git a/debian/patches/pager b/debian/patches/pager
index b3c96e2..d72d250 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -10,7 +10,7 @@ Forwarded: not-needed
--- a/lib/init/grass.py
+++ b/lib/init/grass.py
-@@ -439,10 +439,12 @@ def find_exe(pgm):
+@@ -440,10 +440,12 @@ def find_exe(pgm):
def set_defaults():
# GRASS_PAGER
if not os.getenv('GRASS_PAGER'):
diff --git a/debian/patches/series b/debian/patches/series
index 0bc68cf..468ac73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,3 @@ pager
instdir
no-fail-html.patch
appstream.patch
-various-typos.patch
-various-typos2.patch
-various-typos3.patch
-spelling-errors.patch
-hicolor-icons.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 7b987ad..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Fix spelling errors.
- calulated -> calculated
- correspoding -> corresponding
- specifed -> specified
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2985
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/68236
-
---- a/raster/r.solute.transport/r.solute.transport.html
-+++ b/raster/r.solute.transport/r.solute.transport.html
-@@ -60,7 +60,7 @@ The calculation and boundary status of s
- The following states are supportet:
-
- <ul>
--<li>0 == inactive - the cell with status 0 will not be calulated, active cells will have a no flow boundary to an inactive cell</li>
-+<li>0 == inactive - the cell with status 0 will not be calculated, active cells will have a no flow boundary to an inactive cell</li>
- <li>1 == active - this cell is used for sloute transport calculation, inner sources can be defined for those cells</li>
- <li>2 == Dirichlet - cells of this type will have a fixed concentration value which do not change over time </li>
- <li>3 == Transmission - cells of this type should be placed on out-flow boundaries to assure the flow of the solute stream out </li>
---- a/raster3d/r3.gwflow/r3.gwflow.html
-+++ b/raster3d/r3.gwflow/r3.gwflow.html
-@@ -47,7 +47,7 @@ status of single cells can be set with t
- cell states are supported:
-
- <ul>
--<li>0 == inactive - the cell with status 0 will not be calulated,
-+<li>0 == inactive - the cell with status 0 will not be calculated,
- active cells will have a no flow boundary to an inactive cell</li>
- <li>1 == active - this cell is used for groundwater calculation,
- inner sources can be defined for those cells</li>
---- a/temporal/t.rast.algebra/t.rast.algebra.html
-+++ b/temporal/t.rast.algebra/t.rast.algebra.html
-@@ -246,7 +246,7 @@ compared by logical operators and evalua
- the related maps.
- For complex relations the comparison operator can be used to combine conditions:
- <br>
--The structure is similar to the select operator with the extention of an aggregation operator:
-+The structure is similar to the select operator with the extension of an aggregation operator:
- {"comparison operator", "topological relations", aggregation operator, "temporal operator"}
- <br>
- This aggregation operator (| or &) define the behaviour if a map is related the more
---- a/vector/v.out.ogr/export_areas.c
-+++ b/vector/v.out.ogr/export_areas.c
-@@ -77,7 +77,7 @@ int export_areas_single(struct Map_info
- * not labeled */
- }
-
-- /* find correspoding area */
-+ /* find corresponding area */
- area = Vect_get_centroid_area(In, centroid);
- if (area == 0)
- continue;
-@@ -184,7 +184,7 @@ int export_areas_multi(struct Map_info *
- "Category %d not found in line %d, field %d"),
- cat, line, field);
-
-- /* find correspoding area */
-+ /* find corresponding area */
- area = Vect_get_centroid_area(In, line);
- if (area == 0)
- continue;
-@@ -241,7 +241,7 @@ int export_areas_multi(struct Map_info *
- * not labeled */
- }
-
-- /* find correspoding area */
-+ /* find corresponding area */
- line = Vect_get_next_line_id(In);
- area = Vect_get_centroid_area(In, line);
- if (area == 0)
---- a/general/g.proj/datumtrans.c
-+++ b/general/g.proj/datumtrans.c
-@@ -91,7 +91,7 @@ int set_datum(char *datum)
- * co-ordinate system definition
- *
- * \param datumtrans Index number of parameter set to use, 0 to leave
-- * unspecifed (or remove specific parameters, leaving just
-+ * unspecified (or remove specific parameters, leaving just
- * the datum name), -1 to list the available parameter
- * sets for this datum and exit.
- *
---- a/lib/proj/convert.c
-+++ b/lib/proj/convert.c
-@@ -264,7 +264,7 @@ OGRSpatialReferenceH GPJ_grass_to_osr(co
- * \param hSRS OGRSpatialReferenceH object containing the co-ordinate
- * system to be converted
- * \param datumtrans Index number of datum parameter set to use, 0 to leave
-- * unspecifed
-+ * unspecified
- *
- * \return 2 if a projected or lat/long co-ordinate system has been
- * defined
-@@ -675,7 +675,7 @@ int GPJ_osr_to_grass(struct Cell_head *c
- * \param wkt Well-known Text (WKT) description of the co-ordinate
- * system to be converted
- * \param datumtrans Index number of datum parameter set to use, 0 to leave
-- * unspecifed
-+ * unspecified
- *
- * \return 2 if a projected or lat/long co-ordinate system has been
- * defined
diff --git a/debian/patches/various-typos.patch b/debian/patches/various-typos.patch
deleted file mode 100644
index dac0411..0000000
--- a/debian/patches/various-typos.patch
+++ /dev/null
@@ -1,523 +0,0 @@
-Description: Fix various typos.
- * intialize -> initialize
- * minumum -> minimum
- * occuring -> occurring
- * outputing -> outputting
- * paremeter -> parameter
- * specifiy -> specify
- * tranformation -> transformation
- * Tranforming -> Transforming
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2882
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/67704
-
---- a/gui/wxpython/lmgr/frame.py
-+++ b/gui/wxpython/lmgr/frame.py
-@@ -1563,7 +1563,7 @@ class GMFrame(wx.Frame):
- The parameters of all handlers which are associated with module
- and contained in menu/toolboxes must be event and cmd.
- When called from menu event is always None and cmd is the
-- associated command (list containing a module name and paremeters).
-+ associated command (list containing a module name and parameters).
-
- .. todo::
- This documentation is actually documentation of some
---- a/imagery/i.landsat.acca/i.landsat.acca.html
-+++ b/imagery/i.landsat.acca/i.landsat.acca.html
-@@ -23,7 +23,7 @@ useful for Landsat-4/5 TM.
- Run the standard ACCA algorithm with filling of small cloud holes
- (the <b>-f</b> flag): With per-band reflectance raster maps
- named <tt>226_62.toar.1, 226_62.toar.2, </tt> [...] and LANDSAT-7
--thermal band <tt>226_62.toar.61</tt>, outputing to a new raster map
-+thermal band <tt>226_62.toar.61</tt>, outputting to a new raster map
- named <tt>226_62.acca</tt>:
-
- <div class="code"><pre>
---- a/raster/r.proj/r.proj.html
-+++ b/raster/r.proj/r.proj.html
-@@ -316,6 +316,6 @@ The 'gdalwarp' and 'gdal_translate' util
- Martin Schroeder, University of Heidelberg, Germany<br>
- Man page text from S.J.D. Cox, AGCRC, CSIRO Exploration & Mining, Nedlands, WA<br>
- Updated by <a href="mailto:morten at untamo.net">Morten Hulden</a><br>
--Datum tranformation support and cleanup by Paul Kelly
-+Datum transformation support and cleanup by Paul Kelly
-
- <p><i>Last changed: $Date: 2015-09-12 11:03:45 +0200 (Sat, 12 Sep 2015) $</i>
---- a/scripts/r.in.aster/r.in.aster.html
-+++ b/scripts/r.in.aster/r.in.aster.html
-@@ -7,7 +7,7 @@ from g.proj. It can import Level 1A, Lev
- line. In either case, the user must specify an <b>input</b> *.hdf file name,
- the <b>type</b> of processing used, the image <b>band</b> to import, and an
- <b>output</b> GRASS raster map name.
--<p>The <b>type</b> paremeter can take values of L1A, L1B, or DEM.
-+<p>The <b>type</b> parameter can take values of L1A, L1B, or DEM.
- <p>The <b>band</b> parameter can take values of 1, 2, 3n, 3b, 4-14
-
-
---- a/vector/v.rectify/v.rectify.html
-+++ b/vector/v.rectify/v.rectify.html
-@@ -9,7 +9,7 @@ system than before it was rectified).
- <p>
- The <em>-o</em> flag enforces orthogonal rotation (currently for 3D only)
- where the axes remain orthogonal to each other, e.g. a cube with right
--angles remains a cube with right angles after tranformation. This is not
-+angles remains a cube with right angles after transformation. This is not
- guaranteed even with affine (1<sup>st</sup> order) 3D transformation.
-
- <p>
---- a/general/g.proj/g.proj.html
-+++ b/general/g.proj/g.proj.html
-@@ -137,7 +137,7 @@ cat proj4.description | g.proj -w proj4=
- </pre></div>
-
- <p>Create a new location with the co-ordinate system referred to by EPSG code
--4326 (Latitude-Longitude/WGS84), without explicitly specifiying datum
-+4326 (Latitude-Longitude/WGS84), without explicitly specifying datum
- transformation parameters:<br>
-
- <div class="code"><pre>
---- a/lib/imagery/iclass_statistics.c
-+++ b/lib/imagery/iclass_statistics.c
-@@ -723,7 +723,7 @@ int I_iclass_statistics_get_product(ICla
-
- \param statistics pointer to statistics structure
- \param band band index
-- \param[out] min minumum value
-+ \param[out] min minimum value
-
- \return 1 on success
- \return 0 band index out of range
---- a/lib/python/temporal/temporal_algebra.py
-+++ b/lib/python/temporal/temporal_algebra.py
-@@ -2148,7 +2148,7 @@ class TemporalAlgebraParser(object):
- t[0] = t[1]
-
- def p_expr_strds_function(self, t):
-- # Specifiy a explicitely a space time raster dataset
-+ # Explicitly specify a space time raster dataset
- # R = A : strds(B)
- """
- expr : STRDS LPAREN stds RPAREN
-@@ -2161,7 +2161,7 @@ class TemporalAlgebraParser(object):
- print "Opening STRDS: ", t[0]
-
- def p_expr_str3ds_function(self, t):
-- # Specifiy a explicitely a space time raster dataset
-+ # Explicitly specify a space time raster dataset
- # R = A : str3ds(B)
- """
- expr : STR3DS LPAREN stds RPAREN
-@@ -2174,7 +2174,7 @@ class TemporalAlgebraParser(object):
- print "Opening STR3DS: ", t[0]
-
- def p_expr_stvds_function(self, t):
-- # Specifiy a explicitely a space time vector dataset
-+ # Explicitly specify a space time vector dataset
- # R = A : stvds(B)
- """
- expr : STVDS LPAREN stds RPAREN
---- a/lib/raster/range.c
-+++ b/lib/raster/range.c
-@@ -542,7 +542,7 @@ void Rast_init_fp_range(struct FPRange *
- }
-
- /*!
-- * \brief Get minumum and maximum value from fp range
-+ * \brief Get minimum and maximum value from fp range
- *
- * Extract the min/max from the range structure <i>range</i>. If the
- * range structure has no defined min/max (first!=0) there will not be
---- a/raster/r.neighbors/main.c
-+++ b/raster/r.neighbors/main.c
-@@ -56,7 +56,7 @@ enum out_type {
- static struct menu menu[] = {
- {c_ave, w_ave, NO_CATS, 1, 1, T_FLOAT, "average", "average value"},
- {c_median, w_median, NO_CATS, 1, 0, T_FLOAT, "median", "median value"},
-- {c_mode, w_mode, NO_CATS, 1, 0, T_COPY, "mode", "most frequently occuring value"},
-+ {c_mode, w_mode, NO_CATS, 1, 0, T_COPY, "mode", "most frequently occurring value"},
- {c_min, NULL, NO_CATS, 1, 0, T_COPY, "minimum", "lowest value"},
- {c_max, NULL, NO_CATS, 1, 0, T_COPY, "maximum", "highest value"},
- {c_range, NULL, NO_CATS, 1, 0, T_COPY, "range", "range value"},
---- a/raster/r.resamp.stats/main.c
-+++ b/raster/r.resamp.stats/main.c
-@@ -30,7 +30,7 @@ static const struct menu
- } menu[] = {
- {c_ave, w_ave, "average", "average (mean) value"},
- {c_median, w_median, "median", "median value"},
-- {c_mode, w_mode, "mode", "most frequently occuring value"},
-+ {c_mode, w_mode, "mode", "most frequently occurring value"},
- {c_min, w_min, "minimum", "lowest value"},
- {c_max, w_max, "maximum", "highest value"},
- {c_quart1, w_quart1, "quart1", "first quartile"},
---- a/raster/r.series/main.c
-+++ b/raster/r.series/main.c
-@@ -32,7 +32,7 @@ struct menu
- {c_ave, 0, "average", "average value"},
- {c_count, 1, "count", "count of non-NULL cells"},
- {c_median, 0, "median", "median value"},
-- {c_mode, 0, "mode", "most frequently occuring value"},
-+ {c_mode, 0, "mode", "most frequently occurring value"},
- {c_min, 0, "minimum", "lowest value"},
- {c_minx, 1, "min_raster", "raster with lowest value"},
- {c_max, 0, "maximum", "highest value"},
---- a/raster/r.series/r.series.html
-+++ b/raster/r.series/r.series.html
-@@ -9,7 +9,7 @@ Following methods are available:
- <li>average: average value
- <li>count: count of non-NULL cells
- <li>median: median value
-- <li>mode: most frequently occuring value
-+ <li>mode: most frequently occurring value
- <li>minimum: lowest value
- <li>maximum: highest value
- <li>range: range of values (max - min)
---- a/raster/r.stream.extract/r.stream.extract.html
-+++ b/raster/r.stream.extract/r.stream.extract.html
-@@ -25,7 +25,7 @@ recommended to use internally computed f
- depression map is provided.
-
- <p>
--Option <b>threshold</b> defines the minumum (optionally modifed) flow
-+Option <b>threshold</b> defines the minimum (optionally modifed) flow
- accumulation value that will initiate a new stream. If Montgomery's
- method for channel initiation is used, the cell value of the
- accumulation input map is multiplied by <tt>(tan(local
---- a/raster3d/r3.in.ascii/r3.in.ascii.html
-+++ b/raster3d/r3.in.ascii/r3.in.ascii.html
-@@ -46,7 +46,7 @@ The version and order option have been i
- The version option is self explaining. The order option specifies the row
- and depth order of the data in the input file.
- The supported row/depth ordering is documented in the <em>r3.out.ascii</em>
--manual page. The order of the data in the input file does not specifiy the
-+manual page. The order of the data in the input file does not specify the
- data order in the generated output 3D raster map which is in any case
- <em>north -> south, west -> east, bottom -> top</em> order.
- So dependent on the order information the data is automatically imported
---- a/raster3d/r3.neighbors/main.c
-+++ b/raster3d/r3.neighbors/main.c
-@@ -42,7 +42,7 @@ struct menu
- {
- c_ave, "average", "average value"}, {
- c_median, "median", "median value"}, {
-- c_mode, "mode", "most frequently occuring value"}, {
-+ c_mode, "mode", "most frequently occurring value"}, {
- c_min, "minimum", "lowest value"}, {
- c_max, "maximum", "highest value"}, {
- c_range, "range", "range value"}, {
---- a/vector/v.vect.stats/main.c
-+++ b/vector/v.vect.stats/main.c
-@@ -39,7 +39,7 @@ static struct menu menu[] = {
- {c_sum, 0, "sum", "sum of values"},
- {c_ave, 1, "average", "average value"},
- {c_median, 0, "median", "median value"},
-- {c_mode, 0, "mode", "most frequently occuring value"},
-+ {c_mode, 0, "mode", "most frequently occurring value"},
- {c_min, 0, "minimum", "lowest value"},
- {c_minx, 0, "min_cat", "category number of lowest value"},
- {c_max, 0, "maximum", "highest value"},
---- a/lib/ogsf/gvld.c
-+++ b/lib/ogsf/gvld.c
-@@ -240,7 +240,7 @@ int gvld_isosurf(geovol * gvl)
- nz[i] = 0;
- }
-
-- G_debug(5, " intialize OK");
-+ G_debug(5, " initialize OK");
-
- for (z = 0; z < depths - 1; z++) {
- zc = z * zres;
-@@ -695,7 +695,7 @@ int gvld_wire_slices(geovol * gvl)
- for (i = 0; i < gvl->n_slices; i++) {
- slice = gvl->slice[i];
-
-- /* intialize correct coords */
-+ /* initialize correct coords */
- if (slice->dir == X) {
- resx = gvl->yres;
- resy = gvl->zres;
---- a/lib/python/temporal/open_stds.py
-+++ b/lib/python/temporal/open_stds.py
-@@ -25,7 +25,7 @@ from factory import *
-
- def open_old_stds(name, type, dbif=None):
- """This function opens an existing space time dataset and return the
-- created and intialized object of the specified type.
-+ created and initialized object of the specified type.
-
- This function will call exit() or raise a
- grass.pygrass.messages.FatalError in case the type is wrong,
---- a/locale/po/grassmods_ar.po
-+++ b/locale/po/grassmods_ar.po
-@@ -34384,7 +34384,7 @@ msgstr "[%s]لم يتم فتح ملف ا
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "التوقيع ..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_cs.po
-+++ b/locale/po/grassmods_cs.po
-@@ -34736,7 +34736,7 @@ msgstr "Nelze zacyklit řetězec ve slou
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Převádím prvky..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_de.po
-+++ b/locale/po/grassmods_de.po
-@@ -34798,7 +34798,7 @@ msgstr "Kann Spalten-Zeichenkette [%s] n
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Transformiere Feature..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_el.po
-+++ b/locale/po/grassmods_el.po
-@@ -33024,7 +33024,7 @@ msgstr "Αδυναμία ανοίγμα�
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Εγγραφή %s από %s..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_es.po
-+++ b/locale/po/grassmods_es.po
-@@ -34922,7 +34922,7 @@ msgstr "a"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Trasponiendo la matriz de valores propios..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_fi.po
-+++ b/locale/po/grassmods_fi.po
-@@ -31656,7 +31656,7 @@ msgid "Unable to tokenize column string:
- msgstr ""
-
- #: ../vector/v.transform/main.c:277
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr ""
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_fr.po
-+++ b/locale/po/grassmods_fr.po
-@@ -36550,7 +36550,7 @@ msgstr "Impossible d'ouvrir le fichier d
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Rotation des données ... "
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_it.po
-+++ b/locale/po/grassmods_it.po
-@@ -34213,7 +34213,7 @@ msgstr ""
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Trasformazione degli elementi in corso..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_ja.po
-+++ b/locale/po/grassmods_ja.po
-@@ -34198,7 +34198,7 @@ msgstr "列の文字を分割できま�
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "フィーチャーを変換中、、、"
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_ko.po
-+++ b/locale/po/grassmods_ko.po
-@@ -33205,7 +33205,7 @@ msgstr "출력할 격자지도"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "출력할 격자지도"
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_lv.po
-+++ b/locale/po/grassmods_lv.po
-@@ -34168,7 +34168,7 @@ msgstr "Neiespējami atvērt šūnu fail
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Drukā ... "
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_pl.po
-+++ b/locale/po/grassmods_pl.po
-@@ -34290,7 +34290,7 @@ msgstr "Nie mozna otworzyć pliku wejśc
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Wczytywanie danych..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_pt.po
-+++ b/locale/po/grassmods_pt.po
-@@ -35297,7 +35297,7 @@ msgstr "N�o consegui usar a coluna '%s'"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Rotacionando dados ... "
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_pt_br.po
-+++ b/locale/po/grassmods_pt_br.po
-@@ -35216,7 +35216,7 @@ msgstr "N�o consegui usar a coluna '%s'"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Rotacionando dados ... "
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_ro.po
-+++ b/locale/po/grassmods_ro.po
-@@ -32166,7 +32166,7 @@ msgid "Unable to tokenize column string:
- msgstr ""
-
- #: ../vector/v.transform/main.c:277
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr ""
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_ru.po
-+++ b/locale/po/grassmods_ru.po
-@@ -34856,7 +34856,7 @@ msgstr "Невозможно разби�
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Трансформирование объектов..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_sl.po
-+++ b/locale/po/grassmods_sl.po
-@@ -34648,7 +34648,7 @@ msgstr "Ne morem odpreti cellfile za [%s
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Ri�em ..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_th.po
-+++ b/locale/po/grassmods_th.po
-@@ -34479,7 +34479,7 @@ msgstr "ไม่สามารถ tok
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "กำลังอ่านข้อมูล ..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_tr.po
-+++ b/locale/po/grassmods_tr.po
-@@ -33837,7 +33837,7 @@ msgstr "<%s> sütunu kullanılamıyor"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Veri okunuyor..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_vi.po
-+++ b/locale/po/grassmods_vi.po
-@@ -34862,7 +34862,7 @@ msgstr "Không thể thẻ hoá chuỗi
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "Đang chuyển đổi các đối tượng..."
-
- #: ../vector/v.transform/main.c:290
---- a/locale/po/grassmods_zh.po
-+++ b/locale/po/grassmods_zh.po
-@@ -34563,7 +34563,7 @@ msgstr "无法打开输出文件 <%s>"
-
- #: ../vector/v.transform/main.c:277
- #, fuzzy
--msgid "Tranforming features..."
-+msgid "Transforming features..."
- msgstr "读取地图"
-
- #: ../vector/v.transform/main.c:290
---- a/raster/r.mapcalc/map.c
-+++ b/raster/r.mapcalc/map.c
-@@ -307,7 +307,7 @@ static void translate_from_colors(struct
- * to compute the key and the index
- *
- * This uses the BTREE library to manage the tree itself
-- * btree structure must already be intialized
-+ * btree structure must already be initialized
- * pcats structure must already contain category labels
- */
-
---- a/raster/r.mapcalc/map3.c
-+++ b/raster/r.mapcalc/map3.c
-@@ -255,7 +255,7 @@ static void translate_from_colors(map *
- * to compute the key and the index
- *
- * This uses the BTREE library to manage the tree itself
-- * btree structure must already be intialized
-+ * btree structure must already be initialized
- * pcats structure must already contain category labels
- */
-
---- a/raster/r.watershed/ram/init_vars.c
-+++ b/raster/r.watershed/ram/init_vars.c
-@@ -178,7 +178,7 @@ int init_vars(int argc, char *argv[])
- ele_scale = 10000;
-
- /* read elevation input and mark NULL/masked cells */
-- /* intialize accumulation and drainage direction */
-+ /* initialize accumulation and drainage direction */
- MASK_flag = 0;
- do_points = nrows * ncols;
- for (r = 0; r < nrows; r++) {
---- a/vector/v.transform/main.c
-+++ b/vector/v.transform/main.c
-@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
- ztozero = 0;
-
- /* do the transformation */
-- G_important_message(_("Tranforming features..."));
-+ G_important_message(_("Transforming features..."));
- transform_digit_file(&Old, &New,
- ztozero, swap_flag->answer, trans_params,
- columns_name, field);
diff --git a/debian/patches/various-typos2.patch b/debian/patches/various-typos2.patch
deleted file mode 100644
index a2d4ba3..0000000
--- a/debian/patches/various-typos2.patch
+++ /dev/null
@@ -1,660 +0,0 @@
-Description: Fix various typos.
- REFERNCES -> REFERENCES
- coefficent -> coefficient
- proccess -> process
- controled -> controlled
- exising -> existing
- miniscule -> minuscule
- indeces -> indices
- errorneous -> erroneous
- containg -> containing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2950
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/68016
-
---- a/imagery/i.fft/i.fft.html
-+++ b/imagery/i.fft/i.fft.html
-@@ -36,7 +36,7 @@ d.rast lsat7_2002_70.real
- d.rast lsat7_2002_70.imag
- </pre></div>
-
--<h2>REFERNCES</h2>
-+<h2>REFERENCES</h2>
-
- <ul>
- <li> M. Frigo and S. G. Johnson (1998): "FFTW: An Adaptive Software Architecture
---- a/raster/r.resamp.bspline/r.resamp.bspline.html
-+++ b/raster/r.resamp.bspline/r.resamp.bspline.html
-@@ -107,7 +107,7 @@ d.histogram elev_srtm_30m_complete
- d.rast elev_srtm_30m_complete
- </pre></div>
-
--<h3>Estimation of <b>lambda</b> parameter with a cross validation proccess</h3>
-+<h3>Estimation of <b>lambda</b> parameter with a cross validation process</h3>
-
- A random sample of points should be generated first with
- <em><a href="r.random.html">r.random</a></em>, and the current region should not
---- a/vector/v.surf.bspline/v.surf.bspline.html
-+++ b/vector/v.surf.bspline/v.surf.bspline.html
-@@ -109,7 +109,7 @@ A bilinear spline interpolation will be
- of 25 map units. An interpolated raster map will be created at the
- current region resolution.
-
--<h3>Estimation of lambda_i parameter with a cross validation proccess</h3>
-+<h3>Estimation of lambda_i parameter with a cross validation process</h3>
-
- <div class="code"><pre>
- v.surf.bspline -c input=point_vector
---- a/raster/r.lake/main.c
-+++ b/raster/r.lake/main.c
-@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
- else
- out_fd = Rast_open_new(seedmap, 1);
-
-- /* More pases are renudant. Real pases count is controled by altered cell count. */
-+ /* More pases are renudant. Real pases count is controlled by altered cell count. */
- pases = (int)(rows * cols) / 2;
-
- G_debug(1,
---- a/raster/r.sim/r.sim.sediment/r.sim.sediment.html
-+++ b/raster/r.sim/r.sim.sediment/r.sim.sediment.html
-@@ -30,7 +30,7 @@ transport capacity limited erosion/depos
- can be viewed while the simulation continues. Sediment flow rate raster map
- <i>sediment_flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
- can take longer time depending on time step and simulation time.
--Simulation time is controled by <i>niterations</i> [minutes] parameter.
-+Simulation time is controlled by <i>niterations</i> [minutes] parameter.
- <!-- Output files can be saved during simulation using <i>outiter</i> parameter
- defining simulation time step for writing output files. This option requires
- time series flag <i>-t</i>. Files are saved with suffix containing
---- a/raster/r.sim/r.sim.water/r.sim.water.html
-+++ b/raster/r.sim/r.sim.water/r.sim.water.html
-@@ -42,7 +42,7 @@ Optionally, user can provide an overland
- <i>infil</i> or a single value <i>infil_value</i> in [mm/hr] that control the rate of
- infiltration for the already flowing water, effectively reducing the flow depth and
- discharge.
--Overland flow can be further controled by permeable check dams or similar type of structures,
-+Overland flow can be further controlled by permeable check dams or similar type of structures,
- the user can provide a map of these structures and their permeability ratio
- in the map <i>flow_control</i> that defines the probability of particles to pass
- through the structure (the values will be 0-1).
-@@ -54,7 +54,7 @@ the <i>error</i> raster map (the resulti
- The output vector points map <i>output_walkers</i> can be used to analyze and visualize
- spatial distribution of walkers at different simulation times (note that
- the resulting water depth is based on the density of these walkers).
--<!--Number of the output walkers is controled by the <i>density</i> parameter, which controls
-+<!--Number of the output walkers is controlled by the <i>density</i> parameter, which controls
- how many walkers used in simulation should be written into the output. -->
- <!-- from
- http://www.ing.unitn.it/~grass/conferences/GRASS2002/proceedings/proceedings/pdfs/Mitasova_Helena_2.pdf
-@@ -64,7 +64,7 @@ analysed using the output error raster f
- of particles used in the simulation and can be reduced by increasing the number of walkers
- given by parameter <i>nwalkers</i>.
- <!--(<font color="#ff0000"> toto treba upresnit/zmenit, lebo nwalk ide prec</font>). -->
--Duration of simulation is controled by the <i>niterations</i> parameter. The default value
-+Duration of simulation is controlled by the <i>niterations</i> parameter. The default value
- is 10 minutes, reaching the steady-state may require much longer time,
- depending on the time step, complexity of terrain, land cover and size of the area.
- Output walker, water depth and discharge maps can be saved during simulation using
---- a/lib/raster/gdal.c
-+++ b/lib/raster/gdal.c
-@@ -579,7 +579,7 @@ void Rast_close_gdal_link(struct GDAL_li
- }
-
- /*!
-- \brief Close exising GDAL link and write out data
-+ \brief Close existing GDAL link and write out data
-
- \param gdal pointer to GDAL_link to be closed
-
---- a/lib/vector/vectorlib_pg.dox
-+++ b/lib/vector/vectorlib_pg.dox
-@@ -28,7 +28,7 @@ API. They are internally used by the vec
- PostGIS data. The programmer should use higher level functions
- instead.
-
--- Vect_open_old() to open exising vector map (ie. PostGIS table when using GRASS-PostGIS data provider)
-+- Vect_open_old() to open existing vector map (ie. PostGIS table when using GRASS-PostGIS data provider)
- - Vect_open_new() to create new vector map
- - Vect_close() to close vector map
-
-@@ -38,7 +38,7 @@ instead.
-
- - Vect_write_line() to write a new feature
- - Vect_delete_line() to delete existing feature
--- Vect_rewrite_line() to modify exising feature
-+- Vect_rewrite_line() to modify existing feature
-
- - Vect_build() to build (pseudo-)topology
-
-@@ -74,7 +74,7 @@ access is provided by functions starting
- - V2_write_line_sfa() - write new simple feature
- - V2_write_line_pg() - write new topological element in PostGIS Topology schema
-
--\par Delete exising feature or topological element
-+\par Delete existing feature or topological element
-
- - V1_delete_line_pg()
- - V2_delete_line_sfa() - delete simple feature
---- a/raster/r.what/r.what.html
-+++ b/raster/r.what/r.what.html
-@@ -42,7 +42,7 @@ r.what map=landuse96_28m,aspect coordina
-
- <h3>Input coordinates given as a vector points map</h3>
-
--Coordinates can be read from exising vector points map by
-+Coordinates can be read from existing vector points map by
- specifying <b>points</b> option. Other features than points or
- centroids are ignored. Example: query North Carolina county number for
- each community college:
-@@ -59,7 +59,7 @@ r.what map=boundary_county_500m points=c
-
- <h3>Input coordinates given as a vector points map, output into CSV file</h3>
-
--Coordinates can be read from exising vector points map by
-+Coordinates can be read from existing vector points map by
- specifying <b>points</b> option. Other features than points or
- centroids are ignored. The output is stored in a CSV file including header
- row. Example: query North Carolina county number for each community college:
---- a/scripts/g.extension/g.extension.py
-+++ b/scripts/g.extension/g.extension.py
-@@ -900,7 +900,7 @@ def remove_modules(mlist, force = False)
- else:
- remove_extension_std(name, force)
-
--# remove exising extension (using standard files layout)
-+# remove existing extension (using standard files layout)
- def remove_extension_std(name, force = False):
- for fpath in [os.path.join(options['prefix'], 'bin', name),
- os.path.join(options['prefix'], 'scripts', name),
---- a/raster/rasterintro.html
-+++ b/raster/rasterintro.html
-@@ -144,9 +144,9 @@ cells whose centres fall within the boun
- <br>
- With <b>-w</b>, the samples are weighted according to the proportion of the
- raster cell which falls within the bounds of the region cell, so the
--result is normally unaffected by rounding error (a miniscule difference
-+result is normally unaffected by rounding error (a minuscule difference
- in the position of the boundary results in the addition or subtraction of
--a sample weighted by a miniscule factor; also, The min and max aggregates
-+a sample weighted by a minuscule factor; also, The min and max aggregates
- can't use weights, so <b>-w</b> has no effect for those).</li>
-
- <li> <a href="r.fillnulls.html">r.fillnulls</a> for Regularized Spline with Tension (RST)
---- a/gui/wxpython/dbmgr/base.py
-+++ b/gui/wxpython/dbmgr/base.py
-@@ -1522,11 +1522,11 @@ class DbMgrBrowsePage(DbMgrNotebookBase)
- table = self.dbMgrData['mapDBInfo'].layers[self.selLayer]["table"]
- key = self.dbMgrData['mapDBInfo'].layers[self.selLayer]["key"]
-
-- indeces = []
-+ indices = []
- # collect SQL statements
- while item != -1:
- index = dlist.itemIndexMap[item]
-- indeces.append(index)
-+ indices.append(index)
-
- cat = dlist.itemCatsMap[index]
-
-@@ -1557,7 +1557,7 @@ class DbMgrBrowsePage(DbMgrNotebookBase)
-
- i = 0
- for index in indexTemp:
-- if index in indeces:
-+ if index in indices:
- continue
- dlist.itemIndexMap.append(i)
- dlist.itemDataMap[i] = dataTemp[index]
---- a/gui/wxpython/gis_set.py
-+++ b/gui/wxpython/gis_set.py
-@@ -1050,7 +1050,7 @@ class GListBox(wx.ListCtrl, listmix.List
- """Load data into list
-
- :param choices: list of item
-- :param disabled: list of indeces of non-selectable items
-+ :param disabled: list of indices of non-selectable items
- """
- idx = 0
- for item in choices:
---- a/gui/wxpython/gmodeler/dialogs.py
-+++ b/gui/wxpython/gmodeler/dialogs.py
-@@ -884,7 +884,7 @@ class ItemListCtrl(ModelListCtrl):
- self.DeleteItem(item)
- del self.itemDataMap[item]
-
-- action = model.GetItem(item+1) # action indeces starts at 1
-+ action = model.GetItem(item+1) # action indices starts at 1
- if not action:
- item = self.GetFirstSelected()
- continue
---- a/gui/wxpython/gmodeler/frame.py
-+++ b/gui/wxpython/gmodeler/frame.py
-@@ -1632,7 +1632,7 @@ class ItemPanel(wx.Panel):
- self.list.OnReload(None)
-
- def _getSelectedItems(self):
-- """Get list of selected items, indeces start at 0"""
-+ """Get list of selected items, indices start at 0"""
- items = []
- current = -1
- while True:
---- a/lib/vector/Vlib/build_pg.c
-+++ b/lib/vector/Vlib/build_pg.c
-@@ -175,7 +175,7 @@ int build_topo(struct Map_info *Map, int
- * mode, before building native topology read nodes from
- * PostGIS Topology */
-
-- /* clean-up spatial a category indeces */
-+ /* clean-up spatial a category indices */
- dig_free_plus(&(Map->plus));
- dig_init_plus(&(Map->plus));
- plus->Spidx_new = TRUE;
---- a/lib/vector/Vlib/open_pg.c
-+++ b/lib/vector/Vlib/open_pg.c
-@@ -331,9 +331,9 @@ int Vect__open_topo_pg(struct Map_info *
- return 1;
-
- /* free and init plus structure, update spatial and category
-- * indeces */
-+ * indices */
- dig_init_plus(plus);
-- plus->Spidx_new = TRUE; /* force building spatial and category indeces */
-+ plus->Spidx_new = TRUE; /* force building spatial and category indices */
- plus->update_cidx = TRUE;
- Map->support_updated = FALSE; /* don't write support files */
-
---- a/lib/vector/Vlib/write_pg.c
-+++ b/lib/vector/Vlib/write_pg.c
-@@ -755,7 +755,7 @@ int create_table(struct Format_info_pg *
- return -1;
- }
-
-- /* create indeces
-+ /* create indices
- - GV_KEY_COLUMN
- - geometry column
- */
---- a/locale/po/grassmods_ar.po
-+++ b/locale/po/grassmods_ar.po
-@@ -40308,7 +40308,7 @@ msgid ""
- msgstr "خريطة مخرجة حيث ستكتب النقاط"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_cs.po
-+++ b/locale/po/grassmods_cs.po
-@@ -40709,7 +40709,7 @@ msgstr ""
- "Název výstupní vektorové vrstvy, do které budou zapsány chybné prvky vektoru"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
- "Sestavit topologii nebo vypsat informace o tolopogii a indexech na "
- "standardní výstup"
---- a/locale/po/grassmods_de.po
-+++ b/locale/po/grassmods_de.po
-@@ -40857,7 +40857,7 @@ msgstr ""
-
- #: ../vector/v.build/main.c:61
- #, fuzzy
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
- "Erzeuge Topologie oder schreibe die Topologie oder den räumlichen Index nach "
- "stdout."
---- a/locale/po/grassmods_el.po
-+++ b/locale/po/grassmods_el.po
-@@ -38681,7 +38681,7 @@ msgid ""
- msgstr "Όνομα εξαγόμενου διανυσματικού χάρτη"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_es.po
-+++ b/locale/po/grassmods_es.po
-@@ -40978,7 +40978,7 @@ msgstr ""
- "Nombre del mapa vectorial donde se escriben elementos vectoriales erróneos"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr "Construir topología o volcar topología o índices a salida estandar"
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_fi.po
-+++ b/locale/po/grassmods_fi.po
-@@ -37124,7 +37124,7 @@ msgid ""
- msgstr ""
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_fr.po
-+++ b/locale/po/grassmods_fr.po
-@@ -42888,7 +42888,7 @@ msgid ""
- msgstr "Nom de la couche en sortie où les erreurs seront écrites"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_it.po
-+++ b/locale/po/grassmods_it.po
-@@ -40094,7 +40094,7 @@ msgid ""
- msgstr "Nome della mappa vettoriale di output su cui scrivere i segmenti"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_ja.po
-+++ b/locale/po/grassmods_ja.po
-@@ -40117,7 +40117,7 @@ msgstr "誤ったベクトルフィー�
-
- #: ../vector/v.build/main.c:61
- #, fuzzy
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
- "トポロジーまたはダンプトポロジーまたは空間インデックスをstdoutに作成します "
-
---- a/locale/po/grassmods_ko.po
-+++ b/locale/po/grassmods_ko.po
-@@ -38902,7 +38902,7 @@ msgid ""
- msgstr "출력할 격자지도"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_lv.po
-+++ b/locale/po/grassmods_lv.po
-@@ -40166,7 +40166,7 @@ msgid ""
- msgstr ""
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_pl.po
-+++ b/locale/po/grassmods_pl.po
-@@ -40206,7 +40206,7 @@ msgid ""
- msgstr "Nazwa wyjściowej wektorowej mapy punktów"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_pt.po
-+++ b/locale/po/grassmods_pt.po
-@@ -41385,7 +41385,7 @@ msgid ""
- msgstr "Mapa de sa�da no qual os erros ser�o gravados"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_pt_br.po
-+++ b/locale/po/grassmods_pt_br.po
-@@ -41309,7 +41309,7 @@ msgid ""
- msgstr "Mapa de sa�da no qual os erros ser�o gravados"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_ro.po
-+++ b/locale/po/grassmods_ro.po
-@@ -37749,7 +37749,7 @@ msgid ""
- msgstr ""
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_ru.po
-+++ b/locale/po/grassmods_ru.po
-@@ -40878,7 +40878,7 @@ msgstr "Имя векторного сл
-
- #: ../vector/v.build/main.c:61
- #, fuzzy
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
- "Построить топологию или вывести топологию или пространственный индекс в "
- "stdout"
---- a/locale/po/grassmods_sl.po
-+++ b/locale/po/grassmods_sl.po
-@@ -40598,7 +40598,7 @@ msgid ""
- msgstr "Ime izhodnega vektorskega sloja"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_th.po
-+++ b/locale/po/grassmods_th.po
-@@ -40423,7 +40423,7 @@ msgstr "ชื่อของ แผน�
-
- #: ../vector/v.build/main.c:61
- #, fuzzy
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr "สร้าง topology หรือ dump topology หรือ spatial index ไปที่ stdout"
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_tr.po
-+++ b/locale/po/grassmods_tr.po
-@@ -39643,7 +39643,7 @@ msgid ""
- msgstr "Hatalı vektör objelerinin yazılacağı vektör haritanın adı"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/locale/po/grassmods_vi.po
-+++ b/locale/po/grassmods_vi.po
-@@ -40862,7 +40862,7 @@ msgstr "Tên của bản đồ vec-tơ d
-
- #: ../vector/v.build/main.c:61
- #, fuzzy
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
- "Xây dựng tôpô hoặc 'đổ' tôpô hoặc chỉ mục không gian vào đầu ra tiêu chuẩn"
-
---- a/locale/po/grassmods_zh.po
-+++ b/locale/po/grassmods_zh.po
-@@ -40508,7 +40508,7 @@ msgid ""
- msgstr "用来存放错误信息的输出地图的名称"
-
- #: ../vector/v.build/main.c:61
--msgid "Build topology or dump topology or indeces to standard output"
-+msgid "Build topology or dump topology or indices to standard output"
- msgstr ""
-
- #: ../vector/v.build/main.c:65
---- a/vector/v.build/main.c
-+++ b/vector/v.build/main.c
-@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
- opt->multiple = YES;
- opt->answer = "build";
- opt->description =
-- _("Build topology or dump topology or indeces to standard output");
-+ _("Build topology or dump topology or indices to standard output");
- opt_desc = NULL;
- G_asprintf(&opt_desc,
- "build;%s;dump;%s;sdump;%s;cdump;%s;fdump;%s",
---- a/vector/v.build/v.build.html
-+++ b/vector/v.build/v.build.html
-@@ -47,7 +47,7 @@ includes:
- <h3>Build topology</h3>
-
- Note that <b>option=build</b> recreates also spatial and category
--indeces, not only topology. For linked OGR layers
-+indices, not only topology. For linked OGR layers
- (see <em><a href="v.external.html">v.external</a></em>) also feature
- index is created.
-
---- a/vector/v.clean/v.clean.html
-+++ b/vector/v.clean/v.clean.html
-@@ -3,7 +3,7 @@
- <em>v.clean</em> allows the user to automatically fix topology of vector
- maps. Several tools may be listed to be executed sequentially. In this
- case, also the threshold parameter requires several values to be listed
--accordingly. An error map is optionally written which stores the errorneous
-+accordingly. An error map is optionally written which stores the erroneous
- geometries.
-
- <h3>Break lines/boundaries</h3>
---- a/gui/wxpython/docs/wxGUI.toolboxes.html
-+++ b/gui/wxpython/docs/wxGUI.toolboxes.html
-@@ -127,7 +127,7 @@ where we omitted the two toolboxes:</p>
-
- <h3>Creating custom toolbox</h3>
-
--<p>In this example we create a new toolbox <em>Favorites</em> containg
-+<p>In this example we create a new toolbox <em>Favorites</em> containing
- existing GRASS module and toolbox, custom module
- created by the user and addon module.
- The <tt>toolboxes.xml</tt> file contains following lines:</p>
---- a/lib/db/dbmi_base/string.c
-+++ b/lib/db/dbmi_base/string.c
-@@ -135,7 +135,7 @@ int db_enlarge_string(dbString * x, int
-
- \param x pointer to dbString
-
-- \return pointer to buffer containg string
-+ \return pointer to buffer containing string
- */
- char *db_get_string(const dbString * x)
- {
---- a/lib/vector/Vlib/header.c
-+++ b/lib/vector/Vlib/header.c
-@@ -395,7 +395,7 @@ int Vect_set_map_date(struct Map_info *M
-
- \param Map pointer to Map_info structure
-
-- \return string containg a date
-+ \return string containing a date
- */
- const char *Vect_get_map_date(const struct Map_info *Map)
- {
---- a/lib/raster/cats.c
-+++ b/lib/raster/cats.c
-@@ -50,7 +50,7 @@
- *
- * sprintf(buff,"Elevation: %.2f to %.2f feet", num*5.0+1000, num*5.0*1005)
- *
-- * Note: while both the format and coefficent lins must be present
-+ * Note: while both the format and coefficient lins must be present
- * a blank line for the fmt will effectively suppress automatic
- * label generation
- *
---- a/raster/r.category/r.category.html
-+++ b/raster/r.category/r.category.html
-@@ -90,7 +90,7 @@ string for category "num":
- <p>
- <tt>sprintf(buff,"Elevation: %.2f to %.2f feet", num*5.0+1000, num*5.0*1005)</tt>
-
--<p>Note: while both the format and coefficent lines must be present
-+<p>Note: while both the format and coefficient lines must be present
- a blank line for the format string will effectively suppress
- automatic label generation.
- <!--
---- a/raster/r.param.scale/feature.c
-+++ b/raster/r.param.scale/feature.c
-@@ -6,7 +6,7 @@
-
- /*** feature() ***/
-
--/*** Returns a terrain feature based on the 6 quadratic coefficents ***/
-+/*** Returns a terrain feature based on the 6 quadratic coefficients ***/
-
- /*** that define a local trend surface. ***/
-
-@@ -21,7 +21,7 @@
-
-
- DCELL feature(double *coeff)
--{ /* Set of six quadratic coefficents. */
-+{ /* Set of six quadratic coefficients. */
-
- /* Quadratic function in the form of
-
---- a/raster/r.param.scale/param.c
-+++ b/raster/r.param.scale/param.c
-@@ -7,7 +7,7 @@
- /*****************************************************************************/
- /*** ***/
- /*** param() ***/
--/*** Returns a terrain parameter based on the 6 quadratic coefficents ***/
-+/*** Returns a terrain parameter based on the 6 quadratic coefficients ***/
- /*** that define a local trend surface. ***/
- /*** Jo Wood, Department of Geography, V2.0 15th December, 1994 ***/
- /*** ***/
-@@ -19,7 +19,7 @@
-
- DCELL param(int ptype, /* Type of terrain parameter to calculate */
- double *coeff)
--{ /* Set of six quadratic coefficents. */
-+{ /* Set of six quadratic coefficients. */
-
- /* Quadratic function in the form of
-
---- a/raster/r.param.scale/param.h
-+++ b/raster/r.param.scale/param.h
-@@ -71,7 +71,7 @@ void find_obs(DCELL * z, /* Local window
- double *obs, /* Observed column vector. */
- double *w); /* Weighting matrix. */
- void find_weight(double *weight_ptr);
--DCELL feature(double *coeff); /* Set of six quadratic coefficents. */
-+DCELL feature(double *coeff); /* Set of six quadratic coefficients. */
-
- /* ------ Global variables ------ */
-
---- a/raster/r.ros/main.c
-+++ b/raster/r.ros/main.c
-@@ -159,8 +159,8 @@ int main(int argc, char *argv[])
- wn_live, /*net live fuel (total) load */
- class_sum, moisture[4], /*moistures of 1-h,10-h,100-h,live fuels */
- Mf_dead, /*total moisture of dead fuels */
-- etaM_dead, /*dead fuel misture damping coefficent */
-- etaM_live, /*live fuel misture damping coefficent */
-+ etaM_dead, /*dead fuel misture damping coefficient */
-+ etaM_live, /*live fuel misture damping coefficient */
- xmext, /*live fuel moisture of extinction */
- phi_ws, /*wind and slope conbined coefficient */
- wmfd, fdmois, fined, finel;
diff --git a/debian/patches/various-typos3.patch b/debian/patches/various-typos3.patch
deleted file mode 100644
index 35e8c1a..0000000
--- a/debian/patches/various-typos3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: Fix various typos.
- * modifed -> modified
- * cummulative -> cumulative
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2971
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/68174
-
---- a/raster/r.stream.extract/r.stream.extract.html
-+++ b/raster/r.stream.extract/r.stream.extract.html
-@@ -25,7 +25,7 @@ recommended to use internally computed f
- depression map is provided.
-
- <p>
--Option <b>threshold</b> defines the minimum (optionally modifed) flow
-+Option <b>threshold</b> defines the minimum (optionally modified) flow
- accumulation value that will initiate a new stream. If Montgomery's
- method for channel initiation is used, the cell value of the
- accumulation input map is multiplied by <tt>(tan(local
---- a/raster/r.watershed/ram/do_flatarea.c
-+++ b/raster/r.watershed/ram/do_flatarea.c
-@@ -6,7 +6,7 @@
- * The assignment of drainage direction over flat surfaces in raster
- * digital elevation models. J. Hydrol 193, 204-213.
- *
-- * the method is modifed for speed, only one pass is necessary to get
-+ * the method is modified for speed, only one pass is necessary to get
- * the gradient away from higher terrain
- *
- *********************************************************************/
---- a/raster/r.cost/main.c
-+++ b/raster/r.cost/main.c
-@@ -678,7 +678,7 @@ int main(int argc, char *argv[])
- Rast_get_row(fd, cell2, row, data_type2);
- ptr2 = cell2;
- for (col = 0; col < ncols; col++) {
-- /* Did I understand that concept of cummulative cost map? - (pmx) 12 april 2000 */
-+ /* Did I understand that concept of cumulative cost map? - (pmx) 12 april 2000 */
- if (!Rast_is_null_value(ptr2, data_type2)) {
- double cellval;
-
---- a/raster/r.walk/main.c
-+++ b/raster/r.walk/main.c
-@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
- Rast_get_row(fd, cell2, row, data_type2);
- ptr2 = cell2;
- for (col = 0; col < ncols; col++) {
-- /* Did I understand that concept of cummulative cost map? - (pmx) 12 april 2000 */
-+ /* Did I understand that concept of cumulative cost map? - (pmx) 12 april 2000 */
- if (!Rast_is_null_value(ptr2, data_type2)) {
- double cellval;
-
---- a/vector/v.net.centrality/v.net.centrality.html
-+++ b/vector/v.net.centrality/v.net.centrality.html
-@@ -21,7 +21,7 @@ Betweenness measure is not normalised. I
- values (between 0 and 1), each number needs to be divided by <em>N
- choose 2=N*(N-1)/2</em> where N is the number of nodes in the
- connected component. Computation of eigenvector measure terminates
--if the given number of iterations is reached or the cummulative <em>
-+if the given number of iterations is reached or the cumulative <em>
- squared</em> error between the successive iterations is less than <b>
- error</b>.
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list