Skip to content
Commits on Source (13)
Show whitespace changes
Inline Side-by-side
config.guess
View file @ 37ba4609
......@@ -890,7 +890,7 @@ EOF
echo "$UNAME_MACHINE"-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
echo x86_64-pc-cygwin
exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
......
config.sub
View file @ 37ba4609
......@@ -89,7 +89,7 @@ while test $# -gt 0 ; do
- ) # Use stdin as input.
break ;;
-* )
echo "$me: invalid option $1$help"
echo "$me: invalid option $1$help" >&2
exit 1 ;;
*local*)
......@@ -149,7 +149,7 @@ case $1 in
esac
;;
*-*)
# A lone config we happen to match not fitting any patern
# A lone config we happen to match not fitting any pattern
case $field1-$field2 in
decstation-3100)
basic_machine=mips-dec
......@@ -950,7 +950,7 @@ unset -v basic_machine
# Decode basic machines in the full and proper CPU-Company form.
case $cpu-$vendor in
# Here we handle the default manufacturer of certain CPU types in cannonical form. It is in
# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
# some cases the only manufacturer, in others, it is the most popular.
craynv-unknown)
vendor=cray
......@@ -1101,7 +1101,7 @@ case $cpu-$vendor in
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
# Recognize the cannonical CPU Types that limit and/or modify the
# Recognize the canonical CPU Types that limit and/or modify the
# company names they are paired with.
cr16-*)
os=${os:-elf}
......@@ -1150,7 +1150,7 @@ case $cpu-$vendor in
;;
*)
# Recognize the cannonical CPU types that are allowed with any
# Recognize the canonical CPU types that are allowed with any
# company name.
case $cpu in
1750a | 580 \
......@@ -1161,6 +1161,7 @@ case $cpu-$vendor in
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
| alphapca5[67] | alpha64pca5[67] \
| am33_2.0 \
| amdgcn \
| arc | arceb \
| arm | arm[lb]e | arme[lb] | armv* \
| avr | avr32 \
......@@ -1360,7 +1361,7 @@ case $os in
| powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
| skyos* | haiku* | rdos* | toppers* | drops* | es* \
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd*)
| midnightbsd* | amdhsa*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
qnx*)
......
debian/changelog
View file @ 37ba4609
grass (7.4.3~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Drop libegl1-mesa-dev build dependency, issue fixed in mesa 18.2.5-2.
-- Bas Couwenberg <sebastic@debian.org> Sat, 24 Nov 2018 22:19:21 +0100
grass (7.4.2-2) unstable; urgency=medium
* Add libegl1-mesa-dev to build dependencies for KHR/khrplatform.h.
GL/glext.h from mesa-common-dev includes this header, but lacks dependency.
-- Bas Couwenberg <sebastic@debian.org> Tue, 20 Nov 2018 17:51:16 +0100
grass (7.4.2-1) unstable; urgency=medium
* New upstream release.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Tue, 23 Oct 2018 07:19:09 +0200
grass (7.4.2~rc2-1~exp1) experimental; urgency=medium
* New upstream release candidate.
......
debian/control
View file @ 37ba4609
......@@ -16,11 +16,11 @@ Build-Depends: autoconf2.13,
libblas-dev,
libbz2-dev,
libcairo2-dev,
libegl1-mesa-dev,
libfftw3-dev,
libfreetype6-dev,
libgdal-dev (>= 2.0),
libgeos-dev,
libglu1-mesa-dev,
libjpeg-dev,
liblapack-dev,
liblas-c-dev (>= 1.8.0-8~),
......
doc/howto_release.txt
View file @ 37ba4609
How to release GRASS GIS binaries and source code
$Date: 2018-10-14 14:46:28 +0200 (Sun, 14 Oct 2018) $
$Date: 2018-10-22 22:53:05 +0200 (Mon, 22 Oct 2018) $
Note: This text contains *some* rules only applicable to the
development coordinator (currently Markus Neteler, PSC Chair).
......@@ -110,7 +110,7 @@ svn ci -m"GRASS GIS $VERSION" include/VERSION
svn up
# Create Changelog file on release branch:
# http://ch.tudelft.nl/~arthur/svn2cl/
# https://arthurdejong.org/svn2cl/
svn2cl
mv ChangeLog ChangeLog_$VERSION
head ChangeLog_$VERSION
......@@ -210,7 +210,7 @@ vim grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
- Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.4.x --> Edit Milestone
- also: Retarget associated open tickets to milestone 7.4.x
- Batch modify tickets, set to next milestone (update this query accordingly: two entries to change)
https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.4.0&milestone=7.4.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.4.0&milestone=7.4.1&milestone=7.4.2&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
- Set max items to 1000, then select all shown tickets via Status: assigned/new/reopened sections
- Scroll down to "Batch modify": under the "Comment" section, add Field "Milestone" and set to next version
- then use "Change ticket" button, done.
......@@ -233,7 +233,7 @@ vim grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
- Modify grass_copy_wwwroot.sh accordingly, eg.
copy_addon 741RC1 7.4.1RC1
copy_addon 741RC1 7.4.2RC1
# Launchpad notes:
......
doc/python/script/r.example.html
View file @ 37ba4609
<h2>DESCRIPTION</h2>
<em>r.example</em> selects values from raster above value of mean plus
standard deviation
standard deviation.
See the source code for details.
<h2>NOTES</h2>
Some more detailed notes go here.
<h2>EXAMPLE</h2>
Computing the mean and standard deviation of the raster map "elevation"
(North Carolina sample dataset):
<div class="code"><pre>
g.region raster=elevation -p
r.example input=elevation output=elevation_mean_stddev
r.info elevation_mean_stddev
</pre></div>
<h2>SEE ALSO</h2>
<em>
<a href="r.univar.html">r.univar</a>,
<a href="r.mapcalc.html">r.mapcalc</a>
<a href="r.mapcalc.html">r.mapcalc</a>,
<a href="v.example.html">v.example</a>
</em>
<a href="http://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
<h2>AUTHOR</h2>
<h2>AUTHORS</h2>
GRASS Development Team
<p><i>Last changed: $Date: 2017-11-03 18:21:39 +0100 (Fri, 03 Nov 2017) $</i>
<p><i>Last changed: $Date: 2018-11-13 17:36:50 +0100 (Tue, 13 Nov 2018) $</i>
doc/raster/r.example/r.example.html
View file @ 37ba4609
<h2>DESCRIPTION</h2>
<em>r.example</em> does practically do nothing, except
for illustrating GRASS raster programming. It copies
for illustrating GRASS GIS raster programming. It copies
over an existing raster map to a new raster map.
See the source code for details.
<h2>NOTES</h2>
Some more detailed notes go here.
<h2>EXAMPLE</h2>
Create a copy of the raster map "elevation"
(North Carolina sample dataset):
<div class="code"><pre>
g.region raster=elevation -p
r.example input=elevation output=elevation2
r.info elevation2
</pre></div>
<h2>SEE ALSO</h2>
<em>
<a href="r.stats.html">r.stats</a>,
<a href="http://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
<a href="v.example.html">v.example</a>
</em>
<em>
<a href="https://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
</em>
<h2>AUTHOR</h2>
<h2>AUTHORS</h2>
GRASS Development Team
<p><i>Last changed: $Date: 2014-08-05 23:45:01 +0200 (Tue, 05 Aug 2014) $</i>
<p><i>Last changed: $Date: 2018-11-13 17:36:50 +0100 (Tue, 13 Nov 2018) $</i>
doc/vector/v.example/v.example.html
View file @ 37ba4609
......@@ -3,21 +3,35 @@
<em>v.example</em> is an example vector module that does something like
labeling all vectors with value 1. A new map is written instead of updating
the input map.
See the source code for details.
<h2>NOTES</h2>
Some more detailed notes go here.
<h2>EXAMPLE</h2>
Label all vectors with value 1 (North Carolina sample dataset):
<div class="code"><pre>
v.example input=map output=newmap
v.example input=zipcodes_wake output=newmap
v.category newmap option=report
</pre></div>
<h2>SEE ALSO</h2>
<em>
<a href="http://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
<a href="r.example.html">r.example</a>,
<a href="v.category.html">r.category</a>,
<a href="v.example.html">v.example</a>
</em>
<em>
<a href="https://grass.osgeo.org/programming7/">GRASS Programmer's Manual</a>
</em>
<h2>AUTHOR</h2>
<h2>AUTHORS</h2>
Radim Blazek, ITC-irst, Trento, Italy
<p><i>Last changed: $Date: 2012-07-19 18:56:09 +0200 (Thu, 19 Jul 2012) $</i>
<p><i>Last changed: $Date: 2018-11-13 17:36:50 +0100 (Tue, 13 Nov 2018) $</i>
gui/wxpython/docs/wxGUI.iscatt.html
View file @ 37ba4609
<!-- meta page description: wxGUI Interactive Scatter Plot Tool-->
<!-- meta page index: wxGUI -->
<h2>KEYWORDS</h2>
<a href="display.html">display</a>, <a href="topic_GUI.html">GUI</a>, <a href="keywords.html#imagery">imagery</a>, <a href="keywords.html#scatter plot">scatter plot</a>
<h2>DESCRIPTION</h2>
<b>Interactive Scatter Plot Tool</b> allows analyzing group of raster
......@@ -82,4 +86,4 @@ Turek, <a href="http://grasswiki.osgeo.org/wiki/GRASS_GSoC_2013_GRASS_GIS_Intera
Summer of Code 2013</a> (mentor: Martin Landa)
<p>
<i>$Date: 2015-10-22 00:30:01 +0200 (Thu, 22 Oct 2015) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
gui/wxpython/docs/wxGUI.nviz.html
View file @ 37ba4609
<!-- meta page description: wxGUI 3D View Mode -->
<!-- meta page index: wxGUI -->
<h2>KEYWORDS</h2>
<a href="display.html">display</a>, <a href="topic_GUI.html">GUI</a>, <a href="keywords.html#visualization">visualization</a>, <a href="keywords.html#graphics">graphics</a>, <a href="keywords.html#raster">raster</a>, <a href="keywords.html#vector">vector</a>, <a href="keywords.html#raster3d">raster3d</a>
<h2>DESCRIPTION</h2>
Note: <b>wxNviz is currently under development. Not
......@@ -440,4 +445,4 @@ with contributions by Terrance McGhee.
<p>
<i>$Date: 2015-07-11 16:01:46 +0200 (Sat, 11 Jul 2015) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
gui/wxpython/docs/wxGUI.rdigit.html
View file @ 37ba4609
<!-- meta page description: wxGUI Raster Digitizer -->
<!-- meta page index: wxGUI -->
<h2>KEYWORDS</h2>
<a href="display.html">display</a>, <a href="topic_GUI.html">GUI</a>, <a href="keywords.html#raster">raster</a>, <a href="keywords.html#editing">editing</a>, <a href="keywords.html#digitizer">digitizer</a>
<h2>DESCRIPTION</h2>
<b>Raster Digitizer</b> is a simple tool to quickly
......@@ -68,12 +72,13 @@ r.sun elevation=elev_edited aspect=elev_aspect slope=elev_slope beam_rad=beam da
<em>
<a href="wxGUI.html">wxGUI</a><br>
<a href="wxGUI.components.html">wxGUI components</a><br>
<a href="r.in.poly.html">r.in.poly</a> (backend of digitizer)
<a href="wxGUI.components.html">wxGUI components</a>,<br>
<a href="r.in.poly.html">r.in.poly</a> (backend of digitizer),<br>
<a href="g.gui.vdigit.html">g.gui.vdigit</a>
</em>
<h2>AUTHOR</h2>
Anna Petrasova, NCSU GeoForALL Laboratory
<p>
<i>$Date: 2017-11-23 04:11:11 +0100 (Thu, 23 Nov 2017) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
gui/wxpython/docs/wxGUI.vnet.html
View file @ 37ba4609
<!-- meta page description: wxGUI Vector Network Analysis Tool -->
<!-- meta page index: wxGUI -->
<h2>KEYWORDS</h2>
<a href="vector.html">vector</a>, <a href="topic_network.html">network</a>, <a href="keywords.html#vector">vector</a>
<h2>DESCRIPTION</h2>
<b>Vector Network Analysis Tool</b> is graphical front-end
......@@ -104,4 +108,4 @@ Turek, <a href="http://grasswiki.osgeo.org/wiki/GRASS_GSoC_2012_WxGUI_front_end_
Summer of Code 2012</a> (mentor: Martin Landa)
<p>
<i>$Date: 2013-09-30 23:56:24 +0200 (Mon, 30 Sep 2013) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
gui/wxpython/iclass/g.gui.iclass.html
View file @ 37ba4609
<!-- meta page description: wxGUI Supervised Classification Tool -->
<!-- meta page index: topic_gui|GUI -->
<h2>KEYWORDS</h2>
<a href="display.html">display</a>, <a href="topic_GUI.html">GUI</a>, <a href="keywords.html#imagery">imagery</a>, <a href="keywords.html#classification">classification</a>, <a href="keywords.html#supervised classification">supervised classification</a>
<h2>DESCRIPTION</h2>
<p>
......@@ -90,4 +95,4 @@ Vaclav Petras,
<a href="http://www.cvut.cz">Czech Technical University in Prague</a>, Czech Republic
<p>
<i>$Date: 2014-04-20 15:20:39 +0200 (Sun, 20 Apr 2014) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
gui/wxpython/psmap/g.gui.psmap.html
View file @ 37ba4609
......@@ -214,8 +214,8 @@ See also <a href="http://grasswiki.osgeo.org/wiki/WxGUI_Cartographic_Composer">w
<h2>AUTHOR</h2>
Anna Kratochvilova, Czech Technical Univesity in Prague, Czech
Anna Kratochvilova, Czech Technical University in Prague, Czech
Republic (bachelor's final project 2011, mentor: Martin Landa)
<p>
<i>$Date: 2018-08-14 02:59:58 +0200 (Tue, 14 Aug 2018) $</i>
<i>$Date: 2018-10-18 21:13:18 +0200 (Thu, 18 Oct 2018) $</i>
gui/wxpython/rlisetup/wizard.py
View file @ 37ba4609
......@@ -885,7 +885,7 @@ class SamplingAreasPage(TitledPage):
_("Sample units"),
_("Moving window"),
_("Select areas from the\n"
"overlayed vector map")],
"overlaid vector map")],
majorDimension=1,
style=wx.RA_SPECIFY_COLS | wx.NO_BORDER)
# layout
......
gui/wxpython/vdigit/g.gui.vdigit.html
View file @ 37ba4609
......@@ -292,7 +292,8 @@ boundaries are automatically attached to the chosen points.
<em>
<a href="v.edit.html">v.edit</a>,
<a href="v.category.html">v.category</a>,
<a href="v.build.html">v.build</a>
<a href="v.build.html">v.build</a>,
<a href="wxGUI.rdigit.html">wxGUI.rdigit</a>
</em>
<p>
......@@ -306,4 +307,4 @@ Martin Landa, FBK-irst (2007-2008), Trento, Italy, and Czech Technical
University in Prague, Czech Republic
<p>
<i>$Date: 2015-08-03 14:53:38 +0200 (Mon, 03 Aug 2015) $</i>
<i>$Date: 2018-10-14 21:39:52 +0200 (Sun, 14 Oct 2018) $</i>
imagery/i.gensigset/i.gensigset.html
View file @ 37ba4609
......@@ -41,7 +41,7 @@ a combination of
<em><a href="wxGUI.vdigit.html">wxGUI vector digitizer</a></em>
and
<em><a href="v.to.rast.html">v.to.rast</a></em>,
or some other import/developement process (e.g.,
or some other import/development process (e.g.,
<em><a href="v.transects.html">v.transects</a>)</em>
to define the areas representative of the classes in the image.
......@@ -231,4 +231,4 @@ School of Electrical Engineering, Purdue University
Michael Shapiro,
U.S.Army Construction Engineering Research Laboratory
<p><i>Last changed: $Date: 2015-02-14 22:07:18 +0100 (Sat, 14 Feb 2015) $</i>
<p><i>Last changed: $Date: 2018-10-18 21:13:18 +0200 (Thu, 18 Oct 2018) $</i>