[pkg-opensc-commit] [libp11] 27/27: Go back to building agaisnt libssl 1.0 for the moment

[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 f6effc9ac4feb522c2a9add93ca0ab2a5226f83c
Author: Eric Dorland <eric at debian.org>
Date:   Mon Aug 7 15:00:17 2017 -0400

    Go back to building agaisnt libssl 1.0 for the moment
---
 debian/changelog                        | 4 +++-
 debian/control                          | 4 ++--
 debian/libengine-pkcs11-openssl.install | 2 +-
 debian/rules                            | 5 ++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca51733..5836600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libp11 (0.4.7-1) unstable; urgency=medium
   * New upstream release.
   * debian/control, debian/libp11-3.install, debian/libp11-3.symbols,
     debian/rules: Revert soname bump.
+  * debian/control, debian/libengine-pkcs11-openssl.install, debian/rules:
+    Go back to building agaisnt libssl 1.0 for the moment.
 
- --
+ -- Eric Dorland <eric at debian.org>  Mon, 07 Aug 2017 14:58:54 -0400
 
 libp11 (0.4.4-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index aafa59f..b7d4a6f 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,
-               libssl-dev,
+               libssl1.0-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}),
-         libssl-dev,
+         libssl1.0-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 193f7e1..8ebd623 100644
--- a/debian/libengine-pkcs11-openssl.install
+++ b/debian/libengine-pkcs11-openssl.install
@@ -1 +1 @@
-usr/lib/*/engines-*/*
+usr/lib/*/openssl-*/engines/*
diff --git a/debian/rules b/debian/rules
index 78bd9c9..27f258a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,8 @@
 
 include /usr/share/dpkg/architecture.mk
 
-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)
+OPENSSL_VERSION := $(shell pkg-config --modversion openssl | sed "s/[a-z]$$//")
+ENGINES_DIR := /usr/lib/$(DEB_HOST_GNU_TYPE)/openssl-$(OPENSSL_VERSION)/engines
 
 %:
 	dh $@

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