[grass] 05/07: Drop spelling-errors.patch, applied upstream.

Thu Nov 24 22:42:13 UTC 2016

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

sebastic pushed a commit to branch experimental
in repository grass.

commit 2d64e17b6df711675a1caed50611d503ea1f43ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 24 22:59:06 2016 +0100

    Drop spelling-errors.patch, applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 -
 debian/patches/spelling-errors.patch | 86 ------------------------------------
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd6f2aa..249ac71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ grass (7.2.0~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Add license & copyright for fix_typos.sh.
+  * Drop spelling-errors.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 24 Nov 2016 22:52:36 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 74dbebd..e8223ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ instdir
 no-fail-html.patch
 appstream.patch
 jquery.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index f7c5543..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Description: Fix spelling errors.
- * betweeen         -> between
- * depenencies      -> dependencies
- * erroneus         -> erroneous
- * allows to <verb> -> allows <verb>ing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3194
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/69749
-
---- a/imagery/i.landsat.toar/landsat_set.c
-+++ b/imagery/i.landsat.toar/landsat_set.c
-@@ -378,7 +378,7 @@ void set_MSS5(lsat_data * lsat)
-     /* Spectral radiances at detector */
-     double Lmax[][4] = {
- 	{240., 170., 150., 127.},	/* before   April 6, 1984    */
--	{268., 179., 159., 123.},	/* betweeen                  */
-+	{268., 179., 159., 123.},	/* between                   */
- 	{268., 179., 148., 123.}	/* after    November 9, 1984 */
-     };
-     double Lmin[][4] = {
---- a/raster/r.compress/r.compress.html
-+++ b/raster/r.compress/r.compress.html
-@@ -114,7 +114,7 @@ FCELL and DCELL maps are never and have
- <dt><strong>ZLIB</strong></dt>
- <dd>ZLIB's deflate is the default compression method for all raster 
- maps. GRASS GIS 7 uses by default 1 as ZLIB compression level which is the 
--best compromise betweeen speed and compression ratio, also when 
-+best compromise between speed and compression ratio, also when 
- compared to other available compression methods. Valid levels are in 
- the range [1, 9] and can be set with the environment variable 
- <tt>GRASS_ZLIB_LEVEL</tt>.</dd>
---- a/raster/rasterintro.html
-+++ b/raster/rasterintro.html
-@@ -302,7 +302,7 @@ FCELL and DCELL maps are never and have
- <dt><strong>ZLIB</strong></dt>
- <dd>ZLIB's deflate is the default compression method for all raster 
- maps. GRASS GIS 7 uses by default 1 as ZLIB compression level which is the 
--best compromise betweeen speed and compression ratio, also when 
-+best compromise between speed and compression ratio, also when 
- compared to other available compression methods. Valid levels are in 
- the range [1, 9] and can be set with the environment variable 
- <tt>GRASS_ZLIB_LEVEL</tt>.</dd>
---- a/temporal/t.rast.algebra/t.rast.algebra.py
-+++ b/temporal/t.rast.algebra/t.rast.algebra.py
-@@ -65,7 +65,7 @@
- 
- #%flag
- #% key: d
--#% description: Perform a dry run, compute all depenencies and module calls but don't run them
-+#% description: Perform a dry run, compute all dependencies and module calls but don't run them
- #%end
- 
- import grass.script
---- a/temporal/t.select/t.select.py
-+++ b/temporal/t.select/t.select.py
-@@ -42,7 +42,7 @@
- 
- #%flag
- #% key: d
--#% description: Perform a dry run, compute all depenencies and module calls but don't run them
-+#% description: Perform a dry run, compute all dependencies and module calls but don't run them
- #%end
- 
- 
---- a/vector/v.generalize/v.generalize.html
-+++ b/vector/v.generalize/v.generalize.html
-@@ -29,7 +29,7 @@ flag is used to disable loop support.
- 
- <p>Lines and boundaries are not translated if they would collapse to a 
- single point. Boundaries are not translated if they would intersect 
--with themselves or other boundaries. Such erroneus features are written 
-+with themselves or other boundaries. Such erroneous features are written 
- to an optional <em>error</em> vector map. Overlaying the <em>error</em> 
- map over the generalized map indicates the kind of error. 
- Lines/boundaries collapsing to a point are written out as points, 
---- a/raster/r.patch/r.patch.html
-+++ b/raster/r.patch/r.patch.html
-@@ -84,7 +84,7 @@ layer.
- from the <em>input</em> maps and creates these files for the patched, 
- composite <em>output</em> map.  This can be quite time consuming for 
- certain maps, especially if there are many different category values 
--across the patched maps. The <em>-s</em> flag allows to disable the reading
-+across the patched maps. The <em>-s</em> flag allows disabling the reading
- and creation of these support files,  meaning that the <em>output</em> 
- map will have no category labels and no explicit color table.
- 

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

