Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/ChangeLog_7.4.0.gz
+++ b/ChangeLog_7.4.0.gz
--- a/ChangeLog_7.4.1RC2.gz
+++ b/ChangeLog_7.4.1RC2.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

--- a/debian/changelog
+++ b/debian/changelog
-grass (7.4.0-2) UNRELEASED; urgency=medium
+grass (7.4.1~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Strip trailing whitespace from control file.
+  * Drop spelling-errors2.patch, applied upstream.
+  * Change grass-dev dependency on python to ${python:Depends}.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 20 May 2018 08:16:39 +0200
+
+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, 03 Feb 2018 11:17:07 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 05 May 2018 10:05:39 +0200

 grass (7.4.0-1) unstable; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,7 @@ Build-Depends: autoconf2.13,
               zlib1g-dev
 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
+Vcs-Git: https://salsa.debian.org/debian-gis-team/grass.git -b experimental
 Homepage: http://grass.osgeo.org/

 Package: grass
@@ -178,7 +178,7 @@ Depends: grass-core (= ${binary:Version}),
         libgdal-dev,
         libpq-dev,
         libproj-dev,
-         python,
+         ${python:Depends},
         ${shlibs:Depends},
         ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
@@ -196,4 +196,3 @@ Description: GRASS GIS development files
 This package contains the header files for developing with GRASS.
 Install this package if you wish to develop software that manipulates
 GRASS data sets or install addons using the g.extension module.
-
--- 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/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream

 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = experimental

 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig

--- 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,5 +2,3 @@ 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.
- * acounts -> accounts
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3484
-Applied-Upstream: https://trac.osgeo.org/grass/changeset/72162
-
--- a/raster/r.drain/r.drain.html
-+++ b/raster/r.drain/r.drain.html
-@@ -33,7 +33,7 @@ incompatible.
- 
- <p>For an elevation surface, the path is calculated by choosing the
- steeper "slope" between adjacent cells. The slope calculation
-accurately acounts for the variable scale in lat-lon projections. For
-+accurately accounts for the variable scale in lat-lon projections. For
- a cost surface, the path is calculated by following the movement
- direction surface back to the start point given
- in <em><a href="r.walk.html">r.walk</a></em> or
--- 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
-@@ -528,7 +528,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
-@@ -528,7 +528,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
-@@ -526,7 +526,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
-@@ -521,7 +521,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
-@@ -531,7 +531,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
-@@ -521,7 +521,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
-@@ -525,7 +525,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
-@@ -3733,7 +3733,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
-@@ -528,7 +528,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
-@@ -526,7 +526,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
-@@ -8496,7 +8496,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
-@@ -7539,7 +7539,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
-@@ -521,7 +521,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
-@@ -522,7 +522,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
-@@ -524,7 +524,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
-@@ -520,7 +520,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
-@@ -519,7 +519,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
-@@ -519,7 +519,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
-@@ -3739,7 +3739,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
-@@ -529,7 +529,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
-@@ -388,7 +388,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
-@@ -522,7 +522,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
-@@ -522,7 +522,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
-@@ -3745,7 +3745,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
-@@ -522,7 +522,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
-@@ -522,7 +522,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)

--- 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/doc/howto_release.txt
+++ b/doc/howto_release.txt
 How to release GRASS GIS binaries and source code

-$Date: 2018-01-26 10:12:26 +0100 (Fri, 26 Jan 2018) $
+$Date: 2018-05-04 23:18:02 +0200 (Fri, 04 May 2018) $

 Note: This text contains *some* rules only applicable to the
      development coordinator (currently Markus Neteler, PSC Chair).
@@ -23,6 +23,19 @@ Contents
 # fix typos in source code with 
 tools/fix_typos.sh

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

@@ -122,7 +135,7 @@ mv * grass-${VERSION}/
 # do not include the debian control files:
 mv grass-${VERSION}/debian .
 # create the package:
