[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=b4ce474

The following commit has been merged in the master branch:
commit b4ce474f7386bb1a8be51b5bcc3e2fe0669f8767
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jun 20 14:56:11 2017 +0100

    remove patch in branch
---
 ...-2-Device-Add-description-for-Floppy-Disk.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch b/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch
deleted file mode 100644
index 2f25387..0000000
--- a/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kai Uwe Broulik <kde at privat.broulik.de>
-Date: Sat, 11 Feb 2017 17:06:15 +0100
-Subject: [UDisks 2 Device] Add description for Floppy Disk
-
-Ensures a floppy disk shows up as "Floppy Disk" instead of "0 Byte Removable Media"
-
-CHANGELOG: Floppy disks now show up as "Floppy Disk" instead of "0 B Removable Media"
-
-Differential Revision: https://phabricator.kde.org/D4570
----
- src/solid/devices/backends/udisks2/udisksdevice.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/solid/devices/backends/udisks2/udisksdevice.cpp b/src/solid/devices/backends/udisks2/udisksdevice.cpp
-index 5208ece..b0a6b51 100644
---- a/src/solid/devices/backends/udisks2/udisksdevice.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksdevice.cpp
-@@ -573,6 +573,8 @@ QString Device::volumeDescription() const
-                 description = tr("Hard Drive");
-             }
-         }
-+    } else if (drive_type == Solid::StorageDrive::Floppy) {
-+        description = tr("Floppy Disk");
-     } else {
-         if (drive_is_removable) {
-             description = tr("%1 Removable Media", "%1 is the size").arg(size_str);
diff --git a/debian/patches/series b/debian/patches/series
index 41ac83a..28007b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 use_shortest_filepath.diff
 fix-FTBFS-on-mipsel-and-m68k-src-solid-predicate_parser.c.patch
-UDisks-2-Device-Add-description-for-Floppy-Disk.patch
 cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch

-- 
solid packaging