REQUIREMENTS.html

@@ -56,7 +56,7 @@ map formats<br>
 </li>
 
 <li><b>Python &gt;= 2.7</b> (for temporal framework, scripts, wxGUI, and ctypes interface)<br>
-<i>Note:</i> Python 3 support is still in development<br>
+<i>Note:</i> Python 3 support is in development and will be completed for the GRASS GIS 7.8.0 release<br>
 <a href="http://www.python.org">http://www.python.org</a>
 </li>
 
@@ -165,6 +165,10 @@ newer versions are named "python-pillow"
 <a href="http://matplotlib.org/">http://matplotlib.org/</a>
 </li>
 
+<li><b>Python wxPython backend for python-matplotlib</b> ("python-matplotlib-wx", needed for e.g. g.gui.timeline)<br>
+<a href="http://matplotlib.org/">http://matplotlib.org/</a>
+</li>
+
 <li><b>python-termcolor</b> (recommended for g.search.modules)<br>
 <a href="https://pypi.python.org/pypi/termcolor">https://pypi.python.org/pypi/termcolor</a>
 </li>
@@ -217,6 +221,6 @@ MacOSX users may go here to download precompiled libraries etc.:
 <br><a href="https://grass.osgeo.org/development/bug-tracking/">https://grass.osgeo.org/development/bug-tracking/</a>
 
 <p>
-<i>Last changed: $Date: 2019-01-01 19:22:26 +0100 (Tue, 01 Jan 2019) $</i>
+<i>Last changed: $Date: 2019-03-07 00:21:50 +0100 (Thu, 07 Mar 2019) $</i>
 </body>
 </html>

binaryInstall.src

@@ -317,27 +317,6 @@ chmod -R 1777 $DESTDIR/locks
 
 echo""
 
