[zoo-project] 04/23: Merge tag 'upstream/1.5.0+svn780+ds'

Bas Couwenberg sebastic at debian.org
Sun Jun 26 17:27:45 UTC 2016


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

sebastic pushed a commit to branch master
in repository zoo-project.

commit 3e757511223b3df87fec903627f6f6279bd17c8f
Merge: 2fd1044 5e4f05c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 25 20:30:01 2016 +0200

    Merge tag 'upstream/1.5.0+svn780+ds'
    
    Upstream version 1.5.0+svn780+ds

 thirds/cgic206/Makefile                            |    4 -
 thirds/grass/grass2zcfg.sh                         |   50 +
 thirds/grass/xml2zcfg.xsl                          |  247 +
 thirds/otb2zcfg/CMakeLists.txt                     |    2 +-
 zoo-project/HISTORY.txt                            |   16 +-
 zoo-project/zoo-api/java/Makefile                  |   18 +-
 .../zoo-api/java/{ => org/zoo_project}/ZOO.java    |    4 +-
 zoo-project/zoo-api/java/zoo-api.c                 |   22 +-
 .../zoo-client/lib/tpl/payload_Execute.mustache    |   68 +-
 zoo-project/zoo-kernel/Makefile.in                 |    8 +-
 zoo-project/zoo-kernel/ZOOMakefile.opts.in         |    9 +-
 zoo-project/zoo-kernel/autom4te.cache/output.0     | 8345 --------------------
 zoo-project/zoo-kernel/autom4te.cache/requests     |   77 -
 zoo-project/zoo-kernel/autom4te.cache/traces.0     |  778 --
 zoo-project/zoo-kernel/caching.c                   |    4 +-
 zoo-project/zoo-kernel/config.log                  | 5747 --------------
 zoo-project/zoo-kernel/config.status               | 1002 ---
 zoo-project/zoo-kernel/configure                   | 8345 --------------------
 zoo-project/zoo-kernel/configure.ac                |   83 +-
 zoo-project/zoo-kernel/doc/index.dox               |    4 +-
 .../locale/po/{messages.po.save => fr_FR.po}       |  161 +-
 .../{messages.po.new => locale/po/it_IT.po}        |  158 +-
 .../zoo-kernel/locale/po/{new.pot => ja_JP.po}     |  166 +-
 zoo-project/zoo-kernel/locale/po/messages.po.orig  |  364 -
 zoo-project/zoo-kernel/main.cfg                    |    1 +
 zoo-project/zoo-kernel/main_conf_read.l            |    2 +-
 zoo-project/zoo-kernel/nmake.opt                   |   23 +-
 zoo-project/zoo-kernel/request_parser.c            |   90 +-
 zoo-project/zoo-kernel/request_parser.h            |    5 +-
 zoo-project/zoo-kernel/response_print.c            |   25 +-
 zoo-project/zoo-kernel/response_print.h            |    6 +-
 zoo-project/zoo-kernel/server_internal.c           |   45 +-
 zoo-project/zoo-kernel/server_internal.h           |    5 +-
 zoo-project/zoo-kernel/service.c                   |    7 +-
 zoo-project/zoo-kernel/service.h                   |   25 +-
 zoo-project/zoo-kernel/service_internal.c          |    8 +-
 zoo-project/zoo-kernel/service_internal_java.c     |  131 +-
 zoo-project/zoo-kernel/service_internal_java.h     |    2 +
 zoo-project/zoo-kernel/service_internal_js.c       |   21 +-
 zoo-project/zoo-kernel/service_internal_ms.c       |   26 +-
 zoo-project/zoo-kernel/service_internal_php.c      |    4 +-
 zoo-project/zoo-kernel/service_internal_python.c   |  118 +-
 zoo-project/zoo-kernel/service_internal_saga.c     |    5 +-
 zoo-project/zoo-kernel/service_yaml.c              |    2 +-
 zoo-project/zoo-kernel/zcfg2yaml                   |  Bin 229828 -> 0 bytes
 zoo-project/zoo-kernel/zoo_loader.c                |    2 +-
 zoo-project/zoo-kernel/zoo_loader.cgi              |  Bin 594772 -> 0 bytes
 zoo-project/zoo-kernel/zoo_service_loader.c        |  149 +-
 zoo-project/zoo-services/cgal/Makefile             |    4 +-
 zoo-project/zoo-services/cgal/cgal_service.c       |   17 +-
 zoo-project/zoo-services/cgal/delaunay.c           |   50 +-
 zoo-project/zoo-services/cgal/voronoi.c            |   50 +-
 zoo-project/zoo-services/data-api/__init__.py      |    0
 .../zoo-services/data-api/cgi-env/__init__.py      |    0
 .../zoo-services/data-api/cgi-env/query.zcfg       |   30 +
 .../zoo-services/data-api/cgi-env/service.py       |   54 +
 zoo-project/zoo-services/data-api/query.zcfg       |   30 +
 zoo-project/zoo-services/data-api/service.py       |   54 +
 zoo-project/zoo-services/gdal/contour/Makefile     |    4 +-
 zoo-project/zoo-services/gdal/contour/makefile.vc  |   16 +-
 zoo-project/zoo-services/gdal/contour/service.c    |   30 +-
 zoo-project/zoo-services/gdal/dem/Makefile         |    4 +-
 zoo-project/zoo-services/gdal/dem/makefile.vc      |   14 +-
 zoo-project/zoo-services/gdal/grid/Makefile        |    4 +-
 zoo-project/zoo-services/gdal/grid/makefile.vc     |   11 +
 zoo-project/zoo-services/gdal/profile/Makefile     |    4 +-
 zoo-project/zoo-services/gdal/profile/makefile.vc  |   16 +-
 zoo-project/zoo-services/gdal/translate/Makefile   |    4 +-
 .../zoo-services/gdal/translate/makefile.vc        |   14 +-
 zoo-project/zoo-services/gdal/warp/Makefile        |    4 +-
 zoo-project/zoo-services/gdal/warp/makefile.vc     |   14 +-
 zoo-project/zoo-services/hello-java/HelloJava.java |    5 +-
 .../zoo-services/hello-py/cgi-env/test_service.py  |    7 +
 .../zoo-services/ogr/base-vect-ops/Makefile        |    2 +-
 .../zoo-services/ogr/base-vect-ops/makefile.vc     |   17 +-
 .../zoo-services/ogr/base-vect-ops/service.c       |  576 +-
 zoo-project/zoo-services/ogr/ogr2ogr/Makefile      |    4 +-
 zoo-project/zoo-services/ogr/ogr2ogr/makefile.vc   |   11 +-
 zoo-project/zoo-services/ogr/ogr2ogr/service.c     |  160 +-
 zoo-project/zoo-services/qrencode/Makefile         |    4 +-
 zoo-project/zoo-services/qrencode/qrenc-service.c  |    3 +-
 zoo-project/zoo-services/utils/registry/Makefile   |    2 +-
 .../zoo-services/utils/registry/makefile.vc        |    3 +-
 zoo-project/zoo-services/utils/registry/service.c  |    2 +-
 zoo-project/zoo-services/utils/status/Makefile     |    4 +-
 zoo-project/zoo-services/utils/status/service.c    |    2 +-
 .../zoo-services/wcps-proxy/cgi-env/WCPS.py        |  109 +
 .../zoo-services/wcps-proxy/cgi-env/WCPS.zcfg      |   54 +
 .../zoo-services/wcps-proxy/cgi-env/__init__.py    |    0
 89 files changed, 2345 insertions(+), 25432 deletions(-)

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



More information about the Pkg-grass-devel mailing list