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

@@ -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)
 

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

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' \)		\

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/;