diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/scripts/prepare-ChangeLog.pl | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9a7a976bb..48baac420 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-04 19:20 mkrufky + + * Makefile: + * v4l/scripts/prepare-ChangeLog.pl: + - Show Changelog entries relative to top-level cvs directory, + rather than v4l/ directory. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-12-04 16:31 hverkuil * ../linux/drivers/media/video/msp3400.c: diff --git a/v4l/scripts/prepare-ChangeLog.pl b/v4l/scripts/prepare-ChangeLog.pl index f464d7573..3aa696efd 100644 --- a/v4l/scripts/prepare-ChangeLog.pl +++ b/v4l/scripts/prepare-ChangeLog.pl @@ -81,7 +81,7 @@ print STDERR " Updating ChangeLog from cvs repository.\n"; open ERRORS, "cvs update ChangeLog |" or die "The cvs update of ChangeLog failed: $OS_ERROR.\n"; print STDERR " $ARG" while <ERRORS>; close ERRORS; -open OLD_CHANGE_LOG, "ChangeLog" or die "Could not open ChangeLog file: $OS_ERROR.\n"; +open OLD_CHANGE_LOG, "v4l/ChangeLog" or die "Could not open ChangeLog file: $OS_ERROR.\n"; my @old_change_log = <OLD_CHANGE_LOG>; close OLD_CHANGE_LOG; @@ -90,12 +90,12 @@ close OLD_CHANGE_LOG; print STDERR " Running cvs diff to find changes.\n"; my %changed_line_ranges; my $file; -open DIFF, "cvs -fq diff -N ..|" or die "The cvs diff failed: $OS_ERROR.\n"; +open DIFF, "cvs -fq diff -N |" or die "The cvs diff failed: $OS_ERROR.\n"; while (<DIFF>) { $file = $1 if /^Index: (\S+)$/; if (defined $file - and $file ne "../v4l/ChangeLog" + and $file ne "v4l/ChangeLog" and (/^\d+(,\d+)?[acd](\d+)(,(\d+))?/ or /^Binary files/) ) { push @{$changed_line_ranges{$file}}, [ $2, $4 || $2 ]; @@ -168,7 +168,7 @@ my $date = sprintf "%d-%02d-%02d %02d:%02d", (gmtime $BASETIME)[2], # hour (gmtime $BASETIME)[1]; # min -open CHANGE_LOG, "> ChangeLog" or die "Could not write ChangeLog\n."; +open CHANGE_LOG, "> v4l/ChangeLog" or die "Could not write ChangeLog\n."; print CHANGE_LOG "$date $login\n\n"; foreach my $file (sort keys %function_lists) { |