[SCM] kwallet-pam packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-54-g9b18a47

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 9b18a478938a3bb2587398f370e381b920c50601
Merge: 6996a45a0a1693161dff18d7302fe72a5be383d5 70031f82e218bdde56107d1063ee0d9e98fa2fbf
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jan 14 20:40:54 2016 -0800

     * 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.  * Cherry pick Rohan's commit 4daa0350d4eba05a6907ede9bd1423352157c3af * Yet another merge fix. yay.
    -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 07:32:56 -0800
    
     * 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.
     * Cherry pick Rohan's commit 4daa0350d4eba05a6907ede9bd1423352157c3af
     * Yet another merge fix. yay.
    -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 07:32:56 -0800

 debian/changelog               | 18 ++++++++++++++++++
 debian/libpam-kwallet5.install |  2 +-
 debian/rules                   |  6 ++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 3ebe0ed,92834b8..ae557e5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,16 +1,36 @@@
 +kwallet-pam (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Debian merge: no remaining changes. 
 +  * Fix control file merge. 
 +  * New upstream release Xenial
 +  * Fix the lib name in kwallet4 install file. 
 +
 +  [ Clive Johnston ]
 +  * new upstream release
 +
 +  [ 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. 
++
 + -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:56:40 +0000
 +
+ kwallet-pam (4:5.5.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * 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. 
+   * Cherry pick Rohan's commit 4daa0350d4eba05a6907ede9bd1423352157c3af
+   * Yet another merge fix. yay. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 18 Dec 2015 07:32:56 -0800
+ 
  kwallet-pam (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
  
    * Debian merge: no remaining changes. 

-- 
kwallet-pam packaging