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.0RC2.gz
+++ b/ChangeLog_7.4.0RC2.gz
--- a/contributors.csv
+++ b/contributors.csv
@@ -38,7 +38,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-1~trusty1) trusty; urgency=medium
+
+  * Rebuild for trusty.
+
+ -- Martin Landa <landa.martin@gmail.com>  Sat, 27 Jan 2018 10:22:31 +0100
+
+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>  Fri, 26 Jan 2018 11:31:40 +0100
+
 grass (7.4.0~rc2-1~exp1~trusty1) trusty; urgency=medium

  * Rebuild for trusty.
@@ -15,6 +32,22 @@ grass (7.4.0~rc2-1~exp1) experimental; urgency=medium

 -- Bas Couwenberg <sebastic@debian.org>  Tue, 09 Jan 2018 08:41:24 +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.4.0~rc1-1~exp1~trusty1) trusty; urgency=medium

  * Rebuild for trusty.
@@ -26,7 +59,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.

--- a/debian/copyright
+++ b/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GRASS GIS
 Upstream-Contact: GRASS Development Team <grass-dev@lists.osgeo.org>
 Source: http://grass.osgeo.org/

--- 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/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
 Description: Fix spelling errors.
- * lenght      -> length
- * aditionally -> additionally
+ * acounts -> accounts
 Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/3476
+Forwarded: https://trac.osgeo.org/grass/ticket/3484

--- 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/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/rules
+++ b/debian/rules
@@ -174,8 +174,8 @@ install-arch-stamp:
 	mv debian/tmp/usr/lib/$(BASE_NAME)/share/applications/grass.desktop debian/tmp/usr/share/applications/$(BASE_NAME).desktop

 	# install AppStream metadata
-	mkdir -p debian/tmp/usr/share/appdata
-	mv debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
+	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

 	# install grass wrapper scripts
 	install -m 755 debian/x-grass7 debian/tmp/usr/bin/x-$(BASE_NAME)

--- 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-01-26 10:12:26 +0100 (Fri, 26 Jan 2018) $

 Note: This text contains *some* rules only applicable to the
      development coordinator (currently Markus Neteler, PSC Chair).
@@ -14,18 +14,22 @@ 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!):
+
+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 +40,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 +58,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 +114,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 +129,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 +150,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
+# 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"

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

--- 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-25 18:04:08 +0100 (Thu, 25 Jan 2018) $


 Related Wiki documents:
@@ -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

--- a/gui/wxpython/core/ws.py
+++ b/gui/wxpython/core/ws.py
@@ -196,7 +196,11 @@ class RenderWMSMgr(wx.EvtHandler):
            if len(r) < 2:
                continue
            try:
-                if r[0] in ['cols', 'rows']:
+                if r[0] in ['e-w resol3', 'n-s resol3', 'rows3', 'cols3',
+                            'depths']:
+                    # ignore 3D region values (causing problems in latlong locations)
+                    continue
+                if r[0] in ['cols', 'rows', 'zone', 'proj']:
                    region[r[0]] = int(r[1])
                else:
                    region[r[0]] = float(r[1])

--- a/gui/wxpython/datacatalog/tree.py
+++ b/gui/wxpython/datacatalog/tree.py
@@ -568,7 +568,7 @@ class DataCatalogTree(LocationMapTree):
        self.copy_type = self.selected_type
        self.copy_mapset = self.selected_mapset
        self.copy_location = self.selected_location
-        label = _("Map <{layer}> marked for moving.").format(layer=self.copy_layer)
+        label = _("Map <{layer}> marked for moving.").format(layer=self.copy_layer.label)
        self.showNotification.emit(message=label)

    def OnCopyMap(self, event):
@@ -578,7 +578,7 @@ class DataCatalogTree(LocationMapTree):
        self.copy_type = self.selected_type
        self.copy_mapset = self.selected_mapset
        self.copy_location = self.selected_location