-echo "Creating datum transformation gridshift files..."
-
-if test -x "${DESTDIR}/etc/proj/nad2bin" ; then
-    NAD2BIN="${DESTDIR}/etc/proj/nad2bin"
-else
-    # Use version installed with PROJ.4 (should be in path)
-    NAD2BIN=nad2bin
-fi
-
-for i in "${DESTDIR}"/etc/proj/nad/src/*.lla
-do 
-    "${NAD2BIN}" < $i \
-    "${DESTDIR}"/etc/proj/nad/`echo \`basename "$i"\` | sed 's/.lla//'` && rm -f "$i"
-done
-
-if test -z "`ls \"${DESTDIR}/etc/proj/nad/src\"`" ; then
-    rmdir "${DESTDIR}/etc/proj/nad/src"
-fi
-
-echo""
-
 echo "Generating display font configuration file..."
 
 GISBASE="$DESTDIR" GISRC=junk LD_LIBRARY_PATH_VAR="${DESTDIR}/lib:$LD_LIBRARY_PATH_VAR" "${DESTDIR}/bin/g.mkfontcap" -o

configure.in

@@ -216,7 +216,7 @@ AC_SUBST(MACOSX_SDK)
 if test -n "$MACOSX_APP" ; then
     INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
 else
-    INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
+    INSTDIR='${prefix}'"/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
 fi
 
 AC_SUBST(INSTDIR)
@@ -751,13 +751,6 @@ AC_SUBST(PROJINC)
 AC_SUBST(PROJLIB)
 AC_SUBST(PROJSHARE)
 
-# nad2bin needs to be in path for installing datum gridshift files
-
-AC_PATH_PROG(NAD2BIN, nad2bin, no)
-if test "$NAD2BIN" = "no"; then
-    AC_MSG_ERROR([*** Unable to locate nad2bin (needs to be in PATH).])
-fi
-
 # Done checking PROJ
 
 # Enable regex option

debian/changelog

+grass (7.6.1-1) unstable; urgency=medium
+
+  * Update gbp.conf to use --source-only-changes by default.
+  * Add patch to fix spelling errors.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 13:30:03 +0200
+
+grass (7.6.1-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 20 Mar 2019 06:58:25 +0100
+
+grass (7.6.1~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Refresh patches.
+  * Add license & copyright for upstream metadata.
+  * Add -DNDEBUG to CFLAGS to remove assert() from executables.
+  * Add lintian overrides for file-references-package-build-path &
+    pkg-config-references-unknown-shared-library.
+  * Drop package name from lintian overrides.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 09 Mar 2019 18:53:20 +0100
+
+grass (7.6.0-2) UNRELEASED; urgency=medium
+
+  * Define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H for PROJ 6.0.0 compatibility.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 14 Apr 2019 07:34:30 +0200
+
 grass (7.6.0-1) unstable; urgency=medium
 
   * Drop unused lintian override.

debian/copyright

@@ -63,6 +63,10 @@ Copyright:   1989-2019, GRASS Development Team
                   1992, USA-CERL
 License: GPL-2+
 
+Files: gui/icons/grass.appdata.xml
+Copyright: 2014, Richard Hughes <richard@hughsie.com>
+License: CC0-1.0
+
 Files: gui/wxpython/gui_core/wxlibplot.py
 Copyright: 2002, Gordon Williams
 License: wxlibplot
@@ -353,3 +357,140 @@ License: Expat
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
+License: CC0-1.0
+ Creative Commons Legal Code
+ CC0 1.0 Universal
+ .
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO
+    WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR
+    WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES
+    RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER.
+ .
+ Statement of Purpose
+ .
+ The laws of most jurisdictions throughout the world automatically confer
+ exclusive Copyright and Related Rights (defined below) upon the creator
+ and subsequent owner(s) (each and all, an "owner") of an original work
+ of authorship and/or a database (each, a "Work").
+ .
+ Certain owners wish to permanently relinquish those rights to a Work for
+ the purpose of contributing to a commons of creative, cultural and
+ scientific works ("Commons") that the public can reliably and without
+ fear of later claims of infringement build upon, modify, incorporate in
+ other works, reuse and redistribute as freely as possible in any form
+ whatsoever and for any purposes, including without limitation commercial
+ purposes. These owners may contribute to the Commons to promote the
+ ideal of a free culture and the further production of creative, cultural
+ and scientific works, or to gain reputation or greater distribution for
+ their Work in part through the use and efforts of others.
+ .
+ For these and/or other purposes and motivations, and without any
+ expectation of additional consideration or compensation, the person
+ associating CC0 with a Work (the "Affirmer"), to the extent that he or
+ she is an owner of Copyright and Related Rights in the Work, voluntarily
+ elects to apply CC0 to the Work and publicly distribute the Work under
+ its terms, with knowledge of his or her Copyright and Related Rights in
+ the Work and the meaning and intended legal effect of CC0 on those
+ rights.
+ .
+ 1. Copyright and Related Rights. A Work made available under CC0 may be
+    protected by copyright and related or neighboring rights ("Copyright
+    and Related Rights"). Copyright and Related Rights include, but are not
+    limited to, the following:
+ .
+    i.   the right to reproduce, adapt, distribute, perform, display,
+         communicate, and translate a Work;
+ .
+    ii.  moral rights retained by the original author(s) and/or
+         performer(s);
+ .
+    iii. publicity and privacy rights pertaining to a person's image or
+         likeness depicted in a Work;
+ .
+    iv.  rights protecting against unfair competition in regards to a
+         Work, subject to the limitations in paragraph 4(a), below;
+ .
+    v.   rights protecting the extraction, dissemination, use and reuse
+         of data in a Work;
+ .
+    vi.  database rights (such as those arising under Directive 96/9/EC
+         of the European Parliament and of the Council of 11 March 1996 on
+         the legal protection of databases, and under any national
+         implementation thereof, including any amended or successor version
+         of such directive); and
+ .
+    vii. other similar, equivalent or corresponding rights throughout
+         the world based on applicable law or treaty, and any national
+         implementations thereof.
+ .
+ 2. Waiver. To the greatest extent permitted by, but not in
+ contravention of, applicable law, Affirmer hereby overtly, fully,
+ permanently, irrevocably and unconditionally waives, abandons, and
+ surrenders all of Affirmer's Copyright and Related Rights and
+ associated claims and causes of action, whether now known or unknown
+ (including existing as well as future claims and causes of action), in
+ the Work (i) in all territories worldwide, (ii) for the maximum
+ duration provided by applicable law or treaty (including future time
+ extensions), (iii) in any current or future medium and for any number
+ of copies, and (iv) for any purpose whatsoever, including without
+ limitation commercial, advertising or promotional purposes (the
+ "Waiver"). Affirmer makes the Waiver for the benefit of each member of
+ the public at large and to the detriment of Affirmer's heirs and
+ successors, fully intending that such Waiver shall not be subject to
+ revocation, rescission, cancellation, termination, or any other legal
+ or equitable action to disrupt the quiet enjoyment of the Work by the
+ public as contemplated by Affirmer's express Statement of Purpose.
+ .
+ 3. Public License Fallback. Should any part of the Waiver for any
+ reason be judged legally invalid or ineffective under applicable law,
+ then the Waiver shall be preserved to the maximum extent permitted
+ taking into account Affirmer's express Statement of Purpose. In
+ addition, to the extent the Waiver is so judged Affirmer hereby grants
+ to each affected person a royalty-free, non transferable, non
+ sublicensable, non exclusive, irrevocable and unconditional license to
+ exercise Affirmer's Copyright and Related Rights in the Work (i) in all
+ territories worldwide, (ii) for the maximum duration provided by
+ applicable law or treaty (including future time extensions), (iii) in
+ any current or future medium and for any number of copies, and (iv) for
+ any purpose whatsoever, including without limitation commercial,
+ advertising or promotional purposes (the "License"). The License shall
+ be deemed effective as of the date CC0 was applied by Affirmer to the
+ Work. Should any part of the License for any reason be judged legally
+ invalid or ineffective under applicable law, such partial invalidity or
+ ineffectiveness shall not invalidate the remainder of the License, and
+ in such case Affirmer hereby affirms that he or she will not (i)
+ exercise any of his or her remaining Copyright and Related Rights in
+ the Work or (ii) assert any associated claims and causes of action with
+ respect to the Work, in either case contrary to Affirmer's express
+ Statement of Purpose.
+ .
+ 4. Limitations and Disclaimers.
+ .
+    a. No trademark or patent rights held by Affirmer are waived,
+       abandoned, surrendered, licensed or otherwise affected by this
+       document.
+ .
+    b. Affirmer offers the Work as-is and makes no representations or
+       warranties of any kind concerning the Work, express, implied,
+       statutory or otherwise, including without limitation warranties of
+       title, merchantability, fitness for a particular purpose, non
+       infringement, or the absence of latent or other defects, accuracy,
+       or the present or absence of errors, whether or not discoverable,
+       all to the greatest extent permissible under applicable law.
+ .
+    c. Affirmer disclaims responsibility for clearing rights of other
+       persons that may apply to the Work or any use thereof, including
+       without limitation any person's Copyright and Related Rights in the
+       Work. Further, Affirmer disclaims responsibility for obtaining any
+       necessary consents, permissions or other rights required for any use
+       of the Work.
+ .
+    d. Affirmer understands and acknowledges that Creative Commons is
+       not a party to this document and has no duty or obligation with
+       respect to this CC0 or use of the Work.
+ .
+ https://creativecommons.org/choose/zero/

debian/gbp.conf

@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
 
 # Always use pristine-tar.
 pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes

debian/grass-core.lintian-overrides

 # False positive, file is an executable not an image
-grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.in.png
-grass-core: image-file-in-usr-lib usr/lib/grass*/bin/r.out.png
+image-file-in-usr-lib usr/lib/grass*/bin/r.in.png
+image-file-in-usr-lib usr/lib/grass*/bin/r.out.png
 
 # html2man doesn't include NAME.
