From 1288a4f9710526c4febb23918fcd1ea31839e2ee Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Wed, 10 Sep 2003 09:44:48 +0000
Subject: [PATCH] Alejandro Mery <amery@geeks.cl>: typo on Build-Tools and the
 resend of the patch to skip .mine and .r<release> files in Create-Diff

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1369 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE | 3 ++-
 scripts/Build-Tools                     | 2 +-
 scripts/Cleanup                         | 1 +
 scripts/Create-Diff                     | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 49dab1f09..e93f5cc51 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -1,7 +1,8 @@
 
 *) 2003-09-10 (2.0.0-rc1 - 2.0.0-rc2)
 
- - Alejandro Mery: fixed xfree config.in
+ - Alejandro Mery: fixed xfree config.in, fixed typo in Build-Tools and
+                   Cleanup to skip svn conflict files
 
 *) 2003-09-09 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index 570c5a219..338f11492 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -211,7 +211,7 @@ EOT
 	ln -sf install_wrapper build/$ROCKCFG_ID/$toolsdir/wrapper/mv
 	wrappers="$wrappers install_wrapper install cp ln mv"
 	#
-	for x in $( lc build/$ROCKCFG_ID/$toolsdir/wrapper/ )
+	for x in $( ls build/$ROCKCFG_ID/$toolsdir/wrapper/ )
 	do
 		z=0
 		for y in $wrappers ; do
diff --git a/scripts/Cleanup b/scripts/Cleanup
index 92fdd6fa9..6acecf4ab 100755
--- a/scripts/Cleanup
+++ b/scripts/Cleanup
@@ -126,6 +126,7 @@ bash scripts/xfind.sh Documentation/. architecture/. misc/. \
   \(									\
 	\( -name 'DEADJOE' -o -name '*-[xX]' -o -name '.[^.]*'		\
            -o -name '*.orig' -o -name '*.rej' -o -name '*#*'		\
+           -o -name '*.mine' -o -name '*.r[1-9][0-9]*'			\
            -o -name TRANS.TBL -o -name '*.cksum-err' -o -name x		\
 	   -o -name '*[.-]old' -o -name a.out -o -name '*~'		\
 	   -o -name '*.incomplete' -o -name '*.ckext-err' \)		\
diff --git a/scripts/Create-Diff b/scripts/Create-Diff
index 3e5bed796..a570d024f 100755
--- a/scripts/Create-Diff
+++ b/scripts/Create-Diff
@@ -65,7 +65,8 @@ for x in $directories ; do
 		source_for_sed=""
 		target_for_sed=""
 	fi
-	diff -x CVS -x '.svn' -x '.#*' $FLAGS "$olddir"/$name_for_diff "$newdir"/$name_for_diff | grep -v '^diff ' | \
+	diff -x CVS -x '.svn' -x '.#*' -x '*.mine' -x '*.r[1-9][0-9]*' \
+		$FLAGS "$olddir"/$name_for_diff "$newdir"/$name_for_diff | grep -v '^diff ' | \
 	sed "s,^--- $olddir/$source_for_sed,--- rock-old/$target_for_sed," | \
 	sed "s,^+++ $newdir/$source_for_sed,+++ rock-new/$target_for_sed," | \
 	perl -pe '$fn=$1 if /^--- rock-old\/(\S+)\s/;