#!/bin/awk -f
/^cvs diff: tag.*is not in file/ {
	print
	next
}
/^cvs diff: Diffing/ {
	next
}
/^Index:/ {
	file=$2
	next
}
/^===============/ {
	next
}
/^RCS/ {
	next
}
/^retrieving/ {
	next
}
/^diff/ {
	next
}
/^---/ {
	if ($2 ~ /^\/dev\/null/ ||
	    $2 ~ /^\/tmp\//)
		$2=file
	if ($2 ~ /.cvsignore$/ ||
	    $2 ~ /^c_stubs/ ||
	    $2 ~ /^redhat/ ||
	    $2 ~ /^glibc-compat/) {
		hide = 1
		next
	} else {
		hide = 0
	}
	sub(/^---[ 	]*/,"--- " PROJVER "-cygnus/")
}
/^\+\+\+/ {
	if (hide)
		next
	if ($2 ~ /^\/dev\/null/ ||
	    $2 ~ /^\/tmp\//)
		$2=file
	sub(/^\+\+\+[ 	]*/,"+++ " PROJVER "-redhat/")
}
{
	if (hide)
		next
	print
}