-tar cvfzh grass-${VERSION}.tar.gz grass-${VERSION}/* --exclude=.svn
+tar cvfzh grass-${VERSION}.tar.gz --exclude=.svn grass-${VERSION}/*
 # restore src code location:
 mv ./grass-${VERSION}/* .
 rmdir ./grass-${VERSION}
@@ -159,8 +172,8 @@ scp -p grass-$VERSION.* AUTHORS COPYING ChangeLog_$VERSION.gz \

 # 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"
+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"

 # update winGRASS related files: Update the winGRASS version
 vim grass-addons/tools/wingrass-packager/grass_packager_release.bat
@@ -176,74 +189,65 @@ vim grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
  - 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)

@@ -277,7 +281,6 @@ vim grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
   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: 2018-01-25 18:04:08 +0100 (Thu, 25 Jan 2018) $
+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)
@@ -205,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.

--- a/doc/vector/v.example/main.c
+++ b/doc/vector/v.example/main.c
@@ -92,16 +92,20 @@ int main(int argc, char *argv[])
    else
 	open3d = WITHOUT_Z;

+    /* Set error handler for input vector map */
+    Vect_set_error_handler_io(&In, NULL);
+    
    /* Open new vector for reading/writing */
    if (0 > Vect_open_new(&Out, new->answer, open3d)) {
-	Vect_close(&In);
 	G_fatal_error(_("Unable to create vector map <%s>"), new->answer);
    }

+    /* Set error handler for output vector map */
+    Vect_set_error_handler_io(NULL, &Out);
+
    /* Let's get vector layers db connections information */
    Fi = Vect_get_field(&In, 1);
    if (!Fi) {
-	Vect_close(&In);
 	G_fatal_error(_("Database connection not defined for layer %d"), 1);
    }

@@ -122,18 +126,19 @@ int main(int argc, char *argv[])
    /* Prepare database for use */
    driver = db_start_driver(Fi->driver);
    if (driver == NULL) {
-	Vect_close(&In);
 	G_fatal_error(_("Unable to start driver <%s>"), Fi->driver);
    }
+
+    /* Set error handler for DB driver */
+    db_set_error_handler_driver(driver);
+      
    db_set_handle(&handle, Fi->database, NULL);
    if (db_open_database(driver, &handle) != DB_OK) {
-	Vect_close(&In);
 	G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
-		      Fi->database, driver);
+		      Fi->database, Fi->driver);
    }
    db_set_string(&table_name, Fi->table);
    if (db_describe_table(driver, &table_name, &table) != DB_OK) {
-	Vect_close(&In);
 	G_fatal_error(_("Unable to describe table <%s>"), Fi->table);
    }
    ncols = db_get_table_number_of_columns(table);

--- a/gui/icons/Makefile
+++ b/gui/icons/Makefile
@@ -52,8 +52,8 @@ default: $(ETCICONS) $(HTMLICONS)
 	$(INSTALL_DATA) grass-192x192.png $(ARCH_DISTDIR)/share/icons/hicolor/192x192/apps/grass.png
 	$(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps
 	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass.svg
-	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
-	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
+	$(MKDIR) $(ARCH_DISTDIR)/share/metainfo
+	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/metainfo/org.osgeo.grass.appdata.xml
 ### disable special 64bit icons (using different icons can be confusing for the user)
 # ifeq ($(findstring x86_64,$(ARCH)),x86_64)
 # 	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons

--- a/gui/icons/grass.appdata.xml
+++ b/gui/icons/grass.appdata.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
-  <id>org.osgeo.grass</id>
+  <id>org.osgeo.grass.desktop</id>
  <name>GRASS GIS</name>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>

--- a/gui/wxpython/core/settings.py
+++ b/gui/wxpython/core/settings.py
@@ -188,6 +188,9 @@ class Settings:
                'autoZooming': {
                    'enabled': False
                },
+                'showCompExtent': {
+                    'enabled': False
+                },
                'statusbarMode': {
                    'selection': 0
                },
@@ -315,6 +318,9 @@ class Settings:
                        'enabled': True
                    },
                },
+                'randomColors': {
+                    'enabled': False,
+                },
            },
            #
            # vdigit
@@ -1286,4 +1292,8 @@ def GetDisplayVectSettings():
            types.append(ftype)
    settings.append('type=%s' % ','.join(types))

+    if UserSettings.Get(group='vectorLayer',
+                        key='randomColors', subkey='enabled'):
+        settings.append('-c')
+
    return settings