Preparing for release of 3.1.0

diff --git a/NEWS b/NEWS
index a034ade479d80a9137121041278fd6a82dd32bf2..3ee18a51e2497ff9c1130d80370132ae31ae524a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-NEWS for rsync 3.1.0 (UNRELEASED)
+NEWS for rsync 3.1.0 (28 Sep 2013)
 Protocol: 31 (changed)
 Changes since 3.0.9:
 

diff --git a/OLDNEWS b/OLDNEWS
index 6abb60fb5f794fe4f714a524d5e0dc3434f7ac13..a3b2ab701f5fc81ff187aa011f7b2c120a08fd3e 100644 (file)
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3290,7 +3290,7 @@ Changes since 2.4.6:
 \f
 Partial Protocol History
        RELEASE DATE    VER.    DATE OF COMMIT* PROTOCOL
-       ?? ??? 2013     3.1.0   31 Aug 2008     31
+       28 Sep 2013     3.1.0   31 Aug 2008     31
        23 Sep 2011     3.0.9                   30
        26 Mar 2011     3.0.8                   30
        31 Dec 2009     3.0.7                   30

diff --git a/configure.ac b/configure.ac
index 6e573675498f13b8df94c1b2bf68c48c75a3b6da..c7507deafc8eb5a922a154d83507932713e319c2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.59)
 
-RSYNC_VERSION=3.1.0pre1
+RSYNC_VERSION=3.1.0
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 

diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index dbd0c3ff5aa28f4b65034e9e311718745f28a741..dd223a6e76e781d84312044b7f21bd86ab6b0d17 100644 (file)
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,9 +1,9 @@
 Summary: A fast, versatile, remote (and local) file-copying tool
 Name: rsync
 Version: 3.1.0
-%define fullversion %{version}pre1
-Release: 0.1.pre1
-%define srcdir src-previews
+%define fullversion %{version}
+Release: 1
+%define srcdir src
 Group: Applications/Internet
 Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
 #Source1: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-patches-%{fullversion}.tar.gz
@@ -89,8 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rsync-ssl/certs
 
 %changelog
-* Sun Jul 28 2013 Wayne Davison <wayned@samba.org>
-Released 3.1.0pre1.
+* Sat Sep 28 2013 Wayne Davison <wayned@samba.org>
+Released 3.1.0.
 
 * Fri Mar 21 2008 Wayne Davison <wayned@samba.org>
 Added installation of /etc/xinetd.d/rsync file and some commented-out

diff --git a/rsync.h b/rsync.h
index 714906a6f1a439b2192c5c147ee9021e999219d2..fcb4c267933d482d8d87370f99ce17e2ebb74c60 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -103,7 +103,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
-#define SUBPROTOCOL_VERSION 14
+#define SUBPROTOCOL_VERSION 0
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on

diff --git a/rsync.yo b/rsync.yo
index 17c38ae929d71355563cb8f97c18ddd3f6b33c50..a84b7bf082fbcc8c12570c06c503afa5edc578ff 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsync)(1)(28 Jul 2013)()()
+manpage(rsync)(1)(28 Sep 2013)()()
 manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
 manpagesynopsis()
 
@@ -3361,7 +3361,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.0pre1 of rsync.
+This man page is current for version 3.1.0 of rsync.
 
 manpagesection(INTERNAL OPTIONS)
 

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index fd319f9438c9670fa9505a9384b1d092c110837f..203e456735a51ad6aa7e330e68597d8da7081c4a 100644 (file)
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsyncd.conf)(5)(28 Jul 2013)()()
+manpage(rsyncd.conf)(5)(28 Sep 2013)()()
 manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
 manpagesynopsis()
 
@@ -894,7 +894,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.0pre1 of rsync.
+This man page is current for version 3.1.0 of rsync.
 
 manpagesection(CREDITS)