-grass-core: manpage-has-bad-whatis-entry *
+manpage-has-bad-whatis-entry *
 
 # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
 #  Fortify Source functions: no, only unprotected functions found!
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/i.gensig
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.ascii
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.bin
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.grow.distance
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.in.ascii
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.cwed
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.dominance
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.edgedensity
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.mpa
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.mps
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padcv
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padrange
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padsd
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.patchdensity
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.patchnum
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.pielou
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.renyi
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.richness
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shannon
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shape
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.li.simpson
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.null
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/r.thin
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/v.extract
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/v.lrs.segment
-grass-core: hardening-no-fortify-functions usr/lib/grass*/bin/v.segment
-grass-core: hardening-no-fortify-functions usr/lib/grass*/driver/db/ogr
-grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/lister/cell
-grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/lister/vector
-grass-core: hardening-no-fortify-functions usr/lib/grass*/etc/lock
-grass-core: hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_dgl.*.so
-grass-core: hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_segment.*.so
+hardening-no-fortify-functions usr/lib/grass*/bin/i.gensig
+hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.ascii
+hardening-no-fortify-functions usr/lib/grass*/bin/r3.in.bin
+hardening-no-fortify-functions usr/lib/grass*/bin/r.grow.distance
+hardening-no-fortify-functions usr/lib/grass*/bin/r.in.ascii
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.cwed
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.dominance
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.edgedensity
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.mpa
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.mps
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padcv
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padrange
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.padsd
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.patchdensity
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.patchnum
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.pielou
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.renyi
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.richness
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shannon
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.shape
+hardening-no-fortify-functions usr/lib/grass*/bin/r.li.simpson
+hardening-no-fortify-functions usr/lib/grass*/bin/r.null
+hardening-no-fortify-functions usr/lib/grass*/bin/r.thin
+hardening-no-fortify-functions usr/lib/grass*/bin/v.extract
+hardening-no-fortify-functions usr/lib/grass*/bin/v.lrs.segment
+hardening-no-fortify-functions usr/lib/grass*/bin/v.segment
+hardening-no-fortify-functions usr/lib/grass*/driver/db/ogr
+hardening-no-fortify-functions usr/lib/grass*/etc/lister/cell
+hardening-no-fortify-functions usr/lib/grass*/etc/lister/vector
+hardening-no-fortify-functions usr/lib/grass*/etc/lock
+hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_dgl.*.so
+hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_segment.*.so
 
 # This license file is used by the program to show license, so needs to be
 # distributed.
