[SCM] solid packaging branch, master, updated. debian/5.28.0-2-4-g0053e80

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2fa7eaa65080027003efc49c399f91685d76a5f2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Apr 8 19:30:41 2017 +0200

    Pick "[UDisks 2 Device] Add description for Floppy Disk" (d92588b)
    
    Floppy disks now show up as "Floppy Disk" instead of "0 B Removable
    Media"
    
    Add upstream patch as:
     UDisks-2-Device-Add-description-for-Floppy-Disk.patch
    
    Gbp-Dch: Full
---
 ...-2-Device-Add-description-for-Floppy-Disk.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

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
new file mode 100644
index 0000000..2f25387
--- /dev/null
+++ b/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch
@@ -0,0 +1,26 @@
+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 061d2a3..54342a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use_shortest_filepath.diff
 fix-FTBFS-on-mipsel-and-m68k-src-solid-predicate_parser.c.patch
 Work-round-DBus-property-fetching-bug.patch
+UDisks-2-Device-Add-description-for-Floppy-Disk.patch

-- 
solid packaging