[SCM] kwallet packaging branch, master, updated. ff0151f1b009d2dbbf50defc55ac71fee44fbafa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5f854154e06c3c2cad465add3ed4c11a9f652483
Merge: 9152ddaac84330fc04467ffb5fba760abb139d8a ccb9a27c595fa2802352ec0d1aff18ae642ef47f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 09:45:45 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control
    	debian/libkf5wallet-dev.install

 debian/changelog                |  6 ++++++
 debian/control                  | 20 ++++++++++----------
 debian/libkf5wallet-bin.install |  1 +
 debian/libkf5wallet5.install    |  1 +
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index e4e66b5,ddfd649..d1622a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,29 @@@
 +kwallet-kf5 (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:37:06 +0100
 +
+ kwallet-kf5 (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:15:47 +0100
+ 
 +kwallet-kf5 (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Split -data package and update install files.
 +  * Update watch file.
 +  * Add acc autopkgtests.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Jan 2015 09:05:21 +0100
 +
  kwallet-kf5 (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 4ef56a5,213a17e..ac33422
--- a/debian/control
+++ b/debian/control
@@@ -3,24 -3,29 +3,24 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 libgcrypt20-dev,
                 libgpgme11-dev,
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5dbusaddons-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5notifications-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5widgetsaddons-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
 -               libkf5configwidgets-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
+                libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5notifications-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.7.0),
+                libkf5widgetsaddons-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/kwallet
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kwallet.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kwallet.git

-- 
kwallet packaging