Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/.appveyor.yml
+++ b/.appveyor.yml
-version: 1.0.{build}
-
-os: Visual Studio 2015
-
-platform: x64
-
-configuration: Release
-
-matrix:
-  fast_finish: true
-
-# Should speed up repository cloning
-shallow_clone: true
-clone_depth: 5
-
-# init:
-    #  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-    #on_finish:
-    # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-cache:
-    C:\Miniconda3-x64\pkgs -> appveyor.yml
-
-install:
-
-  - set "CONDA_ROOT=C:\Miniconda3-x64"
-  - set PATH=%CONDA_ROOT%;%CONDA_ROOT%\\scripts;%CONDA_ROOT%\\Library\\bin;%PATH%;C:\\Program Files (x86)\\CMake\\bin
-  - conda config --set always_yes yes
-  - conda config --add channels conda-forge
-  - conda config --add channels anaconda
-  - conda update -q conda
-  - conda config --set auto_update_conda no
-  - conda update -q --all
-  - conda info
-  - python -c "import sys; print(sys.version)"
-  - python -c "import sys; print(sys.executable)"
-  - python -c "import sys; print(sys.prefix)"
-  - call "%CONDA_ROOT%\Scripts\activate.bat" base
-  - conda install cmake ninja
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-  - call scripts\\appveyor\\config.cmd
-
-
-build_script:
-  - call "%CONDA_ROOT%\Scripts\activate.bat" base
-  - call scripts\\appveyor\\build.cmd
-
-test_script:
-  - call "%CONDA_ROOT%\Scripts\activate.bat" base
-  - call scripts\\appveyor\\test.cmd
-
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ test/tprtree/test1/queries
 test/tprtree/test2/mix
 docs/build
 CMakeFiles/
+CTestTestfile.cmake
 src/CMakeFiles/
 bin/
 CMakeCache.txt

--- a/.travis.yml
+++ b/.travis.yml
-language: cpp
-sudo: required
-dist: xenial
-services: docker
-
-compiler:
- g++
- clang
-
-before_install:
- "./scripts/travis/before_install.sh"
-
-after_success: |
-  if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" &&
-        "$TRAVIS_BRANCH" == "master" &&
-        "$CC" == "clang" &&
-        -n "$encrypted_e7d7c698df9c_key" ]]
-  then
-      cd scripts/travis
-      ./after_success.sh $TRAVIS_BUILD_DIR $encrypted_e7d7c698df9c_key \
-            $encrypted_e7d7c698df9c_iv
-  fi
-script: "./scripts/travis/build.sh"
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,3 +12,6 @@ nitro@dr-code.org

 Norman Barker - flush(), index paging, C API improvements
 norman.barker@gmail.com
+
+Morteza NourelahiAlamdari
+me@mortezana.com
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,8 @@
 #
 # (based originally on the libLAS files copyright Mateusz Loskot)

-cmake_minimum_required(VERSION 2.8.4)
+SET(MSVC_INCREMENTAL_DEFAULT OFF)
+cmake_minimum_required(VERSION 3.5.0)
 project(spatialindex)

 #------------------------------------------------------------------------------
@@ -12,6 +13,9 @@ project(spatialindex)

 set(CMAKE_COLOR_MAKEFILE ON)

+# C++11 required
+set (CMAKE_CXX_STANDARD 11)
+
 # Allow advanced users to generate Makefiles printing detailed commands
 mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)

@@ -20,18 +24,26 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}

 cmake_policy(SET CMP0054 NEW) # Make string comparison behave like you'd expect

-if (CMAKE_MAJOR_VERSION GREATER 2)
-    cmake_policy(SET CMP0042 OLD) # osx rpath
+if (WIN32)
+    if(${CMAKE_VERSION} VERSION_GREATER "3.14.5") 
+        cmake_policy(SET CMP0092 NEW) # don't put /w3 in flags
+    endif()
 endif()
