[ogdi-dfsg] 04/06: Merge tag 'upstream/3.2.1+ds'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ogdi-dfsg.

commit 9ba7d9fe08e0ab4362935f1bc5a613b762a871c3
Merge: 3a0e46d ed8dd00
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 1 19:15:39 2018 +0100

    Merge tag 'upstream/3.2.1+ds'
    
    Upstream version 3.2.1+ds

 .cvsignore                            |   4 +
 .gitignore                            |  11 +
 ChangeLog                             |  11 +
 HOWTO-RELEASE                         |   7 +-
 NEWS                                  |   9 +
 VERSION                               |   1 -
 config/common.mak.in                  |   2 +
 config/mkinstalldirs                  |   2 +-
 config/win64.mak                      | 192 ++++++++++++++++++
 configure                             |  16 +-
 configure.in                          |   2 +-
 contrib/gdal/.cvsignore               |   1 +
 contrib/gdal/gbgetsymbol.c            |   6 +-
 contrib/gdal/gdal_serv.c              |   6 +-
 contrib/gdal/gdal_serv.h              |   6 +-
 contrib/gdal/gdalbridge.c             |   6 +-
 contrib/gdal/gdalbridge.h             |   6 +-
 contrib/ogdi_import/.cvsignore        |   1 +
 contrib/ogdi_import/ogdi_import.c     |   6 +-
 contrib/ogdi_info/.cvsignore          |   1 +
 contrib/ogdi_info/ogdi_info.c         |   6 +-
 lib/.cvsignore                        |   2 +
 lib/win32/.cvsignore                  |   2 +
 makefile                              |   2 +
 mkogdidist.sh                         |  23 +--
 ogdi/c-api/.cvsignore                 |   1 +
 ogdi/c-api/client.c                   |   6 +-
 ogdi/c-api/ecs_capabilities.c         |   6 +-
 ogdi/c-api/ecs_dyna.c                 |   6 +-
 ogdi/c-api/ecs_xdrz.c                 |   6 +-
 ogdi/c-api/ecsassoc.c                 |   6 +-
 ogdi/c-api/ecsdist.c                  |   6 +-
 ogdi/c-api/ecsgeo.c                   |   6 +-
 ogdi/c-api/ecshash.c                  |   6 +-
 ogdi/c-api/ecsinfo.c                  |   6 +-
 ogdi/c-api/ecslist.c                  |   6 +-
 ogdi/c-api/ecsregex.c                 |   6 +-
 ogdi/c-api/ecssplit.c                 |   6 +-
 ogdi/c-api/ecstile.c                  |   6 +-
 ogdi/c-api/ogdi.def                   |   1 +
 ogdi/c-api/opendir.c                  |   4 +-
 ogdi/c-api/opendir.h                  |   4 +-
 ogdi/c-api/server.c                   |   6 +-
 ogdi/datum_driver/canada/.cvsignore   |   1 +
 ogdi/datum_driver/canada/dtcanada.def |  24 +--
 ogdi/datum_driver/usa/.cvsignore      |   1 +
 ogdi/datum_driver/usa/dtusa.c         |  36 ++++
 ogdi/datum_driver/usa/dtusa.def       |  26 +--
 ogdi/driver/adrg/.cvsignore           |   1 +
 ogdi/driver/adrg/adrg.c               |   6 +-
 ogdi/driver/adrg/adrg.h               |   4 +-
 ogdi/driver/adrg/object.c             |   6 +-
 ogdi/driver/adrg/utils.c              |   6 +-
 ogdi/driver/dted/.cvsignore           |   1 +
 ogdi/driver/dted/dted.c               |   6 +-
 ogdi/driver/dted/dted.h               |   4 +-
 ogdi/driver/dted/object.c             |   6 +-
 ogdi/driver/dted/utils.c              |   6 +-
 ogdi/driver/network/.cvsignore        |   1 +
 ogdi/driver/network/remote.def        |  48 ++---
 ogdi/driver/rpf/.cvsignore            |   1 +
 ogdi/driver/rpf/object.c              |   6 +-
 ogdi/driver/rpf/rpf.c                 |  10 +-
 ogdi/driver/rpf/rpf.h                 |   4 +-
 ogdi/driver/rpf/utils.c               |   6 +-
 ogdi/driver/skeleton/.cvsignore       |   1 +
 ogdi/driver/vrf/.cvsignore            |   1 +
 ogdi/driver/vrf/feature.c             |  96 +++++++--
 ogdi/driver/vrf/object.c              | 179 ++++++++--------
 ogdi/driver/vrf/open.c                |   6 +-
 ogdi/driver/vrf/swq.c                 |   6 +-
 ogdi/driver/vrf/swq.h                 |   4 +-
 ogdi/driver/vrf/utils.c               |   6 +-
 ogdi/driver/vrf/vrf.c                 |   6 +-
 ogdi/driver/vrf/vrf.def               |  46 ++---
 ogdi/driver/vrf/vrf.h                 |  17 +-
 ogdi/driver/vrf/vrfswq.c              |   6 +-
 ogdi/examples/example1/.cvsignore     |   1 +
 ogdi/examples/example2/.cvsignore     |   1 +
 ogdi/gltpd/.cvsignore                 |   1 +
 ogdi/gltpd/asyncsvr.c                 |   6 +-
 ogdi/gltpd/ecs_sif.c                  |   6 +-
 ogdi/glutil/.cvsignore                |   1 +
 ogdi/glutil/getglenv.c                |   1 +
 ogdi/glutil/status_d.mak              | 372 +++++++++++++++++-----------------
 ogdi/glutil/status_d.rc               |  44 ++--
 ogdi/include/ecs_util.h               |   8 +-
 ogdi/tcl_interface/.cvsignore         |   1 +
 ogdi/tcl_interface/ecs_tcl.c          |   4 +-
 vpflib/.cvsignore                     |   1 +
 vpflib/strfunc.h                      |   7 +
 vpflib/vpfread.c                      |   2 +-
 92 files changed, 911 insertions(+), 554 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ogdi-dfsg.git