[SCM] kate packaging branch, master, updated. debian/4.14.2-2-57-g2fc795c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5db49ac5b155c11a979f1cb0d0613ff044dc4870
Merge: 7bf152e778011f0fd3c7ad3aa74b268041faba05 de1db8949744d7e8d99f44e2771078cec923ee77
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 24 16:38:09 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'

 debian/changelog                             |  6 ++++++
 debian/patches/series                        |  1 +
 debian/patches/upstream_find-IconThemes.diff | 12 ++++++++++++
 3 files changed, 19 insertions(+)

diff --cc debian/changelog
index 486f8ff,7ec56dd..1e14a59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,21 @@@
 +kate (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:18:18 +0200
 +
 +kate (4:14.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:12:54 +0200
 +
+ kate (4:14.12.3-0ubuntu2) vivid; urgency=medium
+ 
+   * Add upstream_find-IconThemes.diff to fix compile
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 16:16:22 +0200
+ 
  kate (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    [ Scarlett Clark ]

-- 
kate packaging