[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  7cb0de6 Preparing for release of 3.1.1
      from  61e74af Add a clarification about shell wildcard expansion.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7cb0de6326c915a72253fd103dae93308031ec3f
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Jun 22 09:50:03 2014 -0700

    Preparing for release of 3.1.1

-----------------------------------------------------------------------

Summary of changes:
 NEWS                     |    2 +-
 OLDNEWS                  |    2 +-
 configure.ac             |    2 +-
 packaging/lsb/rsync.spec |   10 +++++-----
 rsync.yo                 |    4 ++--
 rsyncd.conf.yo           |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/NEWS b/NEWS
index a65b3bb..1cbbe9b 100644
--- 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 4871fdf..ba02b07 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3534,7 +3534,7 @@ Changes since 2.4.6:
 
 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 1729be9..cf588ce 100644
--- 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 ed54d30..d9c3196 100644
--- 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 at samba.org>
-Released 3.1.1pre2.
+* Sun Jun 22 2014 Wayne Davison <wayned at samba.org>
+Released 3.1.1.
 
 * Fri Mar 21 2008 Wayne Davison <wayned at samba.org>
 Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.yo b/rsync.yo
index 40b8057..87028ca 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs at 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 e5ed8f6..9f9f6ac 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
 mailto(rsync-bugs at 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)
 


-- 
The rsync repository.