[SCM] kitemviews packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfd21fca

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 9fb0d954f740e2139bb4db7f1373779ffc600ba6
Merge: 00e5d6493c0b5f0c207b9fd91f618263b3564bdc 16b35c924e5ffd7b1c816f1f742ee20e41b05182
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 3 12:24:26 2015 +0100

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

 debian/changelog | 34 ++++++++++++++++++++++++++++++++++
 debian/control   |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 961543c,48fc575..ebe476b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,37 +1,59 @@@
 +kitemviews (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:39:42 +0100
 +
+ kitemviews (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:18:51 +0100
+ 
 +kitemviews (5.6.0-1) experimental; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Do not build depend on qt5-default, we only need qtbase5-dev
 +
 +  [ Maximiliano Curia ]
 +  * 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 15:58:46 +0100
 +
+ kitemviews (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 19:49:00 +0100
+ 
+ kitemviews (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 11:11:49 +0100
+ 
+ kitemviews (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:10:52 +0100
+ 
+ kitemviews (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Do not build depend on qt5-default, we only need qtbase5-dev
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:19:56 +0100
+ 
  kitemviews (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index db328dc,523f17e..c836f20
--- a/debian/control
+++ b/debian/control
@@@ -3,11 -3,11 +3,11 @@@ 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),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
                 qttools5-dev-tools,
                 xauth,

-- 
kitemviews packaging