+
+if (APPLE)
+	set(CMAKE_MACOSX_RPATH ON)
+endif (APPLE)
+
 #------------------------------------------------------------------------------
 # libspatialindex general settings
 #------------------------------------------------------------------------------

 SET(SIDX_VERSION_MAJOR "1")
 SET(SIDX_VERSION_MINOR "9")
-SET(SIDX_VERSION_PATCH "0")
-SET(SIDX_LIB_VERSION "5.0.0")
-SET(SIDX_LIB_SOVERSION "5")
+SET(SIDX_VERSION_PATCH "1")
+SET(SIDX_LIB_VERSION "6.0.0")
+SET(SIDX_LIB_SOVERSION "6")
+SET(BUILD_SHARED_LIBS ON)


 set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}")
@@ -40,7 +52,7 @@ set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERS
 # libspatialindex general cmake options
 #------------------------------------------------------------------------------

-option(SIDX_BUILD_TESTS "Enables integrated test suites" ON)
+option(SIDX_BUILD_TESTS "Enables integrated test suites" OFF)


 # Name of C++ library
@@ -74,44 +86,15 @@ check_function_exists(bcopy HAVE_BCOPY)

 INCLUDE (CheckIncludeFiles)

-if (HAVE_SRAND48)
-    add_definitions(-DHAVE_SRAND48=1)
-endif()
-
-if (HAVE_GETTIMEOFDAY)
-    add_definitions(-DHAVE_GETTIMEOFDAY=1)
-endif()
-
-if (HAVE_BZERO)
-    add_definitions(-DHAVE_BZERO=1)
-endif()
-
-if (HAVE_MEMSET)
-    add_definitions(-DHAVE_MEMSET=1)
-endif()
-
-if (HAVE_MEMCPY)
-    add_definitions(-DHAVE_MEMCPY=1)
-endif()
-
-if (HAVE_BCOPY)
-    add_definitions(-DHAVE_BCOPY=1)
-endif()
-
-if (HAVE_PTHREAD_H)
-    add_definitions(-DHAVE_PTHREAD_H=1)
-endif()

 #------------------------------------------------------------------------------
 # General build settings
 #------------------------------------------------------------------------------

-# note we default to debug mode
+# note we default to RelWithDebInfo mode
 if(NOT MSVC_IDE)
-  if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
-  endif()
  message(STATUS "Setting libspatialindex build type - ${CMAKE_BUILD_TYPE}")
 endif()

@@ -134,46 +117,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SIDX_BUILD_OUTPUT_DIRECTORY})
 # Platform and compiler specific settings
 #------------------------------------------------------------------------------

-if(WIN32)
-  if (MSVC)
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-    add_definitions(-D_CRT_NONSTDC_NO_WARNING)
-    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-    add_definitions(-DSPATIALINDEX_CREATE_DLL=1)
-    add_definitions(-DNOMINMAX)
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} /wd4068")
-
-    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-      string(REGEX REPLACE "/W[0-4]" "/W4"
-        CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    else()
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-    endif()
-  endif()
-
-else()
-  # not WIN32
-
+if(NOT WIN32)
  # Recommended C++ compilation flags
-  # -Weffc++
  set(SIDX_COMMON_CXX_FLAGS
    "-pedantic -Wall -Wpointer-arith -Wcast-align -Wcast-qual  -Wredundant-decls -Wno-long-long")
-
-  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIDX_COMMON_CXX_FLAGS}")
-    if (CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-
-    set(SIDX_COMPILER_GCC 1)
-
-  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
-    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS} ${SIDX_COMMON_CXX_FLAGS}")
-    set(SIDX_COMPILER_CLANG 1)
-  endif()
-endif(WIN32)
+endif(NOT WIN32)

 if (APPLE)
  set(SO_EXT dylib)
@@ -244,9 +192,9 @@ endif()
 # CPACK controls
 #------------------------------------------------------------------------------

