r2581 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 07:47:13 +0100 (Mon, 10 Mar 2008)
New Revision: 2581

Modified:
   branches/1.2/
   branches/1.2/debian/varnish.postinst
Log:
Merged revisions 2291 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2291 | ssm | 2007-12-11 08:02:24 +0100 (Tue, 11 Dec 2007) | 4 lines
  
  Debian packaging: Remove extra debhelper section in main postinst file, this
  was included by the debhelper tag as well, which resulted in a double startup
  entry, and an error on package installation.
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321-2327,2337,2358,2362-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2522-2524,2545,2563-2565,2569,2572,2575-2577
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317,2319,2321-2327,2337,2358,2362-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2522-2524,2545,2563-2565,2569,2572,2575-2577

Modified: branches/1.2/debian/varnish.postinst
===================================================================
--- branches/1.2/debian/varnish.postinst	2008-03-10 06:02:00 UTC (rev 2580)
+++ branches/1.2/debian/varnish.postinst	2008-03-10 06:47:13 UTC (rev 2581)
@@ -13,13 +13,3 @@
 varnish_create_storagedir
 
 #DEBHELPER#
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/varnish" ]; then
-	update-rc.d varnish defaults >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d varnish start || exit $?
-	else
-		/etc/init.d/varnish start || exit $?
-	fi
-fi
-# End automatically added section