From 613a65c3e73bc9abcb01f48dd08a6bc9aeb906d8 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Tue, 20 Aug 2019 17:09:16 +0000 Subject: [PATCH] debian/1.62: geodata: semantic world support --- externals/libsemantic | 2 +- externals/libshtools | 2 +- mapproxy/CMakeLists.txt | 4 +++- mapproxy/debian/bionic/control | 3 ++- mapproxy/debian/changelog | 6 ++++++ mapproxy/debian/stretch/control | 3 ++- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/externals/libsemantic b/externals/libsemantic index 99a9bb4..1b429b5 160000 --- a/externals/libsemantic +++ b/externals/libsemantic @@ -1 +1 @@ -Subproject commit 99a9bb40f59ddfd19ed1942ccbdb23eeda1e015e +Subproject commit 1b429b517948f7bce4ed3e0957b8e6b943dfaf4b diff --git a/externals/libshtools b/externals/libshtools index 5b915a2..f4fc3c1 160000 --- a/externals/libshtools +++ b/externals/libshtools @@ -1 +1 @@ -Subproject commit 5b915a294427eb8763b5ddfb3197462241301f02 +Subproject commit f4fc3c187616316f30bd025dbb4a2d57da2f31a6 diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt index 41b35f2..5b41355 100644 --- a/mapproxy/CMakeLists.txt +++ b/mapproxy/CMakeLists.txt @@ -106,4 +106,6 @@ add_subdirectory(src/setup-resource) # for testing add_subdirectory(src/utility/tools EXCLUDE_FROM_ALL) -add_subdirectory(src/semantic/tools EXCLUDE_FROM_ALL) + +set(semantic-tools-INSTALL-COMPONENT tools) +add_subdirectory(src/semantic/tools) diff --git a/mapproxy/debian/bionic/control b/mapproxy/debian/bionic/control index d3893b1..bc61403 100644 --- a/mapproxy/debian/bionic/control +++ b/mapproxy/debian/bionic/control @@ -19,4 +19,5 @@ m4_define({{{VAR_BuildDepends}}},{{{debhelper (>= 11), libboost1.65-all-dev , libicu-dev (>= 60.2-3ubuntu3) , libtinyxml2-dev , libmarkdown2-dev - , gawk, pandoc}}})m4_dnl + , libfftw3-dev, liblapack-dev, libblas-dev + , gawk, pandoc, gfortran}}})m4_dnl diff --git a/mapproxy/debian/changelog b/mapproxy/debian/changelog index 14cc393..b98fba1 100644 --- a/mapproxy/debian/changelog +++ b/mapproxy/debian/changelog @@ -1,3 +1,9 @@ +vts-mapproxy (1.62) stable; urgency=medium + + * geodata: semantic world support + + -- Vaclav Blazek Tue, 20 Aug 2019 15:03:49 +0000 + vts-mapproxy (1.61) stable; urgency=medium * geodata: layer enhancer ignores NULL entries diff --git a/mapproxy/debian/stretch/control b/mapproxy/debian/stretch/control index d8d6d7c..9d30590 100644 --- a/mapproxy/debian/stretch/control +++ b/mapproxy/debian/stretch/control @@ -18,4 +18,5 @@ m4_define({{{VAR_BuildDepends}}},{{{debhelper (>= 9.20150101+deb8u2), libboost1. , libmagic-dev (>= 5.25) , libtinyxml2-dev , libmarkdown2-dev - , gawk, pandoc}}})m4_dnl + , libfftw3-dev, liblapack-dev, libblas-dev + , gawk, pandoc, gfortran}}})m4_dnl