[svn-commits] tilghman: branch 1.6.0 r135486 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Aug  4 12:12:44 2008
New Revision: 135486

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135486
Log:
Merged revisions 135485 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r135485 | tilghman | 2008-08-04 12:12:15 -0500 (Mon, 04 Aug 2008) | 3 lines

Rename Mandrake scripts to Mandriva
(Closes issue #13221)

........

Added:
    branches/1.6.0/contrib/init.d/rc.mandriva.asterisk
      - copied unchanged from r135485, trunk/contrib/init.d/rc.mandriva.asterisk
    branches/1.6.0/contrib/init.d/rc.mandriva.zaptel
      - copied unchanged from r135485, trunk/contrib/init.d/rc.mandriva.zaptel
Removed:
    branches/1.6.0/contrib/init.d/rc.mandrake.asterisk
    branches/1.6.0/contrib/init.d/rc.mandrake.zaptel
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.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=135486&r1=135485&r2=135486
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Aug  4 12:12:44 2008
@@ -778,7 +778,7 @@
 			$(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; \
 		elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
-			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+			$(INSTALL) -m 755 contrib/init.d/rc.mandriva.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \