[SCM] kwallet packaging branch, kubuntu_wily_backports, updated. debian/5.16.0-1-41-gf8cd05e

Philip Muškovac yofel-guest at moszumanska.debian.org
Sat Jan 9 11:08:57 UTC 2016


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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 172946db19ce4f9adac442ea02933bf54eff18b0
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Sat Jan 9 10:15:37 2016 +0530

    remove patch to revert 1d0bec, not required with latest master
---
 debian/changelog                                   |  3 +++
 ...t_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff | 29 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c06525..185e2fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ kwallet-kf5 (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
   * Add kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
     to revert an upstream commit that freezes kwallet when started by kwallet-pam
 
+  [ Bhushan Shah ]
+  * Remove patch, doesn't apply after upstream change
+
  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:08:39 +0100
 
 kwallet-kf5 (5.16.0-1) unstable; urgency=medium
diff --git a/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff b/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
deleted file mode 100644
index 9275973..0000000
--- a/debian/patches/kubuntu_revert_1d0bec904dd78ff21d1d68e9c3e363ad1a77f7ed.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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



More information about the pkg-kde-commits mailing list