[master] b79e940e7 Prepare for 6.5.0

[Dridi Boukelmoune]

commit b79e940e716474ab5186336db2a86461b32f2413
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Sep 15 15:43:21 2020 +0200

    Prepare for 6.5.0

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index c6e4218f4..919a34d15 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -141,7 +141,7 @@ Resp_Setup_Deliver(struct req *req)
 	http_PrintfHeader(h, "Age: %.0f",
 	    floor(fmax(0., req->t_prev - oc->t_origin)));
 
-	http_SetHeader(h, "Via: 1.1 varnish (Varnish/6.4)");
+	http_SetHeader(h, "Via: 1.1 varnish (Varnish/6.5)");
 
 	if (cache_param->http_gzip_support &&
 	    ObjCheckFlag(req->wrk, oc, OF_GZIPED) &&
diff --git a/configure.ac b/configure.ac
index b63840512..70aa3aed7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2020 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [6.5.0], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index e5c33b1e4..83f0cdc79 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -37,7 +37,7 @@ Longer listings like example command output and VCL look like this::
     $ /opt/varnish/sbin/varnishd -V
     varnishd (varnish-trunk revision 199de9b)
     Copyright (c) 2006 Verdens Gang AS
-    Copyright (c) 2006-2020 Varnish Software AS
+    Copyright (c) 2006-2020 Varnish Software
 
 
 .. For maintainers:
diff --git a/include/vrt.h b/include/vrt.h
index f80d5fa47..c4858cd8b 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -52,7 +52,7 @@
  * Whenever something is deleted or changed in a way which is not
  * binary/load-time compatible, increment MAJOR version
  *
- * NEXT (2020-09-15)
+ * 12.0 (2020-09-15)
  *	Added VRT_DirectorResolve()
  *	Added VCL_STRING VRT_BLOB_string(VRT_CTX, VCL_BLOB)
  *	[cache.h] WS_Reserve() removed
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index f54e78407..9bc77a378 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -74,7 +74,7 @@ VCS_String(const char *which)
 		    ")"
 		    "\n"
 		    "Copyright (c) 2006 Verdens Gang AS\n"
-		    "Copyright (c) 2006-2020 Varnish Software AS\n"
+		    "Copyright (c) 2006-2020 Varnish Software\n"
 		);
 	default:
 		WRONG("Wrong argument to VCS_String");