From a738a1f6e7001f4178976faba4f241f7935b4a32 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 26 Nov 2008 20:21:04 +0000
Subject: [PATCH] rename these files so as to avoid conflicts when users update
 their working copies and have unversioned files already in place

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@159571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/Makefile                    | 8 ++++----
 channels/{busy.h => busy_tone.h}     | 0
 channels/chan_alsa.c                 | 4 ++--
 channels/chan_oss.c                  | 4 ++--
 channels/{ringtone.h => ring_tone.h} | 0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename channels/{busy.h => busy_tone.h} (100%)
 rename channels/{ringtone.h => ring_tone.h} (100%)

diff --git a/channels/Makefile b/channels/Makefile
index e2cadfa131..8f067f6b02 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -94,11 +94,11 @@ gentone: gentone.c
 	$(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS)
 gentone: LIBS+=-lm
 
-busy.h:
-	./gentone busy 480 620
+busy_tone.h:
+	./gentone busy_tone 480 620
 
-ringtone.h:
-	./gentone ringtone 440 480
+ring_tone.h:
+	./gentone ring_tone 440 480
 
 $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o
 
diff --git a/channels/busy.h b/channels/busy_tone.h
similarity index 100%
rename from channels/busy.h
rename to channels/busy_tone.h
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index eae5b6fa52..c0e77c5a36 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -63,8 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/abstract_jb.h"
 #include "asterisk/musiconhold.h"
 
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index a4f373ad93..ac62f2005a 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -77,8 +77,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/musiconhold.h"
 
 /* ringtones we use */
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 
diff --git a/channels/ringtone.h b/channels/ring_tone.h
similarity index 100%
rename from channels/ringtone.h
rename to channels/ring_tone.h