[SCM] kwallet packaging branch, master, updated. debian/4.12.4-1-4-g7801d4f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7801d4f2a03bf2b555d331230e0c86ba96dc6e52
Merge: 5341e968a4118911d326f60bef1226d41a88e2cd 1d4f1148f5d871cce729e0021ac5642b0cd1633c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 29 16:10:31 2014 +0200

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/kwallet
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index a9285ec,2f414fa..2cafbbf
--- a/debian/control
+++ b/debian/control
@@@ -11,10 -11,10 +11,10 @@@ Uploaders: Fathi Boudra <fabo at debian.or
             Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.11),
 +               kde-sc-dev-latest (>= 4:4.12),
                 kdelibs5-dev (>= 4:4.11),
                 pkg-kde-tools (>= 0.12)
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.5
  Homepage: http://www.kde.org
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kwallet.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kwallet.git

-- 
kwallet packaging