[Git][debian-gis-team/grass][ubuntugis/bionic] 9 commits: Add libegl1-mesa-dev to build dependencies for KHR/khrplatform.h.
Martin Landa
gitlab at salsa.debian.org
Sun Nov 25 13:15:27 GMT 2018
Martin Landa pushed to branch ubuntugis/bionic at Debian GIS Project / grass
Commits:
73a8a070 by Bas Couwenberg at 2018-11-20T16:51:14Z
Add libegl1-mesa-dev to build dependencies for KHR/khrplatform.h.
GL/glext.h from mesa-common-dev includes this header, but lacks dependency.
- - - - -
15133e00 by Bas Couwenberg at 2018-11-20T16:51:24Z
Set distribution to unstable.
- - - - -
b68c77c7 by Bas Couwenberg at 2018-11-21T06:36:45Z
Drop libegl1-mesa-dev build dependency, issue fixed in mesa 18.2.5-2.
- - - - -
645ef319 by Bas Couwenberg at 2018-11-24T21:17:30Z
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
05438d95 by Bas Couwenberg at 2018-11-24T21:17:57Z
New upstream version 7.4.3~rc1
- - - - -
53b8f860 by Bas Couwenberg at 2018-11-24T21:18:18Z
Merge tag 'upstream/7.4.3_rc1' into experimental
Upstream version 7.4.3~rc1
- - - - -
3924f08d by Bas Couwenberg at 2018-11-24T21:18:37Z
New upstream release candidate.
- - - - -
37ba4609 by Bas Couwenberg at 2018-11-24T21:19:35Z
Set distribution to experimental.
- - - - -
df011f5a by Martin Landa at 2018-11-25T13:05:18Z
Rebuild 7.4.3~rc1 for bionic
- - - - -
27 changed files:
- − ChangeLog_7.4.2.gz
- + ChangeLog_7.4.3RC1.gz
- config.guess
- config.sub
- debian/changelog
- debian/control
- doc/howto_release.txt
- doc/python/script/r.example.html
- doc/raster/r.example/r.example.html
- doc/vector/v.example/v.example.html
- include/VERSION
- lib/python/script/core.py
- lib/vector/diglib/spindex_rw.c
- lib/vector/rtree/index.c
- lib/vector/rtree/io.c
- raster/r.external/link.c
- raster/r.in.png/r.in.png.html
- raster/r.out.png/r.out.png.html
- raster/r.relief/main.c
- raster/r.relief/r.relief.html
- raster3d/r3.out.vtk/main.c
- raster3d/r3.out.vtk/r3.out.vtk.html
- rpm/grass.spec
- scripts/r.in.srtm/r.in.srtm.html
- scripts/r.in.srtm/r.in.srtm.py
- vector/v.generalize/main.c
- vector/v.select/main.c
Changes:
=====================================
ChangeLog_7.4.2.gz deleted
=====================================
Binary files a/ChangeLog_7.4.2.gz and /dev/null differ
=====================================
ChangeLog_7.4.3RC1.gz
=====================================
Binary files /dev/null and b/ChangeLog_7.4.3RC1.gz differ
=====================================
config.guess
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -1,3 +1,23 @@
+grass (7.4.3~rc1-1~exp1~bionic1) bionic; urgency=medium
+
+ * Rebuild for bionic.
+
+ -- Martin Landa <landa.martin at gmail.com> Sun, 25 Nov 2018 14:04:31 +0100
+
+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 at 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 at debian.org> Tue, 20 Nov 2018 17:51:16 +0100
+
grass (7.4.2-1~bionic1) bionic; urgency=medium
* Rebuild for bionic.
=====================================
debian/control
=====================================
@@ -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
=====================================
@@ -1,6 +1,6 @@
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
=====================================
@@ -1,18 +1,36 @@
<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
=====================================
@@ -1,20 +1,38 @@
<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
=====================================
@@ -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>
=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
7
4
-2
+3RC1
2018
=====================================
lib/python/script/core.py
=====================================
@@ -78,7 +78,7 @@ STDOUT = subprocess.STDOUT
raise_on_error = False # raise exception instead of calling fatal()
-_capture_stderr = True # capture stderr of subprocesses if possible
+_capture_stderr = False # capture stderr of subprocesses if possible
def call(*args, **kwargs):
=====================================
lib/vector/diglib/spindex_rw.c
=====================================
@@ -65,7 +65,8 @@ int dig_Wr_spidx_head(struct gvfile * fp, struct Plus_head *ptr)
/* use ptr->off_t_size = 4 if possible */
if (sizeof(off_t) > 4) {
- size = ptr->Node_spidx->n_nodes * ptr->Node_spidx->nodesize;
+ size = 145; /* max header size, see below */
+ size += ptr->Node_spidx->n_nodes * ptr->Node_spidx->nodesize;
size += ptr->Line_spidx->n_nodes * ptr->Line_spidx->nodesize;
size += ptr->Area_spidx->n_nodes * ptr->Area_spidx->nodesize;
size += ptr->Isle_spidx->n_nodes * ptr->Isle_spidx->nodesize;
=====================================
lib/vector/rtree/index.c
=====================================
@@ -84,13 +84,13 @@ struct RTree *RTreeCreateTree(int fd, off_t rootpos, int ndims)
new_rtree->free_nodes.pos = NULL;
new_rtree->rectsize = new_rtree->nsides_alloc * sizeof(RectReal);
+ new_rtree->branchsize = sizeof(struct RTree_Branch) -
+ sizeof(struct RTree_Rect) +
+ new_rtree->rectsize;
new_rtree->nodesize = sizeof(struct RTree_Node) -
- MAXCARD * sizeof(RectReal *) +
- MAXCARD * new_rtree->rectsize;
+ sizeof(struct RTree_Branch *) +
+ MAXCARD * new_rtree->branchsize;
- new_rtree->branchsize = sizeof(struct RTree_Branch) -
- sizeof(RectReal *) + new_rtree->rectsize;
-
/* create empty root node */
n = RTreeAllocNode(new_rtree, 0);
new_rtree->rootlevel = n->level = 0; /* leaf */
=====================================
lib/vector/rtree/io.c
=====================================
@@ -18,10 +18,12 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include <assert.h>
-#include <grass/config.h>
+#include <errno.h>
+#include <grass/gis.h>
#include "index.h"
/* #define USAGE_SWAP */
@@ -153,8 +155,12 @@ size_t RTreeWriteBranch(struct RTree_Branch *b, struct RTree *t)
{
size_t size = 0;
- size += write(t->fd, b->rect.boundary, t->rectsize);
- size += write(t->fd, &(b->child), sizeof(union RTree_Child));
+ if (write(t->fd, b->rect.boundary, t->rectsize) != t->rectsize)
+ G_fatal_error("RTreeWriteBranch(): Unable to write (%s)", strerror(errno));
+ size += t->rectsize;
+ if (write(t->fd, &(b->child), sizeof(union RTree_Child)) != sizeof(union RTree_Child))
+ G_fatal_error("RTreeWriteBranch(): Unable to write (%s)", strerror(errno));
+ size += sizeof(union RTree_Child);
return size;
}
@@ -166,8 +172,12 @@ size_t RTreeWriteNode(struct RTree_Node *n, struct RTree *t)
size_t size = 0;
/* file position must be set first with RTreeGetFNodePos() */
- size += write(t->fd, &(n->count), sizeof(int));
- size += write(t->fd, &(n->level), sizeof(int));
+ if (write(t->fd, &(n->count), sizeof(int)) != sizeof(int))
+ G_fatal_error("RTreeWriteNode(): Unable to write (%s)", strerror(errno));
+ size += sizeof(int);
+ if (write(t->fd, &(n->level), sizeof(int)) != sizeof(int))
+ G_fatal_error("RTreeWriteNode(): Unable to write (%s)", strerror(errno));
+ size += sizeof(int);
for (i = 0; i < MAXCARD; i++) {
size += RTreeWriteBranch(&(n->branch[i]), t);
=====================================
raster/r.external/link.c
=====================================
@@ -8,8 +8,6 @@
void query_band(GDALRasterBandH hBand, const char *output,
struct Cell_head *cellhd, struct band_info *info)
{
- int bGotMin, bGotMax;
-
info->gdal_type = GDALGetRasterDataType(hBand);
info->null_val = GDALGetRasterNoDataValue(hBand, &info->has_null);
@@ -49,10 +47,7 @@ void query_band(GDALRasterBandH hBand, const char *output,
break;
}
- info->range[0] = GDALGetRasterMinimum(hBand, &bGotMin);
- info->range[1] = GDALGetRasterMaximum(hBand, &bGotMax);
- if(!(bGotMin && bGotMax))
- GDALComputeRasterMinMax(hBand, 0, info->range);
+ GDALComputeRasterMinMax(hBand, 0, info->range);
Rast_init_colors(&info->colors);
=====================================
raster/r.in.png/r.in.png.html
=====================================
@@ -1,13 +1,20 @@
<h2>DESCRIPTION</h2>
-<em>r.in.png</em> imports a PNG image as a GRASS raster map.
+<em>r.in.png</em> imports a non-georeferenced Portable Network Graphics (PNG) image
+as a GRASS raster map. Georeferencing .wld files are not supported, for that
+<em>r.import</em> can be used.
+
+<h2>NOTES</h2>
+
+In order to assign georeferencing after import use <em>r.region</em>.
<h2>SEE ALSO</h2>
<em>
<a href="r.import.html">r.import</a>,
<a href="r.in.gdal.html">r.in.gdal</a>,
-<a href="r.out.png.html">r.out.png</a>
+<a href="r.out.png.html">r.out.png</a>,
+<a href="r.region.html">r.region</a>
</em>
<h2>AUTHORS</h2>
@@ -17,4 +24,4 @@ Alex Shevlakov<br>
Glynn Clements
<p>
-<i>Last changed: $Date: 2016-01-13 10:18:55 +0100 (Wed, 13 Jan 2016) $</i>
+<i>Last changed: $Date: 2018-11-05 14:29:44 +0100 (Mon, 05 Nov 2018) $</i>
=====================================
raster/r.out.png/r.out.png.html
=====================================
@@ -1,13 +1,15 @@
<h2>DESCRIPTION</h2>
-<em>r.out.png</em> exports a GRASS raster map in non-georeferenced PNG image
-format, respecting the current region resolution and bounds.
+<em>r.out.png</em> exports a GRASS raster map in non-georeferenced
+Portable Network Graphics (PNG) image format, respecting the current
+region resolution and bounds.
-<p>Optionally the user can choose to export a World File to provide basic
+<p>
+Optionally the user can choose to export a World File (.wld) to provide basic
georeferencing support. When used with the transparency flag this can
create images useful for KML, TMS, or WMS overlays. (e.g. for use in
-Google Earth or as OpenLayers tiles) If output is to stdout, the world
-file will be called <tt>png_map.wld</tt>.
+Google Earth or as OpenLayers tiles) If output is redirected to stdout,
+the world file will be called <tt>png_map.wld</tt>.
<h2>SEE ALSO</h2>
@@ -16,7 +18,7 @@ file will be called <tt>png_map.wld</tt>.
<a href="r.out.gdal.html">r.out.gdal</a>,
<a href="r.out.ppm.html">r.out.ppm</a>,
<a href="r.out.ascii.html">r.out.ascii</a>,
-<a href="r.in.png.html">r.in.png</a>
+<a href="r.import.html">r.import</a>
</em>
@@ -25,4 +27,4 @@ file will be called <tt>png_map.wld</tt>.
Alex Shevlakov<br>
Hamish Bowman
-<p><i>Last changed: $Date: 2014-11-01 20:57:37 +0100 (Sat, 01 Nov 2014) $</i>
+<p><i>Last changed: $Date: 2018-11-05 14:29:44 +0100 (Mon, 05 Nov 2018) $</i>
=====================================
raster/r.relief/main.c
=====================================
@@ -112,10 +112,11 @@ int main(int argc, char *argv[])
module->label = _("Creates shaded relief map from an elevation map (DEM).");
parm.elevation = G_define_standard_option(G_OPT_R_INPUT);
-
+ parm.elevation->description = _("Name of input raster (typically elevation) map");
+
parm.relief = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.relief->label = _("Name for output shaded relief map");
-
+ parm.relief->description = _("Name for output shaded relief map");
+
parm.altitude = G_define_option();
parm.altitude->key = "altitude";
parm.altitude->type = TYPE_DOUBLE;
=====================================
raster/r.relief/r.relief.html
=====================================
@@ -1,22 +1,20 @@
<h2>DESCRIPTION</h2>
-<em>r.relief</em> creates a raster shaded relief map based on
-current resolution settings and on sun altitude, azimuth, and
-z-exaggeration values entered by the user. If no output shademap
-name is given, the new shaded relief map is named <em><input_map
->.shade</em>. The map is assigned a grey-scale color table.
+<em>r.relief</em> creates a raster shaded relief map based on current
+resolution settings and on sun altitude, azimuth, and z-exaggeration
+values entered by the user.
<p>The parameters controlling the shading are:
<ol>
-<li>A raster map layer to provide elevation values for the shaded
-relief map. Typically, this would be a map layer of elevation;
+<li>An <b>input</b> raster map to provide elevation values for the shaded
+relief map. Typically, this would be a map layer of elevation;
however, any raster map layer can be named.
<li>The <b>altitude</b> of the sun in degrees above the horizon
(a value between 0 and 90 degrees).
-<li>The <b>azimuth</b> of the sun in degrees to the east of north
-(a value between 0 and 360 degrees; clockwise from north).
+<li>The <b>azimuth</b> of the sun in degrees to the east of north (a
+value between 0 and 360 degrees; clockwise from north)
<li>The scaling parameter, which compensates for a different
horizontal <b>scale</b> than vertical scale. If <b>scale</b> is a
@@ -25,7 +23,7 @@ calculate the shading. (Default=1.0 for equivalent horizontal and
vertical scales.)
<li>The <b>zscale</b> exaggeration factor that changes the apparent relief
-for the shaded relief map. This can be any positive (or negative) floating
+for the shaded relief map. This can be any positive (or negative) floating
point value. (Default=1.0)
<li>Horizontal distances are calculated in meters, using geodesic
@@ -42,10 +40,14 @@ shaded relief map.
<h2>NOTES</h2>
-To visually improve the result of shade maps from low resolution elevation
-models, use <em>r.resamp.interp</em> with bilinear or bicubic method to
-resample the DEM at higher resolution. <em>r.relief</em> is then
-run on the resampled DEM.
+To visually improve the result of shade maps from low resolution
+elevation models,
+use <em><a href="r.resamp.interp.html">r.resamp.interp</a></em> with
+bilinear or bicubic method to resample the DEM at higher
+resolution. <em>r.relief</em> is then run on the resampled DEM.
+
+<p>
+The current mask is ignored.
<h2>EXAMPLES</h2>
@@ -67,7 +69,10 @@ r.relief input=elevation output=elevation_shade
<h3>Colorizing a shaded relief map</h3>
-Color can be added later using <em><a href="r.shade.html">r.shade</a></em>:
+Color can be added later
+using <em><a href="r.shade.html">r.shade</a></em>
+or <em><a href="d.shade.html">d.shade</a></em>:
+
<div class="code"><pre>
r.shade shade=elevation_shade color=elevation output=elevation_shaded
</pre></div>
@@ -89,16 +94,17 @@ 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>
-The most simple way to export it while even reducing the file size is to
-export as palette byte map. This requires a conversion done in <tt>r.mapcalc</tt>,
-using the # operator to convert map category values to their grey scale
+The most simple way to export it while even reducing the file size is
+to export as palette byte map. This requires a conversion done
+in <em><a href="r.mapcalc.html">r.mapcalc</a></em>, using the #
+operator to convert map category values to their grey scale
equivalents:
<div class="code"><pre>
# using the map created above
# create new map from map category values
-r.mapcalc "elevation_shade_byte = #elevation_shade"
+r.mapcalc expression="elevation_shade_byte = #elevation_shade"
# verify data range
r.info elevation_shade_byte
@@ -118,13 +124,6 @@ gdaladdo --config GDAL_CACHEMAX 2000 elevation_shade.tif 2 4 8 16
<h2>SEE ALSO</h2>
<p>
-<!--
- RGB version not ported to GRASS 6 (why?):
- <em><a href="shade.clr.sh.html">shade.clr.sh</a></em><br>
- d.shade and r.shade probably cover most of the shade.clr functionality
- however, it is not possible to create shade+color map in one step
- delete this note when it is solved or if it is not considered as an issue
--->
<em>
<a href="d.shade.html">d.shade</a>,
<a href="d.his.html">d.his</a>,
@@ -142,4 +141,4 @@ Jim Westervelt, U.S. Army Construction Engineering Research Laboratory
<br>
Markus Metz: Enhanced fast C version of r.relief for GRASS GIS 7
-<p><i>Last changed: $Date: 2016-05-16 12:06:50 +0200 (Mon, 16 May 2016) $</i>
+<p><i>Last changed: $Date: 2018-10-26 15:33:43 +0200 (Fri, 26 Oct 2018) $</i>
=====================================
raster3d/r3.out.vtk/main.c
=====================================
@@ -417,8 +417,7 @@ int main(int argc, char *argv[])
fp = fopen(param.output->answer, "w");
if (fp == NULL) {
perror(param.output->answer);
- G_usage();
- exit(EXIT_FAILURE);
+ G_fatal_error(_("Unable to open file <%s>"), param.output->answer);
}
} else
fp = stdout;
=====================================
raster3d/r3.out.vtk/r3.out.vtk.html
=====================================
@@ -153,11 +153,11 @@ g.region -dp3 res=1000 res3=1000
r.mapcalc "bottom = 100"
#export of volume to VTK:
-r3.out.vtk -s in=precip3d.500z50 top=dem500 bottom=bottom
-out=/tmp/slovakia3d.vtk
+r3.out.vtk -s in=precip3d.500z50 top=dem500 bottom=bottom \
+ output=/path/to/slovakia3d.vtk
# visualize in paraview or other VTK viewer:
-paraview --data=/tmp/slovakia3d.vtk
+paraview --data=/path/to/slovakia3d.vtk
# set Display style to 'surface#
# set Actor Control z to 10
</pre></div>
@@ -173,4 +173,4 @@ paraview --data=/tmp/slovakia3d.vtk
<h2>AUTHOR</h2>
Sören Gebbert
-<p><i>Last changed: $Date: 2014-11-23 23:32:44 +0100 (Sun, 23 Nov 2014) $</i>
+<p><i>Last changed: $Date: 2018-11-22 07:39:40 +0100 (Thu, 22 Nov 2018) $</i>
=====================================
rpm/grass.spec
=====================================
@@ -2,8 +2,8 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: grass
-Version: 7.4.1
-Release: 6%{?dist}
+Version: 7.4.2
+Release: 2%{?dist}
Summary: GRASS GIS - Geographic Resources Analysis Support System
%if 0%{?rhel}
@@ -49,11 +49,10 @@ BuildRequires: netcdf-devel
%endif
BuildRequires: python < 3.0
BuildRequires: python2-numpy
-%if (0%{?rhel} > 6 || 0%{?fedora})
+%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: postgresql-devel
%else
-# RHEL6: PG from http://yum.postgresql.org/9.6/redhat/rhel-$releasever-$basearch/
-BuildRequires: postgresql96-devel postgresql96-libs
+BuildRequires: libpq-devel
%endif
BuildRequires: proj-devel
BuildRequires: proj-epsg
@@ -188,12 +187,7 @@ export GRASS_PYTHON="/usr/bin/python2"
%else
--with-mysql-libs=%{_libdir}/mysql \
%endif
-%if (0%{?rhel} > 6 || 0%{?fedora})
- --with-postgres-includes=%{_includedir}/pgsql \
-%else
- --with-postgres-includes=%{_prefix}/pgsql-9.6/include/ \
- --with-postgres-libs=%{_prefix}/pgsql-9.6/lib/ \
-%endif
+ --with-postgres-includes=%{_includedir}/pgsql \
--with-cairo-ldflags=-lfontconfig \
--with-freetype-includes=%{_includedir}/freetype2 \
--with-proj-share=%{_datadir}/proj
@@ -322,7 +316,7 @@ fi
%files libs
%license AUTHORS COPYING GPL.TXT CHANGES
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%{_libdir}/%{name}%{shortver}/lib/*.%{version}.so
+%{_libdir}/%{name}%{shortver}/lib/*.so
%{_libdir}/%{name}%{shortver}/lib/*.a
%dir %{_libdir}/%{name}%{shortver}/driver
%dir %{_libdir}/%{name}%{shortver}/driver/db
@@ -336,10 +330,21 @@ fi
%{macrosdir}/macros.%{name}
%{_libdir}/pkgconfig/*
%dir %{_libdir}/%{name}%{shortver}/lib
-%{_libdir}/%{name}%{shortver}/lib/*[!%{version}].so
%{_libdir}/%{name}%{shortver}/include
%changelog
+* Tue Nov 06 2018 Markus Neteler <neteler at mundialis.de> - 7.4.2-2
+- fix to include libgrass_*.so files in grass-libs.rpm
+
+* Sun Oct 28 2018 Markus Neteler <neteler at mundialis.de> - 7.4.2-1
+- new upstream version 7.4.2
+
+* Sun Sep 09 2018 Pavel Raiskup <praiskup at redhat.com> - 7.4.1-8
+- Clean up of PostgreSQL support (PR#4)
+
+* Tue Jul 31 2018 Florian Weimer <fweimer at redhat.com> - 7.4.1-7
+- Rebuild with fixed binutils
+
* Sun Jul 29 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-6
- added BuildRequires gcc-c++ to address RHBZ #1604262 due to RHBZ #1551327 (removing gcc and gcc-c++ from default buildroot)
@@ -378,6 +383,7 @@ fi
* Mon Jan 15 2018 Markus Metz <metz at mundialis.de> - 7.4.0-1
- New upstream version 7.4.0
+- Major cleanup of SPEC file
- Fix grass-devel which needs include/grass and include/Make dirs
* Fri Jul 21 2017 Kalev Lember <klember at redhat.com> - 7.2.1-2
=====================================
scripts/r.in.srtm/r.in.srtm.html
=====================================
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>r.in.srtm</em> imports SRTM hgt files into GRASS.
+<em>r.in.srtm</em> imports SRTM HGT files into GRASS.
SRTM Version 1 and improved Version 2 data sets can be downloaded from
NASA at this site:<br>
@@ -15,19 +15,21 @@ Gap-filled SRTM Version 3 data can be downloaded from USGS at this site:<br>
SRTM tiles are of 1 degree by 1 degree size. The SRTM filename contains the
coordinates which refer to the <b>center</b> of the lower left pixel (e.g., N51E010:
lower left cell center at 10E, 51N). To identify a tile name, a grid can be easily
-visualized in the GRASS monitor:
+visualized by <em><a href="d.grid.html">d.grid</a></em>:
<div class="code"><pre>
d.grid size=1
</pre></div>
-To import TOPEX/SRTM30 PLUS data, use <em>r.in.bin</em>.
+To import TOPEX/SRTM30 PLUS data, use <em><a href="r.in.bin.html">r.in.bin</a></em>.
<h2>SEE ALSO</h2>
<em>
-<a href="r.in.bin.html">r.in.bin</a>
+<a href="r.in.bin.html">r.in.bin</a>,
+<a href="https://grass.osgeo.org/grass7/manuals/addons/r.in.srtm.region.html">r.in.srtm.region</a> (Addon)
</em>
+
<p>The <a href="http://www2.jpl.nasa.gov/srtm/">Shuttle Radar Topography Mission</a>
homepage at NASA's JPL.
<br>
@@ -44,4 +46,4 @@ Markus Neteler<br>
Improved by W. Kyngesburye and H. Bowman<br>
Update for SRTM V3 by Markus Metz
-<p><i>Last changed: $Date: 2014-01-25 14:50:45 +0100 (Sat, 25 Jan 2014) $</i>
+<p><i>Last changed: $Date: 2018-11-09 14:37:36 +0100 (Fri, 09 Nov 2018) $</i>
=====================================
scripts/r.in.srtm/r.in.srtm.py
=====================================
@@ -52,6 +52,7 @@
#% description: Imports SRTM HGT files into raster map.
#% keyword: raster
#% keyword: import
+#% keyword: SRTM
#%End
#%option G_OPT_F_INPUT
#% description: Name of SRTM input tile (file without .hgt.zip extension)
=====================================
vector/v.generalize/main.c
=====================================
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
{
struct Map_info In, Out, Error;
struct line_pnts *Points;
- struct line_cats *Cats;
+ struct line_cats *Cats, *ACats;
int i, type, iter;
struct GModule *module; /* GRASS module for parsing arguments */
struct Option *map_in, *map_out, *error_out, *thresh_opt, *method_opt,
@@ -317,6 +317,7 @@ int main(int argc, char *argv[])
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
+ ACats = Vect_new_cats_struct();
Vect_check_input_output_name(map_in->answer, map_out->answer,
G_FATAL_EXIT);
@@ -438,13 +439,13 @@ int main(int argc, char *argv[])
right = Vect_get_isle_area(&Out, abs(right));
if (left > 0) {
- Vect_get_area_cats(&Out, left, Cats);
- do_line = Vect_cats_in_constraint(Cats, layer, cat_list);
+ Vect_get_area_cats(&Out, left, ACats);
+ do_line = Vect_cats_in_constraint(ACats, layer, cat_list);
}
if (!do_line && right > 0) {
- Vect_get_area_cats(&Out, right, Cats);
- do_line = Vect_cats_in_constraint(Cats, layer, cat_list);
+ Vect_get_area_cats(&Out, right, ACats);
+ do_line = Vect_cats_in_constraint(ACats, layer, cat_list);
}
}
if (!do_line)
=====================================
vector/v.select/main.c
=====================================
@@ -118,17 +118,6 @@ int main(int argc, char *argv[])
/* Read field info */
IFi = Vect_get_field(&(In[0]), ifield[0]);
- /* Open output */
- if (Vect_open_new(&Out, parm.output->answer, Vect_is_3d(&(In[0]))) < 0)
- G_fatal_error(_("Unable to create vector map <%s>"),
- parm.output->answer);
-
- Vect_set_map_name(&Out, _("Output from v.select"));
- Vect_set_person(&Out, G_whoami());
- Vect_copy_head_data(&(In[0]), &Out);
- Vect_hist_copy(&(In[0]), &Out);
- Vect_hist_command(&Out);
-
/* Select features */
#ifdef HAVE_GEOS
nfound = select_lines(&(In[0]), itype[0], ifield[0],
@@ -155,6 +144,16 @@ int main(int argc, char *argv[])
if (nfound != 0) {
+ /* Open output */
+ if (Vect_open_new(&Out, parm.output->answer, Vect_is_3d(&(In[0]))) < 0)
+ G_fatal_error(_("Unable to create vector map <%s>"),
+ parm.output->answer);
+
+ Vect_set_map_name(&Out, _("Output from v.select"));
+ Vect_set_person(&Out, G_whoami());
+ Vect_copy_head_data(&(In[0]), &Out);
+ Vect_hist_copy(&(In[0]), &Out);
+ Vect_hist_command(&Out);
native = Vect_maptype(&Out) == GV_FORMAT_NATIVE;
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/compare/b13afee4979d2dc5ff6f2c39b3c56e8ef3286f11...df011f5a6d79dea10bd371e16b1be5c929c1aad6
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/compare/b13afee4979d2dc5ff6f2c39b3c56e8ef3286f11...df011f5a6d79dea10bd371e16b1be5c929c1aad6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181125/39ae642f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list