Beginning work on a 3.0.5 release.

3 files changed, 70 insertions, 61 deletions

diff --git a/NEWS b/NEWS
index 2dd8c3eb..be43079a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,64 +1,6 @@
-NEWS for rsync 3.0.4 (6 Sep 2008)
+NEWS for rsync 3.0.5 (UNRELEASED)
 Protocol: 30 (unchanged)
-Changes since 3.0.3:
+Changes since 3.0.4:
 
   BUG FIXES:
 
-    - Fixed a bug in the hard-linking code where it would sometimes try to
-      allocate 0 bytes of memory (which fails on some OSes, such as AIX).
-
-    - Fixed the hard-linking of files from a device that has a device number
-      of 0 (which seems to be a common device number on NetBSD).
-
-    - Fixed the handling of a --partial-dir that cannot be created.  This
-      particularly impacts the --delay-updates option (since the files cannot
-      be delayed without a partial-dir), and was potentially destructive if
-      the --remove-source-files was also specified.
-
-    - Fixed a couple issues in the --fake-super handling of xattrs when the
-      destination files have root-level attributes (e.g. selinux values) that
-      a non-root copy can't affect.
-
-    - Improved the keep-alive check in the generator to fire consistently in
-      incremental-recursion mode when --timeout is enabled.
-
-    - The --iconv option now converts the content of a symlink too, instead
-      of leaving it in the wrong character-set (requires 3.0.4 on both sides
-      of the transfer).
-
-    - When using --iconv, if a filename fails to convert on the receiving side,
-      this no longer makes deletions in the root-dir of the transfer fail
-      silently (the user now gets a warning about deletions being disabled
-      due to IO error as long as --ignore-errors was not specified).
-
-    - When using --iconv, if a server-side receiver can't convert a filename,
-      the error message sent back to the client no longer mangles the name
-      with the wrong charset conversion.
-
-    - Fixed a potential alignment issue in the IRIX ACL code when allocating
-      the initial "struct acl" object.  Also, cast mallocs to avoid warnings.
-
-    - Changed some errors that were going to stdout to go to stderr.
-
-    - Made human_num() and human_dnum() able to output a negative number
-      (rather than outputting a cryptic string of punctuation).
-
-  ENHANCEMENTS:
-
-    - Rsync will avoid sending an -e option to the server if an older protocol
-      is requested (and thus the option would not be useful).  This lets the
-      user specify the --protocol=29 option to access an overly-restrictive
-      server that is rejecting the protocol-30 use of -e to the server.
-
-    - Improved the message output for an RERR_PARTIAL exit.
-
-  DEVELOPER RELATED:
-
-    - The Makefile will not halt for just a timestamp change on the Makefile
-      or the configure files, only for actual changes in content.
-
-    - Changed some commands in the testsuite's xattrs.test that called "rsync"
-      instead of "$RSYNC".
-
-    - Enhanced the release scripts to be able to handle a branch release and
-      to do even more consistency checks on the files.
diff --git a/OLDNEWS b/OLDNEWS
index 7d69ec6d..993bb8cc 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -1,3 +1,69 @@
+NEWS for rsync 3.0.4 (6 Sep 2008)
+Protocol: 30 (unchanged)
+Changes since 3.0.3:
+
+  BUG FIXES:
+
+    - Fixed a bug in the hard-linking code where it would sometimes try to
+      allocate 0 bytes of memory (which fails on some OSes, such as AIX).
+
+    - Fixed the hard-linking of files from a device that has a device number
+      of 0 (which seems to be a common device number on NetBSD).
+
+    - Fixed the handling of a --partial-dir that cannot be created.  This
+      particularly impacts the --delay-updates option (since the files cannot
+      be delayed without a partial-dir), and was potentially destructive if
+      the --remove-source-files was also specified.
+
+    - Fixed a couple issues in the --fake-super handling of xattrs when the
+      destination files have root-level attributes (e.g. selinux values) that
+      a non-root copy can't affect.
+
+    - Improved the keep-alive check in the generator to fire consistently in
+      incremental-recursion mode when --timeout is enabled.
+
+    - The --iconv option now converts the content of a symlink too, instead
+      of leaving it in the wrong character-set (requires 3.0.4 on both sides
+      of the transfer).
+
+    - When using --iconv, if a filename fails to convert on the receiving side,
+      this no longer makes deletions in the root-dir of the transfer fail
+      silently (the user now gets a warning about deletions being disabled
+      due to IO error as long as --ignore-errors was not specified).
+
+    - When using --iconv, if a server-side receiver can't convert a filename,
+      the error message sent back to the client no longer mangles the name
+      with the wrong charset conversion.
+
+    - Fixed a potential alignment issue in the IRIX ACL code when allocating
+      the initial "struct acl" object.  Also, cast mallocs to avoid warnings.
+
+    - Changed some errors that were going to stdout to go to stderr.
+
+    - Made human_num() and human_dnum() able to output a negative number
+      (rather than outputting a cryptic string of punctuation).
+
+  ENHANCEMENTS:
+
+    - Rsync will avoid sending an -e option to the server if an older protocol
+      is requested (and thus the option would not be useful).  This lets the
+      user specify the --protocol=29 option to access an overly-restrictive
+      server that is rejecting the protocol-30 use of -e to the server.
+
+    - Improved the message output for an RERR_PARTIAL exit.
+
+  DEVELOPER RELATED:
+
+    - The Makefile will not halt for just a timestamp change on the Makefile
+      or the configure files, only for actual changes in content.
+
+    - Changed some commands in the testsuite's xattrs.test that called "rsync"
+      instead of "$RSYNC".
+
+    - Enhanced the release scripts to be able to handle a branch release and
+      to do even more consistency checks on the files.
+
+
 NEWS for rsync 3.0.3 (29 Jun 2008)
 Protocol: 30 (unchanged)
 Changes since 3.0.2:
@@ -2841,6 +2907,7 @@ Changes since 2.4.6:
 
 Partial Protocol History
 	RELEASE DATE	VER.	DATE OF COMMIT*	PROTOCOL
+	?? Oct 2008	3.0.5			30
 	06 Sep 2008	3.0.4			30
 	29 Jun 2008	3.0.3			30
 	08 Apr 2008	3.0.2			30
diff --git a/configure.in b/configure.in
index 26606c52..57b2e374 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.59)
 
-RSYNC_VERSION=3.0.4
+RSYNC_VERSION=3.0.5dev
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])