34_ignore_unknown_filesystems.patch: also ignore fstype swap

[live-boot-grml.git] / debian / patches / 31_package_rename.patch

diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch
index a83724d..b04d165 100644 (file)
--- a/debian/patches/31_package_rename.patch
+++ b/debian/patches/31_package_rename.patch
@@ -1,15 +1,13 @@
-Index: b/Makefile
-===================================================================
---- a/Makefile 2011-07-24 23:49:55.000000000 +0200
-+++ b/Makefile 2011-07-24 23:50:20.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -52,11 +52,11 @@
        cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
  
        # Installing docs
 -      mkdir -p $(DESTDIR)/usr/share/doc/live-boot
--      cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
+-      cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
 +      mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
-+      cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot-grml
++      cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot-grml
  
 -      mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
 -      cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
@@ -18,12 +16,12 @@ Index: b/Makefile
        # (FIXME)
  
        # Installing manpages
-@@ -85,7 +85,7 @@
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+@@ -94,7 +94,7 @@
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
  
        # Uninstalling docs
 -      rm -rf $(DESTDIR)/usr/share/doc/live-boot
 +      rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true