[SCM] kwallet packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-4-g23ab44e

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 23ab44eed0ef0456c57a94dbf60da043b7027558
Merge: cf442381e10f54f08b96e3013c500b1aa5f67af6 5691fbde4c1cb2a1c3414929608f8c3ed717f39a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Jul 11 06:37:19 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                |  7 +++++++
 debian/control                  | 25 +++++++++++++------------
 debian/libkf5wallet-bin.install |  2 ++
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 1fe9c14,12ea228..8b6a92b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
 +kwallet-kf5 (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Fix merge.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:26:21 -0700
 +
+ kwallet-kf5 (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 20:36:24 +0200
+ 
  kwallet-kf5 (5.10.0-0ubuntu2) wily; urgency=medium
  
    * libkf5wallet-data Breaks/Replaces libkf5wallet5 (<< 5.10)
diff --cc debian/control
index 00eee7c,bda4014..9d2d921
--- a/debian/control
+++ b/debian/control
@@@ -5,18 -5,19 +5,19 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
+                extra-cmake-modules (>= 5.11.0~),
+                kdoctools-dev,
                 libgcrypt20-dev (>= 1.5.0~),
                 libgpgme11-dev,
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5dbusaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5notifications-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5dbusaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5notifications-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.11.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5dbusaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5notifications-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6
@@@ -28,9 -29,9 +29,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5wallet-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5config-dev (>= 5.12.0),
 -Depends: libkf5config-dev (>= 5.11.0~),
++Depends: libkf5config-dev (>= 5.12.0~),
           libkf5wallet5 (= ${binary:Version}),
-          libkf5windowsystem-dev (>= 5.12.0),
 -         libkf5windowsystem-dev (>= 5.11.0~),
++         libkf5windowsystem-dev (>= 5.12.0~),
           libkwalletbackend5-5 (= ${binary:Version}),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}

-- 
kwallet packaging