This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository zoo-project.
commit b14e4ba86c38d9921893683373d2a2a72757a429 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jun 26 21:01:45 2016 +0200 Add ZOO service packages for CGAL, OGR, OTB & Status. - Merged changes from OSGeo-Live package. - Install files directly in debian/rules, drop zoo-service-*.install files. - Change zoo-services into metapackage depending on all zoo-service-* packages. --- debian/changelog | 32 ++++++++++++++++++++ debian/control | 63 +++++++++++++++++++++++++++++++++++++-- debian/libzoo-service-dev.install | 1 - debian/libzoo-service1.5.install | 1 - debian/rules | 52 ++++++++++++++++++++++++++++---- debian/zoo-kernel.install | 1 - debian/zoo-services.install | 31 ------------------- 7 files changed, 140 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3814c12..1ec550c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,3 +3,35 @@ zoo-project (1.5.0+svn780+ds-1) UNRELEASED; urgency=medium * Initial release (closes: #nnnnnn) -- Angelos Tzotsos <gcpp.kal...@gmail.com> Sun, 12 Jun 2016 00:20:00 +0200 + +zoo-project (1.5.0+svn780-0~xenial0) xenial; urgency=low + + * Enabled OTB and CGAL support. + + -- Angelos Tzotsos <gcpp.kal...@gmail.com> Tue, 14 Jun 2016 19:10:00 +0200 + +zoo-project (1.5.0+svn773-1~xenial0) xenial; urgency=low + + * Using latest SVN to rebuilt against GDAL 2.1. + + -- Angelos Tzotsos <gcpp.kal...@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 <da...@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.kal...@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.kal...@gmail.com> Tue, 10 Jun 2014 21:17:04 +0200 diff --git a/debian/control b/debian/control index 859046d..0c9e756 100644 --- a/debian/control +++ b/debian/control @@ -6,17 +6,24 @@ Priority: optional Build-Depends: debhelper (>= 9), dh-autoreconf, dpkg-dev (>= 1.16.1.1), + cmake, bison, flex, libcurl4-gnutls-dev, libfcgi-dev, + libfftw3-dev, libcgal-dev, libgdal-dev, libmapserver-dev, libmozjs185-dev, + libotb-apps, + libotb-dev, libssl-dev, + libtinyxml-dev, libxml2-dev, libxslt1-dev, + otb-bin, + otb-bin-qt, python-all, python-dev Build-Conflicts: libcurl3-openssl-dev @@ -51,17 +58,69 @@ Description: Javascript API for creating and chaining WPS services Package: zoo-services Architecture: any +Depends: zoo-service-cgal (= ${binary:Version}), + zoo-service-ogr (= ${binary:Version}), + zoo-service-otb (= ${binary:Version}), + zoo-service-status (= ${binary:Version}), + ${misc:Depends} +Description: CGI ZOO services + ZOO-Project is a WPS (Web Processing Service) open source project + released under a MIT/X-11 style license. It provides an OGC WPS + compliant developer-friendly framework to create and chain WPS Web + services. + . + This metapackage depends on the individual ZOO service packages. + +Package: zoo-service-cgal +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: CGAL CGI ZOO services + ZOO-Project is a WPS (Web Processing Service) open source project + released under a MIT/X-11 style license. It provides an OGC WPS + compliant developer-friendly framework to create and chain WPS Web + services. + . + This package contains the CGAL CGI ZOO services. + +Package: zoo-service-ogr +Architecture: any Depends: python, python-gdal, ${shlibs:Depends}, ${misc:Depends} -Description: CGI ZOO services +Description: OGR CGI ZOO services + ZOO-Project is a WPS (Web Processing Service) open source project + released under a MIT/X-11 style license. It provides an OGC WPS + compliant developer-friendly framework to create and chain WPS Web + services. + . + This package contains the OGR CGI ZOO services. + +Package: zoo-service-otb +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: OTB CGI ZOO services + ZOO-Project is a WPS (Web Processing Service) open source project + released under a MIT/X-11 style license. It provides an OGC WPS + compliant developer-friendly framework to create and chain WPS Web + services. + . + This package contains the OTB CGI ZOO services. + +Package: zoo-service-status +Architecture: any +Depends: python, + ${shlibs:Depends}, + ${misc:Depends} +Description: Status CGI ZOO services ZOO-Project is a WPS (Web Processing Service) open source project released under a MIT/X-11 style license. It provides an OGC WPS compliant developer-friendly framework to create and chain WPS Web services. . - This package contains the CGI ZOO services. + This package contains the Status CGI ZOO services. Package: libzoo-service1.5 Architecture: any diff --git a/debian/libzoo-service-dev.install b/debian/libzoo-service-dev.install index 91664a5..7e4fd81 100644 --- a/debian/libzoo-service-dev.install +++ b/debian/libzoo-service-dev.install @@ -1,3 +1,2 @@ usr/lib/lib*.so usr/include - diff --git a/debian/libzoo-service1.5.install b/debian/libzoo-service1.5.install index 5e9c55d..d0dbfd1 100644 --- a/debian/libzoo-service1.5.install +++ b/debian/libzoo-service1.5.install @@ -1,2 +1 @@ usr/lib/lib*.so.* - diff --git a/debian/rules b/debian/rules index 9a8ecaa..9fbaa8c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,16 +24,29 @@ override_dh_auto_clean: --builddirectory=zoo-project/zoo-kernel if [ -e zoo-project/zoo-kernel/ZOOMakefile.opts ]; then \ + (cd zoo-project/zoo-services/cgal && make clean); \ (cd zoo-project/zoo-services/ogr/base-vect-ops && make clean); \ + (cd zoo-project/zoo-services/utils/status && make clean); \ fi + dh_auto_clean --sourcedirectory=thirds/otb2zcfg \ + --builddirectory=thirds/otb2zcfg/build + override_dh_auto_configure: dh_auto_configure --sourcedirectory=zoo-project/zoo-kernel \ --builddirectory=zoo-project/zoo-kernel \ -- --with-python \ --with-js \ + --with-cgal=/usr \ --with-mapserver=/usr \ - --with-ms-version=7 + --with-ms-version=7 \ + --with-itk=/usr \ + --with-itk-version=4.9 \ + --with-otb=/usr \ + --with-otb-version=5.4 + + dh_auto_configure --sourcedirectory=thirds/otb2zcfg \ + --builddirectory=thirds/otb2zcfg/build override_dh_auto_build: dh_auto_build --sourcedirectory=thirds/cgic206 \ @@ -43,7 +56,14 @@ override_dh_auto_build: --builddirectory=zoo-project/zoo-kernel \ --max-parallel=1 + (cd zoo-project/zoo-services/cgal && make) (cd zoo-project/zoo-services/ogr/base-vect-ops && make) + (cd zoo-project/zoo-services/utils/status && make) + + dh_auto_build --sourcedirectory=thirds/otb2zcfg \ + --builddirectory=thirds/otb2zcfg/build + + (mkdir -p thirds/otb2zcfg/build/zcfgs && cd thirds/otb2zcfg/build/zcfgs && ITK_AUTOLOAD_PATH=/usr/lib/otb/applications/ ../otb2zcfg || echo "Ignoring otb2zcfg failure") override_dh_auto_install: dh_auto_install --sourcedirectory=zoo-project/zoo-kernel \ @@ -53,11 +73,33 @@ override_dh_auto_install: install -m644 $(CURDIR)/zoo-project/zoo-kernel/main.cfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/ - install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/ogr_service.zo $(CURDIR)/debian/tmp/usr/lib/cgi-bin/ - install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/ + # OGR + install -d $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin + + install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zo $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/ + install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/ + + install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.py $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/ + install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/ + + # Status + install -d $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin + install -d $(CURDIR)/debian/zoo-service-status/var/data + + install -m755 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zo $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/ + install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.py $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/ + install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/ + + install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/updateStatus.xsl $(CURDIR)/debian/zoo-service-status/var/data/ + + # CGAL + install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin + install -m755 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zo $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin/ + install -m644 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin/ - install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py $(CURDIR)/debian/tmp/usr/lib/cgi-bin/ - install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.zcfg $(CURDIR)/debian/tmp/usr/lib/cgi-bin/ + # OTB + install -d $(CURDIR)/debian/zoo-service-otb/usr/lib/cgi-bin/OTB + install -m644 $(CURDIR)/thirds/otb2zcfg/build/zcfgs/*.zcfg $(CURDIR)/debian/zoo-service-otb/usr/lib/cgi-bin/OTB/ override_dh_install: dh_install --list-missing diff --git a/debian/zoo-kernel.install b/debian/zoo-kernel.install index 5b23eca..0765e6d 100644 --- a/debian/zoo-kernel.install +++ b/debian/zoo-kernel.install @@ -1,3 +1,2 @@ usr/lib/cgi-bin/zoo_loader.cgi usr/lib/cgi-bin/main.cfg - diff --git a/debian/zoo-services.install b/debian/zoo-services.install deleted file mode 100644 index cf9416e..0000000 --- a/debian/zoo-services.install +++ /dev/null @@ -1,31 +0,0 @@ -usr/lib/cgi-bin/ogr_service.zo -usr/lib/cgi-bin/ogr_sp.py -usr/lib/cgi-bin/Boundary.zcfg -usr/lib/cgi-bin/Buffer.zcfg -usr/lib/cgi-bin/Centroid.zcfg -usr/lib/cgi-bin/Contains.zcfg -usr/lib/cgi-bin/ConvexHull.zcfg -usr/lib/cgi-bin/Crosses.zcfg -usr/lib/cgi-bin/Difference.zcfg -usr/lib/cgi-bin/Disjoint.zcfg -usr/lib/cgi-bin/Distance.zcfg -usr/lib/cgi-bin/Equals.zcfg -usr/lib/cgi-bin/GetArea.zcfg -usr/lib/cgi-bin/Intersection.zcfg -usr/lib/cgi-bin/Intersects.zcfg -usr/lib/cgi-bin/IsSimple.zcfg -usr/lib/cgi-bin/IsValid.zcfg -usr/lib/cgi-bin/Simplify.zcfg -usr/lib/cgi-bin/SymDifference.zcfg -usr/lib/cgi-bin/Touches.zcfg -usr/lib/cgi-bin/Union.zcfg -usr/lib/cgi-bin/Within.zcfg -usr/lib/cgi-bin/BoundaryPy.zcfg -usr/lib/cgi-bin/BufferPy.zcfg -usr/lib/cgi-bin/CentroidPy.zcfg -usr/lib/cgi-bin/ConvexHullPy.zcfg -usr/lib/cgi-bin/DifferencePy.zcfg -usr/lib/cgi-bin/IntersectionPy.zcfg -usr/lib/cgi-bin/SymDifferencePy.zcfg -usr/lib/cgi-bin/UnionPy.zcfg - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel