[SCM] kate packaging branch, master, updated. debian/14.12.3-1-38-gbec3ff2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ee28ab9abc4e08eb0f5b9d2d3557cc546ab421a4
Merge: 2fc795c3fb8aadf81094186e661b0d6a1d781f67 b9824bacc1188f509e3bb026415b6936e69e5a4f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 13:52:52 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'
    
    Conflicts:
    	debian/control
    	debian/patches/series

 debian/changelog                                   | 28 +++++++++
 debian/control                                     |  1 +
 debian/patches/series                              |  0
 ...stream_Register_with_dbus_to_wake_up_KRun.patch | 69 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)

diff --cc debian/changelog
index 2c9c2b5,1d0540c..bcc06e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,31 +1,46 @@@
 +kate (4:15.04.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +  * Remove upstream applied patch: upstream_find-IconThemes.diff
 +  * New upstream release (15.04.1).
 +  * New upstream release (15.04.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:01:43 +0200
 +
+ kate (4:15.04.2-0ubuntu1) wily; 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. 
+   * manual merge backports. 
+   * Remove upstream_find-IconThemes.diff from series file.
+     The patch does not exist in directory. 
+   * and remove upstream_Register_with_dbus_to_wake_up_KRun.patch
+     it has already been applied to this backport. 
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:37:40 +0200
+ 
+ kate (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:19:24 -0700
+ 
 +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
diff --cc debian/control
index 999e395,cc7ecd6..e8424ae
--- a/debian/control
+++ b/debian/control
@@@ -5,29 -5,29 +5,30 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Modestas Vainius <modax at debian.org>,
             Sune Vuorela <sune at debian.org>,
             Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 +Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
 -               kdoctools-dev,
 -               kinit-dev,
 -               kio-dev,
 +               kdoctools-dev (>= 5.6.0~),
 +               kinit-dev (>= 5.6.0~),
 +               kio-dev (>= 5.6.0~),
                 libgit2-dev,
 -               libkf5config-dev,
 +               libkf5config-dev (>= 5.6.0~),
+                libkf5crash-dev,
                 libkf5dbusaddons-dev,
 -               libkf5guiaddons-dev,
 -               libkf5i18n-dev,
 +               libkf5guiaddons-dev (>= 5.6.0~),
 +               libkf5i18n-dev (>= 5.6.0~),
 +               libkf5iconthemes-dev (>= 5.6.0~),
                 libkf5itemmodels-dev,
 -               libkf5jobwidgets-dev,
 +               libkf5jobwidgets-dev (>= 5.6.0~),
                 libkf5newstuff-dev,
                 libkf5notifications-dev,
 -               libkf5parts-dev,
 +               libkf5parts-dev (>= 5.6.0~),
                 libkf5service-dev,
 -               libkf5texteditor-dev,
 +               libkf5texteditor-dev (>= 5.6.0~),
                 libkf5threadweaver-dev,
                 libkf5wallet-dev,
 -               libkf5windowsystem-dev,
 -               libkf5xmlgui-dev,
 +               libkf5windowsystem-dev (>= 5.6.0~),
 +               libkf5xmlgui-dev (>= 5.6.0~),
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 plasma-framework-dev,

-- 
kate packaging