[SCM] kinit packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-4-g3c7dacd

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit f4b324e4f8819459dc32c7419aba28f071cbd134
Merge: d01a5a8bd9940c33d6f97d403f2f5a0b37e27ae4 f1771e8630a322d72706324726fc0e9804cf0b33
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:20:11 2015 +0100

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

 debian/changelog |  6 ++++++
 debian/control   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 0f0b172,fd3472c..0299bbd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +kinit (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:41:04 +0100
 +
+ kinit (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 17:01:03 +0100
+ 
 +kinit (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.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 30 Jan 2015 15:25:01 +0100
 +
  kinit (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 15d906d,8d1a42e..9c2b5fb
--- a/debian/control
+++ b/debian/control
@@@ -3,21 -3,40 +3,21 @@@ 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),
-                kdoctools-dev (>= 5.6.0),
-                kio-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
+                kdoctools-dev (>= 5.7.0),
+                kio-dev (>= 5.7.0),
                 libcap-dev,
                 libcap2-bin,
-                libkf5config-dev (>= 5.6.0),
-                libkf5crash-dev (>= 5.6.0),
-                libkf5i18n-dev (>= 5.6.0),
-                libkf5service-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.0),
 -               libkf5attica-dev (>= 5.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5bookmarks-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5completion-dev (>= 5.7.0),
+                libkf5config-dev (>= 5.7.0),
 -               libkf5configwidgets-dev (>= 5.7.0),
 -               libkf5coreaddons-dev (>= 5.7.0),
+                libkf5crash-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5globalaccel-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
+                libkf5i18n-dev (>= 5.7.0),
 -               libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
 -               libkf5jobwidgets-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
+                libkf5service-dev (>= 5.7.0),
 -               libkf5solid-dev (>= 5.7.0),
 -               libkf5sonnet-dev (>= 5.7.0),
 -               libkf5textwidgets-dev (>= 5.7.0),
 -               libkf5widgetsaddons-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
 -               libkf5xmlgui-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
  Homepage: https://projects.kde.org/projects/frameworks/kinit
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/kinit.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kinit.git

-- 
kinit packaging