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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 362eb92cd11bc96db46af40caf06c550e93ab03a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Dec 11 14:59:18 2015 +0100

    Revert the previous two tests.
---
 debian/patches/fix_install_location.diff | 14 ++++++--------
 debian/rules                             |  5 ++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/patches/fix_install_location.diff b/debian/patches/fix_install_location.diff
index 9d5664f..38b82ce 100644
--- a/debian/patches/fix_install_location.diff
+++ b/debian/patches/fix_install_location.diff
@@ -1,12 +1,10 @@
 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:45:45.967413893 +0100
-@@ -36,7 +36,6 @@
- endif()
- 
- add_library (${library_name} SHARED ${pam_kwallet_SRCS})
--set_target_properties (${library_name} PROPERTIES PREFIX "")
- target_link_libraries (${library_name}
-    ${PAM_LIBRARIES}
++++ 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/rules b/debian/rules
index 9a6d5a2..404230b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,8 @@ override_dh_auto_clean:
 	rm -rf $(QT4_BUILD_DIR)
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX:PATH=/
-	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- \
-	    -DCMAKE_INSTALL_PREFIX:PATH=/ -DKWALLET4=1
+	dh_auto_configure
+	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- -DKWALLET4=1
 
 override_dh_auto_build:
 	dh_auto_build

-- 
kwallet-pam packaging