The branch, master has been updated
via bc58313 Preparing for release of 3.1.0
via de78297 Remove unused var.
from 9c7d755 Flush write buffer on an aborted in-place transfer.
;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bc58313bf7f42f0993f7279299e8137e0f14f01c
Author: Wayne Davison <way...@samba.org>
Date: Sat Sep 28 13:55:54 2013 -0700
Preparing for release of 3.1.0
commit de78297b61b302ded59b726ebf8e1e3b149fc153
Author: Wayne Davison <way...@samba.org>
Date: Sat Sep 28 13:53:23 2013 -0700
Remove unused var.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
OLDNEWS | 2 +-
configure.ac | 2 +-
packaging/lsb/rsync.spec | 10 +++++-----
rsync.h | 2 +-
rsync.yo | 4 ++--
rsyncd.conf.yo | 4 ++--
tls.c | 1 -
8 files changed, 13 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index a034ade..3ee18a5 100644
--- 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 6abb60f..a3b2ab7 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3290,7 +3290,7 @@ Changes since 2.4.6:
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 6e57367..c7507de 100644
--- 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 dbd0c3f..dd223a6 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.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 <way...@samba.org>
-Released 3.1.0pre1.
+* Sat Sep 28 2013 Wayne Davison <way...@samba.org>
+Released 3.1.0.
* Fri Mar 21 2008 Wayne Davison <way...@samba.org>
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.h b/rsync.h
index 714906a..fcb4c26 100644
--- 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 17c38ae..a84b7bf 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@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 fd319f9..203e456 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@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)
diff --git a/tls.c b/tls.c
index b84085d..ca3ec7c 100644
--- a/tls.c
+++ b/tls.c
@@ -232,7 +232,6 @@ main(int argc, char *argv[])
{
poptContext pc;
const char **extra_args;
- char buf[32];
int opt;
pc = poptGetContext(PROGRAM, argc, (const char **)argv,
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