-SET(CPACK_PACKAGE_VERSION_MAJOR ${PDAL_VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${PDAL_VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${PDAL_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_MAJOR ${SIDX_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${SIDX_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${SIDX_VERSION_MINOR})
 SET(CPACK_PACKAGE_NAME "libspatialindex")

 SET(CPACK_SOURCE_GENERATOR "TBZ2;TGZ")
@@ -260,31 +208,28 @@ set(CPACK_SOURCE_IGNORE_FILES
 "/\\\\.gitattributes;/\\\\.vagrant;/\\\\.DS_Store;/CVS/;/\\\\.git/;\\\\.swp$;~$;\\\\.\\\\#;/\\\\#")

 list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeScripts/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeCache.txt")
-list(APPEND CPACK_SOURCE_IGNORE_FILES ".xcodeproj")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "build.make")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "_CPack_Packages")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "cmake_install.cmake")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "Testing")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "PDAL.build/")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "/bin/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/lib/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/build/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/scripts/")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/azure-pipelines.yml")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".gitignore")
+list(APPEND CPACK_SOURCE_IGNORE_FILES ".ninja*")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "HOWTORELEASE.txt")
+
+list(APPEND CPACK_SOURCE_IGNORE_FILES "README")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "build/")
+
 list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "CTestTestfile.cmake")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/data/local/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/unit/TestConfig.hpp$")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/doxygen/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/build/")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/docs/build/")
 list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/presentations/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/_static/logo/dongle/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/cmake/examples/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "pdal_features.hpp$")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "package.sh")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "package-release.sh")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "docker-package.sh")
+
 list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz2")
+
 list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")

 include(CPack)
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-
--- a/HOWTORELEASE.txt
+++ b/HOWTORELEASE.txt
@@ -14,10 +14,6 @@ Release Process

 1) Increment Version Numbers

-  - configure.ac
-    * sidx_version_major
-    * sidx_version_minor
-    * sidx_version_micro
  - include/spatialindex/Version.h
    * SIDX_VERSION_MAJOR
    * SIDX_VERSION_MINOR
@@ -29,8 +25,6 @@ Release Process
    * SET(SIDX_VERSION_PATCH "0")
    * SET(SIDX_LIB_VERSION "4.0.0")
    * SET(SIDX_LIB_SOVERSION "4")
-  - Makefile.am
-    * version-info 3:2:0
  - Update SO versions
    * https://github.com/libspatialindex/libspatialindex/pull/44#issuecomment-57088783

@@ -45,12 +39,12 @@ Release Process

 5) Tag the release

-6) Invoke `package-release.sh`
+6) Invoke `docker-package-release.sh`

  ::

 	cd libspatialindex
-	./package-release.sh
+	./docker-package-release.sh


 8) Update https://github.com/libspatialindex/libspatialindex/releases

--- a/Makefile.am
+++ b/Makefile.am
-## Makefile.am -- Process this file with automake to produce Makefile.in
-SUBDIRS = src . test include
-
-ACLOCAL_AMFLAGS= -I m4
-lib_LTLIBRARIES = libspatialindex.la libspatialindex_c.la
-
-libspatialindex_la_SOURCES =
-libspatialindex_la_LIBADD = \
-	src/spatialindex/liblibrary.la \
-    src/capi/libsidxc.la \
-	src/storagemanager/libstoragemanager.la \
-	src/rtree/librtree.la \
-	src/mvrtree/libmvrtree.la \
-	src/tprtree/libtprtree.la \
-	src/tools/libtools.la
-
-libspatialindex_c_la_SOURCES =
-libspatialindex_c_la_LIBADD = \
-	libspatialindex.la \
-	src/capi/libsidxc.la
-
-# Dummy file to force C++ linking, see this page for more details:
-# https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
-nodist_EXTRA_libspatialindex_la_SOURCES = dummy.cxx
-nodist_EXTRA_libspatialindex_c_la_SOURCES = dummy.cxx
-
-libspatialindex_la_LDFLAGS = -version-info 5:0:0 -no-undefined
-libspatialindex_c_la_LDFLAGS = -version-info 5:0:0 -no-undefined
-
-EXTRA_DIST = CMakeLists.txt \
-             src/CMakeLists.txt \
-             test/CMakeLists.txt \
-             test/mvrtree/test1/run \
-             test/mvrtree/test2/run \
-             test/rtree/test1/run \
-             test/rtree/test2/run \
-             test/rtree/test3/run \
-             test/rtree/test4/run \
-             test/tprtree/test1/run \
-             test/tprtree/test2/run
--- a/README.rst
+++ b/README.rst
-.. image:: https://travis-ci.org/libspatialindex/libspatialindex.svg?branch=master
-.. image:: https://ci.appveyor.com/api/projects/status/fpdtkp2this1gkg6?svg=true
+.. image:: https://dev.azure.com/hobuinc/libspatialindex/_apis/build/status/libspatialindex.libspatialindex?branchName=master

 *****************************************************************************
 libspatialindex
