Use the name "ChangeLog" for the ftp copy of the repository history.

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

diff --git a/packaging/release-rsync b/packaging/release-rsync
index 7dc38ca..3711c4c 100755 (executable)
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -181,7 +181,7 @@ About to:
     - create patches tar, "$pattar_name"
     - create release diffs, "$diff_name"
     - update patch branches and generate patch/* files
-    - update README, *NEWS, TODO, and changelog
+    - update README, *NEWS, TODO, and ChangeLog
     - update rsync*.html man pages
     - gpg-sign the release files
 
@@ -239,7 +239,7 @@ if ($diffdir ne $dest) {
 }
 
 print "Creating $diff_file ...\n";
-system "make gen; rsync -a @extra_files b/";
+system "./config.status Makefile; make gen; rsync -a @extra_files b/";
 my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:';
 system "(git diff v$lastversion v$version; diff -up a b | sed -r '$sed_script') | gzip -9 >$diff_file";
 system "rm -rf a";
@@ -250,17 +250,16 @@ system "git archive --format=tar --prefix=rsync-$version/ v$version | tar xf -";
 system "support/git-set-file-times --prefix=rsync-$version/";
 system "fakeroot tar czf $srctar_file rsync-$version; rm -rf rsync-$version";
 
-system "support/patch-update --gen";
-
-symlink('.', "rsync-$version");
-system "fakeroot tar chzf $pattar_file rsync-$version/patches";
-unlink("rsync-$version");
+mkdir("rsync-$version", 0755);
+mkdir("rsync-$version/patches", 0755);
+system "support/patch-update --skip-check --gen=rsync-$version/patches";
+system "fakeroot tar chzf $pattar_file rsync-$version/patches; rm -rf rsync-$version";
 
 print "Updating the other files in $dest ...\n";
 system "rsync -a README NEWS OLDNEWS TODO $dest";
 unlink("$dest/rsync-$version-NEWS");
 link("$dest/NEWS", "$dest/rsync-$version-NEWS");
-system "git log --name-status | gzip -9 >$dest/changelog.gz";
+system "git log --name-status | gzip -9 >$dest/ChangeLog.gz";
 
 system "yodl2html -o $dest/rsync.html rsync.yo";
 system "yodl2html -o $dest/rsyncd.conf.html rsyncd.conf.yo";