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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit 29f7ecb3efe2ca4d3d98722c7e5e0bef6d66db62
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed May 27 12:24:26 2015 -0700

    Remove upstream applied  upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch
---
 debian/changelog      | 6 ++++--
 debian/patches/series | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c4da2b..3738f46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 kde-baseapps (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 
-   * Dolphin is behaving strangely, moving usr/lib/libkdeinit4_dolphin.so
+  * Dolphin is behaving strangely, moving usr/lib/libkdeinit4_dolphin.so
     to kde-baseapps-bin 
-   * Vivid backport.
+  * Vivid backport.
+  * Remove upstream applied 
+    upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 12:18:15 -0700
 
diff --git a/debian/patches/series b/debian/patches/series
index de3b391..289e6d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ kubuntu_folderview_livecd_directory.diff
 kubuntu_folderwidget_drawing.diff
 kubuntu_install_flash.diff
 kubuntu_disable-failing-test.diff
-upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch

-- 
KDE Base Applications module packaging