diff -Nru varnish-3.0.5/debian/changelog varnish-3.0.5/debian/changelog --- varnish-3.0.5/debian/changelog 2014-03-24 17:13:33.000000000 +0000 +++ varnish-3.0.5/debian/changelog 2014-03-24 20:37:58.000000000 +0000 @@ -1,22 +1,20 @@ -varnish (3.0.5-1ubuntu2) trusty; urgency=medium +varnish (3.0.5-2) unstable; urgency=medium - * Add missing "needs-root" test restriction. + [ Mattia Rizzolo ] + * debian/varnish.init: Add a configtest action. + Thanks to Samuele Giovanni Tonon (Closes: #740002) (LP: #1284095) - -- Martin Pitt Mon, 24 Mar 2014 18:13:21 +0100 + [ Stig Sandbeck Mathisen ] + * debian/varnish.service: Test configuration before starting, add reload -varnish (3.0.5-1ubuntu1) trusty; urgency=low + [ Jonathan Davies ] + * debian/varnish.init: Use start-stop-daemon for status + * debian/varnish.init: Remove PID file on stop (Closes: #661602) - * Merge from Debian unstable (LP: #1285299). Remaining changes: - - debian/patches/aarch64-support.patch: dropped, incorporeted in Debian - differently. - - debian/varnish.init: - + add confingtest action (LP: #1284095, thanks Samuele Giovanni Tonon - for the patch). - + Remove PID file on stop (LP: #1014793, thanks Jonathan Davies for the - patch). - + Use start-stop-deamon to get status. + [ Martin Pitt ] + * Add missing "needs-root" test restriction to fix autopkgtest - -- Mattia Rizzolo Mon, 24 Feb 2014 19:57:58 +0100 + -- Stig Sandbeck Mathisen Mon, 24 Mar 2014 21:37:23 +0100 varnish (3.0.5-1) unstable; urgency=low @@ -35,19 +33,6 @@ -- Stig Sandbeck Mathisen Sun, 24 Nov 2013 18:55:59 +0100 -varnish (3.0.4-1ubuntu2) trusty; urgency=medium - - * Build using dh-autoreconf. - - -- Matthias Klose Mon, 30 Dec 2013 12:18:38 +0100 - -varnish (3.0.4-1ubuntu1) saucy; urgency=low - - * debian/patches/aarch64-support.patch: Add jemalloc definitions for - aarch64. - - -- William Grant Thu, 17 Oct 2013 01:41:42 +1100 - varnish (3.0.4-1) unstable; urgency=low [ Stig Sandbeck Mathisen ] @@ -532,4 +517,3 @@ * Initial release (Closes: #382451) -- Lars Bahner Fri, 6 Oct 2006 16:26:57 +0200 - diff -Nru varnish-3.0.5/debian/control varnish-3.0.5/debian/control --- varnish-3.0.5/debian/control 2014-03-05 07:54:00.000000000 +0000 +++ varnish-3.0.5/debian/control 2014-03-24 20:37:58.000000000 +0000 @@ -1,8 +1,7 @@ Source: varnish Section: web Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Varnish Package Maintainers +Maintainer: Varnish Package Maintainers Uploaders: Jan Wagner , Lars Bahner , diff -Nru varnish-3.0.5/debian/varnish.service varnish-3.0.5/debian/varnish.service --- varnish-3.0.5/debian/varnish.service 2013-12-02 14:06:51.000000000 +0000 +++ varnish-3.0.5/debian/varnish.service 2014-03-24 20:37:58.000000000 +0000 @@ -5,7 +5,9 @@ Type=forking LimitNOFILE=131072 LimitMEMLOCK=82000 +ExecStartPre=/usr/sbin/varnishd -C -f /etc/varnish/default.vcl ExecStart=/usr/sbin/varnishd -a :6081 -T localhost:6082 -f /etc/varnish/default.vcl -S /etc/varnish/secret -s malloc,256m +ExecReload=/usr/share/varnish/reload-vcl [Install] WantedBy=multi-user.target