aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2014-06-22 09:50:03 -0700
committerWayne Davison <wayned@samba.org>2014-06-22 09:50:03 -0700
commit7cb0de6326c915a72253fd103dae93308031ec3f (patch)
tree227b0b75ef32e00a3909ec2c5339d8a7553dd5c8
parent61e74afc420b95bea28e8a75632fc1d749b599b8 (diff)
downloadandroid_external_rsync-7cb0de6326c915a72253fd103dae93308031ec3f.tar.gz
android_external_rsync-7cb0de6326c915a72253fd103dae93308031ec3f.tar.bz2
android_external_rsync-7cb0de6326c915a72253fd103dae93308031ec3f.zip
Preparing for release of 3.1.1
-rw-r--r--NEWS2
-rw-r--r--OLDNEWS2
-rw-r--r--configure.ac2
-rw-r--r--packaging/lsb/rsync.spec10
-rw-r--r--rsync.yo4
-rw-r--r--rsyncd.conf.yo4
6 files changed, 12 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index a65b3bb3..1cbbe9b0 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 4871fdfc..ba02b075 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 1729be97..cf588ce8 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 ed54d309..d9c3196f 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@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 40b80570..87028ca0 100644
--- 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 e5ed8f6b..9f9f6ac0 100644
--- 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)