[asterisk-commits] branch oej/test-this-branch r33009 - in
/team/oej/test-this-branch: ./ apps/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Jun 8 02:04:21 MST 2006
Author: oej
Date: Thu Jun 8 04:04:19 2006
New Revision: 33009
URL: http://svn.digium.com/view/asterisk?rev=33009&view=rev
Log:
Update, resolve conflicts
Added:
team/oej/test-this-branch/configs/followme.conf.sample
- copied unchanged from r32971, trunk/configs/followme.conf.sample
team/oej/test-this-branch/contrib/utils/zones2indications.c
- copied unchanged from r32971, trunk/contrib/utils/zones2indications.c
team/oej/test-this-branch/include/asterisk/autoconfig.h.in
- copied unchanged from r32971, trunk/include/asterisk/autoconfig.h.in
team/oej/test-this-branch/sounds/Makefile
- copied unchanged from r32971, trunk/sounds/Makefile
team/oej/test-this-branch/sounds/sounds.xml
- copied unchanged from r32971, trunk/sounds/sounds.xml
Removed:
team/oej/test-this-branch/include/autoconfig.h.in
team/oej/test-this-branch/sounds/agent-alreadyon.gsm
team/oej/test-this-branch/sounds/agent-incorrect.gsm
team/oej/test-this-branch/sounds/agent-loggedoff.gsm
team/oej/test-this-branch/sounds/agent-loginok.gsm
team/oej/test-this-branch/sounds/agent-newlocation.gsm
team/oej/test-this-branch/sounds/agent-pass.gsm
team/oej/test-this-branch/sounds/agent-user.gsm
team/oej/test-this-branch/sounds/auth-incorrect.gsm
team/oej/test-this-branch/sounds/auth-thankyou.gsm
team/oej/test-this-branch/sounds/beep.gsm
team/oej/test-this-branch/sounds/beeperr.gsm
team/oej/test-this-branch/sounds/conf-adminmenu.gsm
team/oej/test-this-branch/sounds/conf-enteringno.gsm
team/oej/test-this-branch/sounds/conf-errormenu.gsm
team/oej/test-this-branch/sounds/conf-getchannel.gsm
team/oej/test-this-branch/sounds/conf-getconfno.gsm
team/oej/test-this-branch/sounds/conf-getpin.gsm
team/oej/test-this-branch/sounds/conf-hasjoin.gsm
team/oej/test-this-branch/sounds/conf-hasleft.gsm
team/oej/test-this-branch/sounds/conf-invalid.gsm
team/oej/test-this-branch/sounds/conf-invalidpin.gsm
team/oej/test-this-branch/sounds/conf-kicked.gsm
team/oej/test-this-branch/sounds/conf-leaderhasleft.gsm
team/oej/test-this-branch/sounds/conf-locked.gsm
team/oej/test-this-branch/sounds/conf-lockednow.gsm
team/oej/test-this-branch/sounds/conf-muted.gsm
team/oej/test-this-branch/sounds/conf-noempty.gsm
team/oej/test-this-branch/sounds/conf-onlyone.gsm
team/oej/test-this-branch/sounds/conf-onlyperson.gsm
team/oej/test-this-branch/sounds/conf-otherinparty.gsm
team/oej/test-this-branch/sounds/conf-placeintoconf.gsm
team/oej/test-this-branch/sounds/conf-thereare.gsm
team/oej/test-this-branch/sounds/conf-unlockednow.gsm
team/oej/test-this-branch/sounds/conf-unmuted.gsm
team/oej/test-this-branch/sounds/conf-usermenu.gsm
team/oej/test-this-branch/sounds/conf-userswilljoin.gsm
team/oej/test-this-branch/sounds/conf-userwilljoin.gsm
team/oej/test-this-branch/sounds/conf-waitforleader.gsm
team/oej/test-this-branch/sounds/demo-abouttotry.gsm
team/oej/test-this-branch/sounds/demo-congrats.gsm
team/oej/test-this-branch/sounds/demo-echodone.gsm
team/oej/test-this-branch/sounds/demo-echotest.gsm
team/oej/test-this-branch/sounds/demo-enterkeywords.gsm
team/oej/test-this-branch/sounds/demo-instruct.gsm
team/oej/test-this-branch/sounds/demo-moreinfo.gsm
team/oej/test-this-branch/sounds/demo-nogo.gsm
team/oej/test-this-branch/sounds/demo-nomatch.gsm
team/oej/test-this-branch/sounds/demo-thanks.gsm
team/oej/test-this-branch/sounds/dictate/
team/oej/test-this-branch/sounds/digits/
team/oej/test-this-branch/sounds/dir-instr.gsm
team/oej/test-this-branch/sounds/dir-intro-fn.gsm
team/oej/test-this-branch/sounds/dir-intro.gsm
team/oej/test-this-branch/sounds/dir-nomatch.gsm
team/oej/test-this-branch/sounds/dir-nomore.gsm
team/oej/test-this-branch/sounds/fpm-calm-river.mp3
team/oej/test-this-branch/sounds/fpm-sunshine.mp3
team/oej/test-this-branch/sounds/fpm-world-mix.mp3
team/oej/test-this-branch/sounds/hello-world.gsm
team/oej/test-this-branch/sounds/hours.gsm
team/oej/test-this-branch/sounds/invalid.gsm
team/oej/test-this-branch/sounds/letters/
team/oej/test-this-branch/sounds/minutes.gsm
team/oej/test-this-branch/sounds/pbx-invalid.gsm
team/oej/test-this-branch/sounds/pbx-invalidpark.gsm
team/oej/test-this-branch/sounds/pbx-transfer.gsm
team/oej/test-this-branch/sounds/phonetic/
team/oej/test-this-branch/sounds/priv-callee-options.gsm
team/oej/test-this-branch/sounds/priv-callpending.gsm
team/oej/test-this-branch/sounds/priv-introsaved.gsm
team/oej/test-this-branch/sounds/priv-recordintro.gsm
team/oej/test-this-branch/sounds/privacy-incorrect.gsm
team/oej/test-this-branch/sounds/privacy-prompt.gsm
team/oej/test-this-branch/sounds/privacy-thankyou.gsm
team/oej/test-this-branch/sounds/privacy-unident.gsm
team/oej/test-this-branch/sounds/queue-callswaiting.gsm
team/oej/test-this-branch/sounds/queue-holdtime.gsm
team/oej/test-this-branch/sounds/queue-less-than.gsm
team/oej/test-this-branch/sounds/queue-minutes.gsm
team/oej/test-this-branch/sounds/queue-periodic-announce.gsm
team/oej/test-this-branch/sounds/queue-reporthold.gsm
team/oej/test-this-branch/sounds/queue-seconds.gsm
team/oej/test-this-branch/sounds/queue-thankyou.gsm
team/oej/test-this-branch/sounds/queue-thereare.gsm
team/oej/test-this-branch/sounds/queue-youarenext.gsm
team/oej/test-this-branch/sounds/screen-callee-options.gsm
team/oej/test-this-branch/sounds/seconds.gsm
team/oej/test-this-branch/sounds/spy-agent.gsm
team/oej/test-this-branch/sounds/spy-h323.gsm
team/oej/test-this-branch/sounds/spy-iax.gsm
team/oej/test-this-branch/sounds/spy-iax2.gsm
team/oej/test-this-branch/sounds/spy-mgcp.gsm
team/oej/test-this-branch/sounds/spy-sip.gsm
team/oej/test-this-branch/sounds/spy-skinny.gsm
team/oej/test-this-branch/sounds/spy-zap.gsm
team/oej/test-this-branch/sounds/ss-noservice.gsm
team/oej/test-this-branch/sounds/transfer.gsm
team/oej/test-this-branch/sounds/tt-allbusy.gsm
team/oej/test-this-branch/sounds/tt-monkeys.gsm
team/oej/test-this-branch/sounds/tt-monkeysintro.gsm
team/oej/test-this-branch/sounds/tt-somethingwrong.gsm
team/oej/test-this-branch/sounds/tt-weasels.gsm
team/oej/test-this-branch/sounds/vm-Cust1.gsm
team/oej/test-this-branch/sounds/vm-Cust2.gsm
team/oej/test-this-branch/sounds/vm-Cust3.gsm
team/oej/test-this-branch/sounds/vm-Cust4.gsm
team/oej/test-this-branch/sounds/vm-Cust5.gsm
team/oej/test-this-branch/sounds/vm-Family.gsm
team/oej/test-this-branch/sounds/vm-Friends.gsm
team/oej/test-this-branch/sounds/vm-INBOX.gsm
team/oej/test-this-branch/sounds/vm-Old.gsm
team/oej/test-this-branch/sounds/vm-Work.gsm
team/oej/test-this-branch/sounds/vm-advopts.gsm
team/oej/test-this-branch/sounds/vm-and.gsm
team/oej/test-this-branch/sounds/vm-calldiffnum.gsm
team/oej/test-this-branch/sounds/vm-changeto.gsm
team/oej/test-this-branch/sounds/vm-delete.gsm
team/oej/test-this-branch/sounds/vm-deleted.gsm
team/oej/test-this-branch/sounds/vm-dialout.gsm
team/oej/test-this-branch/sounds/vm-enter-num-to-call.gsm
team/oej/test-this-branch/sounds/vm-extension.gsm
team/oej/test-this-branch/sounds/vm-first.gsm
team/oej/test-this-branch/sounds/vm-for.gsm
team/oej/test-this-branch/sounds/vm-forward.gsm
team/oej/test-this-branch/sounds/vm-forwardoptions.gsm
team/oej/test-this-branch/sounds/vm-from-extension.gsm
team/oej/test-this-branch/sounds/vm-from-phonenumber.gsm
team/oej/test-this-branch/sounds/vm-from.gsm
team/oej/test-this-branch/sounds/vm-goodbye.gsm
team/oej/test-this-branch/sounds/vm-helpexit.gsm
team/oej/test-this-branch/sounds/vm-incorrect-mailbox.gsm
team/oej/test-this-branch/sounds/vm-incorrect.gsm
team/oej/test-this-branch/sounds/vm-instructions.gsm
team/oej/test-this-branch/sounds/vm-intro.gsm
team/oej/test-this-branch/sounds/vm-isonphone.gsm
team/oej/test-this-branch/sounds/vm-isunavail.gsm
team/oej/test-this-branch/sounds/vm-last.gsm
team/oej/test-this-branch/sounds/vm-leavemsg.gsm
team/oej/test-this-branch/sounds/vm-login.gsm
team/oej/test-this-branch/sounds/vm-mailboxfull.gsm
team/oej/test-this-branch/sounds/vm-message.gsm
team/oej/test-this-branch/sounds/vm-messages.gsm
team/oej/test-this-branch/sounds/vm-minutes.gsm
team/oej/test-this-branch/sounds/vm-mismatch.gsm
team/oej/test-this-branch/sounds/vm-msginstruct.gsm
team/oej/test-this-branch/sounds/vm-msgsaved.gsm
team/oej/test-this-branch/sounds/vm-newpassword.gsm
team/oej/test-this-branch/sounds/vm-newuser.gsm
team/oej/test-this-branch/sounds/vm-next.gsm
team/oej/test-this-branch/sounds/vm-no.gsm
team/oej/test-this-branch/sounds/vm-nobodyavail.gsm
team/oej/test-this-branch/sounds/vm-nobox.gsm
team/oej/test-this-branch/sounds/vm-nomore.gsm
team/oej/test-this-branch/sounds/vm-nonumber.gsm
team/oej/test-this-branch/sounds/vm-num-i-have.gsm
team/oej/test-this-branch/sounds/vm-onefor.gsm
team/oej/test-this-branch/sounds/vm-options.gsm
team/oej/test-this-branch/sounds/vm-opts.gsm
team/oej/test-this-branch/sounds/vm-passchanged.gsm
team/oej/test-this-branch/sounds/vm-password.gsm
team/oej/test-this-branch/sounds/vm-press.gsm
team/oej/test-this-branch/sounds/vm-prev.gsm
team/oej/test-this-branch/sounds/vm-reachoper.gsm
team/oej/test-this-branch/sounds/vm-rec-busy.gsm
team/oej/test-this-branch/sounds/vm-rec-name.gsm
team/oej/test-this-branch/sounds/vm-rec-temp.gsm
team/oej/test-this-branch/sounds/vm-rec-unv.gsm
team/oej/test-this-branch/sounds/vm-received.gsm
team/oej/test-this-branch/sounds/vm-reenterpassword.gsm
team/oej/test-this-branch/sounds/vm-repeat.gsm
team/oej/test-this-branch/sounds/vm-review.gsm
team/oej/test-this-branch/sounds/vm-saved.gsm
team/oej/test-this-branch/sounds/vm-savedto.gsm
team/oej/test-this-branch/sounds/vm-savefolder.gsm
team/oej/test-this-branch/sounds/vm-savemessage.gsm
team/oej/test-this-branch/sounds/vm-saveoper.gsm
team/oej/test-this-branch/sounds/vm-sorry.gsm
team/oej/test-this-branch/sounds/vm-star-cancel.gsm
team/oej/test-this-branch/sounds/vm-starmain.gsm
team/oej/test-this-branch/sounds/vm-tempgreetactive.gsm
team/oej/test-this-branch/sounds/vm-tempgreeting.gsm
team/oej/test-this-branch/sounds/vm-tempgreeting2.gsm
team/oej/test-this-branch/sounds/vm-tempremoved.gsm
team/oej/test-this-branch/sounds/vm-then-pound.gsm
team/oej/test-this-branch/sounds/vm-theperson.gsm
team/oej/test-this-branch/sounds/vm-tocallback.gsm
team/oej/test-this-branch/sounds/vm-tocallnum.gsm
team/oej/test-this-branch/sounds/vm-tocancel.gsm
team/oej/test-this-branch/sounds/vm-tocancelmsg.gsm
team/oej/test-this-branch/sounds/vm-toenternumber.gsm
team/oej/test-this-branch/sounds/vm-toforward.gsm
team/oej/test-this-branch/sounds/vm-tohearenv.gsm
team/oej/test-this-branch/sounds/vm-tomakecall.gsm
team/oej/test-this-branch/sounds/vm-tooshort.gsm
team/oej/test-this-branch/sounds/vm-toreply.gsm
team/oej/test-this-branch/sounds/vm-torerecord.gsm
team/oej/test-this-branch/sounds/vm-undelete.gsm
team/oej/test-this-branch/sounds/vm-undeleted.gsm
team/oej/test-this-branch/sounds/vm-unknown-caller.gsm
team/oej/test-this-branch/sounds/vm-whichbox.gsm
team/oej/test-this-branch/sounds/vm-youhave.gsm
Modified:
team/oej/test-this-branch/ (props changed)
team/oej/test-this-branch/CREDITS
team/oej/test-this-branch/Makefile
team/oej/test-this-branch/abstract_jb.c
team/oej/test-this-branch/acl.c
team/oej/test-this-branch/app.c
team/oej/test-this-branch/apps/Makefile
team/oej/test-this-branch/apps/app_adsiprog.c
team/oej/test-this-branch/apps/app_alarmreceiver.c
team/oej/test-this-branch/apps/app_amd.c
team/oej/test-this-branch/apps/app_authenticate.c
team/oej/test-this-branch/apps/app_cdr.c
team/oej/test-this-branch/apps/app_chanisavail.c
team/oej/test-this-branch/apps/app_channelredirect.c
team/oej/test-this-branch/apps/app_chanspy.c
team/oej/test-this-branch/apps/app_controlplayback.c
team/oej/test-this-branch/apps/app_db.c
team/oej/test-this-branch/apps/app_dial.c
team/oej/test-this-branch/apps/app_dictate.c
team/oej/test-this-branch/apps/app_directed_pickup.c
team/oej/test-this-branch/apps/app_directory.c
team/oej/test-this-branch/apps/app_disa.c
team/oej/test-this-branch/apps/app_dumpchan.c
team/oej/test-this-branch/apps/app_echo.c
team/oej/test-this-branch/apps/app_exec.c
team/oej/test-this-branch/apps/app_externalivr.c
team/oej/test-this-branch/apps/app_festival.c
team/oej/test-this-branch/apps/app_flash.c
team/oej/test-this-branch/apps/app_followme.c
team/oej/test-this-branch/apps/app_forkcdr.c
team/oej/test-this-branch/apps/app_getcpeid.c
team/oej/test-this-branch/apps/app_hasnewvoicemail.c
team/oej/test-this-branch/apps/app_ices.c
team/oej/test-this-branch/apps/app_image.c
team/oej/test-this-branch/apps/app_ivrdemo.c
team/oej/test-this-branch/apps/app_lookupblacklist.c
team/oej/test-this-branch/apps/app_lookupcidname.c
team/oej/test-this-branch/apps/app_macro.c
team/oej/test-this-branch/apps/app_meetme.c
team/oej/test-this-branch/apps/app_milliwatt.c
team/oej/test-this-branch/apps/app_mixmonitor.c
team/oej/test-this-branch/apps/app_morsecode.c
team/oej/test-this-branch/apps/app_mp3.c
team/oej/test-this-branch/apps/app_nbscat.c
team/oej/test-this-branch/apps/app_osplookup.c
team/oej/test-this-branch/apps/app_page.c
team/oej/test-this-branch/apps/app_parkandannounce.c
team/oej/test-this-branch/apps/app_playback.c
team/oej/test-this-branch/apps/app_privacy.c
team/oej/test-this-branch/apps/app_queue.c
team/oej/test-this-branch/apps/app_random.c
team/oej/test-this-branch/apps/app_read.c
team/oej/test-this-branch/apps/app_readfile.c
team/oej/test-this-branch/apps/app_realtime.c
team/oej/test-this-branch/apps/app_record.c
team/oej/test-this-branch/apps/app_sayunixtime.c
team/oej/test-this-branch/apps/app_senddtmf.c
team/oej/test-this-branch/apps/app_sendtext.c
team/oej/test-this-branch/apps/app_setcallerid.c
team/oej/test-this-branch/apps/app_setcdruserfield.c
team/oej/test-this-branch/apps/app_settransfercapability.c
team/oej/test-this-branch/apps/app_skel.c
team/oej/test-this-branch/apps/app_sms.c
team/oej/test-this-branch/apps/app_softhangup.c
team/oej/test-this-branch/apps/app_speech_utils.c
team/oej/test-this-branch/apps/app_stack.c
team/oej/test-this-branch/apps/app_system.c
team/oej/test-this-branch/apps/app_talkdetect.c
team/oej/test-this-branch/apps/app_test.c
team/oej/test-this-branch/apps/app_transfer.c
team/oej/test-this-branch/apps/app_url.c
team/oej/test-this-branch/apps/app_userevent.c
team/oej/test-this-branch/apps/app_verbose.c
team/oej/test-this-branch/apps/app_voicemail.c
team/oej/test-this-branch/apps/app_waitforring.c
team/oej/test-this-branch/apps/app_waitforsilence.c
team/oej/test-this-branch/apps/app_while.c
team/oej/test-this-branch/apps/app_zapateller.c
team/oej/test-this-branch/apps/app_zapbarge.c
team/oej/test-this-branch/apps/app_zapras.c
team/oej/test-this-branch/apps/app_zapscan.c
team/oej/test-this-branch/ast_expr2.c
team/oej/test-this-branch/ast_expr2.fl
team/oej/test-this-branch/ast_expr2.y
team/oej/test-this-branch/ast_expr2f.c
team/oej/test-this-branch/asterisk.c
team/oej/test-this-branch/astmm.c
team/oej/test-this-branch/autoservice.c
team/oej/test-this-branch/build_tools/cflags.xml
team/oej/test-this-branch/build_tools/menuselect.c
team/oej/test-this-branch/build_tools/menuselect_curses.c
team/oej/test-this-branch/build_tools/prep_moduledeps
team/oej/test-this-branch/callerid.c
team/oej/test-this-branch/cdr.c
team/oej/test-this-branch/cdr/Makefile
team/oej/test-this-branch/cdr/cdr_csv.c
team/oej/test-this-branch/cdr/cdr_custom.c
team/oej/test-this-branch/cdr/cdr_manager.c
team/oej/test-this-branch/cdr/cdr_odbc.c
team/oej/test-this-branch/cdr/cdr_pgsql.c
team/oej/test-this-branch/cdr/cdr_radius.c
team/oej/test-this-branch/cdr/cdr_sqlite.c
team/oej/test-this-branch/cdr/cdr_tds.c
team/oej/test-this-branch/channel.c
team/oej/test-this-branch/channels/Makefile
team/oej/test-this-branch/channels/chan_agent.c
team/oej/test-this-branch/channels/chan_alsa.c
team/oej/test-this-branch/channels/chan_features.c
team/oej/test-this-branch/channels/chan_h323.c
team/oej/test-this-branch/channels/chan_iax2.c
team/oej/test-this-branch/channels/chan_jingle.c
team/oej/test-this-branch/channels/chan_local.c
team/oej/test-this-branch/channels/chan_mgcp.c
team/oej/test-this-branch/channels/chan_misdn.c
team/oej/test-this-branch/channels/chan_nbs.c
team/oej/test-this-branch/channels/chan_oss.c
team/oej/test-this-branch/channels/chan_phone.c
team/oej/test-this-branch/channels/chan_sip.c
team/oej/test-this-branch/channels/chan_skinny.c
team/oej/test-this-branch/channels/chan_vpb.c
team/oej/test-this-branch/channels/chan_zap.c
team/oej/test-this-branch/channels/iax2-parser.c
team/oej/test-this-branch/channels/iax2-provision.c
team/oej/test-this-branch/channels/misdn/isdn_lib.c
team/oej/test-this-branch/channels/misdn_config.c
team/oej/test-this-branch/chanvars.c
team/oej/test-this-branch/cli.c
team/oej/test-this-branch/codecs/Makefile
team/oej/test-this-branch/codecs/codec_a_mu.c
team/oej/test-this-branch/codecs/codec_adpcm.c
team/oej/test-this-branch/codecs/codec_alaw.c
team/oej/test-this-branch/codecs/codec_g723_1.c
team/oej/test-this-branch/codecs/codec_g726.c
team/oej/test-this-branch/codecs/codec_gsm.c
team/oej/test-this-branch/codecs/codec_ilbc.c
team/oej/test-this-branch/codecs/codec_lpc10.c
team/oej/test-this-branch/codecs/codec_speex.c
team/oej/test-this-branch/codecs/codec_ulaw.c
team/oej/test-this-branch/config.c
team/oej/test-this-branch/configs/extensions.conf.sample
team/oej/test-this-branch/configs/indications.conf.sample
team/oej/test-this-branch/configs/jabber.conf.sample
team/oej/test-this-branch/configs/musiconhold.conf.sample
team/oej/test-this-branch/configs/rtp.conf.sample
team/oej/test-this-branch/configure
team/oej/test-this-branch/configure.ac
team/oej/test-this-branch/cryptostub.c
team/oej/test-this-branch/db.c
team/oej/test-this-branch/devicestate.c
team/oej/test-this-branch/dns.c
team/oej/test-this-branch/dnsmgr.c
team/oej/test-this-branch/doc/smdi.txt
team/oej/test-this-branch/dsp.c
team/oej/test-this-branch/enum.c
team/oej/test-this-branch/file.c
team/oej/test-this-branch/fixedjitterbuf.c
team/oej/test-this-branch/formats/Makefile
team/oej/test-this-branch/formats/format_g723.c
team/oej/test-this-branch/formats/format_g726.c
team/oej/test-this-branch/formats/format_g729.c
team/oej/test-this-branch/formats/format_gsm.c
team/oej/test-this-branch/formats/format_h263.c
team/oej/test-this-branch/formats/format_h264.c
team/oej/test-this-branch/formats/format_ilbc.c
team/oej/test-this-branch/formats/format_jpeg.c
team/oej/test-this-branch/formats/format_ogg_vorbis.c
team/oej/test-this-branch/formats/format_pcm.c
team/oej/test-this-branch/formats/format_sln.c
team/oej/test-this-branch/formats/format_vox.c
team/oej/test-this-branch/formats/format_wav.c
team/oej/test-this-branch/formats/format_wav_gsm.c
team/oej/test-this-branch/frame.c
team/oej/test-this-branch/fskmodem.c
team/oej/test-this-branch/funcs/Makefile
team/oej/test-this-branch/funcs/func_base64.c
team/oej/test-this-branch/funcs/func_callerid.c
team/oej/test-this-branch/funcs/func_cdr.c
team/oej/test-this-branch/funcs/func_channel.c
team/oej/test-this-branch/funcs/func_curl.c
team/oej/test-this-branch/funcs/func_cut.c
team/oej/test-this-branch/funcs/func_db.c
team/oej/test-this-branch/funcs/func_enum.c
team/oej/test-this-branch/funcs/func_env.c
team/oej/test-this-branch/funcs/func_global.c
team/oej/test-this-branch/funcs/func_groupcount.c
team/oej/test-this-branch/funcs/func_language.c
team/oej/test-this-branch/funcs/func_logic.c
team/oej/test-this-branch/funcs/func_math.c
team/oej/test-this-branch/funcs/func_md5.c
team/oej/test-this-branch/funcs/func_moh.c
team/oej/test-this-branch/funcs/func_odbc.c
team/oej/test-this-branch/funcs/func_rand.c
team/oej/test-this-branch/funcs/func_realtime.c
team/oej/test-this-branch/funcs/func_sha1.c
team/oej/test-this-branch/funcs/func_strings.c
team/oej/test-this-branch/funcs/func_timeout.c
team/oej/test-this-branch/funcs/func_uri.c
team/oej/test-this-branch/http.c
team/oej/test-this-branch/image.c
team/oej/test-this-branch/include/ (props changed)
team/oej/test-this-branch/include/asterisk/ (props changed)
team/oej/test-this-branch/include/asterisk.h
team/oej/test-this-branch/include/asterisk/alaw.h
team/oej/test-this-branch/include/asterisk/astmm.h
team/oej/test-this-branch/include/asterisk/callerid.h
team/oej/test-this-branch/include/asterisk/channel.h
team/oej/test-this-branch/include/asterisk/dnsmgr.h
team/oej/test-this-branch/include/asterisk/file.h
team/oej/test-this-branch/include/asterisk/frame.h
team/oej/test-this-branch/include/asterisk/jabber.h
team/oej/test-this-branch/include/asterisk/linkedlists.h
team/oej/test-this-branch/include/asterisk/rtp.h
team/oej/test-this-branch/include/asterisk/stringfields.h
team/oej/test-this-branch/include/asterisk/translate.h
team/oej/test-this-branch/include/asterisk/ulaw.h
team/oej/test-this-branch/indications.c
team/oej/test-this-branch/io.c
team/oej/test-this-branch/jitterbuf.c
team/oej/test-this-branch/loader.c
team/oej/test-this-branch/logger.c
team/oej/test-this-branch/manager.c
team/oej/test-this-branch/md5.c
team/oej/test-this-branch/netsock.c
team/oej/test-this-branch/pbx.c
team/oej/test-this-branch/pbx/Makefile
team/oej/test-this-branch/pbx/ael/ael.flex
team/oej/test-this-branch/pbx/ael/ael.tab.c
team/oej/test-this-branch/pbx/ael/ael.y
team/oej/test-this-branch/pbx/ael/ael_lex.c
team/oej/test-this-branch/pbx/dundi-parser.c
team/oej/test-this-branch/pbx/pbx_ael.c
team/oej/test-this-branch/pbx/pbx_config.c
team/oej/test-this-branch/pbx/pbx_dundi.c
team/oej/test-this-branch/pbx/pbx_gtkconsole.c
team/oej/test-this-branch/pbx/pbx_loopback.c
team/oej/test-this-branch/pbx/pbx_realtime.c
team/oej/test-this-branch/pbx/pbx_spool.c
team/oej/test-this-branch/plc.c
team/oej/test-this-branch/privacy.c
team/oej/test-this-branch/res/Makefile
team/oej/test-this-branch/res/res_adsi.c
team/oej/test-this-branch/res/res_agi.c
team/oej/test-this-branch/res/res_clioriginate.c
team/oej/test-this-branch/res/res_config_odbc.c
team/oej/test-this-branch/res/res_config_pgsql.c
team/oej/test-this-branch/res/res_convert.c
team/oej/test-this-branch/res/res_crypto.c
team/oej/test-this-branch/res/res_features.c
team/oej/test-this-branch/res/res_indications.c
team/oej/test-this-branch/res/res_jabber.c
team/oej/test-this-branch/res/res_monitor.c
team/oej/test-this-branch/res/res_musiconhold.c
team/oej/test-this-branch/res/res_odbc.c
team/oej/test-this-branch/res/res_osp.c
team/oej/test-this-branch/res/res_smdi.c
team/oej/test-this-branch/res/res_snmp.c
team/oej/test-this-branch/res/res_speech.c
team/oej/test-this-branch/rtp.c
team/oej/test-this-branch/say.c
team/oej/test-this-branch/sched.c
team/oej/test-this-branch/slinfactory.c
team/oej/test-this-branch/sounds/ (props changed)
team/oej/test-this-branch/srv.c
team/oej/test-this-branch/stdtime/localtime.c
team/oej/test-this-branch/strcompat.c
team/oej/test-this-branch/tdd.c
team/oej/test-this-branch/term.c
team/oej/test-this-branch/translate.c
team/oej/test-this-branch/udptl.c
team/oej/test-this-branch/utils.c
team/oej/test-this-branch/utils/Makefile
team/oej/test-this-branch/utils/ael_main.c
team/oej/test-this-branch/utils/astman.c
team/oej/test-this-branch/utils/smsq.c
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 8 04:04:19 2006
@@ -1,1 +1,1 @@
-/trunk:1-31635
+/trunk:1-32988
Modified: team/oej/test-this-branch/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/CREDITS?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/CREDITS (original)
+++ team/oej/test-this-branch/CREDITS Thu Jun 8 04:04:19 2006
@@ -117,6 +117,12 @@
Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
roy at karlsbakk.net, Briiz Telecom AS
+Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+
+Philippe Sultan - RADIUS CDR module
+ INRIA, http://www.inria.fr/
+
+John Martin, Aupix - Improved video support in the SIP channel
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/oej/test-this-branch/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/Makefile?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/Makefile (original)
+++ team/oej/test-this-branch/Makefile Thu Jun 8 04:04:19 2006
@@ -13,6 +13,8 @@
.EXPORT_ALL_VARIABLES:
+.PHONY: sounds
+
# Create OPTIONS variable
OPTIONS=
@@ -36,22 +38,6 @@
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
- # Stack backtraces, while useful for debugging, are incompatible with optimizations
- ifeq (${OSARCH},Linux)
- CFLAGS+=-DSTACK_BACKTRACES
- endif
-endif
# Overwite config files on "make samples"
OVERWRITE=y
@@ -151,9 +137,32 @@
include makeopts
endif
-TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
-OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+ ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions. This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.
+#K6OPT = -DK6OPT
+
+# Tell gcc to optimize the code
+OPTIMIZE+=-O6
+ else
+ # Stack backtraces, while useful for debugging, are incompatible with optimizations
+ ifeq (${OSARCH},Linux)
+ CFLAGS+=-DSTACK_BACKTRACES
+ endif
+ endif
+else
+ # Stack backtraces, while useful for debugging, are incompatible with optimizations
+ ifeq (${OSARCH},Linux)
+ CFLAGS+=-DSTACK_BACKTRACES
+ endif
+endif
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
@@ -195,7 +204,6 @@
endif
endif
endif
- MPG123TARG=linux
endif
GREP=grep
@@ -238,12 +246,10 @@
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
endif
- MPG123TARG=freebsd
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
- MPG123TARG=netbsd
endif
ifeq ($(OSARCH),OpenBSD)
@@ -516,19 +522,19 @@
rm -f include/asterisk/version.h
rm -f .tags-sources tags TAGS
@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
- @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
$(MAKE) -C db1-ast clean
$(MAKE) -C stdtime clean
distclean: dist-clean
dist-clean: clean
+ $(MAKE) -C mxml clean
+ $(MAKE) -C build_tools dist-clean
+ $(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts makeopts.xml
rm -f config.log config.status
rm -f include/autoconfig.h
rm -f include/asterisk/buildopts.h
- $(MAKE) -C mxml clean
- $(MAKE) -C build_tools dist-clean
datafiles: all
if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -539,57 +545,12 @@
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
- for x in sounds/digits/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
- for x in sounds/dictate/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
- for x in sounds/letters/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
- for x in sounds/phonetic/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
mkdir -p $(DESTDIR)$(ASTDATADIR)/images
for x in images/*.jpg; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
done
mkdir -p $(DESTDIR)$(AGI_DIR)
+ $(MAKE) -C sounds install
update:
@if [ -d .svn ]; then \
@@ -641,11 +602,11 @@
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+ $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
@@ -663,7 +624,6 @@
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
install-subdirs:
@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
@@ -776,20 +736,6 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
- for x in sounds/demo-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
- mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- for x in sounds/*.mp3; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
- done
- rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -843,12 +789,6 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
-
-mpg123:
- @wget -V >/dev/null || (echo "You need wget" ; false )
- [ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
- [ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
- $(MAKE) -C mpg123-0.59r $(MPG123TARG)
config:
@if [ "${OSARCH}" = "Linux" ]; then \
@@ -918,6 +858,9 @@
%_env:
$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+
+sounds:
+ $(MAKE) -C sounds all
env:
env
@@ -991,10 +934,10 @@
rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
rm -rf $(DESTDIR)$(ASTHEADERDIR)
- rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
rm -rf $(DESTDIR)$(ASTMANDIR)/man8
for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+ $(MAKE) -C sounds uninstall
uninstall: _uninstall
@echo " +--------- Asterisk Uninstall Complete -----+"
@@ -1028,6 +971,6 @@
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
@echo "Generating list of available modules ..."
@build_tools/prep_moduledeps > $@
Modified: team/oej/test-this-branch/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/abstract_jb.c?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/abstract_jb.c (original)
+++ team/oej/test-this-branch/abstract_jb.c Thu Jun 8 04:04:19 2006
@@ -26,13 +26,13 @@
* \author Slav Klenov <slav at securax.org>
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/frame.h"
#include "asterisk/channel.h"
Modified: team/oej/test-this-branch/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/acl.c?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/acl.c (original)
+++ team/oej/test-this-branch/acl.c Thu Jun 8 04:04:19 2006
@@ -22,6 +22,10 @@
*
* \author Mark Spencer <markster at digium.com>
*/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <stdio.h>
#include <stdlib.h>
@@ -58,10 +62,6 @@
#define IPTOS_MINCOST IPTOS_LOWCOST
#endif
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
#include "asterisk/acl.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
@@ -69,7 +69,6 @@
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/srv.h"
-#include "asterisk/compat.h"
struct ast_ha {
/* Host access rule */
Modified: team/oej/test-this-branch/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/app.c?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/app.c (original)
+++ team/oej/test-this-branch/app.c Thu Jun 8 04:04:19 2006
@@ -23,6 +23,10 @@
* \author Mark Spencer <markster at digium.com>
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,10 +38,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <regex.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
Modified: team/oej/test-this-branch/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/Makefile?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/Makefile (original)
+++ team/oej/test-this-branch/apps/Makefile Thu Jun 8 04:04:19 2006
@@ -11,7 +11,9 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
+include ../menuselect.makeopts
+
+SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
# If you have UnixODBC you can use ODBC voicemail
# storage
@@ -21,6 +23,8 @@
# Uncomment for extended ODBC voicemail storage
#CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: $(MODS)
Modified: team/oej/test-this-branch/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/app_adsiprog.c?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/app_adsiprog.c (original)
+++ team/oej/test-this-branch/apps/app_adsiprog.c Thu Jun 8 04:04:19 2006
@@ -25,6 +25,10 @@
* \ingroup applications
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <sys/types.h>
#include <netinet/in.h>
#include <stdlib.h>
@@ -34,10 +38,6 @@
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/file.h"
#include "asterisk/logger.h"
Modified: team/oej/test-this-branch/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/apps/app_alarmreceiver.c?rev=33009&r1=33008&r2=33009&view=diff
==============================================================================
--- team/oej/test-this-branch/apps/app_alarmreceiver.c (original)
+++ team/oej/test-this-branch/apps/app_alarmreceiver.c Thu Jun 8 04:04:19 2006
@@ -22,13 +22,17 @@
*
* *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
*
- * Use at your own risk. Please consult the GNU GPL license document included with Asterisk details. *
+ * Use at your own risk. Please consult the GNU GPL license document included with Asterisk. *
*
* *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
*
* \ingroup applications
*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <string.h>
#include <stdlib.h>
[... 23298 lines stripped ...]
More information about the asterisk-commits
mailing list