[neon/kf6/kf6-solid/Neon/release] debian: new release

[Jonathan Riddell]

Git commit 8dfdaf4f361559eec1c905c90a184d95b22dd48e by Jonathan Riddell.
Committed on 19/04/2024 at 15:03.
Pushed by jriddell into branch 'Neon/release'.

new release

M  +1    -1    debian/changelog
D  +0    -29   debian/patches/luks.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-solid/-/commit/8dfdaf4f361559eec1c905c90a184d95b22dd48e

diff --git a/debian/changelog b/debian/changelog
index 98ea0ae..f6c2ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kf6-solid (6.1.0-0neon) jammy; urgency=medium
+kf6-solid (6.1.1-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/patches/luks.diff b/debian/patches/luks.diff
deleted file mode 100644
index e4f1519..0000000
--- a/debian/patches/luks.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 9ecaf388ccd41d2831ab3833c26627f72ab78f40
-Author: Kai Uwe Broulik <kde at privat.broulik.de>
-Date:   Mon Apr 15 22:43:15 2024 +0200
-
-    udisks: Return empty string for "root" clearTextPath
-    
-    There cannot be an empty object path on DBus, so "/" is used to denote
-    no clear text device. Return empty string explicitly here to avoid
-    littering even more places with empty || "/" checks.
-    
-    BUG: 485507
-
-diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-index 04e78b1f..cfbedae0 100644
---- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
-@@ -465,7 +465,11 @@ QString StorageAccess::generateReturnObjectPath()
- 
- QString StorageAccess::clearTextPath() const
- {
--    return m_device->prop("CleartextDevice").value<QDBusObjectPath>().path();
-+    const QString path = m_device->prop("CleartextDevice").value<QDBusObjectPath>().path();
-+    if (path != QLatin1String("/")) {
-+        return path;
-+    }
-+    return QString();
- }
- 
- QString StorageAccess::dbusPath() const
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 98738f3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-luks.diff