[SCM] solid packaging branch, master, updated. debian/5.22.0-1-4-g53c4de9
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Jun 18 06:26:54 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=7e69201
The following commit has been merged in the master branch:
commit 7e6920193c471cee37a170d2a422ef3ddadf362f
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date: Sun Jun 12 21:57:27 2016 +0200
Refresh patches
---
debian/patches/use_shortest_filepath.diff | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/debian/patches/use_shortest_filepath.diff b/debian/patches/use_shortest_filepath.diff
index e702522..4f737cb 100644
--- a/debian/patches/use_shortest_filepath.diff
+++ b/debian/patches/use_shortest_filepath.diff
@@ -1,6 +1,16 @@
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Sun, 12 Jun 2016 21:57:24 +0200
+Subject: use_shortest_filepath
+
+---
+ .../backends/udisks2/udisksstorageaccess.cpp | 33 ++++++++++++++--------
+ 1 file changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+index 1bd6acf..4a3d088 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-@@ -75,6 +75,24 @@
+@@ -75,6 +75,24 @@ bool StorageAccess::isAccessible() const
return m_device->isMounted();
}
@@ -25,7 +35,7 @@
QString StorageAccess::filePath() const
{
ByteArrayList mntPoints;
-@@ -86,20 +104,13 @@
+@@ -86,20 +104,13 @@ QString StorageAccess::filePath() const
}
Device holderDevice(path);
mntPoints = qdbus_cast<ByteArrayList>(holderDevice.prop("MountPoints"));
--
solid packaging
More information about the pkg-kde-commits
mailing list