[SCM] threadweaver packaging branch, master, updated. 019e375fc8064cc9e7e82cc86d8e2083a521bf74

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 718cc05a0f0ac7066797a4ed218c358a87071d8c
Merge: 4e8c5885b08b5d4e65059c3013babe76ff2d7604 21f308a5b3f966c55b93a0f5f79829f304619791
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 4 11:20:44 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 569e366,d925aa2..61df081
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,33 +1,51 @@@
 +threadweaver (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:38:31 +0100
 +
+ threadweaver (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:44:34 +0100
+ 
 +threadweaver (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 copyright information.
 +  * Update install files.
 +  * Add basic autopkgtests support.
 +  * Update build dependencies to follow cmake.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 24 Jan 2015 20:17:32 +0100
 +
+ threadweaver (5.6.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 06 Jan 2015 20:08:24 +0100
+ 
+ threadweaver (5.5.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 12:18:47 +0100
+ 
+ threadweaver (5.4.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 15:36:31 +0100
+ 
+ threadweaver (5.3.0-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:32:42 +0100
+ 
  threadweaver (5.2.0-0ubuntu1) utopic; urgency=medium
  
    * New upstream release
diff --cc debian/control
index d982df4,8de928c..9e00faa
--- a/debian/control
+++ b/debian/control
@@@ -3,13 -3,12 +3,13 @@@ 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
 -Standards-Version: 3.9.5
 +               qtbase5-dev (>= 5.2.0)
 +Standards-Version: 3.9.6
 +XS-Testsuite: autopkgtest
  Homepage: https://projects.kde.org/projects/frameworks/threadweaver
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/threadweaver.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/threadweaver.git

-- 
threadweaver packaging