[SCM] kate packaging branch, master, updated. debian/4.14.2-2-46-gca10d71

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kate.git;a=commitdiff;h=ca10d71

The following commit has been merged in the master branch:
commit ca10d71631ca5d706e70baa93cedddddf496f30f
Merge: 3ca4c5380f241039da610a0fcbccb55418463c19 17003c016ffdb8203443ea313951d48777e06811
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 16:30:41 2015 +0100

    Merge commit '17003c016ffdb8203443ea313951d48777e06811'

 debian/changelog     | 10 ++++++++++
 debian/kate.install  |  1 -
 debian/not-installed |  3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7245dd1,8dff4ee..99035a2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,13 +1,26 @@@
 +kate (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:21:17 +0100
 +
+ kate (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * Don't install applet file, broken in 14.12
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 13 Mar 2015 13:18:13 -0700
+ 
 +kate (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 22:39:13 +0100
 +
  kate (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
kate packaging