[grass] 01/04: New upstream version 7.2.2~rc2

Bas Couwenberg sebastic at debian.org
Thu Aug 31 09:44:37 UTC 2017


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

sebastic pushed a commit to branch master
in repository grass.

commit 6664f7d8aa79ff3663311dc5d6dc66532acf8ecd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 31 10:56:59 2017 +0200

    New upstream version 7.2.2~rc2
---
 ChangeLog_7.2.2RC1.gz                              | Bin 868317 -> 0 bytes
 ChangeLog_7.2.2RC2.gz                              | Bin 0 -> 869110 bytes
 db/db.select/db.select.html                        |   5 +++--
 display/d.linegraph/d.linegraph.html               |   2 +-
 display/d.mon/d.mon.html                           |   2 +-
 doc/.howto_release.txt.swp                         | Bin 16384 -> 0 bytes
 doc/howto_release.txt                              |   4 ++--
 doc/infrastructure.txt                             |  10 +++++++--
 gui/wxpython/animation/g.gui.animation.html        |  14 +++++++-----
 gui/wxpython/gui_core/widgets.py                   |   4 ++--
 imagery/i.group/i.group.html                       |   2 +-
 include/VERSION                                    |   2 +-
 lib/python/ctypes/ctypesgencore/parser/cgrammar.py |  10 ++++-----
 lib/python/ctypes/ctypesgencore/parser/pplexer.py  |  15 ++++++-------
 .../ctypes/ctypesgencore/printer/preamble.py       |   9 ++++----
 lib/python/pygrass/vector/table.py                 |   6 ++----
 lib/python/pygrass/vector/testsuite/test_table.py  |  10 ++++-----
 lib/python/script/raster.py                        |   7 ++----
 lib/python/script/task.py                          |   8 ++-----
 lib/python/script/utils.py                         |   4 ++++
 lib/python/temporal/core.py                        |  24 ++++++++++-----------
 lib/python/temporal/mapcalc.py                     |   3 +++
 misc/m.nviz.script/m.nviz.script.html              |   2 +-
 mswindows/osgeo4w/package.sh                       |   8 ++++---
 raster/r.carve/r.carve.html                        |   2 +-
 raster/r.circle/r.circle.html                      |   2 +-
 raster/r.in.lidar/r.in.lidar.html                  |   2 +-
 raster/r.mapcalc/r3.mapcalc.html                   |   2 +-
 raster/r.out.gdal/r.out.gdal.html                  |   2 +-
 raster/r.profile/main.c                            |   1 +
 raster/r.transect/main.c                           |   1 +
 raster3d/r3.in.lidar/r3.in.lidar.html              |   2 +-
 raster3d/r3.timestamp/r3.timestamp.html            |   2 +-
 scripts/m.proj/m.proj.html                         |   4 ++--
 scripts/r.pack/r.pack.html                         |   2 +-
 scripts/v.db.univar/v.db.univar.html               |   2 +-
 scripts/v.what.vect/v.what.vect.html               |   2 +-
 temporal/t.info/t.info.py                          |   2 +-
 temporal/t.merge/t.merge.py                        |   2 +-
 temporal/t.rast.gapfill/t.rast.gapfill.py          |   2 +-
 temporal/t.rast.series/t.rast.series.py            |   2 +-
 temporal/t.rast.to.rast3/t.rast.to.rast3.py        |   2 +-
 temporal/t.register/t.register.html                |   2 +-
 temporal/t.rename/t.rename.py                      |   2 +-
 temporal/t.unregister/t.unregister.py              |   2 +-
 .../t.vect.observe.strds/t.vect.observe.strds.py   |   2 +-
 vector/v.in.lidar/v.in.lidar.html                  |   2 +-
 vector/v.in.ogr/main.c                             |  16 ++++++--------
 vector/v.in.ogr/v.in.ogr.html                      |  23 ++++++++++++++++----
 vector/v.in.pdal/v.in.pdal.html                    |   2 +-
 vector/v.kernel/v.kernel.html                      |   2 +-
 vector/v.mkgrid/v.mkgrid.html                      |   2 +-
 vector/v.out.ogr/attrb.c                           |   8 +++++++
 vector/v.overlay/v.overlay.html                    |   2 +-
 vector/v.random/v.random.html                      |   2 +-
 vector/v.timestamp/v.timestamp.html                |   2 +-
 vector/v.univar/v.univar.html                      |   2 +-
 vector/v.vect.stats/v.vect.stats.html              |   2 +-
 58 files changed, 144 insertions(+), 116 deletions(-)

diff --git a/ChangeLog_7.2.2RC1.gz b/ChangeLog_7.2.2RC1.gz
deleted file mode 100644
index 52526b6..0000000
Binary files a/ChangeLog_7.2.2RC1.gz and /dev/null differ
diff --git a/ChangeLog_7.2.2RC2.gz b/ChangeLog_7.2.2RC2.gz
new file mode 100644
index 0000000..e30bff4
Binary files /dev/null and b/ChangeLog_7.2.2RC2.gz differ
diff --git a/db/db.select/db.select.html b/db/db.select/db.select.html
index 6b73cfc..72ce854 100644
--- a/db/db.select/db.select.html
+++ b/db/db.select/db.select.html
@@ -2,7 +2,8 @@
 
 <em>db.select</em> prints result of selection from database based on
 SQL statement read from input file or from standard input to standard
-output.
+output. Each individual query has to be written on one single line and
+different queries have to be written on separate lines.
 
 <h2>NOTE</h2>
 
@@ -102,4 +103,4 @@ Modifications by Radim Blazek, ITC-Irst, Trento, Italy<br>
 Support for multiple statements by Martin Landa, Czech Technical University in Prague
 
 <p>
-<i>Last changed: $Date: 2014-11-28 10:57:47 +0100 (Fri, 28 Nov 2014) $</i>
+<i>Last changed: $Date: 2017-08-11 12:16:56 +0200 (Fri, 11 Aug 2017) $</i>
diff --git a/display/d.linegraph/d.linegraph.html b/display/d.linegraph/d.linegraph.html
index f86f630..fcc5d76 100644
--- a/display/d.linegraph/d.linegraph.html
+++ b/display/d.linegraph/d.linegraph.html
@@ -85,4 +85,4 @@ driver and converting that back into a rasterized image in a paint program)
 <h2>AUTHOR</h2>
 Chris Rewerts, Agricultural Engineering, Purdue University
 
