See ChangeLog: Tue Oct 26 14:10:21 CEST 1999 Werner Koch

scripts/ChangeLog

@@ -1,3 +1,8 @@
+Tue Oct 26 14:10:21 CEST 1999  Werner Koch  <wk@gnupg.de>
+
+	* commit: Remove leading and trailing empty lines when copying
+	Changes to Changelog
+
 Wed Sep 15 16:22:17 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 

scripts/commit

@@ -11,15 +11,25 @@ addr="<`id -un`@`hostname -d`>"
 for i in `find . -name Changes -print`; do
     dir=`dirname $i`
     if [ -s $dir/Changes ]; then
-	lines=`wc -l <$dir/Changes`
-	echo "$date  $name  $addr" >$dir/ChangeLog.new
-	echo >>$dir/ChangeLog.new
-	cat $dir/Changes   >>$dir/ChangeLog.new
-	[ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new
-	echo -n > $dir/Changes
-	[ -f $dir/ChangeLog ] && rm $dir/ChangeLog
-	mv $dir/ChangeLog.new $dir/ChangeLog
-	echo "$lines new lines in $dir/ChangeLog"
+	awk '
+	state == 0 && /^[ \t]*$/  { next }
+	state == 0  { state = 1 }
+	/^[ \t]*$/ { empty++; next }
+		   { while ( empty > 0 ) { print ""; empty--; }; print  }
+	' < $dir/Changes > $dir/Changes.tmp
+	if [ -s $dir/Changes.tmp ]; then
+	    lines=`wc -l <$dir/Changes.tmp`
+	    echo "$date  $name  $addr" >$dir/ChangeLog.new
+	    echo >>$dir/ChangeLog.new
+	    cat $dir/Changes.tmp   >>$dir/ChangeLog.new
+	    echo >>$dir/ChangeLog.new
+	    [ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new
+	    echo -n > $dir/Changes
+	    [ -f $dir/ChangeLog ] && rm $dir/ChangeLog
+	    mv $dir/ChangeLog.new $dir/ChangeLog
+	    echo "$lines new lines in $dir/ChangeLog"
+	fi
+	rm $dir/Changes.tmp || true
     fi
 done
 

scripts/mksnapshot

@@ -21,7 +21,7 @@ This is a snapshot of the current CVS head branch!
 
 It may not compile or not work.  Please don't report
 bugs about this snapshot release it is just for your
-convenience and to reduce the load of out CVS server.
+convenience and to reduce the load of our CVS server.
 
 Thanks,