Drop debian/patches/04_get_rid_of_utillinux-mountbinary.dpatch

diff --git a/debian/changelog b/debian/changelog
index bbe3c1b..067219e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ live-initramfs (1.139.1-2~grml.01) unstable; urgency=low
   * Resync with Debian's 1.139.1-1 version.
     [Closes: issue497]
   * Drop debian/patches/03_fix_cow_tmpfs_mount.dpatch.
+  * Drop debian/patches/04_get_rid_of_utillinux-mountbinary.dpatch.
   * Integrate debian/patches/03_grml_version_file_hook.dpatch.
 
- -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 14:38:53 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 15:54:54 +0200
 
 live-initramfs (1.136.3-2~grml.04) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 590ac99..af077af 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 01_add_rsync.dpatch
 02_more_verbose_toram.dpatch
 03_grml_version_file_hook.dpatch
-04_get_rid_of_utillinux-mountbinary.dpatch
 05_boot_failure_message_grml.dpatch

diff --git a/debian/patches/04_get_rid_of_utillinux-mountbinary.dpatch b/debian/patches/04_get_rid_of_utillinux-mountbinary.dpatch
deleted file mode 100755 (executable)
index dd7331e..0000000
--- a/debian/patches/04_get_rid_of_utillinux-mountbinary.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_get_rid_of_utillinux-mountbinary.dpatch by  <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get rid of util-linux mount binary
-
-@DPATCH@
-
-diff -r 9c83db37b8d9 hooks/live
---- a/hooks/live       Sun Jul 20 19:19:41 2008 +0200
-+++ b/hooks/live       Fri Aug 01 16:07:05 2008 +0200
-@@ -74,11 +74,11 @@
- fi
- 
- # Filesystem: cifs
--if [ -x /sbin/mount.cifs ]
--then
--      copy_exec /sbin/mount.cifs /sbin
--        manual_add_modules cifs
--fi
-+#if [ -x /sbin/mount.cifs ]
-+#then
-+#     copy_exec /sbin/mount.cifs /sbin
-+#        manual_add_modules cifs
-+#fi
- 
- # Filesystem: ext3
- manual_add_modules ext3