Get the version # right in the changelog.

[rsync/rsync.git] / packaging / release-rsync

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 5bdfe8d..89b2702 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -16,9 +16,9 @@ my $dest = $ENV{HOME} . '/samba-rsync-ftp';
 my $releasedir = $ENV{HOME} . '/release';
 my $cvsroot = $ENV{CVSROOT} = 'samba.org:/data/cvs';
 
+my $cl_today = time2str('* %a %b %d %Y', time);
 my $ztoday = time2str('%d %b %Y', time);
-my $today = $ztoday;
-$today =~ s/^0//;
+(my $today = $ztoday) =~ s/^0//;
 
 my $break = <<EOT;
 ==========================================================================
@@ -67,7 +67,7 @@ while (<CVS>) {
 chdir('rsync') or die $!;
 
 my($version, $lastversion);
-open(IN, 'configure.in') or die $!;
+open(IN, '<', 'configure.in') or die $!;
 while (<IN>) {
     if (/^RSYNC_VERSION=(.*)/) {
        $version = $lastversion = $1;
@@ -76,7 +76,13 @@ while (<IN>) {
 }
 close IN;
 
-$lastversion =~ s/(\d+)cvs$/ $1 - 1 /e;
+if ($lastversion =~ /cvs$/) {
+    open(IN, '<', 'OLDNEWS') or die $!;
+    $_ = <IN>;
+    close IN;
+    ($lastversion) = /(\d+\.\d+\.\d+)/;
+}
+
 $version =~ s/cvs/pre1/ || $version =~ s/pre(\d+)/ 'pre' . ($1 + 1) /e;
 
 print $break, "\nPlease enter the version number of this release: [$version] ";
@@ -130,8 +136,9 @@ print "\n", $break, <<EOT;
 \$release is "$release"
 
 About to:
-    - make sure that configure, config.h.in, and proto.h are updated
+    - make sure that SUBPROTOCOL_VERSION is 0$skipping2
     - tweak the version in configure.in, configure, and the spec files
+    - make sure that configure, config.h.in, and proto.h are updated
     - tweak NEWS and OLDNEWS to update the release date$skipping2
     - tweak the date in the *.yo files and re-generate the man pages
     - make sure that the patches dir has been updated
@@ -148,7 +155,7 @@ system "./prepare-source && touch proto.h";
 my @tweak_files = ( glob('packaging/*.spec'), glob('packaging/*/*.spec'),
                    glob('*.yo'), qw( configure.in configure ) );
 if ($version !~ /pre/) {
-    push(@tweak_files, qw( NEWS OLDNEWS ));
+    push(@tweak_files, qw( rsync.h NEWS OLDNEWS ));
 }
 foreach my $fn (@tweak_files) {
     open(IN, '<', $fn) or die $!;
@@ -159,12 +166,16 @@ foreach my $fn (@tweak_files) {
     } elsif ($fn =~ /\.spec/) {
        s/^(Version:) .*/$1 $version/m;
        s/^(Release:) .*/$1 $release/m;
+       s/^(Released) .*/$1 $version./m;
+       s/^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)/$cl_today $1/m;
     } elsif ($fn =~ /\.yo/) {
        s/^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)/$1$today$2/m;
        s/^(This man ?page is current for version) \S+ (of rsync)/$1 $version $2/m;
     } elsif ($fn eq 'NEWS') {
        s/^(NEWS for rsync \Q$version\E) \(UNRELEASED\)\s*\n/$1 ($today)\n/mi
            or die "Couldn't update NEWS file with release date!\n";
+    } elsif ($fn eq 'rsync.h') {
+       s/(#define\s+SUBPROTOCOL_VERSION)\s+\d+/$1 0/;
     } elsif ($fn eq 'OLDNEWS') {
        s/^\t\S\S\s\S\S\S\s\d\d\d\d(\t\Q$version\E)/\t$ztoday$1/m
            or die "Couldn't update OLDNEWS file with release date!\n";
@@ -176,9 +187,8 @@ foreach my $fn (@tweak_files) {
     close OUT;
 }
 
-system "yodl2man -o rsync.1 rsync.yo";
-system "yodl2man -o rsyncd.conf.5 rsyncd.conf.yo";
-#system "perl -pi -e \"s/\\\\\\'/\\\\&'/g\" rsync.1 rsyncd.conf.5";
+system "yodl2man -o rsync.1 rsync.yo; ./tweak_manpage rsync.1";
+system "yodl2man -o rsyncd.conf.5 rsyncd.conf.yo; ./tweak_manpage rsyncd.conf.5";
 
 mkdir('patches/tmp') or die $!;
 system "rsync -a --exclude=patches/ --exclude-from=.cvsignore . patches/tmp/cvsdir/";