[Pkg-kde-commits] rev 1849 - in branches/kde-3.4.0/packages/kdeutils/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-22 17:19:37 +0000 (Thu, 22 Sep 2005)
New Revision: 1849

Added:
   branches/kde-3.4.0/packages/kdeutils/debian/patches/11_floppy_nodes.diff
Modified:
   branches/kde-3.4.0/packages/kdeutils/debian/changelog
Log:
floppy patch, see changelog.


Modified: branches/kde-3.4.0/packages/kdeutils/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-09-22 16:35:48 UTC (rev 1848)
+++ branches/kde-3.4.0/packages/kdeutils/debian/changelog	2005-09-22 17:19:37 UTC (rev 1849)
@@ -1,3 +1,13 @@
+kdeutils (4:3.4.2-3) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which fixes kfloppy formatting with udev, though auto-detection
+    remains broken. This is an adapted version of the patch submitted by
+    Edward J. Sharnock. (Closes: #329588, #278909, #264924)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdeutils (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:

Added: branches/kde-3.4.0/packages/kdeutils/debian/patches/11_floppy_nodes.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeutils/debian/patches/11_floppy_nodes.diff	2005-09-22 16:35:48 UTC (rev 1848)
+++ branches/kde-3.4.0/packages/kdeutils/debian/patches/11_floppy_nodes.diff	2005-09-22 17:19:37 UTC (rev 1849)
@@ -0,0 +1,27 @@
+--- kde.orig/kfloppy/format.cpp
++++ kde.patched/kfloppy/format.cpp
+@@ -166,15 +166,15 @@
+ //
+ #ifdef ANY_LINUX
+ 
+-const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/floppy/0u1440", "/dev/fd0h1440", "/dev/fd0H1440", 0L } ;
+-const char *fd0D720[] = { "/dev/fd0u720", "/dev/floppy/0u720", "/dev/fd0D720", "/dev/fd0h720", 0L };
+-const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/floppy/0h1200", 0L };
+-const char *fd0h360[] = { "/dev/fd0u360", "/dev/floppy/0u360", "/dev/fd0h360", "/dev/fd0d360", 0L };
+-
+-const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/floppy/1u1440","/dev/fd1h1440", "/dev/fd1H1440", 0L } ;
+-const char *fd1D720[] = { "/dev/fd1u720", "/dev/floppy/1u720", "/dev/fd1D720", "/dev/fd1h720", 0L };
+-const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/floppy/1h1200", 0L };
+-const char *fd1h360[] = { "/dev/fd1u360", "/dev/floppy/1u360","/dev/fd1h360", "/dev/fd1d360", 0L };
++const char *fd0H1440[] = { "/dev/fd0u1440", "/dev/fd0h1440", "/dev/fd0", 0L } ;
++const char *fd0D720[] = { "/dev/fd0u720", "/dev/fd0h720", "/dev/fd0", 0L };
++const char *fd0h1200[] = { "/dev/fd0h1200", "/dev/fd0", 0L };
++const char *fd0h360[] = { "/dev/fd0u360", "/dev/fd0h360", "/dev/fd0d360", "/dev/fd0", 0L };
++
++const char *fd1H1440[] = { "/dev/fd1u1440", "/dev/fd1h1440", "/dev/fd1", 0L } ;
++const char *fd1D720[] = { "/dev/fd1u720", "/dev/fd1h720", "/dev/fd1", 0L };
++const char *fd1h1200[] = { "/dev/fd1h1200", "/dev/fd1", 0L };
++const char *fd1h360[] = { "/dev/fd1u360", "/dev/fd1h360", "/dev/fd1d360", "/dev/fd1", 0L };
+ 
+ const char *fd0auto[] = { "/dev/fd0", 0L };
+ const char *fd1auto[] = { "/dev/fd1", 0L };