Merge branch 'master' into 4.0

.gitignore

@@ -28,3 +28,4 @@ Makefile.in
 
 /src/vcc_if.c
 /src/vcc_if.h
+/src/vmod_*rst

Makefile.am

@@ -7,6 +7,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 EXTRA_DIST = README.rst LICENSE vmod-example.spec debian
 
+doc_DATA = README.rst LICENSE
+
 dist_man_MANS = vmod_example.3
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 

debian/control

 Source: libvmod-example
 Section: web
 Priority: extra
-Maintainer: Lasse Karstensen <lkarsten@varnish-software.com>
-Build-Depends: debhelper (>= 7), build-essential, pkg-config, python-docutils, varnish (>= 4.0.2), libvarnishapi-dev (>= 4.0.2)
+Maintainer: Varnish Software <support@varnish-software.com>
+Build-Depends: debhelper (>= 7),
+ build-essential,
+ pkg-config,
+ python-docutils,
+ varnish (>= 4.0.2),
+ libvarnishapi-dev (>= 4.0.2)
 Standards-Version: 3.8.1
 Vcs-Git: git://github.com/varnish/libvmod-example.git
 
 Package: libvmod-example
 Architecture: any
-Depends: varnish (>= 4.0.2), ${misc:Depends}
+Depends: varnish (>= 4.0.2), ${misc:Depends}, ${Varnish:ABI}
 Description: Example vmod for Varnish

debian/docs

 README.rst
 LICENSE
-COPYING

src/Makefile.am

-AM_CPPFLAGS = @VMOD_INCLUDES@
+AM_CPPFLAGS = @VMOD_INCLUDES@ -Wall -Werror
 
 vmoddir = @VMOD_DIR@
 vmod_LTLIBRARIES = libvmod_example.la
@@ -21,6 +21,8 @@ $(top_srcdir)/src/tests/*.vtc:
 
 check: $(VMOD_TESTS)
 
-EXTRA_DIST = vmod_example.vcc $(VMOD_TESTS)
+EXTRA_DIST = \
+	vmod_example.vcc \
+	$(VMOD_TESTS)
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h

vmod-example.spec

@@ -20,22 +20,20 @@ Example VMOD
 
 %build
 %configure --prefix=/usr/
-make
-make check
+%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} check
 
 %install
-make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/usr/share/doc/%{name}/
-cp README.rst %{buildroot}/usr/share/doc/%{name}/
-cp LICENSE %{buildroot}/usr/share/doc/%{name}/
+[ %{buildroot} != "/" ] && %{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
 %clean
-rm -rf %{buildroot}
+[ %{buildroot} != "/" ] && %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %{_libdir}/varnis*/vmods/
-%doc /usr/share/doc/%{name}/*
+%doc /usr/share/doc/lib%{name}/*
 %{_mandir}/man?/*
 
 %changelog