[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_backports, updated. debian/4.14.2-1-24-g3e1402c

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 3e1402c4c4fb1691928a7098a27a21cdaf5c3e34
Merge: 7bfebfc11472921bb2a82a0c64bb51b5d4902a0e 8bda479517742d87d5b716f6d18c8625cf2ab395
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 13 16:27:11 2015 +0200

    Merging kubuntu_vivid_archive into kubuntu_vivid_backports
    
    NOCI

 debian/.gitattributes                              |  1 -
 debian/changelog                                   | 51 ++++++++++++++++++++--
 debian/control                                     |  8 ++--
 debian/konsole.install                             | 28 ------------
 debian/konsole.lintian-overrides                   |  3 --
 debian/konsole.postinst                            | 20 ---------
 debian/konsole.prerm                               | 22 ----------
 debian/kwrite.install                              |  7 ---
 debian/not-installed                               |  2 -
 debian/patches/kubuntu_disable-failing-test.diff   | 18 ++++++++
 debian/patches/series                              |  2 +
 ...aces.xbel-instead-of-bookmarks.xml-in-pla.patch | 30 +++++++++++++
 debian/source/local-options                        |  1 -
 13 files changed, 102 insertions(+), 91 deletions(-)

diff --cc debian/changelog
index 230d16f,03a6739..06c3b77
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,48 +1,54 @@@
 +kde-baseapps (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 16 Apr 2015 11:35:31 -0700
 +
- kde-baseapps (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
+ kde-baseapps (4:14.12.3-0ubuntu3.1) vivid; urgency=medium
+ 
+   * Fix dolphin losing places bookmarks.
+     + Add patch
+       upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch to
+       force dolphin to only use the new user-places.xbel file rather than the
+       legacy kfileplaces bookmarks file.  LP: #1422469
+ 
+  -- Harald Sitter <sitter at kde.org>  Mon, 04 May 2015 11:04:31 +0200
+ 
+ kde-baseapps (4:14.12.3-0ubuntu3) vivid; urgency=medium
+ 
+   * Drop unused kf5 packages (they have been split). Affects konsole and
+     kwrite and kate.
+   * Dolphin recommends konsole4-kpart for the embedded terminal
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 24 Mar 2015 12:41:53 +0100
+ 
+ kde-baseapps (4:14.12.3-0ubuntu2) vivid; urgency=medium
+ 
+   * Add kubuntu_disable-failing-test.diff to disable test failing due to
+     test environment favicontest
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 19 Mar 2015 13:11:37 +0100
+ 
+ kde-baseapps (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:16:56 -0700
+ 
+ kde-baseapps (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:11:24 -0800
+ 
+ kde-baseapps (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 16:53:18 +0100
+ 
+ kde-baseapps (4:14.11.97-0ubuntu1) vivid; urgency=medium
  
    * Merge with debian unstable, remaining changes: 
      - lower the konqueror priority to 30 as it's not our default.

-- 
KDE Base Applications module packaging