[SCM] kate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-52-g19fb102

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 19fb102d38df143b519e6919a4ff619bcc1b6679
Merge: 528a3fad2878f84bc955e82c14d136a444214baa 93573bf40c8c52e805bfeacb96fb3b5a4de46d1e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed May 27 15:26:52 2015 -0700

     * New upstream release * Vivid backport
    -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:19:24 -0700
    
     * New upstream release
     * Vivid backport
    -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:19:24 -0700

 debian/changelog                             | 14 +++++++++++++-
 debian/control                               |  1 +
 debian/kate.install                          |  1 +
 debian/kwrite.install                        |  1 +
 debian/patches/upstream_find-IconThemes.diff | 12 ------------
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index b64b793,28526cb..50fb4ac
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,23 @@@
- kate (4:14.12.3-0ubuntu2.1) vivid; urgency=medium
++kate (4:15.04.1-0ubuntu2) UNRELEASED; urgency=medium
 +
++  [ Felix Geyer ]
 +  * Fix "KDEInit could not launch Kate" error when opening second file with Kate
 +    in Dolphin. (LP: #1449029)
 +    - Add upstream_Register_with_dbus_to_wake_up_KRun.patch
 +
++  [ Scarlett Clark ]
++  * Fix merge conflict (changelog version discrepancy)
++  * manual merge. 
++
 + -- Felix Geyer <debfx at ubuntu.com>  Wed, 27 May 2015 23:44:57 +0200
 +
+ kate (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
 -  * New upstream release
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:19:24 -0700
+ 
  kate (4:14.12.3-0ubuntu2) vivid; urgency=medium
  
    * Add upstream_find-IconThemes.diff to fix compile

-- 
kate packaging