Merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/fix-upstart-jobs into lp:ubuntu/natty/squid-deb-proxy

[Clint Byrum]

Fixes problems with boxes on wifi and restarting squid-deb-proxy.

[Bilal Akhtar (bilalakhtar)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-10 10:45:49 +0000
+++ debian/changelog	2010-11-19 00:54:09 +0000
@@ -1,3 +1,12 @@
+squid-deb-proxy (0.3.3) natty; urgency=low
+
+  * Adjusting upstart job so restarting squid-deb-proxy does not result
+    in killing squid-deb-proxy-avahi. (LP: #677276)
+  * Also adjusting upstart job so squid-deb-proxy does not get started
+    a real network interface is up and all local filesystems are mounted 
+
+ -- Clint Byrum <[e-mail]>  Thu, 18 Nov 2010 16:27:24 -0800
+
 squid-deb-proxy (0.3.2) natty; urgency=low
 
   [ Colin Dean ]

=== modified file 'debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart'
--- debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart	2010-11-10 10:45:49 +0000
+++ debian/squid-deb-proxy.squid-deb-proxy-avahi.upstart	2010-11-19 00:54:09 +0000
@@ -4,7 +4,7 @@
 description "squid-deb-proxy-avahi"
 
 start on (started squid-deb-proxy and started avahi-daemon)
-stop on stopping squid-deb-proxy
+stop on stopped squid-deb-proxy
 
 # get it back with 
 #     avahi-browse -prt _apt_proxy._tcp
@@ -13,4 +13,4 @@
   if [ -n "$PORT" ] && [ -x /usr/bin/avahi-publish ]; then
     exec avahi-publish -s "Squid deb proxy" _apt_proxy._tcp $PORT
   fi
-end script
\ No newline at end of file
+end script

=== modified file 'debian/squid-deb-proxy.upstart'
--- debian/squid-deb-proxy.upstart	2010-01-26 09:19:50 +0000
+++ debian/squid-deb-proxy.upstart	2010-11-19 00:54:09 +0000
@@ -11,8 +11,8 @@
   fi
 end script
 
-start on runlevel [2345]
+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
\ No newline at end of file
+exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf