r5761 - in branches/2.1/varnish-cache: . redhat

[kristian at varnish-cache.org]

Author: kristian
Date: 2011-01-18 15:34:48 +0100 (Tue, 18 Jan 2011)
New Revision: 5761

Modified:
   branches/2.1/varnish-cache/configure.ac
   branches/2.1/varnish-cache/redhat/Makefile.am
   branches/2.1/varnish-cache/redhat/varnish.spec
Log:
2.1: Prepare for 2.1.5

- Bump version numbers to 2.1.5
- Redhat: Don't rebuild doc-stuff (it's done at make dist-time)
- Redhat: Include the varnish_reload_vcl script in extra dist

Modified: branches/2.1/varnish-cache/configure.ac
===================================================================
--- branches/2.1/varnish-cache/configure.ac	2011-01-18 14:05:58 UTC (rev 5760)
+++ branches/2.1/varnish-cache/configure.ac	2011-01-18 14:34:48 UTC (rev 5761)
@@ -5,7 +5,7 @@
 Copyright (c) 2006-2010 Redpill Linpro AS
 Copyright (c) 2010 Varnish Software AS])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [2.1.4], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [2.1.5], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/varnishapi.h)
 AM_CONFIG_HEADER(config.h)
 

Modified: branches/2.1/varnish-cache/redhat/Makefile.am
===================================================================
--- branches/2.1/varnish-cache/redhat/Makefile.am	2011-01-18 14:05:58 UTC (rev 5760)
+++ branches/2.1/varnish-cache/redhat/Makefile.am	2011-01-18 14:34:48 UTC (rev 5761)
@@ -8,4 +8,5 @@
 	varnish.spec		\
 	varnish.sysconfig	\
 	varnishlog.initrc	\
+	varnish_reload_vcl	\
 	varnishncsa.initrc

Modified: branches/2.1/varnish-cache/redhat/varnish.spec
===================================================================
--- branches/2.1/varnish-cache/redhat/varnish.spec	2011-01-18 14:05:58 UTC (rev 5760)
+++ branches/2.1/varnish-cache/redhat/varnish.spec	2011-01-18 14:34:48 UTC (rev 5761)
@@ -1,6 +1,6 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 2.1.4
+Version: 2.1.5
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -136,9 +136,6 @@
 	redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
 %endif
 
-pushd doc/sphinx
-make html
-popd
 cp -r doc/sphinx/\=build/html doc
 
 %check