-grass-core: extra-license-file usr/lib/grass*/etc/license
-grass-core: extra-license-file usr/share/doc/grass-core/COPYING
+extra-license-file usr/lib/grass*/etc/license
+extra-license-file usr/share/doc/grass-core/COPYING
 
 # Python 3 not supported yet
-grass-core: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+dependency-on-python-version-marked-for-end-of-life (Depends: python)
 
 # Not a problem
-grass-core: package-contains-documentation-outside-usr-share-doc usr/lib/grass*/etc/license
+package-contains-documentation-outside-usr-share-doc usr/lib/grass*/etc/license
 
 # False positive, part of NormalX, NormalY, NormalZ
-grass-core: spelling-error-in-binary usr/lib/grass*/bin/v.in.pdal NormalY Normally
+spelling-error-in-binary usr/lib/grass*/bin/v.in.pdal NormalY Normally
+
+# https://trac.osgeo.org/grass/ticket/3786
+file-references-package-build-path
 

debian/grass-dev.lintian-overrides

 # Python 3 not supported yet
-grass-dev: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+dependency-on-python-version-marked-for-end-of-life (Depends: python)
+
+# https://trac.osgeo.org/grass/ticket/3786
+file-references-package-build-path *
+
+# https://trac.osgeo.org/grass/ticket/3787
+pkg-config-references-unknown-shared-library *
 

debian/grass-doc.lintian-overrides

 # html2man doesn't include NAME (see also: #379913)
