[SCM] KDE Base Applications module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-22-g8bda479

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8bda479517742d87d5b716f6d18c8625cf2ab395
Author: Harald Sitter <sitter at kde.org>
Date:   Mon May 4 11:08:18 2015 +0200

    Fix dolphin losing places bookmarks.
    
    * 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
---
 debian/changelog                                   | 10 ++++++++
 debian/patches/series                              |  1 +
 ...aces.xbel-instead-of-bookmarks.xml-in-pla.patch | 30 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 61fc829..03a6739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
index 289e6d4..de3b391 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ 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
diff --git a/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch b/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch
new file mode 100644
index 0000000..cc0997d
--- /dev/null
+++ b/debian/patches/upstream_Use-user-places.xbel-instead-of-bookmarks.xml-in-pla.patch
@@ -0,0 +1,30 @@
+From 270d2affaafcc9e87ba14f82bfe579e22607e2d2 Mon Sep 17 00:00:00 2001
+From: Emmanuel Pescosta <emmanuelpescosta099 at gmail.com>
+Date: Thu, 30 Apr 2015 10:12:24 +0200
+Subject: [PATCH] Use user-places.xbel instead of bookmarks.xml in places
+ model.
+
+FIXED-IN: 15.04.1
+CCBUG: 345174
+---
+ dolphin/src/panels/places/placesitemmodel.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dolphin/src/panels/places/placesitemmodel.cpp b/dolphin/src/panels/places/placesitemmodel.cpp
+index 637bfc1..1702757 100644
+--- a/dolphin/src/panels/places/placesitemmodel.cpp
++++ b/dolphin/src/panels/places/placesitemmodel.cpp
+@@ -85,8 +85,8 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
+     Baloo::IndexerConfig config;
+     m_fileIndexingEnabled = config.fileIndexingEnabled();
+ #endif
+-    const QString file = KStandardDirs::locateLocal("data", "kfileplaces/bookmarks.xml");
+-    m_bookmarkManager = KBookmarkManager::managerForFile(file, "kfilePlaces");
++    const QString file = KStandardDirs().localxdgdatadir() + "user-places.xbel";
++    m_bookmarkManager = KBookmarkManager::managerForExternalFile(file);
+ 
+     createSystemBookmarks();
+     initializeAvailableDevices();
+-- 
+2.1.4
+

-- 
KDE Base Applications module packaging