[pkg-opensc-commit] [engine-pkcs11] 01/04: Install engine into the current openssl engine directory

[Eric Dorland]

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

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 0f9adff289380caf2887276d6e979871dbe174ba
Author: Eric Dorland <eric at debian.org>
Date:   Tue Mar 15 01:15:40 2016 -0400

    Install engine into the current openssl engine directory
    
    Closes: 815004
---
 debian/changelog                        | 8 ++++++++
 debian/control                          | 3 ++-
 debian/libengine-pkcs11-openssl.install | 2 +-
 debian/rules                            | 7 ++++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1996eb6..b22ae83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+engine-pkcs11 (0.2.1-2) unstable; urgency=medium
+
+  * debian/control, debian/rules, debian/libengine-pkcs11-openssl.install:
+    Install engine into the current openssl engine directory. (Closes:
+    #815004)
+
+ --
+
 engine-pkcs11 (0.2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index da4d373..16a2e79 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: dh-autoreconf,
                debhelper (>= 9),
                libltdl3-dev,
                libp11-dev (>= 0.3.1),
-               libssl-dev
+               libssl-dev,
+               pkg-config
 Standards-Version: 3.9.6
 Homepage: https://github.com/OpenSC/engine_pkcs11
 Vcs-Git: https://anonscm.debian.org/git/pkg-opensc/engine-pkcs11.git
diff --git a/debian/libengine-pkcs11-openssl.install b/debian/libengine-pkcs11-openssl.install
index aa1e59e..8ebd623 100644
--- a/debian/libengine-pkcs11-openssl.install
+++ b/debian/libengine-pkcs11-openssl.install
@@ -1 +1 @@
-usr/lib/ssl/engines/*
+usr/lib/*/openssl-*/engines/*
diff --git a/debian/rules b/debian/rules
index 0235415..0627ca2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
+OPENSSL_VERSION := $(shell pkg-config --modversion openssl | sed "s/[a-z]$$//")
+ENGINES_DIR := /usr/lib/$(DEB_HOST_GNU_TYPE)/openssl-$(OPENSSL_VERSION)/engines
+
 %:
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		--with-enginesdir=/usr/lib/ssl/engines
+		--with-enginesdir=$(ENGINES_DIR)
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git