Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/ChangeLog_7.4.0RC2.gz
+++ b/ChangeLog_7.4.0RC2.gz
--- a/ChangeLog_7.4.1RC1.gz
+++ b/ChangeLog_7.4.1RC1.gz
--- a/REQUIREMENTS.html
+++ b/REQUIREMENTS.html
@@ -55,7 +55,7 @@ map formats<br>
 <a href="http://gdal.org">http://gdal.org</a>
 </li>

-<li><b>Python &gt;= 2.6</b> (for temporal framework, scripts, wxGUI, and ctypes interface)<br>
+<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>
 <a href="http://www.python.org">http://www.python.org</a>
 </li>
@@ -217,6 +217,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: 2018-01-01 23:36:04 +0100 (Mon, 01 Jan 2018) $</i>
+<i>Last changed: $Date: 2018-03-25 16:51:11 +0200 (Sun, 25 Mar 2018) $</i>
 </body>
 </html>
--- a/contributors.csv
+++ b/contributors.csv
@@ -15,6 +15,8 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed
 -,Pietro Zambelli,<peter.zamb gmail.com>,Italy,zarch,yes
 -,Štěpán Turek,<stepan.turek seznam.cz>,Czech Republic,turek,yes
 -,Margherita Di Leo,<diregola gmail com>,Italy,madi,yes
+-,Veronica Andreo,<veroandreo gmail.com>,Argentina,veroandreo,yes
+-,Stefan Blumentrath,<stefan.blumentrath nina.no>,Norway,sbl,yes
 alex,Alex Shevlakov,<sixote yahoo.com>,Russia,-,-
 andreas,Andreas Lange,<andreas.c.lange gmx.de>,Germany,-,-
 benjamin,Benjamin Ducke,<benducke fastmail.fm>,Germany,benducke,yes
@@ -38,7 +40,7 @@ job,Job Spijker,<spijker geo.uu.nl>,Netherlands,-,-
 john,John Huddleston,<jhudd.lamar colostate.edu>,USA,-,-
 justin,Justin Hickey,<jhickey hpcc.nectec.or.th>,Thailand,-,-
 malcolm,Malcolm Blue,<mblue nb.sympatico.ca>,Canada,-,-
-markus,Markus Neteler,<neteler osgeo.org>,Italy,neteler,yes
+markus,Markus Neteler,<neteler osgeo.org>,Germany,neteler,yes
 martin,Martin Wegmann,<wegmann biozentrum.uni-wuerzburg.de>,Germany,wegmann,yes
 martinl,Martin Landa,<landa.martin gmail.com>,Czech Republic,martinl,yes
 massimo,Massimo Cuomo,<m.cuomo acsys.it>,Switzerland,-,-

--- a/debian/changelog
+++ b/debian/changelog
-grass (7.4.0~rc2-1~exp2) UNRELEASED; urgency=medium
+grass (7.4.1~rc1-1~exp1) experimental; urgency=medium

+  [ Bas Couwenberg ]
+  * New upstream release candidate.
+  * Don't use libjs-jquery for Doxygen docs.
+  * Add patch to fix spelling errors.
+  * Fix deprecated source override location.
+  * Update Vcs-* URLs for Salsa.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Update copyright years for Tereza Fiedlerova.
+  * Refresh patches.
+  * Fix AppStream metadata installation.
+
+  [ Francesco Paolo Lovergine ]
+  * Fixating wrong permissions (-x) for r.*.png modules.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 05 May 2018 10:05:39 +0200
+
+grass (7.4.0-1) unstable; urgency=medium
+
+  * New upstream release.
  * Don't install AppStream metadata in legacy location.
  * Update copyright-format URL to use HTTPS.
+  * Drop spelling-errors.patch, applied upstream.
+  * Add patch to fix spelling errors.
+  * Move from experimental to unstable.

- -- Bas Couwenberg <sebastic@debian.org>  Tue, 09 Jan 2018 22:01:34 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 26 Jan 2018 11:31:40 +0100

 grass (7.4.0~rc2-1~exp1) experimental; urgency=medium

