[postgis] 02/03: Fix liblwgeom LD_PRELOAD for the renamed library.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository postgis.

commit 8a75e5fc96791287a7b3768bc9613249e8e95a78
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 7 00:42:58 2016 +0100

    Fix liblwgeom LD_PRELOAD for the renamed library.
---
 debian/changelog |  1 +
 debian/rules     | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c424fd2..ff492a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ postgis (2.2.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop typo patches, applied upstream.
   * Rename liblwgeom package for SONAME bump.
+  * Fix liblwgeom LD_PRELOAD for the renamed library.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 06 Jan 2016 23:58:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 0f43d78..d24c549 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,14 +60,22 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 # Upstream version (including ~rcN) for symbols version
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
-MAJOR_VERSION = $(shell grep POSTGIS_MAJOR_VERSION Version.config|cut -d= -f2)
-MINOR_VERSION = $(shell grep POSTGIS_MINOR_VERSION Version.config|cut -d= -f2)
-MICRO_VERSION = $(shell grep POSTGIS_MICRO_VERSION Version.config|cut -d= -f2)
+MAJOR_VERSION = $(shell grep ^POSTGIS_MAJOR_VERSION Version.config|cut -d= -f2)
+MINOR_VERSION = $(shell grep ^POSTGIS_MINOR_VERSION Version.config|cut -d= -f2)
+MICRO_VERSION = $(shell grep ^POSTGIS_MICRO_VERSION Version.config|cut -d= -f2)
 POSTGIS_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
 ifeq ($(POSTGIS_VERSION),..)
 $(error Cannot detect Postgis version, fix debian/rules)
 endif
 
+LIBLWGEOM_CURRENT   = $(shell grep ^LIBLWGEOM_IFACE_CUR Version.config | cut -d= -f2)
+LIBLWGEOM_REVISION  = $(shell grep ^LIBLWGEOM_IFACE_REV Version.config | cut -d= -f2)
+LIBLWGEOM_AGE       = $(shell grep ^LIBLWGEOM_IFACE_AGE Version.config | cut -d= -f2)
+LIBLWGEOM_SOVERSION = $(shell expr $(LIBLWGEOM_CURRENT) - $(LIBLWGEOM_AGE))
+ifeq ($(LIBLWGEOM_SOVERSION),)
+$(error Cannot detect liblwgeom SOVERSION, fix debian/rules)
+endif
+
 # For the Postgres APT repository, we want to support multiple
 # Postgres versions. However, docs and the JDBC jar only need to be
 # built once - in the main directory.
@@ -191,7 +199,7 @@ build-indep-stamp: configuration-stamp build-arch-stamp
 check: build-arch-stamp
 #   Run unit tests (against the newest Postgres version only, for
 #   now).
-	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(MAJOR_VERSION)'" \
+	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \
 		> $(CURDIR)/postgis-check-env.tmp
 	(set -e; \
 		test -z '$(CHECK)' || \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git