[SCM] kwallet-pam packaging branch, master, updated. debian/5.4.3-1-14-g71bad9a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwallet-pam.git;a=commitdiff;h=c26a3d0

The following commit has been merged in the master branch:
commit c26a3d020e0c8b081b0791a7f02aabf2df7b62d0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 22 13:09:41 2016 +0100

    Try using -DCMAKE_INSTALL_LIBDIR.
---
 debian/changelog                         |  2 +-
 debian/patches/fix_install_location.diff | 10 ----------
 debian/patches/series                    |  1 -
 debian/rules                             |  5 +++--
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91b01ee..0bd3f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 kwallet-pam (5.5.4-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Try using -DCMAKE_INSTALL_LIBDIR.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 22 Feb 2016 13:08:22 +0100
 
diff --git a/debian/patches/fix_install_location.diff b/debian/patches/fix_install_location.diff
deleted file mode 100644
index 38b82ce..0000000
--- a/debian/patches/fix_install_location.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: kwallet-pam/CMakeLists.txt
-===================================================================
---- kwallet-pam.orig/CMakeLists.txt	2015-12-10 14:12:47.823621683 +0100
-+++ kwallet-pam/CMakeLists.txt	2015-12-10 20:14:41.316898893 +0100
-@@ -42,4 +42,4 @@
-    ${LIBGCRYPT_LIBRARIES}
- )
- 
--install(TARGETS ${library_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/security)
-+install(TARGETS ${library_name} DESTINATION /${CMAKE_INSTALL_LIBDIR}/security)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5acedc4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_install_location.diff
diff --git a/debian/rules b/debian/rules
index 404230b..c08a5cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 QT4_BUILD_DIR = build-qt4
 
@@ -9,8 +10,8 @@ override_dh_auto_clean:
 	rm -rf $(QT4_BUILD_DIR)
 
 override_dh_auto_configure:
-	dh_auto_configure
-	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- -DKWALLET4=1
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}"
+	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- -DKWALLET4=1 -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}"
 
 override_dh_auto_build:
 	dh_auto_build

-- 
kwallet-pam packaging