[Devil-linux-commit] build/scripts iputils, 1.8.2.1, 1.8.2.2 rrdtool, 1.3.2.1, 1.3.2.2

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12677/scripts

Modified Files:
      Tag: rel-1-2-patches
	iputils rrdtool 
Log Message:
- ping now correctly resides in /bin/
- added missing rrdtool font


Index: rrdtool
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/rrdtool,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- rrdtool	7 Jan 2006 17:49:47 -0000	1.3.2.1
+++ rrdtool	25 Oct 2006 13:27:13 -0000	1.3.2.2
@@ -43,18 +43,13 @@
 		rm -rf $TMPDIR/usr/lib/*.a || exit 1
 		rm -rf $TMPDIR/usr/lib/*.la || exit 1
 
-		mkdir -p $DOCDIR/rrdtool || exit 1
-#Version??
-#		rm -rf $TMPDIR/usr/share/doc/txt/*.pod || exit 1
-#		cp -dpR $TMPDIR/usr/share/doc/{txt,html} $DOCDIR/rrdtool || exit 1
-		cp -dpR $TMPDIR/usr/share/rrdtool/examples $DOCDIR/rrdtool || exit 1
-		rm -rf $TMPDIR/usr/share/doc || exit 1
-		rm -rf $TMPDIR/usr/share/rrdtool/examples || exit 1
-
 		copy_docs $TMPDIR
+		mv $DOCDIR/rrdtool* $DOCDIR/rrdtool || exit 1
 
-		copy_files $TMPDIR/usr/bin $CDDIR/usr/ || exit 1
-		copy_files $TMPDIR/usr/lib $CDDIR/usr/ || exit 1
+		cp -dvpR $TMPDIR/usr/share/rrdtool/examples $DOCDIR/rrdtool || exit 1
+		rm -rf $TMPDIR/usr/share/rrdtool/examples || exit 1
+
+		cp -dpvR $TMPDIR/usr $CDDIR/ || exit 1
 		rm -rf $TMPDIR || exit 1
 	fi
 	;;

Index: iputils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Attic/iputils,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- iputils	16 May 2006 03:09:16 -0000	1.8.2.1
+++ iputils	25 Oct 2006 13:27:13 -0000	1.8.2.2
@@ -36,9 +36,11 @@
 		;;
 
 	install )
-		copy_files "arping ping ping6 tracepath tracepath6 traceroute6" $CDDIR/usr/sbin || exit 1
+		copy_files "arping ping6 tracepath tracepath6 traceroute6" $CDDIR/usr/sbin || exit 1
+		copy_files "ping" $CDDIR/bin || exit 1
 		# set setuid flag so users can execute those files
-		chmod u+s $CDDIR/usr/sbin/{ping,ping6}
+		chmod u+s $CDDIR/usr/sbin/ping6
+		chmod u+s $CDDIR/bin/ping
 		copy_man
 		;;