[SCM] kwallet-pam packaging branch, kubuntu_wily_backports, updated. debian/5.4.3-1-44-g6996a45

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 6996a45a0a1693161dff18d7302fe72a5be383d5
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Jan 11 12:40:19 2016 +0100

    Fix breaks on old pam-kwallet and new pam-kwallet4
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4e6874b..2f39b30 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kwallet-pam.git
 Package: libpam-kwallet4
 Architecture: any
 Depends: socat, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: pam-kwallet (<< 4:5.5)
-Breaks: pam-kwallet (<< 4:5.5)
+Conflicts: pam-kwallet (<< 4:5.3.95), pam-kwallet4 (<< 4:5.5)
+Breaks: pam-kwallet (<< 4:5.3.95), pam-kwallet4 (<< 4:5.5)
 Description: KWallet (KDE 4) 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

-- 
kwallet-pam packaging