@@ -8,7 +7,7 @@

 :Author: Marios Hadjieleftheriou
 :Contact: mhadji@gmail.com
-:Revision: 1.9.0
-:Date: 03/02/2017
+:Revision: 1.9.1
+:Date: 10/19/2019

 See http://libspatialindex.org for full documentation.
--- a/autogen.sh
+++ b/autogen.sh
-#!/bin/sh
-# $Id: autogen.sh 61 2007-12-11 20:13:48Z hobu $
-#
-# Autotools boostrapping script
-#
-giveup()
-{
-        echo
-        echo "  Something went wrong, giving up!"
-        echo
-        exit 1
-}
-
-OSTYPE=`uname -s`
-
-for libtoolize in glibtoolize libtoolize; do
-    if which $libtoolize 1>/dev/null 2>/dev/null; then
-        LIBTOOLIZE=`which $libtoolize 2>/dev/null`
-        break;
-    fi
-done
-
-if test "$LIBTOOLIZE" = ""; then
-    echo
-    echo "  glibtoolize or libtoolize not found. Giving up!"
-    echo
-    exit 1
-fi
-
-
-doit()
-{
-
-	#AMFLAGS="--add-missing --copy --force-missing"
-	AMFLAGS="--add-missing --copy"
-	if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
-	   AMFLAGS=$AMFLAGS" --include-deps";
-	fi
-
-	cd $1
-	echo "Running aclocal"
-	aclocal || giveup
-	#echo "Running autoheader"
-	#autoheader || giveup
-	echo "Running libtoolize"
-	$LIBTOOLIZE --force --copy || giveup
-	echo "Running automake"
-	automake $AMFLAGS # || giveup
-	echo "Running autoconf"
-	autoconf || giveup
-
-	echo "======================================"
-	echo "Now you are ready to run './configure'"
-	echo "======================================"
-	cd -
-}
-
-doit "test/gtest/gtest-1.7.0"
-doit "."
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
+pr:
+  branches:
+    include:
+    - master
+
+variables:
+  - name: BUILD_TYPE
+    value: Release
+
+jobs:
+  - template: ./scripts/azp/linux.yml
+  - template: ./scripts/azp/win.yml
+  - template: ./scripts/azp/osx.yml
+  - template: ./scripts/azp/docs.yml
--- a/configure.ac
+++ b/configure.ac
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
-
-m4_define([sidx_version_major], [1])
-m4_define([sidx_version_minor], [9])
-m4_define([sidx_version_micro], [0])
-m4_define([sidx_version],
-          [sidx_version_major.sidx_version_minor.sidx_version_micro])
-
-AC_INIT([spatialindex], [sidx_version], [mhadji@gmail.com], [spatialindex-src])
-AC_CANONICAL_BUILD
-AC_CONFIG_MACRO_DIR([m4])
-
-debug_default="no"
-
-CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
-CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++11 $CXXFLAGS"
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
-
-# Checks for header files.
-AC_CHECK_HEADERS(fcntl.h,, [AC_MSG_ERROR([cannot find fcntl.h, bailing out])])
-AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])])
-AC_CHECK_HEADERS(sys/types.h,, [AC_MSG_ERROR([cannot find sys/types.h, bailing out])])
-AC_CHECK_HEADERS(sys/stat.h,, [AC_MSG_ERROR([cannot find sys/stat.h, bailing out])])
-AC_CHECK_HEADERS(sys/resource.h,, [AC_MSG_ERROR([cannot find sys/resource.h, bailing out])])
-AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])])
-AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])])
-AC_CHECK_HEADERS(features.h)
-
-#MH_CXX_HEADER_TOOLS
-
-LIBS="$LIBS"
-
-AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=$debug_default]],, enable_debug=$debug_default)
-
-if test "x$enable_debug" = "xyes"; then
-	CXXFLAGS="$CXXFLAGS -g -DDEBUG"
-	AC_MSG_RESULT(checking wether debug information is enabled... yes)
-else
-	CXXFLAGS="$CXXFLAGS -DNDEBUG"
-	AC_MSG_RESULT(checking wether debug information is enabled... no)
-fi
-
-# Checks for library functions.
-AC_CHECK_FUNCS([gettimeofday memset memcpy bcopy srand48])
-
-AM_CONDITIONAL([RAND_IS_CONFIG], [test "x$HAVE_SRAND48" = xtrue])
-
-
-AC_CONFIG_FILES([	Makefile
-					include/Makefile
-					src/Makefile
-					src/libspatialindex.pc
-					src/capi/Makefile
-					src/spatialindex/Makefile
-					src/storagemanager/Makefile
-					src/rtree/Makefile
-					src/mvrtree/Makefile
-					src/tprtree/Makefile
-		 			src/tools/Makefile
-		 			test/Makefile
-					test/geometry/Makefile
-					test/rtree/Makefile
-					test/mvrtree/Makefile
-					test/tprtree/Makefile
-					test/gtest/Makefile])
-
-AC_CONFIG_SUBDIRS([test/gtest/gtest-1.7.0/])
-
-AC_OUTPUT
--- a/debian/changelog
+++ b/debian/changelog
-spatialindex (1.9.0-2) UNRELEASED; urgency=medium
+spatialindex (1.9.1-1~exp1) experimental; urgency=medium