-<p><i>Last changed: $Date: 2012-12-28 02:52:38 -0800 (Fri, 28 Dec 2012) $</i>
+<p><i>Last changed: $Date: 2012-12-28 11:52:38 +0100 (Fri, 28 Dec 2012) $</i>
diff --git a/display/d.mon/d.mon.html b/display/d.mon/d.mon.html
index 2e2e6d9..d03b35a 100644
--- a/display/d.mon/d.mon.html
+++ b/display/d.mon/d.mon.html
@@ -139,4 +139,4 @@ of variables for rendering</a>,
 Martin Landa, OSGeoREL, Czech Technical University in Prague, Czech Republic
 
 <p>
-<i>Last changed: $Date: 2016-04-26 00:10:52 +0200 (Tue, 26 Apr 2016) $</i>
+<i>Last changed: $Date: 2016-01-28 12:21:34 +0100 (Thu, 28 Jan 2016) $</i>
diff --git a/doc/.howto_release.txt.swp b/doc/.howto_release.txt.swp
deleted file mode 100644
index a0d8a37..0000000
Binary files a/doc/.howto_release.txt.swp and /dev/null differ
diff --git a/doc/howto_release.txt b/doc/howto_release.txt
index 8033974..0fd7598 100644
--- a/doc/howto_release.txt
+++ b/doc/howto_release.txt
@@ -1,6 +1,6 @@
 How to release GRASS GIS binaries and source code
 
-$Date: 2017-06-27 11:34:06 +0200 (Tue, 27 Jun 2017) $
+$Date: 2017-08-10 23:07:00 +0200 (Thu, 10 Aug 2017) $
 
 Note: This text contains *some* rules only applicable to the
       development coordinator (currently Markus Neteler, PSC Chair).
@@ -145,7 +145,7 @@ Contents
      scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \
          INSTALL REQUIREMENTS.html SUBMITTING neteler@$SERVER2:$SERVER2DIR
 
-   # generate link to "latest" source code
+   # Only full release: generate link to "latest" source code
      ssh neteler@$SERVER1 rm -f $SERVER1DIR/grass-$MAJOR.$MINOR-latest.tar.gz
      ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz $SERVER1DIR/grass-$MAJOR.$MINOR-latest.tar.gz"
 
diff --git a/doc/infrastructure.txt b/doc/infrastructure.txt
index 746ca65..02e904b 100644
--- a/doc/infrastructure.txt
+++ b/doc/infrastructure.txt
@@ -1,7 +1,7 @@
 How the GRASS Webserver and related infrastructure works
 
 written by M. Neteler
-Last changed: $Date: 2017-02-05 22:11:16 +0100 (Sun, 05 Feb 2017) $
+Last changed: $Date: 2017-08-14 23:30:40 +0200 (Mon, 14 Aug 2017) $
 
 
 Related Wiki documents:
@@ -207,6 +207,7 @@ Maintainer: Martin Landa
 
 * https://travis-ci.org/GRASS-GIS
 * https://github.com/GRASS-GIS/grass-ci
+* https://svn.osgeo.org/grass/grass-addons/tools/grass-ci/
 
 Travis CI control files:
  trunk/.travis/
@@ -214,8 +215,13 @@ Travis CI control files:
    linux.install.sh
    linux.script.sh
 
+Maintenance script:
+* https://svn.osgeo.org/grass/grass-addons/tools/grass-ci/grass-ci.sh
+
+== GRASS Coverity Scan ==
+
+Maintainer: Markus Neteler
 
-Coverity Scan:
 * https://scan.coverity.com/projects/grass?tab=overview
 
 == OLD: GRASS Quality Control ==
diff --git a/gui/wxpython/animation/g.gui.animation.html b/gui/wxpython/animation/g.gui.animation.html
index 1fc1d0c..5606938 100644
--- a/gui/wxpython/animation/g.gui.animation.html
+++ b/gui/wxpython/animation/g.gui.animation.html
@@ -25,8 +25,9 @@ Animation Tool allows you to:
 </ul>
 
 <p>
-3D view animation enables to animate raster (as an elevation map or a color map)
-or vector map (points, lines). Internally, module m.nviz.image is used.
+3D view animation enables to animate raster (as an elevation map or a
+color map) or vector map (points, lines). Internally,
+module <em><a href="m.nviz.image.html">m.nviz.image</a></em> is used.
 To display 3D view animation follow these steps:
 <ul>
   <li>open GRASS GUI, load maps and start 3D view</li>
@@ -35,7 +36,9 @@ To display 3D view animation follow these steps:
   <li>add new animation in Animation Tool, choose 3D view mode</li>
   <li>choose data (series of maps or space time dataset) used for animation</li>
   <li>set workspace file</li>
-  <li>choose parameter (parameter of m.nviz.image) to animate (e.g. color_map)</li>
+  <li>choose parameter (parameter
+  of <em><a href="m.nviz.image.html">m.nviz.image</a></em>) to animate
+  (e.g. color_map)</li>
 
 </ul>
 
