With the actuall debdiff attached... -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog
index 43aeb56..eba3635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+udisks (1.0.4-7) unstable; urgency=low
+
+ * debian/patches/13-dosfslabel.patch: The original reasons why mlabel was
+ preferred over dosfslabel are no longer true. So switch back to dosfslabel
+ which is part of dosfstools which we already require for mkfs.vfat and
+ drop the Recommends on mtools. Fix the maximum length for FAT labels while
+ at it. (Closes: #680683)
+
+ -- Michael Biebl <biebl@debian.org> Fri, 20 Jul 2012 11:39:01 +0200
+
udisks (1.0.4-6) unstable; urgency=low
* debian/tests/control: Add mtools dependency for VFAT test. (LP: #976269)
diff --git a/debian/control b/debian/control
index 196629d..9e2e0a0 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Package: udisks
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, udev, dbus
-Recommends: policykit-1, hdparm, dosfstools, mtools, ntfs-3g, eject, cryptsetup-bin
+Recommends: policykit-1, hdparm, dosfstools, ntfs-3g, eject, cryptsetup-bin
Suggests: xfsprogs, reiserfsprogs, mdadm
Breaks: libgdu0 (<< 2.28), libgdu-gtk0 (<< 2.28)
Conflicts: devicekit-disks
diff --git a/debian/patches/13-dosfslabel.patch b/debian/patches/13-dosfslabel.patch
new file mode 100644
index 0000000..d80b87f
--- /dev/null
+++ b/debian/patches/13-dosfslabel.patch
@@ -0,0 +1,61 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index 6072502..3ed2b94 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -247,7 +247,7 @@ static const Filesystem known_file_systems[] =
+ FALSE, /* supports_unix_owners */
+ TRUE, /* can_mount */
+ TRUE, /* can_create */
+- 254, /* max_label_len */
++ 11, /* max_label_len */
+ TRUE, /* supports_label_rename */
+ FALSE, /* supports_online_label_rename*/
+ TRUE, /* supports_fsck */
+diff --git a/src/helpers/job-change-filesystem-label.c b/src/helpers/job-change-filesystem-label.c
+index fcdee76..3426323 100644
+--- a/src/helpers/job-change-filesystem-label.c
++++ b/src/helpers/job-change-filesystem-label.c
+@@ -91,7 +91,7 @@ main (int argc,
+ }
+ else if (strcmp (fstype, "vfat") == 0)
+ {
+- if (!validate_and_escape_label (&new_label, 254))
++ if (!validate_and_escape_label (&new_label, 11))
+ goto out;
+ /* VFAT does not allow some characters */
+ for (c = "\"*/:<>?\\|"; *c; ++c)
+@@ -103,11 +103,7 @@ main (int argc,
+ }
+ }
+
+- g_setenv ("MTOOLS_SKIP_CHECK", "1", TRUE);
+- if (strlen (new_label) == 0)
+- command_line = g_strdup_printf ("mlabel -c -i %s ::", device);
+- else
+- command_line = g_strdup_printf ("mlabel -i %s \"::%s\"", device, new_label);
++ command_line = g_strdup_printf ("dosfslabel %s \"%s\"", device, new_label);
+
+ }
+ else if (strcmp (fstype, "ntfs") == 0)
+diff --git a/src/helpers/job-mkfs.c b/src/helpers/job-mkfs.c
+index 2ab7400..a06b89d 100644
+--- a/src/helpers/job-mkfs.c
++++ b/src/helpers/job-mkfs.c
+@@ -109,7 +109,7 @@ main (int argc,
+ if (g_str_has_prefix (options[n], "label="))
+ {
+ label = strdup (options[n] + sizeof("label=") - 1);
+- if (!validate_and_escape_label (&label, 254))
++ if (!validate_and_escape_label (&label, 11))
+ {
+ g_string_free (s, TRUE);
+ goto out;
+@@ -498,7 +498,7 @@ main (int argc,
+
+ if (strcmp (fstype, "vfat") == 0)
+ {
+- command_line = g_strdup_printf ("mlabel -i %s \"::%s\"", device, label);
++ command_line = g_strdup_printf ("dosfslabel %s \"%s\"", device, label);
+ }
+ else
+ {
diff --git a/debian/patches/series b/debian/patches/series
index d1a71a2..ad709b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
10-po-pt_BR.patch
11-systemd-service.patch
12-bogus-uevent-paths.patch
+13-dosfslabel.patch
Attachment:
signature.asc
Description: OpenPGP digital signature