X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F31_package_rename.patch;h=7bd598b239bbb201984bfbbf9794066bcf274471;hb=3b3ac7b387df59cc871f6572344f249a203b371c;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..7bd598b 100644
--- a/debian/patches/31_package_rename.patch
+++ b/debian/patches/31_package_rename.patch
@@ -1,29 +1,24 @@
-Index: b/Makefile
+Index: live-boot-grml/Makefile
 ===================================================================
---- a/Makefile	2011-07-24 22:58:34.000000000 +0200
-+++ b/Makefile	2011-07-24 22:59:00.000000000 +0200
-@@ -52,11 +52,11 @@
- 	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
+--- live-boot-grml.orig/Makefile	2014-03-08 13:36:52.857434829 +0100
++++ live-boot-grml/Makefile	2014-03-08 13:36:52.853435298 +0100
+@@ -55,8 +55,8 @@
+ 	cp frontend/* $(DESTDIR)/bin
  
  	# 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
- 
--	mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
--	cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
-+	mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml/examples
-+	cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot-grml/examples
- 	# (FIXME)
++	cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot-grml
  
  	# Installing manpages
-@@ -85,7 +85,7 @@
- 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+ 	for MANPAGE in manpages/en/*; \
+@@ -90,7 +90,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