[pkg-opensc-commit] [libp11] 01/06: Rebuild against libssl 1.1 once again

[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 b76e48c5f8f8339fae60a01398a45e962f75bebe
Author: Eric Dorland <eric at debian.org>
Date:   Mon Dec 11 00:43:49 2017 -0500

    Rebuild against libssl 1.1 once again
    
    Closes: 875349
---
 debian/changelog                        | 7 +++++++
 debian/control                          | 4 ++--
 debian/libengine-pkcs11-openssl.install | 2 +-
 debian/rules                            | 5 +++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5836600..a623820 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libp11 (0.4.7-2) unstable; urgency=medium
+
+  * debian/control, debian/libengine-pkcs11-openssl.install, debian/rules:
+    Rebuild against libssl 1.1 once again. (Closes: #875349)
+
+ --
+
 libp11 (0.4.7-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