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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 031d862abfed55726cc66fdf75eacd560344355c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 8 15:27:25 2016 +0200

    Add -common package
---
 debian/control                       | 21 +++++++++++++++++++--
 debian/libpam-kwallet-common.install |  2 ++
 debian/rules                         |  8 ++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 9c9ea3f..5ac3a7e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,23 @@ Homepage: https://projects.kde.org/projects/kde/workspace/kwallet-pam
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/plasma/kwallet-pam.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/kwallet-pam.git
 
+Package: libpam-kwallet-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: KWallet integration with PAM (common files)
+ The KDE Wallet system provides a secure way to store passwords and other
+ secret information, allowing the user to remember only a single KDE Wallet
+ password instead of numerous different passwords and credentials.
+ .
+ This package provides a the common files needed by the KDE 4 and Kf5 version
+ of the PAM integration.
+
 Package: libpam-kwallet4
 Architecture: any
-Depends: socat, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpam-kwallet-common (= ${source:Version}),
+         socat,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Conflicts: pam-kwallet (<< 4:5.3.95)
 Breaks: pam-kwallet (<< 4:5.3.95)
 Description: KWallet (KDE 4) integration with PAM
@@ -29,7 +43,10 @@ Description: KWallet (KDE 4) integration with PAM
 
 Package: libpam-kwallet5
 Architecture: any
-Depends: socat, ${misc:Depends}, ${shlibs:Depends}
+Depends: libpam-kwallet-common (= ${source:Version}),
+         socat,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: KWallet (Kf5) integration with PAM
  The KDE Wallet system provides a secure way to store passwords and other
  secret information, allowing the user to remember only a single KDE Wallet
diff --git a/debian/libpam-kwallet-common.install b/debian/libpam-kwallet-common.install
new file mode 100644
index 0000000..2f2d6a7
--- /dev/null
+++ b/debian/libpam-kwallet-common.install
@@ -0,0 +1,2 @@
+etc/xdg/autostart/pam_kwallet_init.desktop
+usr/share/libpam-kwallet-common/
diff --git a/debian/rules b/debian/rules
index c08a5cf..1326e7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,12 @@ override_dh_auto_clean:
 	rm -rf $(QT4_BUILD_DIR)
 
 override_dh_auto_configure:
-	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}"
+	dh_auto_configure -- \
+	    -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
+	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
+	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- \
+	    -DKWALLET4=1 -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
+	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
 
 override_dh_auto_build:
 	dh_auto_build

-- 
kwallet-pam packaging