@@ -21,7 +43,7 @@ grass (7.4.0~rc1-1~exp1) experimental; urgency=medium
  * New upstream release candidate.
  * Update spelling-errors.patch to fix additional typos.
  * Add lintian override for package-installs-java-bytecode false positive.
-  * Bump Standards-Version to 4.1.1, no changes.
+  * Bump Standards-Version to 4.1.2, no changes.
  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
  * Update watch file for GRASS 7.4 releases.
  * Strip trailing whitespace from changelog.
@@ -34,6 +56,22 @@ grass (7.4.0~rc1-1~exp1) experimental; urgency=medium

 -- Bas Couwenberg <sebastic@debian.org>  Fri, 17 Nov 2017 10:45:33 +0100

+grass (7.2.2-2) unstable; urgency=medium
+
+  * Add patch to only link to GEOS C library.
+  * Update spelling-errors.patch to fix additional typo.
+  * Add lintian override for package-installs-java-bytecode false positive.
+  * Bump Standards-Version to 4.1.2, no changes.
+  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+  * Strip trailing whitespace from changelog.
+  * Drop explicit use of autotools_dev dh helper.
+  * Update watch file to use HTTPS.
+  * Strip trailing whitespace from rules file.
+  * Drop unused lintian override for package-installs-java-bytecode.
+  * Add overrides for dependency-on-python-version-marked-for-end-of-life.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 27 Dec 2017 23:13:43 +0100
+
 grass (7.2.2-1) unstable; urgency=medium

  * New upstream release.

--- a/debian/control
+++ b/debian/control
@@ -49,9 +49,9 @@ Build-Depends: autoconf2.13,
               python-wxgtk3.0,
               unixodbc-dev,
               zlib1g-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b experimental
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/grass
+Vcs-Git: https://salsa.debian.org/debian-gis-team/grass.git -b experimental
 Homepage: http://grass.osgeo.org/

 Package: grass
@@ -156,8 +156,7 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: libjs-jquery,
-         ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: grass
 Description: GRASS GIS Programmers' Manual
 Commonly referred to as GRASS, this is a Geographic Information

--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,7 @@ Source: http://grass.osgeo.org/

 Files: *
 Copyright:   1989-2018, GRASS Development Team
+             2014-2018, Tereza Fiedlerova
             1992-2017, Helena Mitasova
             2003-2017, Glynn Clements
             2011-2017, Markus Metz
@@ -14,7 +15,6 @@ Copyright:   1989-2018, GRASS Development Team
                  2017, Maris Nartiss
             2003-2016, Markus Neteler
             2012-2016, Anna Petrasova
-             2014-2016, Tereza Fiedlerova
                  2016, Adam Laza
                  2016, Zofie Cimburova
             2006-2015, Martin Landa

--- a/debian/grass-core.install
+++ b/debian/grass-core.install
@@ -7,6 +7,6 @@ usr/lib/grass74/fonts
 usr/lib/grass74/lib
 usr/lib/grass74/locale
 usr/lib/grass74/scripts
-usr/share/appdata
 usr/share/applications
+usr/share/metainfo
 usr/share/icons/hicolor
--- a/debian/grass-core.install.in
+++ b/debian/grass-core.install.in
@@ -7,6 +7,6 @@ usr/lib/grass@VERSION@/fonts
 usr/lib/grass@VERSION@/lib
 usr/lib/grass@VERSION@/locale
 usr/lib/grass@VERSION@/scripts
-usr/share/appdata
 usr/share/applications
+usr/share/metainfo
 usr/share/icons/hicolor
--- a/debian/grass-doc.links
+++ b/debian/grass-doc.links
 usr/share/doc/grass-doc/html usr/lib/grass74/docs/html
-usr/share/javascript/jquery  usr/share/doc/grass-doc/html/jquery
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -10,7 +10,7 @@ Forwarded: not-needed

 --- a/lib/init/grass.py
 +++ b/lib/init/grass.py
-@@ -636,10 +636,12 @@ def find_exe(pgm):
+@@ -640,10 +640,12 @@ def find_exe(pgm):
 def set_defaults():
     # GRASS_PAGER
     if not os.getenv('GRASS_PAGER'):

