[pkg-opensc-commit] [libp11] 48/51: Drop upstreamed enginesexecdir patch

[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 a92e05c1ffd63168769992f9e2356bba40b41296
Author: Eric Dorland <eric at debian.org>
Date:   Tue Dec 6 00:03:24 2016 -0500

    Drop upstreamed enginesexecdir patch
---
 debian/changelog                                   |  2 +
 ...ginesexecdir-use-it-instead-of-enginesdir.patch | 51 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78c2e45..97a324d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libp11 (0.4.3-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #846774)
+  * debian/patches/0001-Add-enginesexecdir-use-it-instead-of-enginesdir.patch:
+    Drop upstreamed enginesexecdir patch.
 
  --
 
diff --git a/debian/patches/0001-Add-enginesexecdir-use-it-instead-of-enginesdir.patch b/debian/patches/0001-Add-enginesexecdir-use-it-instead-of-enginesdir.patch
deleted file mode 100644
index 82e58ce..0000000
--- a/debian/patches/0001-Add-enginesexecdir-use-it-instead-of-enginesdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Eric Dorland <eric at debian.org>
-Date: Sun, 23 Oct 2016 14:42:59 -0400
-Subject: Add enginesexecdir, use it instead of enginesdir
-
-To be properly installed at install-exec time, the dir needs to have exec in
-its name. This fixes a problem where install-exec-hook can fail with newer
-automakes.
----
- configure.ac    | 2 ++
- src/Makefile.am | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a69e230..2c7e1cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,10 +195,12 @@ if test -n "${pkcs11_module}"; then
- fi
- 
- pkgconfigdir="\$(libdir)/pkgconfig"
-+enginesexecdir="\$(enginesdir)"
- 
- AC_SUBST([pkgconfigdir])
- AC_SUBST([apidocdir])
- AC_SUBST([enginesdir])
-+AC_SUBST([enginesexecdir])
- AC_SUBST([LIBP11_VERSION_MAJOR])
- AC_SUBST([LIBP11_VERSION_MINOR])
- AC_SUBST([LIBP11_VERSION_FIX])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c39266b..4ac2987 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@ EXTRA_DIST = Makefile.mak libp11.rc.in pkcs11.rc.in
- noinst_HEADERS= libp11-int.h pkcs11.h atfork.h
- include_HEADERS= libp11.h
- lib_LTLIBRARIES = libp11.la
--engines_LTLIBRARIES = pkcs11.la
-+enginesexec_LTLIBRARIES = pkcs11.la
- pkgconfig_DATA = libp11.pc
- 
- SHARED_EXT=@SHARED_EXT@
-@@ -40,7 +40,7 @@ pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
- check-local: $(LTLIBRARIES)
- 	cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
- install-exec-hook:
--	cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-+	cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
- 
- if WIN32
- # def file required for MS users to build library
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 742f8f6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-enginesexecdir-use-it-instead-of-enginesdir.patch

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