[pkg-opensc-commit] [libp11] 01/04: Rebuild against libssl 1.1 and fix the path to the 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 libp11.

commit e8d6da04fa3e0805c2cfeea4351f3c559b460882
Author: Eric Dorland <eric at debian.org>
Date:   Thu May 18 00:26:24 2017 -0400

    Rebuild against libssl 1.1 and fix the path to the engine directory
    
    Patch from Luke Faraone.
    
    Closes: 846548
---
 debian/changelog                        | 8 ++++++++
 debian/control                          | 4 ++--
 debian/libengine-pkcs11-openssl.install | 2 +-
 debian/rules                            | 5 +++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2d6f4b..3540ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libp11 (0.4.4-2) unstable; urgency=medium
+
+  * debian/control, debian/libengine-pkcs11-openssl.install, debian/rules:
+    Patch from Luke Faraone to rebuild against libssl 1.1 and fix the path
+    to the engine directory. (Closes: #846548)
+
+ -- Eric Dorland <eric at debian.org>  Thu, 18 May 2017 00:25:29 -0400
+
 libp11 (0.4.4-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index b7d4a6f..aafa59f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Eric Dorland <eric at debian.org>
 Build-Depends: debhelper (>= 10),
                libltdl3-dev,
                libp11-kit-dev,
-               libssl1.0-dev,
+               libssl-dev,
                pkg-config
 Standards-Version: 3.9.8
 Homepage: https://github.com/OpenSC/libp11
@@ -16,7 +16,7 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-opensc/libp11.git
 Package: libp11-dev
 Architecture: any
 Depends: libp11-2 (= ${binary:Version}),
-         libssl1.0-dev,
+         libssl-dev,
          pkg-config,
          ${misc:Depends}
 Description: pkcs#11 convenience library - development files
diff --git a/debian/libengine-pkcs11-openssl.install b/debian/libengine-pkcs11-openssl.install
index 8ebd623..193f7e1 100644
--- a/debian/libengine-pkcs11-openssl.install
+++ b/debian/libengine-pkcs11-openssl.install
@@ -1 +1 @@
-usr/lib/*/openssl-*/engines/*
+usr/lib/*/engines-*/*
diff --git a/debian/rules b/debian/rules
index 27f258a..78bd9c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,9 @@
 
 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
+OPENSSL_VERSION := \
+  $(shell pkg-config --modversion openssl | \sed "s/[a-z]$$//" | cut -d . -f -2)
+ENGINES_DIR := /usr/lib/$(DEB_HOST_GNU_TYPE)/engines-$(OPENSSL_VERSION)
 
 %:
 	dh $@

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