[libspatialindex] 01/07: Imported Upstream version 1.8.4
Bas Couwenberg
sebastic at xs4all.nl
Sat Oct 11 10:47:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository libspatialindex.
commit 2d54f2ba3b279d74a9ab658fa7a8e959af3c051a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Sep 29 23:00:34 2014 +0200
Imported Upstream version 1.8.4
---
CMakeLists.txt | 4 ++--
Makefile.am | 4 ++--
Makefile.in | 4 ++--
README | 4 ++--
configure | 20 ++++++++++----------
configure.ac | 2 +-
include/spatialindex/Version.h | 6 +++---
src/CMakeLists.txt | 10 ++++++----
8 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e0ab98..2c93d26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ endif()
SET(SIDX_VERSION_MAJOR "1")
SET(SIDX_VERSION_MINOR "8")
-SET(SIDX_VERSION_PATCH "3")
-SET(SIDX_LIB_SOVERSION "3.2.0")
+SET(SIDX_VERSION_PATCH "4")
+SET(SIDX_LIB_SOVERSION "4.0.0")
set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}")
diff --git a/Makefile.am b/Makefile.am
index 3c2a260..c8b11d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ libspatialindex_c_la_LIBADD = \
libspatialindex.la \
src/capi/libsidxc.la
-libspatialindex_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
-libspatialindex_c_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
+libspatialindex_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
+libspatialindex_c_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
EXTRA_DIST = INSTALL.WIN \
spatialindex.sln \
diff --git a/Makefile.in b/Makefile.in
index fc661bb..5a799e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -398,8 +398,8 @@ libspatialindex_c_la_LIBADD = \
libspatialindex.la \
src/capi/libsidxc.la
-libspatialindex_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
-libspatialindex_c_la_LDFLAGS = -version-info 3:2:0 -no-undefined -lstdc++
+libspatialindex_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
+libspatialindex_c_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++
EXTRA_DIST = INSTALL.WIN \
spatialindex.sln \
spatialindex-vc/spatialindex.vcproj \
diff --git a/README b/README
index df9fa64..67c4401 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
:Author: Marios Hadjieleftheriou
:Contact: mhadji at gmail.com
-:Revision: 1.8.3
-:Date: 09/20/2014
+:Revision: 1.8.4
+:Date: 09/24/2014
See http://libspatialindex.org for full documentation.
diff --git a/configure b/configure
index 26d031f..cf8bb33 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spatialindex 1.8.3.
+# Generated by GNU Autoconf 2.69 for spatialindex 1.8.4.
#
# Report bugs to <mhadji at gmail.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='spatialindex'
PACKAGE_TARNAME='spatialindex-src'
-PACKAGE_VERSION='1.8.3'
-PACKAGE_STRING='spatialindex 1.8.3'
+PACKAGE_VERSION='1.8.4'
+PACKAGE_STRING='spatialindex 1.8.4'
PACKAGE_BUGREPORT='mhadji at gmail.com'
PACKAGE_URL=''
@@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures spatialindex 1.8.3 to adapt to many kinds of systems.
+\`configure' configures spatialindex 1.8.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1394,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spatialindex 1.8.3:";;
+ short | recursive ) echo "Configuration of spatialindex 1.8.4:";;
esac
cat <<\_ACEOF
@@ -1503,7 +1503,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spatialindex configure 1.8.3
+spatialindex configure 1.8.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1993,7 +1993,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by spatialindex $as_me 1.8.3, which was
+It was created by spatialindex $as_me 1.8.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -14957,7 +14957,7 @@ fi
# Define the identity of the package.
PACKAGE='spatialindex-src'
- VERSION='1.8.3'
+ VERSION='1.8.4'
cat >>confdefs.h <<_ACEOF
@@ -16057,7 +16057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by spatialindex $as_me 1.8.3, which was
+This file was extended by spatialindex $as_me 1.8.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16114,7 +16114,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-spatialindex config.status 1.8.3
+spatialindex config.status 1.8.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2e6bed7..f855d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
m4_define([sidx_version_major], [1])
m4_define([sidx_version_minor], [8])
-m4_define([sidx_version_micro], [3])
+m4_define([sidx_version_micro], [4])
m4_define([sidx_version],
[sidx_version_major.sidx_version_minor.sidx_version_micro])
diff --git a/include/spatialindex/Version.h b/include/spatialindex/Version.h
index 782ced3..c285d84 100644
--- a/include/spatialindex/Version.h
+++ b/include/spatialindex/Version.h
@@ -30,7 +30,7 @@
#ifndef SIDX_VERSION_MAJOR
#define SIDX_VERSION_MAJOR 1
#define SIDX_VERSION_MINOR 8
-#define SIDX_VERSION_REV 3
+#define SIDX_VERSION_REV 4
#define SIDX_VERSION_BUILD 0
#endif
@@ -39,10 +39,10 @@
#endif
#ifndef SIDX_RELEASE_DATE
-#define SIDX_RELEASE_DATE 20140920
+#define SIDX_RELEASE_DATE 20140929
#endif
#ifndef SIDX_RELEASE_NAME
-#define SIDX_RELEASE_NAME "1.8.3"
+#define SIDX_RELEASE_NAME "1.8.4"
#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5842857..96d967a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,7 +52,7 @@ set(SIDX_CAPI_HPP
"${SIDX_HEADERS_CAPI_DIR}/LeafQuery.h"
"${SIDX_HEADERS_CAPI_DIR}/ObjVisitor.h"
"${SIDX_HEADERS_CAPI_DIR}/sidx_api.h"
- "${SIDX_HEADERS_CAPI_DIR}/sidx_config.h"
+ "${SIDX_HEADERS_CAPI_DIR}/sidx_config.h"
"${SIDX_HEADERS_CAPI_DIR}/sidx_impl.h"
"${SIDX_HEADERS_CAPI_DIR}/Utility.h"
)
@@ -205,10 +205,12 @@ target_link_libraries(${SIDX_C_LIB_NAME}
set_target_properties(${SIDX_LIB_NAME}
- PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
+ PROPERTIES VERSION "${SIDX_LIB_VERSION}"
+ SOVERSION "${SIDX_LIB_SOVERSION}" )
-set_target_properties(${SIDX_C_LIB_NAME}
- PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
+set_target_properties(${SIDX_C_LIB_NAME}
+ PROPERTIES VERSION "{SIDX_LIB_VERSION}"
+ SOVERSION "${SIDX_LIB_SOVERSION}" )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libspatialindex.git
More information about the Pkg-grass-devel
mailing list