Merge lp:~clint-fewbar/ubuntu/natty/squid/postinst-using-invoke-rc.d into lp:ubuntu/natty/squid

[Clint Byrum]

Changes postinst to call invoke-rc.d instead of 'restart', and uses stop/start to deal with the fact that restart does not reload the job config file.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 15:58:19 +0000
+++ debian/changelog	2011-03-08 14:02:55 +0000
@@ -1,3 +1,10 @@
+squid (2.7.STABLE9-2.1ubuntu4) UNRELEASED; urgency=low
+
+  * Simplify postinst script and use invoke-rc.d per policy. Also use
+    stop/start to make sure new job file is reloaded. (LP: #726348).
+
+ -- Clint Byrum <[e-mail]>  Tue, 08 Mar 2011 05:19:18 -0800
+
 squid (2.7.STABLE9-2.1ubuntu3) natty; urgency=low
 
   * Detect and deal with the situation where upstart has lost track of

=== modified file 'debian/postinst'
--- debian/postinst	2010-09-22 13:02:47 +0000
+++ debian/postinst	2011-03-08 14:02:55 +0000
@@ -183,20 +183,17 @@
 
 cd /
 
-if status squid | grep "start/running" > /dev/null; then
-	restart squid
-else
-	start squid
-fi
-
 if [ "$FIXLINES" = "false" ]; then
   echo "squid.conf contains 2.2.5 syntax - cache_dir directive - not starting "
   echo "Run 'dpkg-reconfigure -plow squid' to fix this automatically," 
   echo "or fix the 'cache_dir'-entry in your squid.conf manually." 
   echo "See documentation in /usr/share/doc/squid for nearer instructions."
 else
-  if status squid | grep "start/running" > /dev/null; then
-	restart squid
+  if [ -e "/etc/init/squid.conf" ] ; then
+    # Using stop/start because restart fails to reload the upstart job
+    # file. See LP: #707479.
+    invoke-rc.d squid stop || :
+    invoke-rc.d squid start
   fi
 fi