rpms/debootstrap/F-13 debootstrap-1.0.19-perms.patch,1.1,1.2

[Jan Zeleny]

Author: jzeleny

Update of /cvs/pkgs/rpms/debootstrap/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5834

Modified Files:
	debootstrap-1.0.19-perms.patch 
Log Message:
updated permission correcting patch

debootstrap-1.0.19-perms.patch:
 Makefile |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: debootstrap-1.0.19-perms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/debootstrap/F-13/debootstrap-1.0.19-perms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- debootstrap-1.0.19-perms.patch	30 Sep 2009 17:06:27 -0000	1.1
+++ debootstrap-1.0.19-perms.patch	8 Mar 2010 08:24:56 -0000	1.2
@@ -1,22 +1,12 @@
-diff -ur debootstrap.orig/Makefile debootstrap/Makefile
---- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
-+++ debootstrap/Makefile	2009-09-30 13:01:27.151069252 -0400
-@@ -13,9 +13,9 @@
- 	mkdir -p $(DSDIR)/scripts
+--- debootstrap-1.0.22/Makefile.orig	2010-03-05 18:44:05.000000000 +0100
++++ debootstrap-1.0.22/Makefile	2010-03-05 18:44:30.000000000 +0100
+@@ -14,13 +14,12 @@
  	mkdir -p $(DESTDIR)/usr/sbin
  
--	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
--	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+ 	cp -a scripts/* $(DSDIR)/scripts/
 -	install -o root -g root -m 0644 functions $(DSDIR)/
-+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
-+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
 +	install -m 0644 functions $(DSDIR)/
  
-         # no special script for etch anymore
- 	ln -s sid $(DSDIR)/scripts/etch
-@@ -30,10 +30,9 @@
- 	ln -s gutsy $(DSDIR)/scripts/lucid
- 
  	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
 -	chown root:root $(DESTDIR)/usr/sbin/debootstrap
  	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap