[SCM] kwallet-pam packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-60-g5a3b4f1

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 5a3b4f19a0b837fe543ad22025403d054728e661
Merge: 106d8a66ec207222fcd00bce9895c8d2b896c752 ca45a5145e47bb88376fb1752f5b025b68c89397
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 4 10:42:38 2016 +0000

    Merging xenial_archive into unstable, fixing changelog conflict

 debian/changelog                         | 36 ++++++++++++++++++--------------
 debian/control                           |  6 ++++--
 debian/libpam-kwallet4.install           |  2 +-
 debian/libpam-kwallet5.install           |  2 +-
 debian/patches/fix_install_location.diff | 12 -----------
 debian/patches/series                    |  1 -
 6 files changed, 26 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index 5111cb5,3ce1cb8..05484ba
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,26 +1,34 @@@
- kwallet-pam (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
+ kwallet-pam (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
  
    [ Scarlett Clark ]
--  * Debian merge: no remaining changes. 
--  * Fix control file merge. 
++  * Debian merge: no remaining changes.
++  * Fix control file merge.
    * New upstream release Xenial
-   * No change, trigger build. 
--  * Fix the lib name in kwallet4 install file. 
-   * Fix filename for kwallet5 install file. 
++  * No change, trigger build.
++  * Fix the lib name in kwallet4 install file.
++  * Fix filename for kwallet5 install file.
 +  * Cherry pick Rohan's commit 4daa0350d4eba05a6907ede9bd1423352157c3af
-   * Yet another merge fix. yay. 
++  * Yet another merge fix. yay.
 +
 +  [ Bhushan Shah ]
 +  * Depend on qtbase5-dev as ecm wants it
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 07:32:56 -0800
+   [ Clive Johnston ]
+   * new upstream release
  
- kwallet-pam (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
+   [ Philip Muškovac ]
+   * Drop fix_install_location.diff as it breaks the sddm integration 
+   * libpam-kwallet[4] breaks/replaces pam-kwallet[4] << 4:5.5 
+ 
+   [ Scarlett Clark ]
+   * Merge unstable to archive to get the debian merge. 
+   * Fix install file. 
  
-   * Debian merge: no remaining changes. 
-   * Fix control file merge. 
-   * Debian merge. again. 
-   * No change, trigger build. 
-   * No change, trigger build, again. 
-   * Fix filename for kwallet4 install file. 
+   [ Clive Johnston ]
+   * New upstream release
++  * Merge fix
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 05 Dec 2015 02:40:15 -0800
+  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:11:55 +0000
  
  kwallet-pam (4:5.4.3-0ubuntu1) xenial; urgency=medium
  

-- 
kwallet-pam packaging