diff -Nru squid-deb-proxy-0.8.13/debian/changelog squid-deb-proxy-0.8.14/debian/changelog --- squid-deb-proxy-0.8.13/debian/changelog 2015-08-24 09:56:27.000000000 +0000 +++ squid-deb-proxy-0.8.14/debian/changelog 2016-01-29 16:56:19.000000000 +0000 @@ -1,3 +1,10 @@ +squid-deb-proxy (0.8.14) unstable; urgency=medium + + * depend on squid3 instead of squid, thanks to + HIGUCHI Daisuke (VDR dai), closes: #813082 + + -- Michael Vogt Fri, 29 Jan 2016 17:55:43 +0100 + squid-deb-proxy (0.8.13) unstable; urgency=medium * add README.md to squid-deb-proxy install, thanks to diff -Nru squid-deb-proxy-0.8.13/debian/control squid-deb-proxy-0.8.14/debian/control --- squid-deb-proxy-0.8.13/debian/control 2014-09-10 13:28:47.000000000 +0000 +++ squid-deb-proxy-0.8.14/debian/control 2016-01-29 16:54:48.000000000 +0000 @@ -15,7 +15,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, - squid3 + squid Recommends: avahi-utils Description: Squid proxy configuration to optimize package downloads This package contains a Squid proxy configuration to manage a cache of diff -Nru squid-deb-proxy-0.8.13/debian/squid-deb-proxy.init squid-deb-proxy-0.8.14/debian/squid-deb-proxy.init --- squid-deb-proxy-0.8.13/debian/squid-deb-proxy.init 2014-09-10 13:28:47.000000000 +0000 +++ squid-deb-proxy-0.8.14/debian/squid-deb-proxy.init 2016-01-29 16:54:48.000000000 +0000 @@ -17,7 +17,7 @@ NAME=squid-deb-proxy DESC="Squid Deb HTTP Proxy" -DAEMON=/usr/sbin/squid3 +DAEMON=/usr/sbin/squid PIDFILE=/var/run/$NAME.pid CONFIG=/etc/squid-deb-proxy/squid-deb-proxy.conf SQUID_ARGS="-YC -f $CONFIG" diff -Nru squid-deb-proxy-0.8.13/debian/squid-deb-proxy.logrotate squid-deb-proxy-0.8.14/debian/squid-deb-proxy.logrotate --- squid-deb-proxy-0.8.13/debian/squid-deb-proxy.logrotate 2012-07-06 09:48:19.000000000 +0000 +++ squid-deb-proxy-0.8.14/debian/squid-deb-proxy.logrotate 2016-01-29 16:54:48.000000000 +0000 @@ -12,8 +12,6 @@ postrotate if [ -x /usr/sbin/squid ]; then SQUID=/usr/sbin/squid - elif [ -x /usr/sbin/squid3 ]; then - SQUID=/usr/sbin/squid3 else echo "No squid binary found" exit 1 diff -Nru squid-deb-proxy-0.8.13/debian/squid-deb-proxy.upstart squid-deb-proxy-0.8.14/debian/squid-deb-proxy.upstart --- squid-deb-proxy-0.8.13/debian/squid-deb-proxy.upstart 2015-05-27 07:04:18.000000000 +0000 +++ squid-deb-proxy-0.8.14/debian/squid-deb-proxy.upstart 2016-01-29 16:54:48.000000000 +0000 @@ -26,8 +26,6 @@ script if [ -x /usr/sbin/squid ]; then SQUID=/usr/sbin/squid - elif [ -x /usr/sbin/squid3 ]; then - SQUID=/usr/sbin/squid3 else echo "No squid binary found" exit 1 diff -Nru squid-deb-proxy-0.8.13/init-common.sh squid-deb-proxy-0.8.14/init-common.sh --- squid-deb-proxy-0.8.13/init-common.sh 2015-05-27 07:04:12.000000000 +0000 +++ squid-deb-proxy-0.8.14/init-common.sh 2016-01-29 16:54:48.000000000 +0000 @@ -24,8 +24,6 @@ pre_start() { if [ -x /usr/sbin/squid ]; then SQUID=/usr/sbin/squid - elif [ -x /usr/sbin/squid3 ]; then - SQUID=/usr/sbin/squid3 else echo "No squid binary found" exit 1 @@ -84,7 +82,7 @@ rm -f $AVAHIFILE } -# from the squid3 debian init script +# from the squid debian init script find_cache_dir () { w=" " # space tab res=`sed -ne ' diff -Nru squid-deb-proxy-0.8.13/squid-deb-proxy.conf squid-deb-proxy-0.8.14/squid-deb-proxy.conf --- squid-deb-proxy-0.8.13/squid-deb-proxy.conf 2015-07-14 14:51:32.000000000 +0000 +++ squid-deb-proxy-0.8.14/squid-deb-proxy.conf 2016-01-29 16:54:48.000000000 +0000 @@ -93,5 +93,5 @@ # And finally deny all other access to this proxy http_access deny all -# we don't want to clash with the squid3 netdb state file +# we don't want to clash with the squid netdb state file netdb_filename stdio:/var/log/squid-deb-proxy/netdb.state