Update the commit scripts to understand 'Approved by:' and kill cvsedit.

5 files changed, 7 insertions, 6 deletions

diff --git a/CVSROOT/checkoutlist b/CVSROOT/checkoutlist
index 97b061938069..5b9d9e60fac7 100644
--- a/CVSROOT/checkoutlist
+++ b/CVSROOT/checkoutlist
@@ -20,7 +20,6 @@ avail
 commit_prep.pl
 commitcheck
 cvs_acls.pl
-cvsedit
 cvswrappers
 exclude
 log_accum.pl
diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo
index bf11de401d30..9e12a3ad8102 100644
--- a/CVSROOT/editinfo
+++ b/CVSROOT/editinfo
@@ -30,5 +30,3 @@
 # Note there is no "edit" example script currently available....
 #
 #DEFAULT		$CVSROOT/CVSROOT/edit "%s"
-# peter's edit post-processor.. (see verifymsg/logcheck now)
-#DEFAULT			$CVSROOT/CVSROOT/cvsedit
diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index 8b0bccc2bbeb..80dd20a84764 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -530,7 +530,8 @@ while (<STDIN>) {
 	if (/^PR:$/i ||
 	    /^Reviewed by:$/i ||
 	    /^Submitted by:$/i ||
-	    /^Obtained from:$/i) {
+	    /^Obtained from:$/i ||
+	    /^Approved by:$/i) {
 	    next;
 	}
 	push (@log_lines,     $_);
diff --git a/CVSROOT/logcheck b/CVSROOT/logcheck
index e9e7083ffb20..fdec5dbca358 100755
--- a/CVSROOT/logcheck
+++ b/CVSROOT/logcheck
@@ -18,10 +18,10 @@ $filename = $ARGV[0];
 $tmpfile = $filename . "tmp";
 
 open(IN, "< $filename") ||
-	die "cvsedit: Cannot open for reading: $filename: $!\n";
+	die "logcheck: Cannot open for reading: $filename: $!\n";
 
 open(OUT, "> $tmpfile") ||
-	die "cvsedit: Cannot open for writing: $tmpfile: $!\n";
+	die "logcheck: Cannot open for writing: $tmpfile: $!\n";
 
 # In-place edit the result of the user's edit on the file.
 $blank = 0;	# true if the last line was blank
@@ -46,6 +46,7 @@ while(<IN>) {
 		if (/^Reviewed by:$/i ||
 		    /^Submitted by:$/i ||
 		    /^Obtained from:$/i ||
+		    /^Approved by:$/i ||
 		    /^PR:$/i) {
 			next;
 		}
diff --git a/CVSROOT/rcstemplate b/CVSROOT/rcstemplate
index b71a483f03c6..8c68bf42f206 100644
--- a/CVSROOT/rcstemplate
+++ b/CVSROOT/rcstemplate
@@ -2,9 +2,11 @@
 PR:		
 Submitted by:	
 Reviewed by:	
+Approved by:	
 Obtained from:	
 CVS: ----------------------------------------------------------------------
 CVS: PR:	      Fill this in if a GNATS PR is affected by the change.
 CVS: Submitted by:    Fill this in if someone else sent in the change.
 CVS: Reviewed by:     Fill this in if someone else reviewed your modification.
+CVS: Approved by:     Fill this in if you needed approval for this commit.
 CVS: Obtained from:   Fill this in if the change is from third party software.