--- upstream/log_accum.pl	2006-08-19 07:43:51.000000000 +0000
+++ log_accum.pl	2006-11-17 18:10:42.000000000 +0000
@@ -199,7 +199,7 @@
 
     # Just set @debug in a global.  It's easier.
     $config->{'debug-log'} = [] unless exists $config->{'debug-log'};
-    push @{$config->{'debug-log'}}, '&STDERR' if $config->{debug};
+    push @{$config->{'debug-log'}}, '&STDERR' if $config->{'debug'};
     foreach (@{$config->{'debug-log'}})
     {
 	my $debug;
@@ -236,16 +236,16 @@
     my %config;
 
     # Set up the option processing functions.
-    $config{'only-tags'} =
+    $config{'only-tag'} =
 	sub
 	{
-	    $_[1] = '' if $_[1] eq "HEAD" || $_[1] eq "TRUNK";
+	    $_[1] = '' if $_[1] eq 'HEAD' || $_[1] eq 'TRUNK';
 	    push @{$config{'tag'}}, $_[1];
 	};
     $config{'quiet'} =
 	sub
 	{
-	    $config{'verbose'} = !$_[1];
+	    $config{'debug'} = !$_[1];
 	};
     $config{'file-prefix'} =
 	sub
@@ -258,7 +258,7 @@
 	sub
 	{
 	    warn "Using deprecated -u option. Use -T instead.";
-	    &{$config{'file-text'}} (@_);
+	    $config{'user'} = $_[1];
 	};
     $config{'suppress-diffs-against-empties'} =
 	sub
@@ -274,7 +274,7 @@
 # This is global for convenience.  It is used in parse_config & process_argv.
 my @option_spec = ("config|c=s@",
 		   "mail-to|m=s@",
-		   "tag|only-tag|r=s@",
+		   "only-tag|tag|r=s@",
 		   "file-prefix|file-text|T=s", "user|u=s",
 		   "debug|verbose|v!",
 		   "debug-log|debug-file=s@",