[SCM] kactivities packaging branch, master, updated. ce194fdf73a0ade098f9ea7bcc75896961630ae6

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 838c0d312665bed9ca90bc854bc3bd4ea6b38435
Merge: e44df2f415e40672f2d16a966d73c46c2e85336a 79cc973466aab2e801d652ba8a85be64a4de93fa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:16:05 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog |  6 ++++++
 debian/control   | 23 +++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index b37ef2e,e84379c..a804a7e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kactivities-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:40:52 +0100
 +
+ kactivities-kf5 (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:59:45 +0100
+ 
 +kactivities-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.
 +  * Update install files.
 +  * Update watch file.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 03 Feb 2015 18:04:39 +0100
 +
  kactivities-kf5 (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 73bbcfe,72f2421..ada990d
--- a/debian/control
+++ b/debian/control
@@@ -3,26 -3,24 +3,25 @@@ 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.11),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                kio-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kio-dev (>= 5.7.0),
                 libboost-dev,
-                libkf5config-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5dbusaddons-dev (>= 5.6.0),
-                libkf5declarative-dev (>= 5.6.0),
-                libkf5globalaccel-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5kcmutils-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.0),
-                libkf5xmlgui-dev (>= 5.6.0),
+                libkf5config-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
+                libkf5dbusaddons-dev (>= 5.7.0),
+                libkf5declarative-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
+                libkf5kcmutils-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
++               libkf5xmlgui-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qtdeclarative5-dev
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/kde/kdelibs/kactivities
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kactivities.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kactivities.git

-- 
kactivities packaging