X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F31_package_rename.patch;h=b04d165d7dd7348a634b3e6c85945de5a0361630;hb=d9780275dfcbdcf3b5d8c8acac9ff4d218a7e620;hp=04198cf7afc92b1b6c743a9d6065f31e0ef676da;hpb=79a3a56c3458d79a855d78daa1e82ef582202aab;p=live-boot-grml.git

diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch
index 04198cf..b04d165 100644
--- 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 22:58:34.000000000 +0200
-+++ b/Makefile	2011-07-24 22:59:00.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
+@@ -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
- 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
- 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+ 	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