[SCM] kde-dev-scripts packaging branch, kubuntu_unstable, updated. debian/14.12.2-1-14-g9240ba3

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-dev-scripts.git;a=commitdiff;h=9240ba3

The following commit has been merged in the kubuntu_unstable branch:
commit 9240ba3f2c6425d264883cce3d321c9a04b62c7e
Merge: a15f2fb4cd0552fa94797fecdae0c3486d14379b 93a21be3ae0185b2162e143b8df5a8fae7caf3a2
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jul 7 16:02:47 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog

 debian/.gitattributes |   1 +
 debian/changelog      |  15 ++++
 debian/control        |  10 +--
 debian/copyright      | 217 ++++++++++++++++++++++++++++++--------------------
 debian/rules          |   2 +
 debian/watch          |   1 -
 6 files changed, 153 insertions(+), 93 deletions(-)

diff --cc debian/changelog
index b755918,bc61a6e..a46e52d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,18 +1,38 @@@
 +kde-dev-scripts (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:48:53 +0200
 +
+ kde-dev-scripts (4:15.04.0-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (15.04.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 16:46:34 +0200
+ 
 +kde-dev-scripts (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:20:37 -0700
 +
+ kde-dev-scripts (4:14.12.2-1) experimental; urgency=medium
+ 
+   * Prepare Debian release.
+   * Update build dependencies to build against experimental and to
+     follow cmake.
+   * Update copyright information.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 17 Feb 2015 15:41:07 +0100
+ 
  kde-dev-scripts (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kde-dev-scripts packaging