@@ -85,7 +88,8 @@ g.gui.animation raster=`g.list -e type=raster mapset=. separator=comma pattern="
 <p>
 <em>
   <a href="g.gui.timeline.html">g.gui.timeline</a>,
-  <a href="g.list.html">g.list</a>
+  <a href="g.list.html">g.list</a>,
+  <a href="m.nviz.image.html">m.nviz.image</a>
 </em>
 
 <p>
@@ -97,4 +101,4 @@ Anna Kratochvilova,
 <a href="http://www.cvut.cz">Czech Technical University in Prague</a>, Czech Republic
 
 <p>
-<i>$Date: 2014-12-26 12:01:43 +0100 (Fri, 26 Dec 2014) $</i>
+<i>$Date: 2017-08-21 19:01:03 +0200 (Mon, 21 Aug 2017) $</i>
diff --git a/gui/wxpython/gui_core/widgets.py b/gui/wxpython/gui_core/widgets.py
index 3ea7625..e9fc4c6 100644
--- a/gui/wxpython/gui_core/widgets.py
+++ b/gui/wxpython/gui_core/widgets.py
@@ -1073,7 +1073,7 @@ class SearchModuleWidget(wx.Panel):
 
         if self._showTip:
             self._searchTip = StaticWrapText(parent=self, id=wx.ID_ANY,
-                                             size=(-1, 35))
+                                  label="Choose a module", size=(-1, 35))
 
         if self._showChoice:
             self._searchChoice = wx.Choice(parent=self, id=wx.ID_ANY)
@@ -1184,7 +1184,7 @@ class SearchModuleWidget(wx.Panel):
         """Reset widget"""
         self._search.SetValue('')
         if self._showTip:
-            self._searchTip.SetLabel('')
+            self._searchTip.SetLabel('Choose a module')
 
 
 class ManageSettingsWidget(wx.Panel):
diff --git a/imagery/i.group/i.group.html b/imagery/i.group/i.group.html
index 50c1a3a..92655c9 100644
--- a/imagery/i.group/i.group.html
+++ b/imagery/i.group/i.group.html
@@ -55,4 +55,4 @@ Research Laboratory
 <br>
 Parser support: Bob Covill (Tekmap, Canada)
 
-<p><i>Last changed: $Date: 2017-05-01 11:29:04 +0200 (Mon, 01 May 2017) $</i>
+<p><i>Last changed: $Date: 2017-05-01 11:29:04 +0200 (Mo, 01. Mai 2017) $</i>
diff --git a/include/VERSION b/include/VERSION
index 5ffbe55..5872758 100644
--- a/include/VERSION
+++ b/include/VERSION
@@ -1,4 +1,4 @@
 7
 2
-2RC1
+2RC2
 2017
diff --git a/lib/python/ctypes/ctypesgencore/parser/cgrammar.py b/lib/python/ctypes/ctypesgencore/parser/cgrammar.py
index 02fe135..1207d70 100644
--- a/lib/python/ctypes/ctypesgencore/parser/cgrammar.py
+++ b/lib/python/ctypes/ctypesgencore/parser/cgrammar.py
@@ -10,12 +10,6 @@ Reference is C99:
   * http://www.open-std.org/JTC1/SC22/WG14/www/docs/n1124.pdf
 
 '''
-try:
-    from builtins import long
-except ImportError:
-    # python3
-    long = int
-
 __docformat__ = 'restructuredtext'
 
 import operator
@@ -31,6 +25,10 @@ from . import preprocessor
 from . import yacc
 
 
+if sys.version_info.major == 3:
+    long = int
+
+
 tokens = (
     'PP_DEFINE', 'PP_DEFINE_NAME', 'PP_DEFINE_MACRO_NAME', 'PP_MACRO_PARAM',
     'PP_STRINGIFY', 'PP_IDENTIFIER_PASTE', 'PP_END_DEFINE',
diff --git a/lib/python/ctypes/ctypesgencore/parser/pplexer.py b/lib/python/ctypes/ctypesgencore/parser/pplexer.py
index 8fb27a2..951cc7d 100644
--- a/lib/python/ctypes/ctypesgencore/parser/pplexer.py
+++ b/lib/python/ctypes/ctypesgencore/parser/pplexer.py
@@ -10,14 +10,6 @@ Reference is C99:
 
 __docformat__ = 'restructuredtext'
 
-try:
-    from builtins import long
-    PY2 = True
-except ImportError:
-    # python3
-    PY2 = False
-    long = int
-
 import os
 import re
 import shlex
@@ -30,6 +22,13 @@ from . import lex
 from . import yacc
 from .lex import TOKEN
 
+
+PY2 = True
+if sys.version_info.major == 3:
+    PY2 = False
+    long = int
+
+
 tokens = (
     'HEADER_NAME', 'IDENTIFIER', 'PP_NUMBER', 'CHARACTER_CONSTANT',
     'STRING_LITERAL', 'OTHER',
diff --git a/lib/python/ctypes/ctypesgencore/printer/preamble.py b/lib/python/ctypes/ctypesgencore/printer/preamble.py
index f5edf25..25e99cc 100644
--- a/lib/python/ctypes/ctypesgencore/printer/preamble.py
+++ b/lib/python/ctypes/ctypesgencore/printer/preamble.py
@@ -1,14 +1,13 @@
-try:
-    from builtins import long
-except ImportError:
-    long = int
-
 import os
 import sys
 
 import ctypes
 from ctypes import *
 
+if sys.version_info.major == 3:
+    long = int
+
+
 _int_types = (c_int16, c_int32)
 if hasattr(ctypes, 'c_int64'):
     # Some builds of ctypes apparently do not have c_int64
diff --git a/lib/python/pygrass/vector/table.py b/lib/python/pygrass/vector/table.py
index 2f339a8..9c033dc 100644
--- a/lib/python/pygrass/vector/table.py
+++ b/lib/python/pygrass/vector/table.py
@@ -9,11 +9,9 @@ from __future__ import (nested_scopes, generators, division, absolute_import,
                         with_statement, print_function, unicode_literals)
 
 import os
+import sys
 
-try:
-    from builtins import long, unicode
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     long = int
     unicode = str
 
diff --git a/lib/python/pygrass/vector/testsuite/test_table.py b/lib/python/pygrass/vector/testsuite/test_table.py
index a60e310..463bf58 100644
--- a/lib/python/pygrass/vector/testsuite/test_table.py
+++ b/lib/python/pygrass/vector/testsuite/test_table.py
@@ -4,14 +4,9 @@ Created on Wed Jun 25 11:08:22 2014
 
 @author: pietro
 """
-try:
-    from builtins import long
-except ImportError:
-    # python3
-    long = int
-
 import os
 import sqlite3
+import sys
 import tempfile as tmp
 from string import ascii_letters, digits
 from random import choice
@@ -23,6 +18,9 @@ from grass.gunittest.main import test
 from grass.pygrass.vector.table import Table, get_path
 
 
+if sys.version_info.major == 3:
+    long = int
+
 # dictionary that generate random data
 COL2VALS = {'INT': lambda n:     np.random.randint(9, size=n),
             'INTEGER': lambda n: np.random.randint(9, size=n),
diff --git a/lib/python/script/raster.py b/lib/python/script/raster.py
index 2c9e472..91d9f85 100644
--- a/lib/python/script/raster.py
+++ b/lib/python/script/raster.py
@@ -20,6 +20,7 @@ for details.
 from __future__ import absolute_import
 
 import os
+import sys
 import string
 import time
 
@@ -28,11 +29,7 @@ from grass.exceptions import CalledModuleError
 from .utils import float_or_dms, parse_key_val
 
 
-try:
-    from builtins import unicode
-    bytes = str
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     unicode = str
 
 
diff --git a/lib/python/script/task.py b/lib/python/script/task.py
index cfa78f1..86a83db 100644
--- a/lib/python/script/task.py
+++ b/lib/python/script/task.py
@@ -18,14 +18,10 @@ for details.
 .. sectionauthor:: Martin Landa <landa.martin gmail.com>
 """
 import re
-import types
+import sys
 import string
 
-try:
-    from builtins import unicode
-    bytes = str
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     unicode = str
 
 try:
diff --git a/lib/python/script/utils.py b/lib/python/script/utils.py
index aa9b99a..c757bd1 100644
--- a/lib/python/script/utils.py
+++ b/lib/python/script/utils.py
@@ -24,6 +24,10 @@ import locale
 import shlex
 import re
 
+if sys.version_info.major == 3:
+    unicode = str
+
+
 def float_or_dms(s):
     """Convert DMS to float.
 
diff --git a/lib/python/temporal/core.py b/lib/python/temporal/core.py
index 28589dc..7589c8f 100644
--- a/lib/python/temporal/core.py
+++ b/lib/python/temporal/core.py
@@ -30,17 +30,16 @@ for details.
 """
 #import traceback
 import os
+import sys
+
+import grass.script as gscript
 # i18N
 import gettext
 gettext.install('grasslibs', os.path.join(os.getenv("GISBASE"), 'locale'))
 
-try:
-    from builtins import long
-except ImportError:
-    # python3
+if sys.version_info.major == 3:
     long = int
 
-import grass.script as gscript
 from datetime import datetime
 from .c_libraries_interface import *
 from grass.pygrass import messages
@@ -543,9 +542,9 @@ def init(raise_fatal_error=False):
     grassenv = gscript.gisenv()
 
     # Set the global variable for faster access
-    current_mapset = grassenv["MAPSET"]
-    current_location = grassenv["LOCATION_NAME"]
-    current_gisdbase = grassenv["GISDBASE"]
+    current_mapset = gscript.encode(grassenv["MAPSET"])
+    current_location = gscript.encode(grassenv["LOCATION_NAME"])
+    current_gisdbase = gscript.encode(grassenv["GISDBASE"])
 
     # Check environment variable GRASS_TGIS_RAISE_ON_ERROR
     if os.getenv("GRASS_TGIS_RAISE_ON_ERROR") == "True" or \
@@ -571,14 +570,14 @@ def init(raise_fatal_error=False):
 
     # Set the mapset check and the timestamp write
     if "TGIS_DISABLE_MAPSET_CHECK" in grassenv:
-        if grassenv["TGIS_DISABLE_MAPSET_CHECK"] == "True" or \
-           grassenv["TGIS_DISABLE_MAPSET_CHECK"] == "1":
+        if gscript.encode(grassenv["TGIS_DISABLE_MAPSET_CHECK"]) == "True" or \
+           gscript.encode(grassenv["TGIS_DISABLE_MAPSET_CHECK"]) == "1":
             enable_mapset_check = False
             msgr.warning("TGIS_DISABLE_MAPSET_CHECK is True")
 
     if "TGIS_DISABLE_TIMESTAMP_WRITE" in grassenv:
-        if grassenv["TGIS_DISABLE_TIMESTAMP_WRITE"] == "True" or \
-           grassenv["TGIS_DISABLE_TIMESTAMP_WRITE"] == "1":
+        if gscript.encode(grassenv["TGIS_DISABLE_TIMESTAMP_WRITE"]) == "True" or \
+           gscript.encode(grassenv["TGIS_DISABLE_TIMESTAMP_WRITE"]) == "1":
             enable_timestamp_write = False
             msgr.warning("TGIS_DISABLE_TIMESTAMP_WRITE is True")
 
@@ -1108,6 +1107,7 @@ class DBConnection(object):
                         detect_types=self.dbmi.PARSE_DECLTYPES | self.dbmi.PARSE_COLNAMES)
                 self.connection.row_factory = self.dbmi.Row
                 self.connection.isolation_level = None
+                self.connection.text_factory = str
                 self.cursor = self.connection.cursor()
                 self.cursor.execute("PRAGMA synchronous = OFF")
                 self.cursor.execute("PRAGMA journal_mode = MEMORY")
diff --git a/lib/python/temporal/mapcalc.py b/lib/python/temporal/mapcalc.py
index 0be9aa7..97c0034 100644
--- a/lib/python/temporal/mapcalc.py
+++ b/lib/python/temporal/mapcalc.py
@@ -315,6 +315,9 @@ def dataset_mapcalculator(inputs, output, type, expression, base, method,
 
         # Remove empty maps
         if len(empty_maps) > 0:
+            n_empty, n_tot = len(empty_maps), len(map_list)
+            msgr.warning(_("Removing {}/{} ({}%) maps because empty..."
+                           ).format(n_empty, n_tot, n_empty * 100. / n_tot))
             names = ""
             count = 0
             for map in empty_maps:
diff --git a/misc/m.nviz.script/m.nviz.script.html b/misc/m.nviz.script/m.nviz.script.html
index 14c5109..bd78226 100644
--- a/misc/m.nviz.script/m.nviz.script.html
+++ b/misc/m.nviz.script/m.nviz.script.html
@@ -132,4 +132,4 @@ and can then be edited there.
 <h2>AUTHOR</h2>
 
 <a href="mailto:bcovill at tekmap.ns.ca">Bob Covill</a>
-<p><i>Last changed: $Date: 2016-08-23 14:47:27 +0200 (Tue, 23 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 14:47:27 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 3948e44..27299c6 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -154,8 +154,12 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 	if [ "$MINGW_POSTFIX" = "64" ]; then
 	    conf_host=x86_64-w64-mingw32
+            # see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
+            # LAS support only enabled on 64bit
+            conf_opts="--with-liblas=$PWD/mswindows/osgeo4w/liblas-config"
 	else
 	    conf_host=i386-w64-mingw32
+            conf_opts=
 	fi
 	
 	log configure
@@ -184,10 +188,8 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	        --with-cairo \
                 --with-postgres \
 	        --with-opengl=windows \
-                --with-bzlib
+                --with-bzlib $conf_opts
 	
-# see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
-# --with-liblas=$PWD/mswindows/osgeo4w/liblas-config
 	touch mswindows/osgeo4w/configure-stamp
 fi
 
diff --git a/raster/r.carve/r.carve.html b/raster/r.carve/r.carve.html
index e2f0ac7..4832214 100644
--- a/raster/r.carve/r.carve.html
+++ b/raster/r.carve/r.carve.html
@@ -123,4 +123,4 @@ M.  Johnston, GMSL (Report for CERL 1999)
 Bill Brown (GMSL)<br>
 GRASS 6 update: Brad Douglas
 
-<p><i>Last changed: $Date: 2017-05-18 13:34:10 +0200 (Thu, 18 May 2017) $</i>
+<p><i>Last changed: $Date: 2017-05-18 13:34:10 +0200 (Do, 18. Mai 2017) $</i>
diff --git a/raster/r.circle/r.circle.html b/raster/r.circle/r.circle.html
index 1f1952f..53235ef 100644
--- a/raster/r.circle/r.circle.html
+++ b/raster/r.circle/r.circle.html
@@ -50,4 +50,4 @@ r.circle -b output=circle coordinate=${EASTCENTER},${NORTHCENTER} min=500 max=10
 Bill Brown, U.S. Army Construction Engineering Research Laboratory<br>
 Additional flag/min/max parameter by Markus Neteler, University of Hannover
 
-<p><i>Last changed: $Date: 2017-04-28 03:32:53 +0200 (Fri, 28 Apr 2017) $</i>
+<p><i>Last changed: $Date: 2017-04-28 03:32:53 +0200 (Fr, 28. Apr 2017) $</i>
diff --git a/raster/r.in.lidar/r.in.lidar.html b/raster/r.in.lidar/r.in.lidar.html
index b165134..a34a1c2 100644
--- a/raster/r.in.lidar/r.in.lidar.html
+++ b/raster/r.in.lidar/r.in.lidar.html
@@ -615,4 +615,4 @@ Vaclav Petras,
 <br>
 based on <em>r.in.xyz</em> by Hamish Bowman and Volker Wichmann<br>
 
-<p><i>Last changed: $Date: 2016-08-22 04:16:33 +0200 (Mon, 22 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/raster/r.mapcalc/r3.mapcalc.html b/raster/r.mapcalc/r3.mapcalc.html
index a1650f9..389e3a8 100644
--- a/raster/r.mapcalc/r3.mapcalc.html
+++ b/raster/r.mapcalc/r3.mapcalc.html
@@ -622,4 +622,4 @@ Tomas Paudits & Jaro Hofierka, funded by GeoModel s.r.o., Slovakia
 <p>Glynn Clements
 
 <p>
-<i>Last changed: $Date: 2016-04-17 23:59:51 +0200 (Sun, 17 Apr 2016) $</i>
+<i>Last changed: $Date: 2016-04-17 23:59:51 +0200 (So, 17. Apr 2016) $</i>
diff --git a/raster/r.out.gdal/r.out.gdal.html b/raster/r.out.gdal/r.out.gdal.html
index 3226481..2103278 100644
--- a/raster/r.out.gdal/r.out.gdal.html
+++ b/raster/r.out.gdal/r.out.gdal.html
@@ -312,4 +312,4 @@ GDAL Pages: <a href="http://www.gdal.org">http://www.gdal.org</a>
 Vytautas Vebra (oliver4grass at gmail.com)<br>
 Markus Metz (improved nodata logic)
 
-<p><i>Last changed: $Date: 2016-08-27 12:54:05 +0200 (Sat, 27 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-27 12:54:05 +0200 (Sat, 27. Aug 2016) $</i>
diff --git a/raster/r.profile/main.c b/raster/r.profile/main.c
index dba7ceb..32308bc 100644
--- a/raster/r.profile/main.c
+++ b/raster/r.profile/main.c
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
     module = G_define_module();
     G_add_keyword(_("raster"));
     G_add_keyword(_("profile"));
+    G_add_keyword(_("transect"));
     module->description =
 	_("Outputs the raster map layer values lying on user-defined line(s).");
 
diff --git a/raster/r.transect/main.c b/raster/r.transect/main.c
index cec1835..125cc96 100644
--- a/raster/r.transect/main.c
+++ b/raster/r.transect/main.c
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
+    G_add_keyword(_("profile"));
     G_add_keyword(_("transect"));
     module->description =
 	_("Outputs raster map layer values lying along "
diff --git a/raster3d/r3.in.lidar/r3.in.lidar.html b/raster3d/r3.in.lidar/r3.in.lidar.html
index 75fccdb..477ad3d 100644
--- a/raster3d/r3.in.lidar/r3.in.lidar.html
+++ b/raster3d/r3.in.lidar/r3.in.lidar.html
@@ -114,4 +114,4 @@ ASPRS LAS format</a>
 
 Vaclav Petras, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU GeoForAll Lab</a>
 
-<p><i>Last changed: $Date: 2016-08-22 04:16:33 +0200 (Mon, 22 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/raster3d/r3.timestamp/r3.timestamp.html b/raster3d/r3.timestamp/r3.timestamp.html
index 712db18..db06c9d 100644
--- a/raster3d/r3.timestamp/r3.timestamp.html
+++ b/raster3d/r3.timestamp/r3.timestamp.html
@@ -70,4 +70,4 @@ Lockheed Martin Space Systems<br>
 based on r.timestamp by Michael Shapiro, <br>
 U.S. Army Construction Engineering Research Laboratory
 
-<p><i>Last changed: $Date: 2016-08-22 15:24:03 +0200 (Mon, 22 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-22 15:24:03 +0200 (Mon, 22. Aug 2016) $</i>
diff --git a/scripts/m.proj/m.proj.html b/scripts/m.proj/m.proj.html
index 9ed31fd..d10dad8 100644
--- a/scripts/m.proj/m.proj.html
+++ b/scripts/m.proj/m.proj.html
@@ -89,7 +89,7 @@ following example shows.
 v.out.ascii bridges | m.proj -o input=-
 
 # Long/Lat WGS84 output in decimal degree
-v.out.ascii bridges | m.proj -o input=-
+v.out.ascii bridges | m.proj -o -d input=-
 </pre></div>
 
 <h3>Reproject Long/Lat WGS84 coordinate pair to current map projection</h3>
@@ -221,4 +221,4 @@ Functionality inspired by the <em>m.proj</em> and <em>m.proj2</em> modules for
 GRASS GIS 5.
 
 <p>
-<i>Last changed: $Date: 2017-04-14 09:00:28 +0200 (Fri, 14 Apr 2017) $</i>
+<i>Last changed: $Date: 2017-08-16 08:58:58 +0200 (Wed, 16 Aug 2017) $</i>
diff --git a/scripts/r.pack/r.pack.html b/scripts/r.pack/r.pack.html
index 4672892..be8b6f7 100644
--- a/scripts/r.pack/r.pack.html
+++ b/scripts/r.pack/r.pack.html
@@ -49,4 +49,4 @@ Original Bash script written by Hamish Bowman, Otago University, New Zealand
 Converted to Python and updated for GRASS 7 by Martin Landa, Czech Technical University in Prague, Czech Republic
 
 <p>
-<i>Last changed: $Date: 2016-04-14 09:01:22 +0200 (Thu, 14 Apr 2016) $</i>
+<i>Last changed: $Date: 2016-04-14 09:01:22 +0200 (Do, 14. Apr 2016) $</i>
diff --git a/scripts/v.db.univar/v.db.univar.html b/scripts/v.db.univar/v.db.univar.html
index 50c8c72..1019080 100644
--- a/scripts/v.db.univar/v.db.univar.html
+++ b/scripts/v.db.univar/v.db.univar.html
@@ -69,4 +69,4 @@ v.db.univar samples column=heights
  Michael Barton, Arizona State University
 <p>and authors of <em>r.univar.sh</em> (Markus Neteler et al.)
 
-<p><i>Last changed: $Date: 2017-06-26 16:13:36 +0200 (Mon, 26 Jun 2017) $</i>
+<p><i>Last changed: $Date: 2017-06-26 16:13:36 +0200 (Mo, 26. Jun 2017) $</i>
diff --git a/scripts/v.what.vect/v.what.vect.html b/scripts/v.what.vect/v.what.vect.html
index 17837ea..035b491 100644
--- a/scripts/v.what.vect/v.what.vect.html
+++ b/scripts/v.what.vect/v.what.vect.html
@@ -71,4 +71,4 @@ v.what.vect corine_code111_112_cities query_map=geonames_IT_cities column=gnamei
 
 Markus Neteler
 
-<p><i>Last changed: $Date: 2016-08-22 04:16:33 +0200 (Mon, 22 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/temporal/t.info/t.info.py b/temporal/t.info/t.info.py
index bac897a..eb44bf8 100755
--- a/temporal/t.info/t.info.py
+++ b/temporal/t.info/t.info.py
@@ -99,7 +99,7 @@ def main():
     if name.find("@") >= 0:
         id_ = name
     else:
-        id_ = name + "@" + grass.gisenv()["MAPSET"]
+        id_ = name + "@" + grass.encode(grass.gisenv()["MAPSET"])
 
     dataset = tgis.dataset_factory(type_, id_)
 
diff --git a/temporal/t.merge/t.merge.py b/temporal/t.merge/t.merge.py
index ee78445..c44e0e1 100755
--- a/temporal/t.merge/t.merge.py
+++ b/temporal/t.merge/t.merge.py
@@ -52,7 +52,7 @@ def main():
     tgis.init()
 
     #Get the current mapset to create the id of the space time dataset
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     inputs_split = inputs.split(",")
     input_ids = []
diff --git a/temporal/t.rast.gapfill/t.rast.gapfill.py b/temporal/t.rast.gapfill/t.rast.gapfill.py
index 0c40a13..05136e8 100755
--- a/temporal/t.rast.gapfill/t.rast.gapfill.py
+++ b/temporal/t.rast.gapfill/t.rast.gapfill.py
@@ -82,7 +82,7 @@ def main():
     nprocs = options["nprocs"]
     tsuffix = options["suffix"]
 
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     # Make sure the temporal database exists
     tgis.init()
diff --git a/temporal/t.rast.series/t.rast.series.py b/temporal/t.rast.series/t.rast.series.py
index 2c86062..f782217 100755
--- a/temporal/t.rast.series/t.rast.series.py
+++ b/temporal/t.rast.series/t.rast.series.py
@@ -120,7 +120,7 @@ def main():
             if output.find("@") >= 0:
                 id = output
             else:
-                mapset = grass.gisenv()["MAPSET"]
+                mapset = grass.encode(grass.gisenv()["MAPSET"])
                 id = output + "@" + mapset
 
             map = sp.get_new_map_instance(id)
diff --git a/temporal/t.rast.to.rast3/t.rast.to.rast3.py b/temporal/t.rast.to.rast3/t.rast.to.rast3.py
index 9649528..5b213d5 100755
--- a/temporal/t.rast.to.rast3/t.rast.to.rast3.py
+++ b/temporal/t.rast.to.rast3/t.rast.to.rast3.py
@@ -50,7 +50,7 @@ def main():
     # Make sure the temporal database exists
     tgis.init()
 
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     sp = tgis.open_old_stds(input, "strds")
 
diff --git a/temporal/t.register/t.register.html b/temporal/t.register/t.register.html
index 1eef3bb..7009600 100644
--- a/temporal/t.register/t.register.html
+++ b/temporal/t.register/t.register.html
@@ -254,5 +254,5 @@ t.register -i type=raster input=temperature_mean_1950_2015_daily \
 
 Sören Gebbert, Thünen Institute of Climate-Smart Agriculture
 
-<p><i>Last changed: $Date: 2017-04-25 19:53:26 +0200 (Tue, 25 Apr 2017) $</i>
+<p><i>Last changed: $Date: 2017-04-25 19:53:26 +0200 (Di, 25. Apr 2017) $</i>
 
diff --git a/temporal/t.rename/t.rename.py b/temporal/t.rename/t.rename.py
index 4330a3b..547c90c 100755
--- a/temporal/t.rename/t.rename.py
+++ b/temporal/t.rename/t.rename.py
@@ -51,7 +51,7 @@ def main():
     tgis.init()
 
     #Get the current mapset to create the id of the space time dataset
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     if input.find("@") >= 0:
         old_id = input
diff --git a/temporal/t.unregister/t.unregister.py b/temporal/t.unregister/t.unregister.py
index 53ce8a4..8e0a522 100755
--- a/temporal/t.unregister/t.unregister.py
+++ b/temporal/t.unregister/t.unregister.py
@@ -67,7 +67,7 @@ def main():
     if not maps and not file:
         grass.fatal(_("%s= or %s= must be specified") % ("input", "file"))
 
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
diff --git a/temporal/t.vect.observe.strds/t.vect.observe.strds.py b/temporal/t.vect.observe.strds/t.vect.observe.strds.py
index 8aa260f..184da20 100755
--- a/temporal/t.vect.observe.strds/t.vect.observe.strds.py
+++ b/temporal/t.vect.observe.strds/t.vect.observe.strds.py
@@ -98,7 +98,7 @@ def main():
     dbif = tgis.SQLDatabaseInterfaceConnection()
     dbif.connect()
 
-    mapset = grass.gisenv()["MAPSET"]
+    mapset = grass.encode(grass.gisenv()["MAPSET"])
 
     out_sp = tgis.check_new_stds(output, "stvds", dbif, overwrite)
 
diff --git a/vector/v.in.lidar/v.in.lidar.html b/vector/v.in.lidar/v.in.lidar.html
index 60f890a..39c816d 100644
--- a/vector/v.in.lidar/v.in.lidar.html
+++ b/vector/v.in.lidar/v.in.lidar.html
@@ -149,4 +149,4 @@ Vaclav Petras,
 <br>
 based on <em>v.in.ogr</em> by various authors
 
-<p><i>Last changed: $Date: 2016-08-27 12:53:22 +0200 (Sat, 27 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-27 12:53:22 +0200 (Sat, 27. Aug 2016) $</i>
diff --git a/vector/v.in.ogr/main.c b/vector/v.in.ogr/main.c
index dd6de87..79d010a 100644
--- a/vector/v.in.ogr/main.c
+++ b/vector/v.in.ogr/main.c
@@ -1205,20 +1205,22 @@ int main(int argc, char *argv[])
 		sprintf(buf, "insert into %s values ( %d", Fi->table, cat);
 		db_set_string(&sql, buf);
 		for (i = 0; i < ncols; i++) {
+		    const char *Ogr_fstring = NULL;
 
                     if (key_idx > -1 && key_idx == i)
                         continue; /* skip defined key (FID column) */
 
 		    Ogr_field = OGR_FD_GetFieldDefn(Ogr_featuredefn, i);
 		    Ogr_ftype = OGR_Fld_GetType(Ogr_field);
-		    if (OGR_F_IsFieldSet(Ogr_feature, i)) {
+		    if (OGR_F_IsFieldSet(Ogr_feature, i))
+			Ogr_fstring = OGR_F_GetFieldAsString(Ogr_feature, i);
+		    if (Ogr_fstring && *Ogr_fstring) {
 			if (Ogr_ftype == OFTInteger ||
 #if GDAL_VERSION_NUM >= 2000000
                             Ogr_ftype == OFTInteger64 ||
 #endif
                             Ogr_ftype == OFTReal) {
-			    sprintf(buf, ", %s",
-				    OGR_F_GetFieldAsString(Ogr_feature, i));
+			    sprintf(buf, ", %s", Ogr_fstring);
 			}
 #if GDAL_VERSION_NUM >= 1320
 			    /* should we use OGR_F_GetFieldAsDateTime() here ? */
@@ -1226,9 +1228,7 @@ int main(int argc, char *argv[])
 				 || Ogr_ftype == OFTDateTime) {
 			    char *newbuf;
 
-			    db_set_string(&strval, (char *)
-					  OGR_F_GetFieldAsString(Ogr_feature,
-								 i));
+			    db_set_string(&strval, (char *)Ogr_fstring);
 			    db_double_quote_string(&strval);
 			    sprintf(buf, ", '%s'", db_get_string(&strval));
 			    newbuf = G_str_replace(buf, "/", "-");	/* fix 2001/10/21 to 2001-10-21 */
@@ -1242,9 +1242,7 @@ int main(int argc, char *argv[])
                                  || Ogr_ftype == OFTInteger64List
 #endif
                                  ) {
-			    db_set_string(&strval, (char *)
-					  OGR_F_GetFieldAsString(Ogr_feature,
-								 i));
+			    db_set_string(&strval, (char *)Ogr_fstring);
 			    db_double_quote_string(&strval);
 			    sprintf(buf, ", '%s'", db_get_string(&strval));
 			}
diff --git a/vector/v.in.ogr/v.in.ogr.html b/vector/v.in.ogr/v.in.ogr.html
index fcc31e9..2ab2ca6 100644
--- a/vector/v.in.ogr/v.in.ogr.html
+++ b/vector/v.in.ogr/v.in.ogr.html
@@ -118,7 +118,7 @@ character, not a number.
 import. The <b>-w</b> flag changes capital column names to
 lowercase characters as a convenience for SQL usage (lowercase column
 names avoid the need to quote them if the attribute table is stored in
-a SQL DBMS such as PostgreSQL). The <b>cnames</b> parameter is used
+a SQL DBMS such as PostgreSQL). The <b>columns</b> parameter is used
 to define new column names during import.
 
 <p>
@@ -128,7 +128,7 @@ column/field names, they will be truncated. If this results in
 multiple columns with the same name then <em>v.in.ogr</em> will
 produce an error.  In this case you will either have to modify the
 input data or use
-<em>v.in.ogr</em>'s <b>cnames</b> parameter to rename columns to something
+<em>v.in.ogr</em>'s <b>columns</b> parameter to rename columns to something
 unique. (hint: copy and modify the list given with the error message).
 Alternatively, change the local DB with
 <em><a href="db.connect.html">db.connect</a></em>.
@@ -247,6 +247,20 @@ v.in.ogr input="PG:host=localhost dbname=postgis user=postgres" layer=polymap \
 output=polygons type=boundary,centroid
 </pre></div>
 
+If the table containing the polygons are in a specific schema, you can use:
+
+<div class="code"><pre>
+v.in.ogr input="PG:host=localhost dbname=postgis user=postgres" \
+layer=myschema.polymap \
+output=polygons type=boundary,centroid
+</pre></div>
+
+Generally, v.in.ogr just follows the 
+<a href="http://www.gdal.org/ogr_formats.html">format-specific</a>
+syntax defined by the OGR library.
+
+
+<!-- Commented out until we clarify usage of default connection - ML
 <h3>Default connection settings as datasource (PostgreSQL only)</h3>
 
 If datasource (<b>input</b>) is specified as 'PG:' and the default DB
@@ -282,6 +296,7 @@ db.login user=user1 password=pwd1
 v.in.ogr input=PG: layer=river output=river 
 db.select table=river
 </pre></div>
+--->
 
 <h3>Oracle Spatial</h3>
 
@@ -342,7 +357,7 @@ contains topological errors. The message suggests a value for the
 <dt>DBMI-DBF driver error: SQL parser error: syntax error,
 unexpected DESC, expecting NAME processing 'DESC'</dt>
 <dd>indicates that a column name corresponds to a reserved SQL word (here: 'DESC').
-A different column name should be used. The <b>cnames</b> parameter can be used
+A different column name should be used. The <b>columns</b> parameter can be used
 to assign different column names on the fly.</dd>
 <dt>Projection of dataset does not appear to match the current location.</dt>
 <dd>You need to create a location whose projection matches the data
@@ -388,4 +403,4 @@ Various improvements by Markus Metz
 Multiple geometry columns support by Martin Landa, OSGeoREL, Czech Technical University in Prague, Czech Republic
 
 <p>
-<i>Last changed: $Date: 2016-12-28 18:05:55 +0100 (Wed, 28 Dec 2016) $</i>
+<i>Last changed: $Date: 2017-08-21 23:43:06 +0200 (Mon, 21 Aug 2017) $</i>
diff --git a/vector/v.in.pdal/v.in.pdal.html b/vector/v.in.pdal/v.in.pdal.html
index 321dd8d..f7d46b2 100644
--- a/vector/v.in.pdal/v.in.pdal.html
+++ b/vector/v.in.pdal/v.in.pdal.html
@@ -58,4 +58,4 @@ v.in.pdal input=points.las output=points -c -r -w
 Vaclav Petras,
 <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU GeoForAll Lab</a>
 
-<p><i>Last changed: $Date: 2016-08-23 04:00:20 +0200 (Tue, 23 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/vector/v.kernel/v.kernel.html b/vector/v.kernel/v.kernel.html
index 79c99c6..9f55d60 100644
--- a/vector/v.kernel/v.kernel.html
+++ b/vector/v.kernel/v.kernel.html
@@ -69,4 +69,4 @@ Stefano Menegon, <a href="http://mpa.itc.it/">ITC-irst</a>, Trento, Italy<br>
 Radim Blazek (additional kernel density functions and network part)
 
 <p>
-<i>Last changed: $Date: 2017-04-28 15:34:00 +0200 (Fri, 28 Apr 2017) $</i>
+<i>Last changed: $Date: 2017-04-28 15:34:00 +0200 (Fr, 28. Apr 2017) $</i>
diff --git a/vector/v.mkgrid/v.mkgrid.html b/vector/v.mkgrid/v.mkgrid.html
index f7f2fb7..8eb0e65 100644
--- a/vector/v.mkgrid/v.mkgrid.html
+++ b/vector/v.mkgrid/v.mkgrid.html
@@ -191,4 +191,4 @@ U.S.Army Construction Engineering
 Research Laboratory
 <p>Update for new vectors Radim Blazek 10/2004 
 
-<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>
diff --git a/vector/v.out.ogr/attrb.c b/vector/v.out.ogr/attrb.c
index 5e3d60d..3f51a57 100644
--- a/vector/v.out.ogr/attrb.c
+++ b/vector/v.out.ogr/attrb.c
@@ -94,7 +94,11 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol,
 		    /* Reset */
 		    if ((nocat && strcmp(Fi->key, colname[j]) == 0) == 0) {
 			/* if this is 'cat', then execute the following only if the '-s' flag was NOT given*/
+#if GDAL_VERSION_NUM >= 2020000
+			OGR_F_SetFieldNull(Ogr_feature, ogrfieldnum);
+#else
 			OGR_F_UnsetField(Ogr_feature, ogrfieldnum);
+#endif
 		    }
 
 		    /* prevent writing NULL values */
@@ -129,6 +133,10 @@ int mk_att(int cat, struct field_info *Fi, dbDriver *driver, int ncol,
 			    }
 			}
 		    }
+#if GDAL_VERSION_NUM >= 2020000
+		    else
+			OGR_F_SetFieldNull(Ogr_feature, ogrfieldnum);
+#endif
 		}
 	    }
 	    db_close_cursor(&cursor);
diff --git a/vector/v.overlay/v.overlay.html b/vector/v.overlay/v.overlay.html
index ca899e2..c8f717c 100644
--- a/vector/v.overlay/v.overlay.html
+++ b/vector/v.overlay/v.overlay.html
@@ -275,4 +275,4 @@ Radim Blazek, ITC-Irst, Trento, Italy<br>
 Markus Metz
 
 <p>
-<i>Last changed: $Date: 2016-08-26 11:27:29 +0200 (Fri, 26 Aug 2016) $</i>
+<i>Last changed: $Date: 2016-08-26 11:27:29 +0200 (Fri, 26. Aug 2016) $</i>
diff --git a/vector/v.random/v.random.html b/vector/v.random/v.random.html
index 8933418..eea6293 100644
--- a/vector/v.random/v.random.html
+++ b/vector/v.random/v.random.html
@@ -269,4 +269,4 @@ random sampling)
 Engineering</a>
 <a href="http://www.purdue.edu/">Purdue University</a>
 
-<p><i>Last changed: $Date: 2017-05-13 11:16:01 +0200 (Sat, 13 May 2017) $</i>
+<p><i>Last changed: $Date: 2017-05-13 11:16:01 +0200 (Sa, 13. Mai 2017) $</i>
diff --git a/vector/v.timestamp/v.timestamp.html b/vector/v.timestamp/v.timestamp.html
index 5dc2565..4547a9a 100644
--- a/vector/v.timestamp/v.timestamp.html
+++ b/vector/v.timestamp/v.timestamp.html
@@ -62,4 +62,4 @@ Spaces in the timestamp value are required.
 
 Michael Shapiro, U.S.Army Construction Engineering Research Laboratory
 
-<p><i>Last changed: $Date: 2016-08-22 15:24:03 +0200 (Mon, 22 Aug 2016) $</i>
+<p><i>Last changed: $Date: 2016-08-22 15:24:03 +0200 (Mon, 22. Aug 2016) $</i>
diff --git a/vector/v.univar/v.univar.html b/vector/v.univar/v.univar.html
index 9eae1f2..ad3cf04 100644
--- a/vector/v.univar/v.univar.html
+++ b/vector/v.univar/v.univar.html
@@ -139,4 +139,4 @@ Hamish Bowman, University of Otago, New Zealand<br>
 Martin Landa 
 
 <p>
-<i>Last changed: $Date: 2017-06-26 16:13:36 +0200 (Mon, 26 Jun 2017) $</i>
+<i>Last changed: $Date: 2017-06-26 16:13:36 +0200 (Mo, 26. Jun 2017) $</i>
diff --git a/vector/v.vect.stats/v.vect.stats.html b/vector/v.vect.stats/v.vect.stats.html
index a39a9fc..5c9e92c 100644
--- a/vector/v.vect.stats/v.vect.stats.html
+++ b/vector/v.vect.stats/v.vect.stats.html
@@ -247,4 +247,4 @@ associated with point, standard deviation)
 Markus Metz
 
 <p>
-<i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23 Aug 2016) $</i>
+<i>Last changed: $Date: 2016-08-23 04:07:22 +0200 (Tue, 23. Aug 2016) $</i>

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