-grass-doc: manpage-has-bad-whatis-entry *
+manpage-has-bad-whatis-entry *
 
 # html2man deficiency
-grass-doc: manpage-has-errors-from-man *
+manpage-has-errors-from-man *
 

debian/grass-gui.lintian-overrides

 # Python 3 not supported yet
-grass-gui: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+dependency-on-python-version-marked-for-end-of-life (Depends: python)
 
 # Not a problem
-grass-gui: package-contains-documentation-outside-usr-share-doc usr/lib/grass*/gui/wxpython/README
+package-contains-documentation-outside-usr-share-doc usr/lib/grass*/gui/wxpython/README
 

debian/patches/instdir

@@ -2,28 +2,6 @@ Description: Don't include GRASS_VERSION_RELEASE in path.
 Author: Francesco Paolo Lovergine <frankie@debian.org>
 Forwarded: not-needed
 
---- a/configure
-+++ b/configure
-@@ -1448,7 +1448,7 @@ fi
- if test -n "$MACOSX_APP" ; then
-     INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
- else
--    INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
-+    INSTDIR='${prefix}'"/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
- fi
- 
- 
---- a/configure.in
-+++ b/configure.in
-@@ -216,7 +216,7 @@ AC_SUBST(MACOSX_SDK)
- if test -n "$MACOSX_APP" ; then
-     INSTDIR='${prefix}'"/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.app/Contents/MacOS"
- else
--    INSTDIR='${prefix}'"/grass-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.${GRASS_VERSION_RELEASE}"
-+    INSTDIR='${prefix}'"/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}"
- fi
- 
- AC_SUBST(INSTDIR)
 --- a/grass.pc.in
 +++ b/grass.pc.in
 @@ -2,13 +2,13 @@

debian/patches/series

@@ -2,3 +2,4 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
+spelling-errors.patch

debian/rules

@@ -6,6 +6,9 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# Workaround for proj_api.h deprecation in PROJ 6.0.0
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+
 # Disable PIE on Ubuntu where it's still problematic
 VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
 DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
@@ -27,6 +30,8 @@ CFLAGS+=-Wno-error=format-security
 
 CFLAGS+=-Wall
 
