Merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/no-expect-fork into lp:ubuntu/natty/squid-deb-proxy

[Clint Byrum]

Same fix that was applied to the main squid package's upstart job.

[Micah Gersten (micahg)]

Looks good, will upload shortly

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-19 00:49:51 +0000
+++ debian/changelog	2011-01-11 23:24:11 +0000
@@ -1,3 +1,10 @@
+squid-deb-proxy (0.3.4) natty; urgency=low
+
+  * Removing expect fork and passing -N to squid to prevent upstart
+    losing track of squid on reload (LP: #573853)
+
+ -- Clint Byrum <[e-mail]>  Tue, 11 Jan 2011 15:07:37 -0800
+
 squid-deb-proxy (0.3.3) natty; urgency=low
 
   * Adjusting upstart job so restarting squid-deb-proxy does not result

=== modified file 'debian/squid-deb-proxy.upstart'
--- debian/squid-deb-proxy.upstart	2010-11-19 00:49:51 +0000
+++ debian/squid-deb-proxy.upstart	2011-01-11 23:24:11 +0000
@@ -14,5 +14,4 @@
 start on (local-filesystems and net-device-up IFACE!=lo)
 stop on runlevel [!2345]
 
-expect fork
-exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf
+exec squid -N -f /etc/squid-deb-proxy/squid-deb-proxy.conf