[svn-commits] tilghman: branch 1.6.0 r213901 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Aug 24 21:42:32 2009
New Revision: 213901

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213901
Log:
Merged revisions 213900 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r213900 | tilghman | 2009-08-24 21:41:17 -0500 (Mon, 24 Aug 2009) | 11 lines
  
  Merged revisions 213899 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r213899 | tilghman | 2009-08-24 21:40:22 -0500 (Mon, 24 Aug 2009) | 4 lines
    
    Use the default runlevels for Debian derivatives, instead of making up our own.
    (closes issue #14730)
     Reported by: pkempgen
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/Makefile?view=diff&rev=213901&r1=213900&r2=213901
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Aug 24 21:42:32 2009
@@ -759,7 +759,7 @@
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/debian_version ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
-			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk defaults 50 91; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \