[Pkg-electronics-commits] [gnucap] 01/01: pkglibdir depends on SOVERSION

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository gnucap.

commit 8b43b2733fe3bb160afad4fd5e22a5200792212d
Author: Felix Salfelder <felix at salfelder.org>
Date:   Fri Mar 2 08:23:58 2018 +0000

    pkglibdir depends on SOVERSION
---
 debian/control                         | 2 +-
 debian/gnucap-default-plugins.install  | 1 -
 debian/gnucap-default-plugins0.install | 1 +
 debian/rules                           | 9 +++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 88e0dd8..351c417 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Description: GNU Circuit Analysis package, development headers
  command driven. It can also be run in batch mode or as a server.
  This package contains the development headers required.
 
-Package: gnucap-default-plugins
+Package: gnucap-default-plugins0
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/gnucap-default-plugins.install b/debian/gnucap-default-plugins.install
deleted file mode 100644
index 88259b6..0000000
--- a/debian/gnucap-default-plugins.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/gnucap/*.so
diff --git a/debian/gnucap-default-plugins0.install b/debian/gnucap-default-plugins0.install
new file mode 100644
index 0000000..6cd8f4e
--- /dev/null
+++ b/debian/gnucap-default-plugins0.install
@@ -0,0 +1 @@
+usr/lib/*/gnucap0/*.so
diff --git a/debian/rules b/debian/rules
index 8628a7e..7ff2223 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,8 @@ tarball_version = $(shell v="$(version_no_epoch)"; echo $${v%%-*})
 upstream_commit = $(shell v="$(tarball_version)"; echo $${v\#\#*~})
 
 # take from control?
-SONAME=libgnucap.so.0
+SOVERSION=0
+SONAME=libgnucap.so.${SOVERSION}
 
 # upstream_commit_short = $(shell echo $(upstream_commit) | sed -e 's/\(........\).*/\1/')
 #
@@ -22,7 +23,7 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 LN_S = ln -sf
 
-pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap
+pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap${SOVERSION}
 
 %:
 	dh $@
@@ -30,7 +31,7 @@ pkglibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap
 override_dh_auto_configure:
 	./configure --prefix=/usr
 	sed -i 's/-lterminfo//' lib/Make2
-	sed -e '/^pkglibdir/s#/lib#/lib/gnucap#' -i main/gnucap-conf
+	sed -e '/^pkglibdir/s#=.*#='${pkglibdir}'#' -i main/gnucap.conf
 
 	grep GNUCAP_SSP include/md.h || \
 	sed -i '/SYSTEMSTARTPATH/s/"PATH"/"GNUCAP_SSP"/' include/md.h
@@ -79,7 +80,7 @@ override_dh_auto_install:
 	        DESTDIR=$(CURDIR)/debian/tmp
 
 	$(MAKE) install -C apps \
-	        INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap install \
+	        INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/gnucap${SOVERSION} install \
 	        DESTDIR=$(CURDIR)/debian/tmp
 
 	$(MAKE) install -C include \

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