[SCM] kwallet-pam packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.3.95-0ubuntu1-1-g1b72a6f

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1b72a6fbc2426ed68d42c11a211727bcde482160
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Aug 21 15:44:38 2015 +0100

    add conflicts on old pam-kwallet
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index b89cb28..4315f94 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Description: transitional dummy package
 Package: pam-kwallet4
 Architecture: any
 Depends: socat, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: pam-kwallet (<< 4:5.3.95)
+Breaks: pam-kwallet (<< 4:5.3.95)
 Description: KWallet integration with PAM
  Integrated KWallet with PAM so you can log in to open a KWallet.
 

-- 
kwallet-pam packaging