[SCM] solid packaging branch, master, updated. debian/5.37.0-2-85-gc9bde65

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=64a8631

The following commit has been merged in the master branch:
commit 64a8631d5ebcbd09d9dab29345c0fceaa9739c9d
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Tue Nov 1 10:55:22 2016 +0100

    Fix patch
---
 debian/patches/use_shortest_filepath.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/use_shortest_filepath.diff b/debian/patches/use_shortest_filepath.diff
index 4f737cb..feb312f 100644
--- a/debian/patches/use_shortest_filepath.diff
+++ b/debian/patches/use_shortest_filepath.diff
@@ -34,11 +34,11 @@ index 1bd6acf..4a3d088 100644
 +
  QString StorageAccess::filePath() const
  {
-     ByteArrayList mntPoints;
+     QByteArrayList mntPoints;
 @@ -86,20 +104,13 @@ QString StorageAccess::filePath() const
          }
          Device holderDevice(path);
-         mntPoints = qdbus_cast<ByteArrayList>(holderDevice.prop("MountPoints"));
+         mntPoints = qdbus_cast<QByteArrayList>(holderDevice.prop("MountPoints"));
 -        if (!mntPoints.isEmpty()) {
 -            return QFile::decodeName(mntPoints.first());    // FIXME Solid doesn't support multiple mount points
 -        } else {
@@ -48,7 +48,7 @@ index 1bd6acf..4a3d088 100644
 +        return get_shortest(mntPoints);
      }
  
-     mntPoints = qdbus_cast<ByteArrayList>(m_device->prop("MountPoints"));
+     mntPoints = qdbus_cast<QByteArrayList>(m_device->prop("MountPoints"));
 -
 -    if (!mntPoints.isEmpty()) {
 -        return QFile::decodeName(mntPoints.first());    // FIXME Solid doesn't support multiple mount points

-- 
solid packaging