+  * New upstream release.
  * Update gbp.conf to use --source-only-changes by default.
  * Bump Standards-Version to 4.4.1, no changes.
+  * Switch to CMake for build.
+  * Update docs to install.
+  * Rename library packages for SONAME bump.
+  * Don't install static library in -dev package, no longer built.
+  * Don't install pkgconfig file in -dev package, no longer built.
+  * Update symbols for amd64.

- -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 08:32:59 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 20 Oct 2019 07:13:52 +0200

 spatialindex (1.9.0-1) unstable; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,14 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9.20160114),
-               autotools-dev,
-               dh-autoreconf,
+               cmake,
               pkg-kde-tools
 Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/libspatialindex
 Vcs-Git: https://salsa.debian.org/debian-gis-team/libspatialindex.git
 Homepage: https://libspatialindex.org/

-Package: libspatialindex5
+Package: libspatialindex6
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -28,7 +27,7 @@ Description: General framework for developing spatial indices
 .
 This package contains the SpatialIndex shared library.

-Package: libspatialindex-c5
+Package: libspatialindex-c6
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -47,8 +46,8 @@ Package: libspatialindex-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libspatialindex5 (= ${binary:Version}),
-         libspatialindex-c5 (= ${binary:Version}),
+Depends: libspatialindex6 (= ${binary:Version}),
+         libspatialindex-c6 (= ${binary:Version}),
         ${misc:Depends}
 Recommends: pkg-config
 Description: General framework for developing spatial indices - development files

--- a/debian/docs
+++ b/debian/docs
-NEWS
-README
+README.rst
--- a/debian/libspatialindex-c5.install
+++ b/debian/libspatialindex-c5.install
--- a/debian/libspatialindex-c5.lintian-overrides
+++ b/debian/libspatialindex-c5.lintian-overrides
--- a/debian/libspatialindex-c5.symbols
+++ b/debian/libspatialindex-c5.symbols
-# SymbolsHelper-Confirmed: 1.9.0~rc1 amd64 arm64 hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips powerpc powerpcspe ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
-libspatialindex_c.so.5 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 1.9.1 amd64
+libspatialindex_c.so.6 #PACKAGE# #MINVER#
 * Build-Depends-Package: libspatialindex-dev
 Error_GetErrorCount@Base 1.8.1
 Error_GetLastErrorMethod@Base 1.8.1
