diff -Nru /tmp/Udt0pvBufr/kdebase-3.5.8/debian/changelog /tmp/KqsJl8AoAD/kdebase-3.5.8/debian/changelog --- /tmp/Udt0pvBufr/kdebase-3.5.8/debian/changelog 2007-12-24 00:06:59.000000000 +0200 +++ /tmp/KqsJl8AoAD/kdebase-3.5.8/debian/changelog 2007-12-24 00:07:10.000000000 +0200 @@ -1,3 +1,11 @@ +kdebase (4:3.5.8-2ubuntu9) hardy; urgency=low + + * Add kubuntu_9918_ntfs_uid_locale.diff + Fixes for NTFS user hard disk mounting + Closes LP: #178351 + + -- Eugene Tretyak Sun, 23 Dec 2007 22:00:03 +0200 + kdebase (4:3.5.8-2ubuntu8) hardy; urgency=low * debian/patches/kubuntu_95_kurl_not-so-pretty.diff: diff -Nru /tmp/Udt0pvBufr/kdebase-3.5.8/debian/patches/kubuntu_9918_ntfs_uid_locale.diff /tmp/KqsJl8AoAD/kdebase-3.5.8/debian/patches/kubuntu_9918_ntfs_uid_locale.diff --- /tmp/Udt0pvBufr/kdebase-3.5.8/debian/patches/kubuntu_9918_ntfs_uid_locale.diff 1970-01-01 03:00:00.000000000 +0300 +++ /tmp/KqsJl8AoAD/kdebase-3.5.8/debian/patches/kubuntu_9918_ntfs_uid_locale.diff 2007-12-24 00:07:10.000000000 +0200 @@ -0,0 +1,33 @@ +--- kdebase-3.5.8.old/kioslave/media/mediamanager/halbackend.cpp 2007-12-23 21:44:16.000000000 +0200 ++++ kdebase-3.5.8/kioslave/media/mediamanager/halbackend.cpp 2007-12-23 21:32:18.000000000 +0200 +@@ -20,6 +20,7 @@ + #include "linuxcdpolling.h" + + #include ++#include + + #include + #include +@@ -1342,7 +1343,7 @@ QString HALBackend::mount(const Medium * + if (valids["flush"] == "true") + soptions << "flush"; + +- if (valids["uid"] == "true") ++ if ((valids["uid"] == "true") && (medium->fsType() != "ntfs")) + { + soptions << QString("uid=%1").arg(getuid()); + } +@@ -1362,6 +1363,13 @@ QString HALBackend::mount(const Medium * + if (valids["sync"] == "true") + soptions << "sync"; + ++ if (medium->fsType() == "ntfs") { ++ QString fsLocale("locale="); ++ fsLocale += setlocale(LC_ALL, ""); ++ ++ soptions << fsLocale; ++ } ++ + QString mount_point = valids["mountpoint"]; + if (mount_point.startsWith("/media/")) + mount_point = mount_point.mid(7);