--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
-spelling-errors.patch
+spelling-errors2.patch
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
-Description: Fix spelling errors.
- * lenght      -> length
- * aditionally -> additionally
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3476
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/72063
-
--- a/imagery/i.ortho.photo/i.ortho.photo/i.ortho.photo.html
-+++ b/imagery/i.ortho.photo/i.ortho.photo/i.ortho.photo.html
-@@ -54,7 +54,7 @@ Five groups of input parameters are requ
- <ul> 
- <li>Aerial image (images),</li>
- <li>Exposure and characteristics of the camera, i.e. its coordinates in
-target coordinate system and height above sea level, focal lenght, yaw, 
-+target coordinate system and height above sea level, focal length, yaw, 
- pitch and roll, dimensions of the camera sensor and resolution of aerial
- images,</li>
- <li>Reference surface, i.e. digital elevation model in the target coordinate
--- a/temporal/t.rast.algebra/t.rast.algebra.html
-+++ b/temporal/t.rast.algebra/t.rast.algebra.html
-@@ -33,7 +33,7 @@ assigned to STRDS or to the map lists re
- STRDS.
- <p>
- By default, only temporal topological relations among space time datasets
-(STDS) are evaluated. The <b>-s</b> flag can be used to aditionally
-+(STDS) are evaluated. The <b>-s</b> flag can be used to additionally
- activate the evaluation of the spatial topology based on the spatial
- extent of maps.
- <p>
--- a/debian/patches/spelling-errors2.patch
+++ b/debian/patches/spelling-errors2.patch
+Description: Fix spelling errors.
+ * condtions -> conditions
+ * program   -> program
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/gui/wxpython/iscatt/iscatt_core.py
+++ b/gui/wxpython/iscatt/iscatt_core.py
+@@ -426,7 +426,7 @@ class AnalyzedData:
+ 
+ 
+ class ScattPlotsCondsData:
+-    """Data structure for selected areas in scatter plot(condtions).
+    """Data structure for selected areas in scatter plot(conditions).
+     """
+ 
+     def __init__(self, an_data):
+--- a/lib/imagery/iscatt_core.c
+++ b/lib/imagery/iscatt_core.c
+@@ -252,7 +252,7 @@ int I_insert_patch_to_cat_rast(const cha
+ 
+     f_cat_rast = fopen(cat_rast, "rb+");
+     if (!f_cat_rast) {
+-	G_warning(_("Unable to open category raster condtions file <%s>."),
+	G_warning(_("Unable to open category raster conditions file <%s>."),
+ 		  cat_rast);
+ 	return -1;
+     }
+@@ -541,7 +541,7 @@ static int compute_scatts_from_chunk_row
+ 		}
+ 	    }
+ 
+-	    /* check condtions defined in scatter plots */
+	    /* check conditions defined in scatter plots */
+ 	    for (i_scatt = 0; i_scatt < scatts_conds->n_a_scatts; i_scatt++) {
+ 		b_1_rast_row = bands_rows[scatts_bands[i_scatt * 2]];
+ 		b_2_rast_row = bands_rows[scatts_bands[i_scatt * 2 + 1]];
+--- a/locale/po/grasslibs_ar.po
+++ b/locale/po/grasslibs_ar.po
+@@ -3488,7 +3488,7 @@ msgstr "'%s' لم يمكن فتح ملف
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, fuzzy, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr "datum لم يمكن فتح ملف جدول : %s"
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_cs.po
+++ b/locale/po/grasslibs_cs.po
+@@ -3278,7 +3278,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_de.po
+++ b/locale/po/grasslibs_de.po
+@@ -3276,7 +3276,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_el.po
+++ b/locale/po/grasslibs_el.po
+@@ -3271,7 +3271,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_es.po
+++ b/locale/po/grasslibs_es.po
+@@ -3314,7 +3314,7 @@ msgstr "No ha sido posible escribir en a
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr "No ha sido posible abrir archivo de condiciones de categorías ráster <%s>."
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_fi.po
+++ b/locale/po/grasslibs_fi.po
+@@ -3271,7 +3271,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_fr.po
+++ b/locale/po/grasslibs_fr.po
+@@ -3309,7 +3309,7 @@ msgstr "Impossible d'écrire dans le fic
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr "Impossible d'ouvrir le fichier <%s> de catégories du raster."
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_id_ID.po
+++ b/locale/po/grasslibs_id_ID.po
+@@ -3270,7 +3270,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_it.po
+++ b/locale/po/grasslibs_it.po
+@@ -3287,7 +3287,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ja.po
+++ b/locale/po/grasslibs_ja.po
+@@ -3276,7 +3276,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ko.po
+++ b/locale/po/grasslibs_ko.po
+@@ -3271,7 +3271,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_lv.po
+++ b/locale/po/grasslibs_lv.po
+@@ -3415,7 +3415,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ml.po
+++ b/locale/po/grasslibs_ml.po
+@@ -3271,7 +3271,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_pl.po
+++ b/locale/po/grasslibs_pl.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_pt.po
+++ b/locale/po/grasslibs_pt.po
+@@ -3274,7 +3274,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_pt_BR.po
+++ b/locale/po/grasslibs_pt_BR.po
+@@ -3270,7 +3270,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ro.po
+++ b/locale/po/grasslibs_ro.po
+@@ -3269,7 +3269,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ru.po
+++ b/locale/po/grasslibs_ru.po
+@@ -3269,7 +3269,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_si.po
+++ b/locale/po/grasslibs_si.po
+@@ -3270,7 +3270,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_sl.po
+++ b/locale/po/grasslibs_sl.po
+@@ -3509,7 +3509,7 @@ msgstr "ne morem zapisati \"history\" po
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, fuzzy, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr "Nezmožen odpreti datoteko s tabelo fundamentalne točke: %s"
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_ta.po
+++ b/locale/po/grasslibs_ta.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_th.po
+++ b/locale/po/grasslibs_th.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_tr.po
+++ b/locale/po/grasslibs_tr.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_uk.po
+++ b/locale/po/grasslibs_uk.po
+@@ -3270,7 +3270,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_vi.po
+++ b/locale/po/grasslibs_vi.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/locale/po/grasslibs_zh.po
+++ b/locale/po/grasslibs_zh.po
+@@ -3272,7 +3272,7 @@ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:255
+ #, c-format
+-msgid "Unable to open category raster condtions file <%s>."
+msgid "Unable to open category raster conditions file <%s>."
+ msgstr ""
+ 
+ #: ../lib/imagery/iscatt_core.c:263
+--- a/imagery/i.fft/i.fft.html
+++ b/imagery/i.fft/i.fft.html
+@@ -44,7 +44,7 @@ for the FFT". See <a href="http://www.ff
+ for computing the Discrete Fourier Transform (DFT) in one or more
+ dimensions, of both real and complex data, and of arbitrary input size.
+ <li> John A. Richards, 1986. Remote Sensing Digital Image Analysis, Springer-Verlag.
+-<li>Personal communication, between progam author and Ali R. Vali,
+<li>Personal communication, between program author and Ali R. Vali,
+ Space Research Center, <A HREF="http://www.utexas.edu">University of Texas</a>, Austin, 1990.
+ </ul>
+ 
--- a/debian/rules
+++ b/debian/rules
@@ -176,7 +176,7 @@ install-arch-stamp:

 	# install AppStream metadata
 	mkdir -p debian/tmp/usr/share/metainfo
-	mv debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml debian/tmp/usr/share/metainfo/org.osgeo.grass.appdata.xml
+	mv debian/tmp/usr/lib/$(BASE_NAME)/share/metainfo/org.osgeo.grass.appdata.xml debian/tmp/usr/share/metainfo/org.osgeo.grass.appdata.xml

 	# install grass wrapper scripts
 	install -m 755 debian/x-grass7 debian/tmp/usr/bin/x-$(BASE_NAME)
@@ -226,7 +226,6 @@ override_dh_auto_install-indep: install-arch-stamp
 	install -m 644 -d debian/tmp
 	install -m 644 -d debian/tmp/programming-manual/html
 	cp -r lib/html/* debian/tmp/programming-manual/html/
-	rm -f debian/tmp/programming-manual/html/jquery.js
 	rm -f debian/tmp/programming-manual/html/*.md5

 override_dh_install-arch:
@@ -267,6 +266,9 @@ override_dh_shlibdeps:
 override_dh_compress:
 	dh_compress -XAUTHORS

+override_dh_fixperms:
+	dh_fixperms -Xr.in.png -Xr.out.png
+
 override_dh_gencontrol:
 	dh_gencontrol -- -Vgrass:Provides="$(GRASS_ABI)"


--- a/display/d.linegraph/main.c
+++ b/display/d.linegraph/main.c
@@ -374,7 +374,7 @@ int main(int argc, char **argv)
    secondary_width_opt = G_define_option();
    secondary_width_opt->key = "secondary_width";
    secondary_width_opt->description = _("Width of point symbol lines");
-    secondary_width_opt->type = TYPE_INTEGER;
+    secondary_width_opt->type = TYPE_DOUBLE;
    secondary_width_opt->required = NO;
    secondary_width_opt->multiple = YES;
    secondary_width_opt->answer = "0.1";

--- a/display/d.text/d.text.html
+++ b/display/d.text/d.text.html
@@ -70,6 +70,7 @@ color yellow, in bold, and using 4/100'ths (4%) of the
 active frame's vertical space per line:
 <p>

+<!--
 <div class="code"><pre>
 <b>d.text</b> &lt;&lt; EOF
 .C yellow
@@ -79,10 +80,19 @@ active frame's vertical space per line:
 This is a test of d.text
 EOF
 </pre></div>
-
-
 The user presses <em>control-d</em> 
 (the "Ctrl" and "d" keys) to end input to <em>d.text</em> (equal to EOF).
+-->
+
+<div class="code"><pre>
+d.text text="This is a test of d.text" color=yellow bgcolor=gray size=4
+</pre></div>
+
+<div align="center" style="margin: 10px">
+<img src='d_text.png' width="600" border="1">
+<br>
+<i>Displayed Text</i>
+</div>

 <h2>NOTES</h2>

@@ -109,4 +119,4 @@ U.S. Army Construction Engineering
 Research Laboratory
 <p>Updates by Huidae Cho

-<p><i>Last changed: $Date: 2014-12-12 00:12:46 +0100 (Fri, 12 Dec 2014) $</i>
+<p><i>Last changed: $Date: 2018-01-20 16:59:07 +0100 (Sat, 20 Jan 2018) $</i>
--- a/display/d.text/d_text.png
+++ b/display/d.text/d_text.png
--- a/doc/howto_release.txt
+++ b/doc/howto_release.txt
 How to release GRASS GIS binaries and source code

-$Date: 2017-11-12 20:51:43 +0100 (Sun, 12 Nov 2017) $
+$Date: 2018-03-25 16:31:41 +0200 (Sun, 25 Mar 2018) $

 Note: This text contains *some* rules only applicable to the
      development coordinator (currently Markus Neteler, PSC Chair).
@@ -14,18 +14,35 @@ Contents
 ###########################################
 (A) HOWTO create a release

-1. Local work (done by release coordinator)
+0. Preparations

-   - svn up
-   - svn status --no-ignore
-   - check if
+#check if still compile; fix otherwise
 ( cd doc/raster/r.example/ ; make clean ; make )
 ( cd doc/vector/v.example/ ; make clean ; make )
-      still compile; fix otherwise

-   - fix typos with tools/fix_typos.sh
+# fix typos in source code with 
+tools/fix_typos.sh

-   - Check that autoconf scripts are up-to-date (to do only in RC cycle!):
+# i18N: sync from Transifex (https://www.transifex.com/grass-gis/grass72/dashboard/)
+#  - except for Latvian; Latvian is directly edited in SVN and then sync'ed from trunk .po files
+cd locale
+sh ~/software/grass-addons/tools/transifex_merge.sh
+make
+make verify
+# ... then fix .po files as needed.
+# after that push fixes to transifex:
+cd locale/transifex/
+tx --debug push -t
+
+#### end of i18N
+
+
+1. Local work
+
+# done by release manager
+
+# Only allowed RC cycle, not final!:
+# Check that autoconf scripts are up-to-date:

 rm -f config.guess config.sub
 wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
@@ -36,9 +53,10 @@ Contents
 svn ci -m"config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/" config.guess config.sub configure
 # test by running ./configure 

-   - make distclean
+# update from SVN
+svn up

-   - cleanup rubbish:
+# cleanup rubbish:
 rm -f locale/templates/*.pot
 rm -f locale/po/messages.mo
 rm -f demolocation/PERMANENT/.bash*
@@ -53,45 +71,51 @@ Contents
 rm -f gui/wxpython/menustrings.py gui/wxpython/build_ext.pyc gui/wxpython/xml/menudata.xml gui/wxpython/xml/module_tree_menudata.xml
 chmod -R a+r *

+# double check
+svn status --no-ignore
 svn status

-   - Create release branch (only if not yet existing)
+# Create release branch (only if not yet existing)
+# ... see below

-   - Update VERSION file to release version:
+# Update VERSION file to release version:
 vim include/VERSION

 #example:
 7
 4
-0RC1
-2017
+1RC1
+2018
+
+# cleanup
 rm -f include/VERSION~

-    - Update OSGeo4W setup.hint file
-       - for RC candidates use 'test' keyword
-       - for final version use 'curr' keyword
+# Update OSGeo4W setup.hint file
+### no longer needed
+#vim mswindows/osgeo4w/setup_x86.hint.tmpl
+#vim mswindows/osgeo4w/setup_x86_64.hint.tmpl

-      vim mswindows/osgeo4w/setup.hint.tmpl
+#### Changelog and tagging etc

-     #version:
+# create version env var for convenience:
 MAJOR=`cat include/VERSION | head -1 | tail -1`
 MINOR=`cat include/VERSION | head -2 | tail -1`
 RELEASE=`cat include/VERSION | head -3 | tail -1`
 VERSION=${MAJOR}.${MINOR}.${RELEASE}
 echo $VERSION

-     svn ci -m"GRASS GIS $VERSION" include/VERSION mswindows/osgeo4w/setup.hint.tmpl
+svn ci -m"GRASS GIS $VERSION" include/VERSION
 svn up

- o Create Changelog file on release branch:
+# Create Changelog file on release branch:
 # http://ch.tudelft.nl/~arthur/svn2cl/
 svn2cl
 mv ChangeLog ChangeLog_$VERSION
 head ChangeLog_$VERSION
 gzip ChangeLog_$VERSION

- o   Tag release (http://trac.osgeo.org/grass/browser/grass/tags):
-     http://svnbook.red-bean.com/en/1.4/svn.branchmerge.tags.html
+# Tag release (http://trac.osgeo.org/grass/browser/grass/tags):
+# see http://svnbook.red-bean.com/en/1.4/svn.branchmerge.tags.html

 TODAY=`date +"%Y%m%d"`
 RELEASETAG=release_${TODAY}_grass_${MAJOR}_${MINOR}_${RELEASE}
@@ -103,7 +127,7 @@ Contents
 	-m "Tagging release grass_${MAJOR}_${MINOR}_${RELEASE}"
      
      
- o create source package (in the source directory):
+# create source package (in the source directory):
 echo grass-${VERSION}

 mkdir grass-${VERSION}
@@ -118,20 +142,20 @@ Contents
 # Calculating MD5 sum:
 md5sum grass-${VERSION}.tar.gz > grass-${VERSION}.md5sum

- o reset include/VERSION file to SVN version:
+# reset include/VERSION file to SVN version:
 vim include/VERSION

 #example
 7
 4
-0svn
-2017
+1svn
+2018

 rm -f include/VERSION~
 svn ci -m"back to SVN" include/VERSION


- o Store the source tarball (twice) in (use scp -p FILES grass:):
+# Store the source tarball (twice) in (use scp -p FILES grass:):
 SERVER1=grass.osgeo.org
 SERVER1DIR=/var/www/grass/grass-cms/grass$MAJOR$MINOR/source/
 SERVER2=upload.osgeo.org
@@ -139,23 +163,25 @@ Contents
 echo $SERVER1:$SERVER1DIR
 echo $SERVER2:$SERVER2DIR

-   # copy along with associated files:
+# upload along with associated files:
 scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \
  INSTALL REQUIREMENTS.html SUBMITTING neteler@$SERVER1:$SERVER1DIR
+
 scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \
  INSTALL REQUIREMENTS.html SUBMITTING neteler@$SERVER2:$SERVER2DIR

-   # 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"
+# Only full release!
+# generate link to "latest" source code
+ssh neteler@$SERVER1 "cd $SERVER1DIR ; rm -f grass-$MAJOR.$MINOR-latest.tar.gz"
+ssh neteler@$SERVER1 "cd $SERVER1DIR ; ln -s grass-$VERSION.tar.gz grass-$MAJOR.$MINOR-latest.tar.gz"

- o update winGRASS related files
-    - Update the winGRASS version
-      grass-addons/tools/wingrass-packager/grass_packager_release.bat
-      grass-addons/tools/wingrass-packager/grass_addons.sh
-      grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
+# update winGRASS related files: Update the winGRASS version
+vim grass-addons/tools/wingrass-packager/grass_packager_release.bat
+vim grass-addons/tools/wingrass-packager/grass_addons.sh
+vim grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh

- o update web site to new version: CMS
+###################
+# update web site to new version: CMS
  - News section
  - https://grass.osgeo.org/download/software/
  - https://grass.osgeo.org/download/software/sources/
@@ -163,74 +189,65 @@ Contents
  - https://grass.osgeo.org/home/history/releases/
  - https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG

-     write announcement
+# write announcement
  - store in trac:
-           http://trac.osgeo.org/grass/wiki/Release/7.XX.YY-News
-           https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74  <- major changes only
+    https://trac.osgeo.org/grass/wiki/Release/7.4.x-News
+    https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74  <- add content of major changes only
  - update version in https://grasswiki.osgeo.org/wiki/GRASS-Wiki
-      - store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how? with protected PHP upload page?
-
-     full release:
-      - update trac 
-         - milesstone/add next: https://trac.osgeo.org/grass/admin/ticket/milestones
-         - add released version: https://trac.osgeo.org/grass/admin/ticket/versions
-      
+  - store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how? with protected PHP upload page? (dropped since CMS)

- o upload user HTML manual in case of *final release* from compiled English
-   version at (warning: needs stuff to be compiled).
-      - download new source code package, compile with most settings
-      -  cd dist.$ARCH/docs/html
-         echo www/grass$MAJOR$MINOR/manuals/
-         scp -r * neteler@grass.osgeo.org:/osgeo/grass/grass-cms/grass$MAJOR$MINOR/manuals/
-         scp -r * neteler@upload.osgeo.org:/osgeo/download/grass/grass$MAJOR$MINOR/manuals/
+# only when new major release
+# update cronjob 'cron_grass_HEAD_src_snapshot.sh' on grass.osgeo.org to next but one release tag for the differences

- o stable release: update cronjob 'cron_grass_HEAD_src_snapshot.sh' on grass.osgeo.org to next but one
-                   release tag for the differences
+# wiki updates, only when new major release:
+  - {{cmd|xxxx}} macro: https://grasswiki.osgeo.org/wiki/Template:Cmd
+  - update last version on main page

- o Trac updates:
+# trac updates, only when new major release:
  - Add new release to https://trac.osgeo.org/grass/admin/ticket/versions
  - 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
     - 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.
       - Only in case of new release branch being created:
-         Add Wiki Macro definitions for manual pages G7X:modulename
-         - Edit: https://trac.osgeo.org/grass/wiki/InterMapTxt
  
+  - Add Wiki Macro definitions for manual pages G7X:modulename
+    - Edit: https://trac.osgeo.org/grass/wiki/InterMapTxt

- o WinGRASS notes:
+# WinGRASS notes:

-   Update grass_packager_release.bat, eg.
+  - Update grass_packager_release.bat, eg.

     set MAJOR=7
     set MINOR=4
-     set PATCH=0RC1
+     set PATCH=1RC1

-   Update addons (grass_addons.sh) rules, eg.
+  - Update addons (grass_addons.sh) rules, eg.

     compile $SVN_PATH/grass7 $GISBASE_PATH/grass740RC1   $ADDON_PATH/grass740RC1/addons

-   Modify grass_copy_wwwroot.sh accordingly, eg.
+  - Modify grass_copy_wwwroot.sh accordingly, eg.

-     copy_addon 740RC1 7.4.0RC1
+     copy_addon 741RC1 7.4.1RC1

- o Launchpad notes:
+# Launchpad notes:

-   Create milestone and release: https://launchpad.net/grass/+series
+  - Create milestone and release: https://launchpad.net/grass/+series

-   Upload tarball for created release
+  - Upload tarball for created release

-   Update daily recipe contents: https://code.launchpad.net/~grass/+recipe/grass-trunk
+  - Update daily recipe contents: https://code.launchpad.net/~grass/+recipe/grass-trunk

- o Packaging notes:
+# Packaging notes:
   https://trac.osgeo.org/grass/wiki/BuildHints
   - https://trac.osgeo.org/grass/wiki/DebianUbuntuPackaging
   - https://trac.osgeo.org/grass/wiki/CompileOnWindows

-
-2. Tell others about it:
+############
+# Marketing - tell others about release:

 * Notify all packagers (MN has email list)

@@ -264,7 +281,6 @@ Contents
   redazione@geoforus.it
   mfeilner@linuxnewmedia.de
   info@harzer.de
-   pr@geocomm.com
   editor-geo@geoconnexion.com

 Web:

--- a/doc/infrastructure.txt
+++ b/doc/infrastructure.txt
 How the GRASS Webserver and related infrastructure works

 written by M. Neteler
-Last changed: $Date: 2017-10-23 22:31:51 +0200 (Mon, 23 Oct 2017) $
+Last changed: $Date: 2018-01-29 12:19:20 +0100 (Mon, 29 Jan 2018) $


 Related Wiki documents:
@@ -89,7 +89,7 @@ Available lists:
   grass-announce 	GRASS announcements
   grass-commit 	Mailing list to distribute GRASS-CVS commits
   grass-dev 		GRASS GIS Development mailing list
-   grass-es 		La lista de correo de GRASS GIS en espaol
+   grass-es 		La lista de correo de GRASS GIS en español
   grass-psc 		GRASS-PSC: GRASS Project Steering Committee
   grass-stats 		GRASS and statistical software
   grass-translations 	Translation of GRASS (i18N)
@@ -165,6 +165,21 @@ Current bugtracker (Jan 2008 - today):
  * https://trac.osgeo.org/grass/report
  * Trac
  * posts new bugs and comments to grass-dev list
+  * Settings:
+
+tracsvn (OSGeo server)
+/var/www/trac/env/grass/conf/trac.ini
+  downloadable_paths = /grass-addons/grass7/*/*,/sandbox/*/*
+  path = /var/www/grass/htdocs
+  link = https://grass.osgeo.org/
+  src = site/grasslogo_vector_small.png
+  smtp_always_cc = grass-dev@lists.osgeo.org
+  smtp_replyto = grass-dev@lists.osgeo.org
+  url = https://grass.osgeo.org
+  .dir = /var/www/svn/repos/grass
+  base_url = https://trac.osgeo.org/grass/
+  database = postgres://postgres@/trac_grass
+

 Old bugtracker (Jan 2007 - Dec 2008):
  * http://wald.intevation.org/tracker/?group_id=21
@@ -190,6 +205,9 @@ Details:
 Installed with g.extension
 Manuals: https://grass.osgeo.org/grass7/manuals/addons/

+The redirect to the latest directory is defined on grass.osgeo.org:
+  /etc/apache2/includes/grass.osgeo.org.inc
+
 Procedure building of binaries (Windows):
  Addons module are compiled on build server, currently at the CTU in Prague)
  and publishing their manual pages on publishing server, i.e. grass.osgeo.org.