diff -Nru grass-7.8.3~rc2/debian/changelog grass-7.8.3/debian/changelog --- grass-7.8.3~rc2/debian/changelog 2020-05-01 20:07:32.000000000 +0000 +++ grass-7.8.3/debian/changelog 2020-05-05 22:56:28.000000000 +0000 @@ -1,3 +1,16 @@ +grass (7.8.3-1~focal1) focal; urgency=medium + + * Rebuild for focal. + + -- Martin Landa Wed, 06 May 2020 00:56:28 +0200 + +grass (7.8.3-1) unstable; urgency=medium + + * New upstream release. + * Move from experimental to unstable. + + -- Bas Couwenberg Tue, 05 May 2020 11:45:27 +0200 + grass (7.8.3~rc2-1~exp1~focal1) focal; urgency=medium * Rebuild for focal. diff -Nru grass-7.8.3~rc2/doc/infrastructure.txt grass-7.8.3/doc/infrastructure.txt --- grass-7.8.3~rc2/doc/infrastructure.txt 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/doc/infrastructure.txt 2020-05-05 08:51:50.000000000 +0000 @@ -1,12 +1,13 @@ How the GRASS Webserver and related infrastructure works written by M. Neteler -Last changed: Apr 2020 +Last changed: May 2020 Related Wiki documents: * https://grass.osgeo.org/wiki/GRASS_Migration_to_OSGeo (historical document) + == GRASS Source code repository == Maintainer: Markus Neteler, Martin Landa, OSGeo-SAC, http://wiki.osgeo.org/wiki/SAC @@ -36,13 +37,15 @@ Statistics: https://trac.osgeo.org/grass/stats/code + == GRASS Web server == Maintainer: M. Neteler -* https://grass.osgeo.org (to be replaced in 2020) +* https://grass.osgeo.org (to be replaced in 2020, see https://staging.grass.osgeo.org/) ** Shared virtual OSGeo machine (osgeo6) hosted at Oregon State University Open Source Lab (server: osgeo6.osgeo.osuosl.org) +** new server 2020: LXD container on osgeo7 ** OSGeo SAC page: http://wiki.osgeo.org/wiki/SAC_Service_Status http://wiki.osgeo.org/index.php/SAC ** Login: via OSGeo LDAP, there is a "grass" LDAP group @@ -53,10 +56,11 @@ * Backup: ** VERIFY 2010: grass.osgeo.org is backup'ed by OSGeo SAC: http://wiki.osgeo.org/wiki/SAC:Backups ** Wiki backup, via rsync to http://josef.fsv.cvut.cz/WIKI/grass-osgeo/index.php/Main_Page +** new server 2020: LXD container on osgeo7 backup'ed * Web pages: -** CMSMS: https://grass.osgeo.org/home/imprint/ -** mirrored from Wroclav university via httrack (tier-1), +** CMSMS: https://grass.osgeo.org/home/imprint/ (to be phased out in 2020 with hugo solution) +** OLD mirrored from Wroclav university via httrack (tier-1), then offered as rsync mirror (tier-2) to other mirror sites ** RSS feed: offered by CMSMS @@ -105,10 +109,12 @@ Summary: The system should run almost autonomously. + == WinGRASS maintenance scripts == * https://github.com/landam/wingrass-maintenance-scripts + == GRASS Mailing lists == Maintainer: Markus Neteler @@ -158,6 +164,7 @@ Macro for manual pages: https://grasswiki.osgeo.org/wiki/Template:Cmd + == GRASS IRC == Channel: irc://irc.freenode.net/grass @@ -173,16 +180,15 @@ == GRASS Bugtracker == -Future bugtracker - * https://github.com/OSGeo/grass +Current bugtracker (Jan 2020 - today): + * https://github.com/OSGeo/grass/issues -Current bugtracker (Jan 2008 - today): +Current bugtracker (Jan 2008 - Jan 2020): * https://trac.osgeo.org/grass/report - * Trac * posts new bugs and comments to grass-dev list * Settings: -tracsvn (OSGeo server) (Dec 2007 - 2019) +Old tracsvn (OSGeo server) (Dec 2007 - Mai 2019) /var/www/trac/env/grass/conf/trac.ini downloadable_paths = /grass-addons/grass7/*/*,/sandbox/*/* path = /var/www/grass/htdocs @@ -195,13 +201,13 @@ base_url = https://trac.osgeo.org/grass/ database = postgres://postgres@/trac_grass -Old bugtracker (Jan 2007 - Dec 2008): +Very old bugtracker (Jan 2007 - Dec 2008): * http://wald.intevation.org/tracker/?group_id=21 * gforce, sponsored by Intevation GmbH, Germany * spamassasin spamfilter locally, bogofilter at grass-dev list * needs 'noreply*wald.intevation.org' to be enabled as alias in Mailman -Very old bugtracker (Dec 2000 - Dec 2006): +Very very old bugtracker (Dec 2000 - Dec 2006): * https://intevation.de/rt/webrt?q_queue=grass * webRT, sponsored by Intevation GmbH, Germany * spamassasin spamfilter locally, bogofilter at grass-dev list @@ -219,7 +225,7 @@ Installed with g.extension Manuals: https://grass.osgeo.org/grass7/manuals/addons/ -The redirect to the latest directory is defined on grass.osgeo.org: +The redirect to the latest grass7x directory is defined on grass.osgeo.org: /etc/apache2/includes/grass.osgeo.org.inc Procedure building of binaries (Windows): @@ -259,9 +265,15 @@ The github update is run as a cronjob on server "geo102" (CTU, CZ). -== GRASS GitHub Actions == -Details: https://github.com/OSGeo/grass/pull/525 +== GRASS CI: GitHub Actions == + +Started Apr. 2020 + +Maintainer: Vaclav Petras + +* https://github.com/OSGeo/grass/actions +* Details: https://github.com/OSGeo/grass/pull/525 - CI workflow with: - A build job which is not parallelized and is meant for clear & relatively fast check of compilation and building in general. (Duplicating what is running on Travis) @@ -272,6 +284,7 @@ Helper files placed to .github/workflows + == GRASS Coverity Scan == Maintainer: Markus Neteler diff -Nru grass-7.8.3~rc2/include/VERSION grass-7.8.3/include/VERSION --- grass-7.8.3~rc2/include/VERSION 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/include/VERSION 2020-05-05 08:51:50.000000000 +0000 @@ -1,4 +1,4 @@ 7 8 -3RC2 +3 2020 diff -Nru grass-7.8.3~rc2/scripts/r.unpack/r.unpack.py grass-7.8.3/scripts/r.unpack/r.unpack.py --- grass-7.8.3~rc2/scripts/r.unpack/r.unpack.py 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/scripts/r.unpack/r.unpack.py 2020-05-05 08:51:50.000000000 +0000 @@ -82,7 +82,7 @@ try: for fname in ['PROJ_INFO', 'PROJ_UNITS']: f = tar.extractfile('{}/{}'.format(data_name, fname)) - sys.stdout.write(f.read()) + sys.stdout.write(f.read().decode()) except KeyError: grass.fatal(_("Pack file unreadable: file '{}' missing".format(fname))) tar.close() diff -Nru grass-7.8.3~rc2/scripts/v.db.addtable/v.db.addtable.py grass-7.8.3/scripts/v.db.addtable/v.db.addtable.py --- grass-7.8.3~rc2/scripts/v.db.addtable/v.db.addtable.py 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/scripts/v.db.addtable/v.db.addtable.py 2020-05-05 08:51:50.000000000 +0000 @@ -148,7 +148,7 @@ # modules such as v.what.rast happy: (creates new row for each # vector line): try: - grass.run_command('v.to.db', map=map_name, layer=layer, + grass.run_command('v.to.db', overwrite=True, map=map_name, layer=layer, option='cat', column=key, qlayer=layer) except CalledModuleError: # remove link diff -Nru grass-7.8.3~rc2/scripts/v.to.lines/v.to.lines.py grass-7.8.3/scripts/v.to.lines/v.to.lines.py --- grass-7.8.3~rc2/scripts/v.to.lines/v.to.lines.py 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/scripts/v.to.lines/v.to.lines.py 2020-05-05 08:51:50.000000000 +0000 @@ -102,7 +102,6 @@ grass.fatal(_("Error creating layer 2")) try: grass.run_command('v.db.addtable', map=input_tmp, layer="2", - columns="left integer,right integer", quiet=quiet) except CalledModuleError: grass.run_command('g.remove', flags='f', type='vector', diff -Nru grass-7.8.3~rc2/scripts/v.unpack/v.unpack.py grass-7.8.3/scripts/v.unpack/v.unpack.py --- grass-7.8.3~rc2/scripts/v.unpack/v.unpack.py 2020-05-01 09:54:46.000000000 +0000 +++ grass-7.8.3/scripts/v.unpack/v.unpack.py 2020-05-05 08:51:50.000000000 +0000 @@ -85,7 +85,7 @@ try: for fname in ['PROJ_INFO', 'PROJ_UNITS']: f = tar.extractfile(fname) - sys.stdout.write(f.read()) + sys.stdout.write(f.read().decode()) except KeyError: grass.fatal(_("Pack file unreadable: file '{}' missing".format(fname))) tar.close()