[zoo-project] 03/12: Merge tag 'upstream/1.6.0_rc1'
Bas Couwenberg
sebastic at debian.org
Sun Jan 15 21:42:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository zoo-project.
commit 9e12ce94cb7605dcaca9c876963548b3330f704a
Merge: 4073009 7f0dc36
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jan 15 22:01:11 2017 +0100
Merge tag 'upstream/1.6.0_rc1'
Upstream version 1.6.0~rc1
Conflicts:
debian/changelog
debian/control
debian/copyright
debian/rules
debian/source/format
debian/zoo-kernel.install
debian/changelog | 20 -
debian/zoo-services.install | 9 +
testing/README | 30 -
testing/extractExceptionInfo.xsl | 14 -
testing/extractStatusLocation.xsl | 15 -
testing/requests/dp.xml | 4 -
testing/requests/igml_o.xml | 19 -
testing/requests/ijson_o.xml | 19 -
testing/requests/ir_o.xml | 17 -
testing/requests/ir_o_async.xml | 17 -
testing/requests/ir_or.xml | 17 -
testing/requests/ir_or_async.xml | 17 -
testing/requests/irb_o.xml | 22 -
testing/requests/irb_o_async.xml | 22 -
testing/requests/irb_or.xml | 22 -
testing/requests/irb_or_async.xml | 22 -
testing/run.sh | 255 -
thirds/cgic206/cgic.html | 2 +-
thirds/dirent-win32/dirent.h | 2 +-
thirds/otb2zcfg/otb2zcfg.cxx | 8 +-
zoo-project/HISTORY.txt | 15 +-
zoo-project/zoo-api/mono/Makefile | 7 +
zoo-project/zoo-api/mono/ZMaps.cs | 133 +
.../zoo-client/lib/js/wps-client/wps-payload.js | 2 +-
zoo-project/zoo-kernel/Makefile.in | 18 +-
zoo-project/zoo-kernel/ZOOMakefile.opts.in | 8 +-
zoo-project/zoo-kernel/autom4te.cache/output.0 | 8640 ++++++++++++++++++++
zoo-project/zoo-kernel/autom4te.cache/requests | 77 +
zoo-project/zoo-kernel/autom4te.cache/traces.0 | 813 ++
zoo-project/zoo-kernel/caching.c | 260 +-
zoo-project/zoo-kernel/caching.h | 2 +-
zoo-project/zoo-kernel/configure | 8640 ++++++++++++++++++++
zoo-project/zoo-kernel/configure.ac | 82 +-
zoo-project/zoo-kernel/locale/po/fr_FR.po | 14 +-
zoo-project/zoo-kernel/locale/po/it_IT.po | 16 +-
zoo-project/zoo-kernel/locale/po/ja_JP.po | 13 +-
zoo-project/zoo-kernel/locale/po/messages.po | 16 +-
zoo-project/zoo-kernel/main_conf_read.l | 2 +-
zoo-project/zoo-kernel/main_conf_read.y | 7 +-
zoo-project/zoo-kernel/makefile.vc | 7 +-
zoo-project/zoo-kernel/nmake.opt | 7 +
zoo-project/zoo-kernel/request_parser.c | 146 +-
zoo-project/zoo-kernel/response_print.c | 425 +-
zoo-project/zoo-kernel/response_print.h | 5 +-
zoo-project/zoo-kernel/server_internal.c | 197 +-
zoo-project/zoo-kernel/server_internal.h | 6 +
zoo-project/zoo-kernel/service.c | 225 +-
zoo-project/zoo-kernel/service.h | 32 +-
zoo-project/zoo-kernel/service_conf.y | 266 +-
zoo-project/zoo-kernel/service_internal.c | 10 +-
zoo-project/zoo-kernel/service_internal_java.c | 26 +-
zoo-project/zoo-kernel/service_internal_js.c | 58 +-
zoo-project/zoo-kernel/service_internal_mono.c | 377 +
.../{sqlapi.h => service_internal_mono.h} | 41 +-
zoo-project/zoo-kernel/service_internal_ms.c | 6 +-
zoo-project/zoo-kernel/service_internal_perl.c | 6 +-
zoo-project/zoo-kernel/service_internal_php.c | 33 +-
zoo-project/zoo-kernel/service_internal_php7.c | 412 +
zoo-project/zoo-kernel/service_internal_python.c | 96 +-
zoo-project/zoo-kernel/service_internal_ruby.c | 7 +-
zoo-project/zoo-kernel/service_internal_saga.c | 24 +-
zoo-project/zoo-kernel/service_yaml.c | 213 +-
zoo-project/zoo-kernel/sql/schema.sql | 2 +-
zoo-project/zoo-kernel/sqlapi.c | 36 +-
zoo-project/zoo-kernel/sqlapi.h | 9 +-
zoo-project/zoo-kernel/ulinet.c | 9 +-
zoo-project/zoo-kernel/zoo_loader.c | 7 +-
zoo-project/zoo-kernel/zoo_service_loader.c | 341 +-
zoo-project/zoo-services/gdal/grid/service.c | 6 +
zoo-project/zoo-services/gdal/ndvi/cgi-env/ndvi.py | 2 +-
zoo-project/zoo-services/hello-mono/Makefile | 7 +
.../zoo-services/hello-mono/cgi-env/HelloMono.zcfg | 43 +
.../hello-mono/cgi-env/longProcessMono.zcfg | 43 +
zoo-project/zoo-services/hello-mono/test.cs | 66 +
zoo-project/zoo-services/ogr/ogr2ogr/service.c | 38 +-
zoo-project/zoo-services/utils/status/service.c | 1 +
76 files changed, 21113 insertions(+), 1440 deletions(-)
diff --cc debian/changelog
index 1ec550c,3ef9bfb..60eff71
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,20 +1,17 @@@
-zoo-project (1.4~devel01) UNRELEASED; urgency=low
+zoo-project (1.5.0+svn780+ds-1) UNRELEASED; urgency=medium
- * Added Gdal ZOO Services
- * Added Cgal ZOO Services
- * Added WPS Status Services
+ * Initial release (closes: #nnnnnn)
- -- David Saggiorato <david at saggiorato.net> Fri, 31 Oct 2014 17:54:34 +0100
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 12 Jun 2016 00:20:00 +0200
-zoo-project (1.3.0-1~trusty10) trusty; urgency=low
+zoo-project (1.5.0+svn780-0~xenial0) xenial; urgency=low
- * Added OGR ZOO Services.
+ * Enabled OTB and CGAL support.
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 28 Jul 2014 19:48:00 +0200
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Tue, 14 Jun 2016 19:10:00 +0200
-zoo-project (1.3.0-1~trusty7) trusty; urgency=low
+zoo-project (1.5.0+svn773-1~xenial0) xenial; urgency=low
- * Initial Debian packaging.
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Tue, 10 Jun 2014 21:17:04 +0200
+ * Using latest SVN to rebuilt against GDAL 2.1.
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 12 Jun 2016 00:20:00 +0200
-
- zoo-project (1.4~devel01) UNRELEASED; urgency=low
-
- * Added Gdal ZOO Services
- * Added Cgal ZOO Services
- * Added WPS Status Services
-
- -- David Saggiorato <david at saggiorato.net> Fri, 31 Oct 2014 17:54:34 +0100
-
- zoo-project (1.3.0-1~trusty10) trusty; urgency=low
-
- * Added OGR ZOO Services.
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 28 Jul 2014 19:48:00 +0200
-
- zoo-project (1.3.0-1~trusty7) trusty; urgency=low
-
- * Initial Debian packaging.
-
- -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Tue, 10 Jun 2014 21:17:04 +0200
--
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