Use etc/default.vcl instead of debian/vcl.conf

Register etc/zope-plone.vcl as an example configuration file

Typo patrol

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1430 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/debian/rules b/varnish-cache/debian/rules
index 1c011e1a323c3c231f0e723539951c32399da555..01c7e54565209e57480df48e1773bea882049c2a 100755 (executable)
--- a/varnish-cache/debian/rules
+++ b/varnish-cache/debian/rules
@@ -67,7 +67,7 @@ install: build
        dh_installdirs
 
        $(MAKE) install DESTDIR=$(CURDIR)/debian/varnish
-       install -m 644 $(CURDIR)/debian/vcl.conf $(CURDIR)/debian/varnish/etc/varnish/
+       install -m 644 $(CURDIR)/etc/default.vcl $(CURDIR)/debian/varnish/etc/varnish/
        install -m 644 $(CURDIR)/debian/lintian-override $(CURDIR)/debian/varnish/usr/share/lintian/overrides/varnish
 
 
@@ -81,9 +81,10 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs ChangeLog
        dh_installdocs
-       # Since varnish looses its cache on restart - we don't.
+       # Since varnish loses its cache on restart - we don't.
        dh_installinit -r
        dh_installman
+       dh_installexamples
        dh_link
        dh_strip
        dh_compress

diff --git a/varnish-cache/debian/varnish.examples b/varnish-cache/debian/varnish.examples
new file mode 100644 (file)
index 0000000..a916c59
--- /dev/null
+++ b/varnish-cache/debian/varnish.examples
@@ -0,0 +1 @@
+etc/zope-plone.vcl