@@ -69,6 +69,9 @@ libspatialindex_c.so.5 #PACKAGE# #MINVER#
 IndexProperty_SetTPRHorizon@Base 1.8.1
 IndexProperty_SetWriteThrough@Base 1.8.1
 Index_ClearBuffer@Base 1.8.1
+ Index_Contains_count@Base 1.9.1
+ Index_Contains_id@Base 1.9.1
+ Index_Contains_obj@Base 1.9.1
 Index_Create@Base 1.8.1
 Index_CreateWithStream@Base 1.8.1
 Index_DeleteData@Base 1.8.1
@@ -238,18 +241,15 @@ libspatialindex_c.so.5 #PACKAGE# #MINVER#
 (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !hppa !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sh4 !sparc64 !x32)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 1.8.1
 (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !hppa !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sh4 !sparc64 !x32)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 1.8.1
 (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !hppa !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sh4 !sparc64 !x32)_ZNSt5dequeI5ErrorSaIS0_EE19_M_destroy_data_auxESt15_Deque_iteratorIS0_RS0_PS0_ES6_@Base 1.8.1
- (optional=templinst)_ZNSt5dequeIlSaIlEE16_M_push_back_auxIJlEEEvDpOT_@Base 1.9.0
 (optional=templinst|arch=sparc)_ZNSt5dequeIxSaIxEE16_M_push_back_auxERKx@Base 1.8.1
 (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt5dequeIxSaIxEE16_M_push_back_auxIJxEEEvDpOT_@Base 1.9.0
 (optional=templinst)_ZNSt6vectorI15LeafQueryResultSaIS0_EE17_M_realloc_insertIJS0_EEEvN9__gnu_cxx17__normal_iteratorIPS0_S2_EEDpOT_@Base 1.9.0
 (optional=templinst)_ZNSt6vectorIPN12SpatialIndex5IDataESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 1.9.0
 (optional=templinst)_ZNSt6vectorIlSaIlEE17_M_default_appendEm@Base 1.9.0
- (optional=templinst)_ZNSt6vectorIlSaIlEE17_M_realloc_insertIJlEEEvN9__gnu_cxx17__normal_iteratorIPlS1_EEDpOT_@Base 1.9.0
 (optional=templinst)_ZNSt6vectorImSaImEE17_M_realloc_insertIJmEEEvN9__gnu_cxx17__normal_iteratorIPmS1_EEDpOT_@Base 1.9.0
 (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIxSaIxEE17_M_default_appendEj@Base 1.9.0
 (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIxSaIxEE17_M_realloc_insertIJxEEEvN9__gnu_cxx17__normal_iteratorIPxS1_EEDpOT_@Base 1.9.0
 (optional=templinst|arch=!amd64 !arm64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIySaIyEE17_M_realloc_insertIJyEEEvN9__gnu_cxx17__normal_iteratorIPyS1_EEDpOT_@Base 1.9.0
- (optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 1.8.5
 (optional=templinst)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag@Base 1.8.5
 (optional=templinst|arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips64el mipsel powerpc powerpcspe ppc64 ppc64el riscv64 s390x sh4 sparc64 x32)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 1.8.5
 (optional=templinst|arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips64el mipsel powerpc powerpcspe ppc64 ppc64el riscv64 s390x sh4 sparc64 x32)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 1.8.5

--- a/debian/libspatialindex-dev.install
+++ b/debian/libspatialindex-dev.install
 usr/include/*
-usr/lib/*/lib*.a
 usr/lib/*/lib*.so
-usr/lib/*/pkgconfig
--- a/debian/libspatialindex5.install
+++ b/debian/libspatialindex5.install
--- a/debian/libspatialindex5.lintian-overrides
+++ b/debian/libspatialindex5.lintian-overrides