From 54c7298ce43c686d66110e32e9c20375522a412d Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 3 Apr 2002 02:13:42 +0000
Subject: [PATCH] Roll over version and news.

---
 NEWS         | 38 +-------------------------------------
 OLDNEWS      | 39 +++++++++++++++++++++++++++++++++++++++
 configure.in |  2 +-
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/NEWS b/NEWS
index d049eb6e..51af02ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,37 +1 @@
-rsync 2.5.5 "Snowy River" (2 April 2002)
-
-  ENHANCEMENTS:
-
-    * With --progress, when a transfer is complete show the time taken;
-      otherwise show expected time to complete. (Cameron Simpson)
-
-    * Make "make install-strip" works properly, and "make install"
-      accepts a DESTDIR variable for help in building binary packages.
-      (Peter Breitenlohner, Greg Louis)
-
-    * If configured with --enable-maintainer-mode, then on receipt of
-      a fatal signal rsync will try to open an xterm running gdb,
-      similarly to Samba's "panic action" or GNOME's bug-buddy.
-      (Martin Pool)
-
-
-  BUG FIXES:
-
-    * Fix situation where failure to fork (e.g. because out of process
-      slots) would cause rsync to kill all processes owned by the
-      current user.  Yes, really!  (Paul Haas, Martin Pool)
-
-    * Fix test suite on Solaris.  (Jos Backus, Martin Pool)
-
-    * Fix minor memory leak in socket code.  (Dave Dykstra, Martin
-      Pool.)
-
-    * Fix --whole-file problem that caused it to be the default even
-      for remote connections.  (Martin Pool, Frank Schulz)
-
-    * Work around bug in Mac OS X mkdir(2), which cannot handle
-      trailing slashes.
-      <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html>
-      (Martin Pool)
-
-    * Improved network error handling.  (Greg A. Woods)
+rsync changes since last release
diff --git a/OLDNEWS b/OLDNEWS
index 37dd355d..a8ea8bf0 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -1,3 +1,42 @@
+rsync 2.5.5 "Snowy River" (2 April 2002)
+
+  ENHANCEMENTS:
+
+    * With --progress, when a transfer is complete show the time taken;
+      otherwise show expected time to complete. (Cameron Simpson)
+
+    * Make "make install-strip" works properly, and "make install"
+      accepts a DESTDIR variable for help in building binary packages.
+      (Peter Breitenlohner, Greg Louis)
+
+    * If configured with --enable-maintainer-mode, then on receipt of
+      a fatal signal rsync will try to open an xterm running gdb,
+      similarly to Samba's "panic action" or GNOME's bug-buddy.
+      (Martin Pool)
+
+
+  BUG FIXES:
+
+    * Fix situation where failure to fork (e.g. because out of process
+      slots) would cause rsync to kill all processes owned by the
+      current user.  Yes, really!  (Paul Haas, Martin Pool)
+
+    * Fix test suite on Solaris.  (Jos Backus, Martin Pool)
+
+    * Fix minor memory leak in socket code.  (Dave Dykstra, Martin
+      Pool.)
+
+    * Fix --whole-file problem that caused it to be the default even
+      for remote connections.  (Martin Pool, Frank Schulz)
+
+    * Work around bug in Mac OS X mkdir(2), which cannot handle
+      trailing slashes.
+      <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html>
+      (Martin Pool)
+
+    * Improved network error handling.  (Greg A. Woods)
+
+
 rsync 2.5.4 (13 March 2002)
 
   "Imitation lizard skin"
diff --git a/configure.in b/configure.in
index 5841ca17..97fce476 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.52)
 
-RSYNC_VERSION=2.5.5
+RSYNC_VERSION=2.5.6cvs
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
-- 
2.34.1