[grass] 06/07: Add patches for various typos.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Jul 4 19:49:30 UTC 2015


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

sebastic pushed a commit to branch experimental
in repository grass.

commit e5e263e98ba844fbc30db15302633a0d24692ca1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 4 20:06:46 2015 +0200

    Add patches for various typos.
---
 debian/changelog                    |   1 +
 debian/patches/allows-to-typo.patch |  90 ++++++++
 debian/patches/length-typo.patch    | 438 ++++++++++++++++++++++++++++++++++++
 debian/patches/permit-to-typo.patch |  15 ++
 debian/patches/series               |   3 +
 5 files changed, 547 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac657cc..48916f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ grass (7.0.1~rc1-1) UNRELEASED; urgency=medium
   * Add Conflicts/Provides/Replaces on the grass7* packages by upstream.
   * New upstream release candidate.
   * Refresh patches and mark as Forwarded.
+  * Add patches for various typos.
 
   [ Francesco Paolo Lovergine ]
   * Added liblas-dev b-d to support new Lidar modules.
diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch
new file mode 100644
index 0000000..50865f7
--- /dev/null
+++ b/debian/patches/allows-to-typo.patch
@@ -0,0 +1,90 @@
+Description: Fix 'allows to' typo, replace with 'allows <verb>ing'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/2704
+
+--- a/gui/wxpython/vdigit/g.gui.vdigit.html
++++ b/gui/wxpython/vdigit/g.gui.vdigit.html
+@@ -43,7 +43,7 @@ A new vector map can be easily created f
+ selecting "New vector map" in "Select vector map"
+ combobox. A new vector map is created, added to the current layer tree
+ in Layer Manager and opened for editing. "Select vector map"
+-combobox in the digitizer toolbar also allows to easily switch between
++combobox in the digitizer toolbar also allows easily switching between
+ vector maps to be edited.
+ 
+ <h3>EDITING AN EXISTING VECTOR MAP</h3>
+--- a/doc/parms_flags.txt
++++ b/doc/parms_flags.txt
+@@ -64,7 +64,7 @@ Import:
+ Export:
+ *  input=name file=name for all raster, sites and vector modules
+ *  export modules should *all* have an output= parameter, however they
+-   should allow to specify "-" to write to stdout (for unix piping)
++   should allow specifying "-" to write to stdout (for unix piping)
+ 
+ -> file is external file. Should be read from current directory, not
+    within mapset!
+--- a/gui/wxpython/docs/wxGUI.nviz.html
++++ b/gui/wxpython/docs/wxGUI.nviz.html
+@@ -296,7 +296,7 @@ attributes.
+ 
+ <h4>Cutting planes</h4>
+ 
+-Cutting planes allow to cut surfaces along a plane. You can switch 
++Cutting planes allow cutting surfaces along a plane. You can switch 
+ between six planes; to disable cutting planes switch to <em>None</em>.
+ Initially the plane is vertical, you can change it to horizontal by
+ setting <em>tilt</em> 90 degrees. The <em>X</em> and <em>Y</em> values
+--- a/gui/wxpython/web_services/widgets.py
++++ b/gui/wxpython/web_services/widgets.py
+@@ -964,7 +964,7 @@ class LayersList(TreeListCtrl, listmix.L
+         return sel_layers_dict
+ 
+     def OnListSelChanging(self, event):
+-        """Do not allow to select items, which cannot be requested from server.
++        """Do not allow selecting items, which cannot be requested from server.
+         """
+         def _emitSelected(layer):
+             title = layer.GetLayerData('title')
+--- a/lib/ogsf/gs2.c
++++ b/lib/ogsf/gs2.c
+@@ -1711,7 +1711,7 @@ int GS_load_att_map(int id, const char *
+ 	tbuff = gs_get_att_typbuff(gs, att, 1);
+ 
+ 	/* TODO: Provide mechanism for loading certain attributes at
+-	   specified sizes, allow to scale or cap, or scale non-zero */
++	   specified sizes, allow scaling or capping, or scale non-zero */
+ 	if (ATT_MASK == att) {
+ 	    atty = ATTY_MASK;
+ 	}
+@@ -3343,7 +3343,7 @@ int GS_load_3dview(const char *vname, in
+ /*!
+    \brief Init viewpoint
+ 
+-   \todo allow to set center?
++   \todo allow setting center?
+  */
+ void GS_init_view(void)
+ {
+--- a/raster/r.null/r.null.html
++++ b/raster/r.null/r.null.html
+@@ -36,7 +36,7 @@ Note that value is restricted to integer
+ <p><em>r.null</em> and reclassified maps:<br>
+ The problem is, if r.null was run on the reclass raster it would alter the
+ original and any other reclass rasters of the original.  Therefore r.null 
+-doesn't allow to recode reclassified maps (products of r.reclass).
++doesn't allow recoding reclassified maps (products of r.reclass).
+ <br>
+ So, the way to recode such a map is: The user makes a raster out of the
+ reclass that isn't a reclass by copying it:<br>
+--- a/temporal/t.rast.accdetect/t.rast.accdetect.html
++++ b/temporal/t.rast.accdetect/t.rast.accdetect.html
+@@ -24,7 +24,7 @@ The <b>minimum</b> and <b>maximum</b> va
+ process can be set, either by using space time raster datasets or 
+ by using fixed values for all raster cells and time steps. 
+ <p>
+-Using space time raster datasets allow to specify minimum and maximum 
++Using space time raster datasets allow specifying minimum and maximum 
+ values for each raster cell and each time step. For example, we want to 
+ detect the germination (minimum value) and harvesting (maximum value) 
+ dates for different crops in Germany using the growing-degree-day (GDD) 
diff --git a/debian/patches/length-typo.patch b/debian/patches/length-typo.patch
new file mode 100644
index 0000000..882c270
--- /dev/null
+++ b/debian/patches/length-typo.patch
@@ -0,0 +1,438 @@
+Description: Fix 'lenght' typo, replace with 'length'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/2704
+
+--- a/gui/wxpython/lmgr/frame.py
++++ b/gui/wxpython/lmgr/frame.py
+@@ -1007,7 +1007,7 @@ class GMFrame(wx.Frame):
+             # can be relaxed in future
+             # but keep it strict unless needed otherwise
+             raise ValueError("OnChangeCWD cmd parameter must be list of"
+-                             " lenght 1 or 2 and 'cd' as a first item")
++                             " length 1 or 2 and 'cd' as a first item")
+         if cmd and len(cmd) > 2:
+             # this might be a user error
+             write_beginning(command=cmd)
+--- a/gui/wxpython/rlisetup/wizard.py
++++ b/gui/wxpython/rlisetup/wizard.py
+@@ -671,9 +671,9 @@ class KeyboardPage(TitledPage):
+         self.sizer.Add(item=self.RowUpLefttxt, border=5, pos=(2, 2),
+                        flag=wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL | wx.ALL)
+ 
+-        #row lenght
++        #row length
+         self.RowLenlabel = wx.StaticText(parent=self, id=wx.ID_ANY,
+-                                         label=_('Row lenght of sampling frame'))
++                                         label=_('Row length of sampling frame'))
+ 
+         self.RowLentxt = wx.TextCtrl(parent=self, id=wx.ID_ANY, size=(250, -1))
+         wx.CallAfter(self.RowLenlabel.SetFocus)
+@@ -683,9 +683,9 @@ class KeyboardPage(TitledPage):
+         self.sizer.Add(item=self.RowLentxt, border=5, pos=(3, 2),
+                        flag=wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL | wx.ALL)
+ 
+-        #column lenght
++        #column length
+         self.ColLenlabel = wx.StaticText(parent=self, id=wx.ID_ANY,
+-                                         label=_('Row lenght of sampling frame'))
++                                         label=_('Row length of sampling frame'))
+ 
+         self.ColLentxt = wx.TextCtrl(parent=self, id=wx.ID_ANY, size=(250, -1))
+         wx.CallAfter(self.ColLenlabel.SetFocus)
+--- a/imagery/i.atcorr/6s.cpp
++++ b/imagery/i.atcorr/6s.cpp
+@@ -75,7 +75,7 @@ int init_6S(char* icnd_name)
+     iwave = IWave::Parse();
+    
+     /**********************************************************************c
+-	c here, we first compute an equivalent wavelenght which is the input   c
++	c here, we first compute an equivalent wavelength which is the input   c
+ 	c value for monochromatic conditions or the integrated value for a     c
+ 	c filter function (call equivwl) then, the atmospheric properties are  c
+ 	c computed for that wavelength (call discom then call specinterp)      c
+--- a/imagery/i.segment/create_isegs.c
++++ b/imagery/i.segment/create_isegs.c
+@@ -945,7 +945,7 @@ double calculate_shape(struct reg_stats
+      Wb is the weigh given to band B
+      SigmaB is the std dev of the object for band b
+      Ws is a user-defined weight giving the importance of compactedness vs smoothness
+-     PL is the perimeter lenght of the object
++     PL is the perimeter length of the object
+      Npx the number of pixels within the object
+      Pbbox the perimeter of the bounding box of the object.
+      */
+--- a/include/iostream/empq_impl.h
++++ b/include/iostream/empq_impl.h
+@@ -556,7 +556,7 @@ long em_pqueue<T,Key>::maxlen() {
+ //return the total nb of elements in the structure 
+ template<class T, class Key>
+ unsigned long em_pqueue<T,Key>::size() {
+-  //sum up the lenghts(nb of elements) of the external buffers 
++  //sum up the lengths(nb of elements) of the external buffers 
+   unsigned long elen = 0;
+   for (unsigned short i=0; i < crt_buf; i++) {
+     elen += buff[i]->get_buf_len();
+@@ -1538,7 +1538,7 @@ em_pqueue<T,Key>::print() {
+ //************************************************************/
+ template<class T, class Key>
+ void em_pqueue<T,Key>::print_size() {
+-  //sum up the lenghts(nb of elements) of the external buffers 
++  //sum up the lengths(nb of elements) of the external buffers 
+   long elen = 0;
+   cout << "EMPQ: pq=" << pq->size() <<",B0=" << buff_0->get_buf_len() << endl;
+   cout.flush();
+--- a/lib/python/pygrass/raster/category.py
++++ b/lib/python/pygrass/raster/category.py
+@@ -311,7 +311,7 @@ class Category(list):
+                 elif len(cat) == 3:
+                     label, min_cat, max_cat = cat
+                 else:
+-                    raise TypeError("Row lenght is greater than 3")
++                    raise TypeError("Row length is greater than 3")
+                 #import pdb; pdb.set_trace()
+                 self.append((label, min_cat, max_cat))
+ 
+--- a/lib/python/pygrass/utils.py
++++ b/lib/python/pygrass/utils.py
+@@ -302,7 +302,7 @@ def set_path(modulename, dirname, path='
+         sys.path.append(path)
+ 
+ 
+-def split_in_chunk(iterable, lenght=10):
++def split_in_chunk(iterable, length=10):
+     """Split a list in chunk.
+ 
+     >>> for chunk in split_in_chunk(range(25)): print chunk
+@@ -322,7 +322,7 @@ def split_in_chunk(iterable, lenght=10):
+     """
+     it = iter(iterable)
+     while True:
+-        chunk = tuple(itertools.islice(it, lenght))
++        chunk = tuple(itertools.islice(it, length))
+         if not chunk:
+             return
+         yield chunk
+--- a/lib/python/pygrass/vector/geometry.py
++++ b/lib/python/pygrass/vector/geometry.py
+@@ -617,7 +617,7 @@ class Line(Geo):
+             >>> line.get_pnt(5)      #doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+             Traceback (most recent call last):
+                 ...
+-            ValueError: The distance exceed the lenght of the line,
++            ValueError: The distance exceed the length of the line,
+             that is: 1.414214
+             >>> line.get_pnt(1)
+             Point(0.707107, 0.707107)
+@@ -627,7 +627,7 @@ class Line(Geo):
+         # instantiate an empty Point object
+         maxdist = self.length()
+         if distance > maxdist:
+-            str_err = "The distance exceed the lenght of the line, that is: %f"
++            str_err = "The distance exceed the length of the line, that is: %f"
+             raise ValueError(str_err % maxdist)
+         pnt = Point(0, 0, -9999)
+         if not libvect.Vect_point_on_line(self.c_points, distance,
+--- a/lib/vector/Vlib/net.c
++++ b/lib/vector/Vlib/net.c
+@@ -63,7 +63,7 @@ static int clipper(dglGraph_s * pgraph,
+    \brief Build network graph.
+ 
+    Internal format for edge costs is integer, costs are multiplied
+-   before conversion to int by 1000 and for lenghts LL without geo flag by 1000000.
++   before conversion to int by 1000 and for lengths LL without geo flag by 1000000.
+    The same multiplication factor is used for nodes.
+    Costs in database column may be 'integer' or 'double precision' number >= 0
+    or -1 for infinity i.e. arc or node is closed and cannot be traversed
+--- a/locale/po/grassmods_pt.po
++++ b/locale/po/grassmods_pt.po
+@@ -37836,7 +37836,7 @@ msgstr "Camada n�mero"
+ #, fuzzy
+ msgid "For coor valid point/centroid, for length valid line/boundary"
+ msgstr ""
+-"Tipo dos elementos (coor para ponto/centr�ide v�lido, lenght para linha/"
++"Tipo dos elementos (coor para ponto/centr�ide v�lido, length para linha/"
+ "contorno v�lido)"
+ 
+ #: ../vector/v.to.db/parse.c:54
+--- a/locale/po/grasswxpy_cs.po
++++ b/locale/po/grasswxpy_cs.po
+@@ -17611,7 +17611,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:751
+--- a/locale/po/grasswxpy_de.po
++++ b/locale/po/grasswxpy_de.po
+@@ -4006,7 +4006,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_el.po
++++ b/locale/po/grasswxpy_el.po
+@@ -3841,7 +3841,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_es.po
++++ b/locale/po/grasswxpy_es.po
+@@ -4064,7 +4064,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_fr.po
++++ b/locale/po/grasswxpy_fr.po
+@@ -3778,7 +3778,7 @@ msgstr "Ligne du coin en haut à gauche"
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr "Nombre de lignes du cadre d'échantillonage"
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_id.po
++++ b/locale/po/grasswxpy_id.po
+@@ -4142,7 +4142,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_it.po
++++ b/locale/po/grasswxpy_it.po
+@@ -3887,7 +3887,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_ja.po
++++ b/locale/po/grasswxpy_ja.po
+@@ -4028,7 +4028,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_ko.po
++++ b/locale/po/grasswxpy_ko.po
+@@ -3746,7 +3746,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_lv.po
++++ b/locale/po/grasswxpy_lv.po
+@@ -3768,7 +3768,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_ml.po
++++ b/locale/po/grasswxpy_ml.po
+@@ -3951,7 +3951,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_pl.po
++++ b/locale/po/grasswxpy_pl.po
+@@ -3938,7 +3938,7 @@ msgstr "Wiersz górnego lewego rogu"
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_pt.po
++++ b/locale/po/grasswxpy_pt.po
+@@ -4137,7 +4137,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_pt_br.po
++++ b/locale/po/grasswxpy_pt_br.po
+@@ -4271,7 +4271,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_ro.po
++++ b/locale/po/grasswxpy_ro.po
+@@ -4018,7 +4018,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_ru.po
++++ b/locale/po/grasswxpy_ru.po
+@@ -4111,7 +4111,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_th.po
++++ b/locale/po/grasswxpy_th.po
+@@ -3949,7 +3949,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_tr.po
++++ b/locale/po/grasswxpy_tr.po
+@@ -4103,7 +4103,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_vi.po
++++ b/locale/po/grasswxpy_vi.po
+@@ -4097,7 +4097,7 @@ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr ""
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/locale/po/grasswxpy_zh.po
++++ b/locale/po/grasswxpy_zh.po
+@@ -3944,7 +3944,7 @@ msgstr "左上角行"
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:676
+ #: ../gui/wxpython/rlisetup/wizard.py:688
+-msgid "Row lenght of sampling frame"
++msgid "Row length of sampling frame"
+ msgstr "取样框架行长度"
+ 
+ #: ../gui/wxpython/rlisetup/wizard.py:802
+--- a/mswindows/GRASS-Installer.nsi.tmpl
++++ b/mswindows/GRASS-Installer.nsi.tmpl
+@@ -317,8 +317,8 @@ FunctionEnd
+ 
+ ;Function CheckInstDir
+ ;	Var /GLOBAL INSTDIR_TEST
+-;	Var /GLOBAL INSTDIR_LENGHT	
+-;	Var /GLOBAL INSTDIR_TEST_LENGHT
++;	Var /GLOBAL INSTDIR_LENGTH	
++;	Var /GLOBAL INSTDIR_TEST_LENGTH
+ ;	Var /GLOBAL MESSAGE_CHKINST_
+ ;	
+ ;	StrCpy $MESSAGE_CHKINST_ "WARNING: you are about to install GRASS into a directory that has spaces$\r$\n"
+@@ -330,10 +330,10 @@ FunctionEnd
+ ;	
+ ;	${StrReplace} "$INSTDIR_TEST" " " "" "$INSTDIR"
+ ;	
+-;	StrLen $INSTDIR_LENGHT "$INSTDIR"
+-;	StrLen $INSTDIR_TEST_LENGHT "$INSTDIR_TEST"
++;	StrLen $INSTDIR_LENGTH "$INSTDIR"
++;	StrLen $INSTDIR_TEST_LENGTH "$INSTDIR_TEST"
+ ;	
+-;	${If} $INSTDIR_TEST_LENGHT < $INSTDIR_LENGHT	
++;	${If} $INSTDIR_TEST_LENGTH < $INSTDIR_LENGTH	
+ ;		MessageBox MB_OK|MB_ICONEXCLAMATION "$MESSAGE_CHKINST_"
+ ;	${EndIf}
+ ;	
+--- a/raster/r.distance/defs.h
++++ b/raster/r.distance/defs.h
+@@ -30,7 +30,7 @@ struct EdgeList			/* keep track of edge
+ 	CELL cat;		/* category number */
+ 	int *row, *col;		/* arrays of pixels indexes */
+ 	int ncells;		/* count of edges cells with this cat */
+-	int nalloc;		/* lenght of allocation for row,col */
++	int nalloc;		/* length of allocation for row,col */
+     } *catlist;			/* array of cat:edgelists */
+     int ncats;			/* number of cats */
+     int nalloc;			/* length of allocation for catlist */
+--- a/raster/r.li/r.li.daemon/daemon.h
++++ b/raster/r.li/r.li.daemon/daemon.h
+@@ -223,8 +223,8 @@ void worker_end(void);
+   * \brief adapts the mask at current raster file
+   * \param mask name of mask raster file
+   * \param raster the name of current raster file
+-  * \param rl the lenght in rows of sample area
+-  * \param cl the lenght in cols of sample area
++  * \param rl the length in rows of sample area
++  * \param cl the length in cols of sample area
+   * \return the name of mask raster file to use
+   */
+ char *mask_preprocessing(char *mask, char *raster, struct area_entry *ad);
+--- a/raster/r.neighbors/r.neighbors.html
++++ b/raster/r.neighbors/r.neighbors.html
+@@ -159,7 +159,7 @@ The result is rounded to the nearest int
+ <em>Neighborhood Size:</em>
+ The neighborhood <b>size</b> specifies which cells surrounding any given
+ cell fall into the neighborhood for that cell.
+-The <b>size</b> must be an odd integer and represent the lenght of one of
++The <b>size</b> must be an odd integer and represent the length of one of
+ moving window edges in cells.
+ For example, a size value of 3 will result in
+ <div class="code"><pre>
diff --git a/debian/patches/permit-to-typo.patch b/debian/patches/permit-to-typo.patch
new file mode 100644
index 0000000..013136b
--- /dev/null
+++ b/debian/patches/permit-to-typo.patch
@@ -0,0 +1,15 @@
+Description: Fix 'permit to' typo, replace with 'permit <verb>ing'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/2704
+
+--- a/raster/r.relief/r.relief.html
++++ b/raster/r.relief/r.relief.html
+@@ -85,7 +85,7 @@ r.relief input=srtm output=srtm_shaded s
+ 
+ <h3>Exporting shaded relief maps to GeoTIFF</h3>
+ 
+-The data range of shaded relief maps usually does not permit to export the
++The data range of shaded relief maps usually does not permit exporting the
+ map to GeoTIFF format along with its associated color table due to limitations
+ in the GeoTIFF format.
+ <p>
diff --git a/debian/patches/series b/debian/patches/series
index ba4211d..a85523d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,6 @@ python-ctypes-ternary.patch
 no-fail-html.patch
 desktop.patch
 appstream.patch
+allows-to-typo.patch
+length-typo.patch
+permit-to-typo.patch

-- 
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