Preparing for release of 2.6.9pre2

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

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 65b5082..f63f3a7 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -155,7 +155,7 @@ foreach my $fn (@tweak_files) {
     undef $/; $_ = <IN>; $/ = "\n";
     close IN;
     if ($fn =~ /configure/) {
-       s/^RSYNC_VERSION.*/RSYNC_VERSION=$version/m;
+       s/^RSYNC_VERSION=.*/RSYNC_VERSION=$version/m;
     } elsif ($fn =~ /\.spec/) {
        s/^(Version:) .*/$1 $version/m;
        s/^(Release:) .*/$1 $release/m;
@@ -292,7 +292,7 @@ system "tar xzf $tar_file; tar xzf $diffdir/rsync-$lastversion.tar.gz";
 ## TWEAK THE VERSIONS AS DESIRED HERE ##
 #mkdir("rsync-$lastversion/support", 0755) or die $!;
 #rename("rsync-$lastversion/rsyncstats", "rsync-$lastversion/support/rsyncstats");
-unlink("rsync-$lastversion/.ignore");
+#unlink("rsync-$lastversion/.ignore");
 ## END ##
 system "diff -urN --exclude=patches rsync-$lastversion rsync-$version| gzip -9 >$diff_file";
 
@@ -310,10 +310,11 @@ system "rm -rf rsync-*";
 if ($live) {
     chdir($dest) or die $!;
     system "gpg -ba $tar_name; gpg -ba $diff_name";
-}
-
-print $break, <<EOT;
+    print $break, <<EOT;
 
 All done.  Remember to announce the release on *BOTH*
 rsync-announce\@lists.samba.org and rsync\@lists.samba.org!
 EOT
+} else {
+    print $break, "All done.\n";
+}