Preparing for release of 3.1.1

diff --git a/NEWS b/NEWS
index a65b3bb3cab66004d521839c9ed05b0d4c1e76fe..1cbbe9b0c3edc4a1935abb950aa3871789c9447c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-NEWS for rsync 3.1.1 (UNRELEASED)
+NEWS for rsync 3.1.1 (22 Jun 2014)
 Protocol: 31 (unchanged)
 Changes since 3.1.0:
 

diff --git a/OLDNEWS b/OLDNEWS
index 4871fdfc1b63b9ee0d3c63df2131567ba6a4d2b1..ba02b075e5b6e6bb6b5c47a7eb652022577ccf5c 100644 (file)
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3534,7 +3534,7 @@ Changes since 2.4.6:
 \f
 Partial Protocol History
        RELEASE DATE    VER.    DATE OF COMMIT* PROTOCOL
-       ?? ??? 2013     3.1.1                   31
+       22 Jun 2014     3.1.1                   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

diff --git a/configure.ac b/configure.ac
index 1729be9788ed7e941d5d9f4e60151c919e23a11d..cf588ce84a3e4a9c70446cda49e8deb3394865b9 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.60)
 
-RSYNC_VERSION=3.1.1pre2
+RSYNC_VERSION=3.1.1
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 

diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index ed54d3094bcf66513b280d91f9c25949050830da..d9c3196f94d7773a0c78e95689a317ceaa5b321b 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.1
-%define fullversion %{version}pre2
-Release: 0.1.pre2
-%define srcdir src-previews
+%define fullversion %{version}
+Release: 1
+%define srcdir src
 Group: Applications/Internet
 License: GPL
 Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
@@ -91,8 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rsync-ssl/certs
 
 %changelog
-* Mon May 26 2014 Wayne Davison <wayned@samba.org>
-Released 3.1.1pre2.
+* Sun Jun 22 2014 Wayne Davison <wayned@samba.org>
+Released 3.1.1.
 
 * 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.yo b/rsync.yo
index 40b80570c2b7e3abf24c01968070741266d637b9..87028ca080bbb81e5855d9e2bf5607fb9414d8a7 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsync)(1)(26 May 2014)()()
+manpage(rsync)(1)(22 Jun 2014)()()
 manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
 manpagesynopsis()
 
@@ -3403,7 +3403,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.1pre2 of rsync.
+This man page is current for version 3.1.1 of rsync.
 
 manpagesection(INTERNAL OPTIONS)
 

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index e5ed8f6bd4d3f0af6e1e82975c51ad317fc95e10..9f9f6ac0d0fd50b4d6d0cf73ec188df44f639c0e 100644 (file)
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsyncd.conf)(5)(26 May 2014)()()
+manpage(rsyncd.conf)(5)(22 Jun 2014)()()
 manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
 manpagesynopsis()
 
@@ -901,7 +901,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.1pre2 of rsync.
+This man page is current for version 3.1.1 of rsync.
 
 manpagesection(CREDITS)