[SCM] kwallet packaging branch, master, updated. debian/5.37.0-2-96-g74de6bf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=be5a051

The following commit has been merged in the master branch:
commit be5a05107776bda6d723ee4620085f63973aa49d
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Jan 8 19:58:23 2016 +0100

    Add patch to work around kwallet freezes
---
 debian/changelog                                   |  2 ++
 ...t_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f960830..2c06525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kwallet-kf5 (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Philip Muškovac ]
   * New upstream release
+  * Add kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
+    to revert an upstream commit that freezes kwallet when started by kwallet-pam
 
  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:08:39 +0100
 
diff --git a/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff b/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
new file mode 100644
index 0000000..9275973
--- /dev/null
+++ b/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
@@ -0,0 +1,29 @@
+diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
+index a48de08..db8d55c 100644
+--- a/src/runtime/kwalletd/main.cpp
++++ b/src/runtime/kwalletd/main.cpp
+@@ -90,21 +90,18 @@ static int waitForEnvironment()
+     }
+     printf("kwalletd5: client connected
");
+ 
+-    char str[BSIZE] = {'

-- 
kwallet packaging