Either I goofed with bzr or the patch has been applied backward :
# bzr diff -r-2..-1
=== modified file 'debian/changelog'
--- debian/changelog 2015-08-24 09:56:49 +0000
+++ debian/changelog 2016-01-29 16:56:25 +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 <m...@debian.org> 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
=== modified file 'debian/control'
--- debian/control 2013-05-16 18:09:24 +0000
+++ debian/control 2016-01-29 16:56:25 +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
=== modified file 'debian/squid-deb-proxy.init'
--- debian/squid-deb-proxy.init 2013-12-19 08:28:46 +0000
+++ debian/squid-deb-proxy.init 2016-01-29 16:56:25 +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"
=== modified file 'debian/squid-deb-proxy.logrotate'
--- debian/squid-deb-proxy.logrotate 2012-04-18 13:58:46 +0000
+++ debian/squid-deb-proxy.logrotate 2016-01-29 16:56:25 +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
=== modified file 'debian/squid-deb-proxy.upstart'
--- debian/squid-deb-proxy.upstart 2014-03-19 13:46:32 +0000
+++ debian/squid-deb-proxy.upstart 2016-01-29 16:56:25 +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
=== modified file 'init-common.sh'
--- init-common.sh 2014-12-17 12:27:25 +0000
+++ init-common.sh 2016-01-29 16:56:25 +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 '
=== modified file 'squid-deb-proxy.conf'
--- squid-deb-proxy.conf 2015-07-14 14:53:01 +0000
+++ squid-deb-proxy.conf 2016-01-29 16:56:25 +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
--
You received this bug notification because you are a member of Ubuntu
Server Team, which is subscribed to squid-deb-proxy in Ubuntu.
https://bugs.launchpad.net/bugs/1544719
Title:
does not start on install / depends on squid which is squid3
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/squid-deb-proxy/+bug/1544719/+subscriptions
--
Ubuntu-server-bugs mailing list
Ubuntu-server-bugs@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/ubuntu-server-bugs