-        label = _("Map <{layer}> marked for copying.").format(layer=self.copy_layer)
+        label = _("Map <{layer}> marked for copying.").format(layer=self.copy_layer.label)
        self.showNotification.emit(message=label)

    def OnRenameMap(self, event):

--- a/gui/wxpython/photo2image/g.gui.photo2image.html
+++ b/gui/wxpython/photo2image/g.gui.photo2image.html
@@ -24,16 +24,16 @@ an extension file (if not given, defaults to \$filename_ip2i_out)
 An example for Location <b>imagery60</b>:

 <div class="code"><pre>
-g.gui.iphoto2image group=aerial@PERMANENT raster=gs13.1@PERMANENT camera=gscamera order=2 extension=try --o
+g.gui.photo2image group=aerial@PERMANENT raster=gs13.1@PERMANENT camera=gscamera order=2 extension=try --o
 </pre></div>

-<h3>Screenshot of g.gui.iphoto2image</h3>
+<h3>Screenshot of g.gui.photo2image</h3>

 <div align="center" style="margin: 10px">
 <a href="wxGUI_iphoto2image_frame.jpg">
-<img src="wxGUI_iphoto2image_frame.jpg" width="600" height="375" alt="Screenshot of g.gui.iphoto2image" border=0>
+<img src="wxGUI_iphoto2image_frame.jpg" width="600" height="375" alt="Screenshot of g.gui.photo2image" border=0>
 </a><br>
-<i>Figure: Screenshot of g.gui.iphoto2image</i>
+<i>Figure: Screenshot of g.gui.photo2image</i>
 </div>

 <h2>For a detailed operation manual please read</h2>
@@ -66,4 +66,4 @@ Markus Metz<br><br>
 Martin Landa, Czech Technical University in Prague, Czech Republic

 <p>
-<i>$Date: 2017-11-11 12:27:38 +0100 (Sat, 11 Nov 2017) $</i>
+<i>$Date: 2018-01-16 21:57:43 +0100 (Tue, 16 Jan 2018) $</i>
--- a/gui/wxpython/photo2image/g.gui.photo2image.py
+++ b/gui/wxpython/photo2image/g.gui.photo2image.py
@@ -82,7 +82,7 @@ def main():
    from core.settings import UserSettings
    from core.globalvar import CheckWxVersion
    from core.giface import StandaloneGrassInterface
-    from iphoto2image.ip2i_manager import GCPWizard
+    from photo2image.ip2i_manager import GCPWizard

    driver = UserSettings.Get(group='display', key='driver', subkey='type')
    if driver == 'png':

--- a/gui/wxpython/photo2image/ip2i_manager.py
+++ b/gui/wxpython/photo2image/ip2i_manager.py
 """
-@package iphoto2image.ip2i_manager
+@package photo2image.ip2i_manager

 @brief Scanning distortion correction of a photo for GRASS GIS. 
 Includes ground control point management and interactive point 
@@ -49,7 +49,7 @@ from gui_core.gselect import Select, LocationSelect, MapsetSelect
 from gui_core.dialogs import GroupDialog
 from core.gcmd import RunCommand, GMessage, GError, GWarning, EncodeString
 from core.settings import UserSettings
-from iphoto2image.ip2i_mapdisplay import MapFrame
+from photo2image.ip2i_mapdisplay import MapFrame
 from core.giface import Notification
 from gui_core.wrap import SpinCtrl


--- a/gui/wxpython/photo2image/ip2i_mapdisplay.py
+++ b/gui/wxpython/photo2image/ip2i_mapdisplay.py
 """
-@package iphoto2image.ip2i_mapdisplay
+@package photo2image.ip2i_mapdisplay

 @brief Display to manage ground control points with two toolbars, one
 for various display management functions, one for manipulating GCPs.

--- a/gui/wxpython/photo2image/ip2i_statusbar.py
+++ b/gui/wxpython/photo2image/ip2i_statusbar.py
 """
-@package iphoto2image.ip2i_statusbar
+@package photo2image.ip2i_statusbar

 @brief Classes for statusbar management in GCP Manager