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>

debian/changelog

+grass (7.2.2~rc2-1~exp1~zesty1) zesty; urgency=medium
+
+  * Rebuild for zesty.
+
+ -- Martin Landa <landa.martin@gmail.com>  Fri, 01 Sep 2017 16:57:27 +0200
+
+grass (7.2.2~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 31 Aug 2017 11:04:01 +0200
+
 grass (7.2.2~rc1-1~exp1~zesty1) zesty; urgency=medium
 
   * Rebuild for zesty.

debian/control

@@ -98,7 +98,7 @@ Suggests: grass-dev,
           python-rpy2,
           python-termcolor
 Breaks: grass (<< 6.4.2-1~)
-Provides: grass722-1
+Provides: grass722-2
 Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information

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>

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>

doc/howto_release.txt

 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"
 

doc/infrastructure.txt

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

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>

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

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>

include/VERSION

 7
 2
-2RC1
+2RC2
 2017

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

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

lib/python/ctypes/ctypesgencore/printer/preamble.py

-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

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
 

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

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