[SCM] libspatialindex branch, master, updated. upstream/1.7.0-29-g8f2f076

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 74e207b8d3bd4a15529dd1a22d67c1ec9ea912b5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 10 19:23:07 2014 +0100

    Change library packages to match SONAME, and use correct description.

diff --git a/debian/changelog b/debian/changelog
index a14bb16..f14ded0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ spatialindex (1.8.1-1) UNRELEASED; urgency=low
   * Support Multi-Arch build.
   * Add misc:Depends for libspatialindex-dev.
   * Don't start description synopsis with an article.
+  * Change library packages to match SONAME, and use correct description.
+    (closes: #642482)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 10 Jan 2014 16:38:53 +0100
 
diff --git a/debian/control b/debian/control
index dbb0fc0..b53eb74 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,13 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/libspatialindex.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/libspatialindex.git
 Homepage: http://libspatialindex.github.io/
 
-Package: libspatialindex-dev
+Package: libspatialindex3
 Architecture: any
 Multi-Arch: same
-Section: libdevel
-Depends: libspatialindex1 (= ${binary:Version}),
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: pkg-config
 Description: General framework for developing spatial indices
  Spatialindex is a C++ library that provides a framework for
  developing spatial indices. Currently it defines generic interfaces,
@@ -27,13 +27,29 @@ Description: General framework for developing spatial indices
  .
  This package contains the SpatialIndex shared library.
 
-Package: libspatialindex1
+Package: libspatialindex-c3
 Architecture: any
 Multi-Arch: same
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Description: General framework for developing spatial indices - C library
+ Spatialindex is a C++ library that provides a framework for
+ developing spatial indices. Currently it defines generic interfaces,
+ provides simple main memory and disk based storage managers and a
+ robust implementation of an R*-tree, an MVR-tree and a TPR-tree.
+ .
+ This package contains the SpatialIndex shared library for C.
+
+Package: libspatialindex-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libspatialindex3 (= ${binary:Version}),
+         libspatialindex-c3 (= ${binary:Version}),
+         ${misc:Depends}
+Recommends: pkg-config
 Description: General framework for developing spatial indices - development files
  Spatialindex is a C++ library that provides a framework for
  developing spatial indices. Currently it defines generic interfaces,
diff --git a/debian/libspatialindex-c3.install b/debian/libspatialindex-c3.install
new file mode 100644
index 0000000..766321d
--- /dev/null
+++ b/debian/libspatialindex-c3.install
@@ -0,0 +1 @@
+usr/lib/*/libspatialindex_c.so.*
diff --git a/debian/libspatialindex-dev.dirs b/debian/libspatialindex-dev.dirs
deleted file mode 100644
index db3993b..0000000
--- a/debian/libspatialindex-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/lib/pkgconfig
diff --git a/debian/libspatialindex1.dirs b/debian/libspatialindex1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libspatialindex1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libspatialindex1.install b/debian/libspatialindex1.install
deleted file mode 100644
index 3ddde58..0000000
--- a/debian/libspatialindex1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff --git a/debian/libspatialindex3.install b/debian/libspatialindex3.install
new file mode 100644
index 0000000..2cb1d7f
--- /dev/null
+++ b/debian/libspatialindex3.install
@@ -0,0 +1 @@
+usr/lib/*/libspatialindex.so.*

-- 
A general framework for developing spatial indices