[SCM] kplotting packaging branch, kubuntu_wily_archive, updated. debian/5.8.0-1-13-g0bb65f3

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1385eff3f576051576ab27f82bb622085a06a84e
Merge: 4c9aba31028c7cb78476da6a9ca1df6b4c8ff3b3 8675fec978e4027558b3ece766a1497bf79ccfd3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 4 11:23:17 2015 +0100

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

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

diff --cc debian/changelog
index 3299d0d,c61a2ee..0d76386
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,33 +1,50 @@@
 +kplotting (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:36:05 +0100
 +
+ kplotting (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:12:42 +0100
+ 
 +kplotting (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 copyright information.
 +  * Add basic autopkgtests support.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 17:17:23 +0100
 +
+ kplotting (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 19:44:16 +0100
+ 
+ kplotting (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 12:26:11 +0100
+ 
+ kplotting (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:36:48 +0100
+ 
+ kplotting (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:32:58 +0100
+ 
  kplotting (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 32c4754,b934d69..a63f5c4
--- a/debian/control
+++ b/debian/control
@@@ -4,8 -4,8 +4,8 @@@ Priority: optiona
  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),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
+                extra-cmake-modules (>= 1.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev,
                 xauth,

-- 
kplotting packaging