+CFLAGS+=-DNDEBUG
+
 TEMPLATES=$(wildcard debian/*.in)
 
 # Use SOURCE_DATE_EPOCH as random seed for reproducible builds

imagery/i.atcorr/i.atcorr.html

@@ -1056,6 +1056,7 @@ GRASS Wiki page about <a href="http://grasswiki.osgeo.org/wiki/Atmospheric_corre
 <p>
 <em>
 <a href="i.aster.toar.html">i.aster.toar</a>,
+<a href="i.colors.enhance.html">i.colors.enhance</a>,
 <a href="i.landsat.toar.html">i.landsat.toar</a>,
 <a href="r.info.html">r.info</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>,
@@ -1122,5 +1123,5 @@ land imager: spectral response and spectral uniformity., Proc. SPIE 8153,
 <br>Stefan Blumentrath, Zofie Cimburova, Norwegian Institute for Nature Research, NINA, Oslo, Norway
 
 <p>
-<i>Last changed: $Date: 2018-12-27 18:44:04 +0100 (Thu, 27 Dec 2018) $</i>
+<i>Last changed: $Date: 2019-01-21 21:08:55 +0100 (Mon, 21 Jan 2019) $</i>
 

imagery/i.evapo.pt/i.evapo.pt.html

@@ -2,10 +2,10 @@
 
 <em>i.evapo.pt</em> Calculates the diurnal evapotranspiration after Prestley
 and Taylor (1972). The Priestley-Taylor model (Priestley and Taylor, 1972)
-is a modification of Penman’s more theoretical equation.
+is a modification of Penman's more theoretical equation.
 
 <h2>NOTES</h2>
-RNETD optional output from i.evapo.potrad is giving good results as input
+RNETD optional output from <em>i.evapo.potrad</em> is giving good results as input
 for net radiation in this module.
 
 <p>Alpha values:
@@ -35,6 +35,6 @@ Alpha values extracted from:
 
 <h2>AUTHORS</h2>
 
-Yann Chemin, GRASS Development team, 2007-08
+Yann Chemin, GRASS Development Team, 2007-08
 
-<p><i>Last changed: $Date: 2014-12-09 18:23:56 +0100 (Tue, 09 Dec 2014) $</i>
+<p><i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>

imagery/i.landsat.toar/i.landsat.toar.html

@@ -110,7 +110,7 @@ in <em>i.gensigset</em>).
 <h3>On Landsat-8 metadata file </h3>
 
 NASA reports a structure of the L1G Metadata file 
-(<a href="http://landsat.usgs.gov/documents/LDCM-DFCB-004.pdf‎">LDCM-DFCB-004.pdf</a>) 
+(<a href="http://landsat.usgs.gov/documents/LDCM-DFCB-004.pdf">LDCM-DFCB-004.pdf</a>) 
 for Landsat Data Continuity Mission (i.e. Landsat-8).
 
 <p>
@@ -243,10 +243,10 @@ The resulting Landsat channels are named <tt>lsat7_2002_toar.1 .. lsat7_2002_toa
   <li>Chander G., B.L. Markham and D.L. Helder, 2009: Remote Sensing of
     Environment, vol. 113</li>
 
-  <li>Chander G.H. and B. Markham, 2003.: IEEE Transactions On Geoscience And
+  <li>Chander G.H. and B. Markham, 2003: IEEE Transactions On Geoscience And
     Remote Sensing, vol. 41, no. 11.</li>
 
-  <li>Chavez P.S., jr. 1996. Image-based atmospheric corrections -
+  <li>Chavez P.S., jr. 1996: Image-based atmospheric corrections -
     Revisited and Improved. Photogrammetric Engineering and Remote
     Sensing 62(9): 1025-1036.</li>
 
@@ -272,11 +272,12 @@ The resulting Landsat channels are named <tt>lsat7_2002_toar.1 .. lsat7_2002_toa
 
 <em>
   <a href="i.atcorr.html">i.atcorr</a>,
+  <a href="i.colors.enhance.html">i.colors.enhance</a>,
   <a href="r.mapcalc.html">r.mapcalc</a>,
   <a href="r.in.gdal.html">r.in.gdal</a>
 </em>
 <p>
-<a href="https://lta.cr.usgs.gov/landsat_dictionary.html">Landsat Data Dictionary</a> by USGS
+<a href="https://lta.cr.usgs.gov/DD/landsat_dictionary.html">Landsat Data Dictionary</a> by USGS
 
 <h2>AUTHOR</h2>
 
@@ -284,4 +285,4 @@ E. Jorge Tizado  (ej.tizado unileon es), Dept. Biodiversity and Environmental Ma
 University of Le&oacute;n, Spain
 
 <p>
-<i>Last changed: $Date: 2017-11-12 13:26:52 +0100 (Sun, 12 Nov 2017) $</i>
+<i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>

include/Make/Grass.make

@@ -67,7 +67,7 @@ TOOLSDIR	= $(ARCH_DISTDIR)/tools
 FONTDIR         = $(ARCH_DISTDIR)/fonts
 
 GRASS_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE)
-GRASS_VERSION_NAME    = $(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)$(GRASS_VERSION_RELEASE)
+GRASS_LIB_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
 
 GRASS_NAME	= grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
@@ -265,7 +265,7 @@ LIB_SUFFIX = $(SHLIB_SUFFIX)
 endif
 
 define lib_rules
-$(1)_LIBNAME = grass_$(2).$(GRASS_VERSION_NUMBER)
+$(1)_LIBNAME = grass_$(2).$(GRASS_LIB_VERSION_NUMBER)
 ifneq ($(NEED_DEPS),)
 $(1)LIB = -l$$($(1)_LIBNAME) $$($(1)DEPS)
 else