[SCM] kidletime packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g89b7fb3

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 80ace465254d89e730cc6380f991773b8b377bab
Merge: 627fd169b81142a8442045e877a61c78eb1320c9 18a7b564b4fff1f7d3cfca9446b5fe6030bd3a48
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 2 16:08:39 2015 +0100

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

 debian/changelog | 30 ++++++++++++++++++++++++++++++
 debian/control   |  1 +
 2 files changed, 31 insertions(+)

diff --cc debian/changelog
index 01ae09f,fa38ae0..de148bc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,33 +1,51 @@@
 +kidletime (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:13 +0100
 +
+ kidletime (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:20:00 +0100
+ 
 +kidletime (5.6.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.6.0).
 +  * Bump build dependencies to build against the experimental versions.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update install files.
 +  * Update build dependencies to follow cmake.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 13:54:46 +0100
 +
+ kidletime (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 19:50:31 +0100
+ 
+ kidletime (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 12:46:27 +0100
+ 
+ kidletime (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:04:40 +0100
+ 
+ kidletime (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:14:11 +0100
+ 
  kidletime (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 53b31a8,d380bef..b6ca3fb
--- a/debian/control
+++ b/debian/control
@@@ -2,9 -2,9 +2,10 @@@ Source: kidletim
  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 (>= 8.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
 +               extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 libqt5x11extras5-dev,
                 libxcb-sync0-dev,
                 libxss-dev,

-- 
kidletime packaging