Preparing for release of 3.1.2

diff --git a/NEWS b/NEWS
index 740cb3407676f60bdcb70d6b0dd18534bbf5f34d..2de8d12213ca487e37c7b2493f4aee7a3fd22d79 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-NEWS for rsync 3.1.2 (UNRELEASED)
+NEWS for rsync 3.1.2 (21 Dec 2015)
 Protocol: 31 (unchanged)
 Changes since 3.1.1:
 

diff --git a/OLDNEWS b/OLDNEWS
index 295ab2e7bab1f944067beef49aced5e374412523..a55595010af29223b9612cdd4fcb91c3b03ed406 100644 (file)
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3650,7 +3650,7 @@ Changes since 2.4.6:
 \f
 Partial Protocol History
        RELEASE DATE    VER.    DATE OF COMMIT* PROTOCOL
-       ?? Dec 2015     3.1.2                   31
+       21 Dec 2015     3.1.2                   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

diff --git a/configure.ac b/configure.ac
index 0478ba8820292bb2df373be0de65b6a460b68500..1b32dfbb0153c04c5db833f745ea6c1ad60bd6f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([rsync],[3.1.2pre1],[http://rsync.samba.org/bugzilla.html])
+AC_INIT([rsync],[3.1.2],[http://rsync.samba.org/bugzilla.html])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([byteorder.h])

diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index e9ed78e06125f745c9b4a0bddd703087cb4fc3e2..8eff53cdf51b3585785d28cc63d147737aec44f7 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.2
-%define fullversion %{version}pre1
-Release: 0.1.pre1
-%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
-* Sat Aug 08 2015 Wayne Davison <wayned@samba.org>
-Released 3.1.2pre1.
+* Mon Dec 21 2015 Wayne Davison <wayned@samba.org>
+Released 3.1.2.
 
 * 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 88479f32684dbd58ba72a3f6f77c8f47f2d1bf4d..09ee92f6980c19f609bbc95bb7a82b39f48cd15d 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsync)(1)(8 Aug 2015)()()
+manpage(rsync)(1)(21 Dec 2015)()()
 manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
 manpagesynopsis()
 
@@ -3410,7 +3410,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.2pre1 of rsync.
+This man page is current for version 3.1.2 of rsync.
 
 manpagesection(INTERNAL OPTIONS)
 

diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index f47ebf7e6808d810b0aa8ffa6b117ba6a60a4130..6915407131fe38850a352b1ffa072c439ca729f4 100644 (file)
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs@samba.org)
-manpage(rsyncd.conf)(5)(8 Aug 2015)()()
+manpage(rsyncd.conf)(5)(21 Dec 2015)()()
 manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
 manpagesynopsis()
 
@@ -904,7 +904,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
 
 manpagesection(VERSION)
 
-This man page is current for version 3.1.2pre1 of rsync.
+This man page is current for version 3.1.2 of rsync.
 
 manpagesection(CREDITS)