Import Debian changes 2.10.1-12

debian/changelog

+udisks2 (2.10.1-12) unstable; urgency=medium
+
+  * tests: Fix expected error message with util-linux 2.41.
+    Patch cherry-picked from upstream Git. (Closes: #1098673)
+  * Switch debian-branch to debian/unstable in gbp.conf
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 25 Feb 2025 12:57:07 +0100
+
 udisks2 (2.10.1-11) unstable; urgency=medium
 
   * Replace dependency on dbus with default-dbus-system-bus | dbus-system-bus.

debian/gbp.conf

 [DEFAULT]
 pristine-tar = True
 patch-numbers = False
-debian-branch = debian/master
+debian-branch = debian/unstable
 upstream-branch = upstream/latest

debian/patches/series

@@ -2,3 +2,4 @@ tests-Fix-targetcli_config.json.patch
 integration-test-Adapt-to-the-new-libmount-context-error-.patch
 Do-not-overwrite-CPPFLAGS.patch
 integration-test-Fix-change-label-test-with-exfatprogs-1..patch
+tests-Fix-expected-error-message-with-util-linux-2.41.patch

debian/patches/tests-Fix-expected-error-message-with-util-linux-2.41.patch

+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Mon, 24 Feb 2025 12:11:51 +0100
+Subject: tests: Fix expected error message with util-linux 2.41
+
+Fixes: #1353
+(cherry picked from commit ccf772b2fe3505b181f5adf8ca3f912c003032f1)
+---
+ src/tests/integration-test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/integration-test b/src/tests/integration-test
+index 65028d6..a00403d 100755
+--- a/src/tests/integration-test
++++ b/src/tests/integration-test
+@@ -1112,7 +1112,7 @@ class FS(UDisksTestCase):
+             except GLib.GError as e:
+                 msg = r"(is write-protected but `rw' option given|" \
+                         "is write-protected but explicit read-write mode requested|" \
+-                        "fsconfig system call failed: /dev/sr.*: Can't open blockdev)"
++                        "fsconfig.*failed: /dev/sr.*: Can't open blockdev)"
+                 if not re.search(msg, str(e)):
+                     self.fail('Mounting read-only device with \'rw\' option failed '
+                               'with an unexpected error.\nGot: %s\nExpected: \'%s\''