[svn-commits] branch oej/astum r34812 - in /team/oej/astum: ./ apps/ build_tools/ cdr/ chan...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Jun 19 06:30:35 MST 2006


Author: oej
Date: Mon Jun 19 08:30:33 2006
New Revision: 34812

URL: http://svn.digium.com/view/asterisk?rev=34812&view=rev
Log:
Reset automerge

Added:
    team/oej/astum/abstract_jb.c
      - copied unchanged from r34194, trunk/abstract_jb.c
    team/oej/astum/apps/app_followme.c
      - copied unchanged from r34194, trunk/apps/app_followme.c
    team/oej/astum/configs/followme.conf.sample
      - copied unchanged from r34194, trunk/configs/followme.conf.sample
    team/oej/astum/contrib/utils/zones2indications.c
      - copied unchanged from r34194, trunk/contrib/utils/zones2indications.c
    team/oej/astum/fixedjitterbuf.c
      - copied unchanged from r34194, trunk/fixedjitterbuf.c
    team/oej/astum/fixedjitterbuf.h
      - copied unchanged from r34194, trunk/fixedjitterbuf.h
    team/oej/astum/funcs/func_global.c
      - copied unchanged from r34194, trunk/funcs/func_global.c
    team/oej/astum/include/asterisk/abstract_jb.h
      - copied unchanged from r34194, trunk/include/asterisk/abstract_jb.h
    team/oej/astum/include/asterisk/autoconfig.h.in
      - copied unchanged from r34194, trunk/include/asterisk/autoconfig.h.in
    team/oej/astum/sounds/Makefile
      - copied unchanged from r34194, trunk/sounds/Makefile
    team/oej/astum/sounds/sounds.xml
      - copied unchanged from r34194, trunk/sounds/sounds.xml
Removed:
    team/oej/astum/include/autoconfig.h.in
    team/oej/astum/sounds/agent-alreadyon.gsm
    team/oej/astum/sounds/agent-incorrect.gsm
    team/oej/astum/sounds/agent-loggedoff.gsm
    team/oej/astum/sounds/agent-loginok.gsm
    team/oej/astum/sounds/agent-newlocation.gsm
    team/oej/astum/sounds/agent-pass.gsm
    team/oej/astum/sounds/agent-user.gsm
    team/oej/astum/sounds/auth-incorrect.gsm
    team/oej/astum/sounds/auth-thankyou.gsm
    team/oej/astum/sounds/beep.gsm
    team/oej/astum/sounds/beeperr.gsm
    team/oej/astum/sounds/conf-adminmenu.gsm
    team/oej/astum/sounds/conf-enteringno.gsm
    team/oej/astum/sounds/conf-errormenu.gsm
    team/oej/astum/sounds/conf-getchannel.gsm
    team/oej/astum/sounds/conf-getconfno.gsm
    team/oej/astum/sounds/conf-getpin.gsm
    team/oej/astum/sounds/conf-hasjoin.gsm
    team/oej/astum/sounds/conf-hasleft.gsm
    team/oej/astum/sounds/conf-invalid.gsm
    team/oej/astum/sounds/conf-invalidpin.gsm
    team/oej/astum/sounds/conf-kicked.gsm
    team/oej/astum/sounds/conf-leaderhasleft.gsm
    team/oej/astum/sounds/conf-locked.gsm
    team/oej/astum/sounds/conf-lockednow.gsm
    team/oej/astum/sounds/conf-muted.gsm
    team/oej/astum/sounds/conf-noempty.gsm
    team/oej/astum/sounds/conf-onlyone.gsm
    team/oej/astum/sounds/conf-onlyperson.gsm
    team/oej/astum/sounds/conf-otherinparty.gsm
    team/oej/astum/sounds/conf-placeintoconf.gsm
    team/oej/astum/sounds/conf-thereare.gsm
    team/oej/astum/sounds/conf-unlockednow.gsm
    team/oej/astum/sounds/conf-unmuted.gsm
    team/oej/astum/sounds/conf-usermenu.gsm
    team/oej/astum/sounds/conf-userswilljoin.gsm
    team/oej/astum/sounds/conf-userwilljoin.gsm
    team/oej/astum/sounds/conf-waitforleader.gsm
    team/oej/astum/sounds/demo-abouttotry.gsm
    team/oej/astum/sounds/demo-congrats.gsm
    team/oej/astum/sounds/demo-echodone.gsm
    team/oej/astum/sounds/demo-echotest.gsm
    team/oej/astum/sounds/demo-enterkeywords.gsm
    team/oej/astum/sounds/demo-instruct.gsm
    team/oej/astum/sounds/demo-moreinfo.gsm
    team/oej/astum/sounds/demo-nogo.gsm
    team/oej/astum/sounds/demo-nomatch.gsm
    team/oej/astum/sounds/demo-thanks.gsm
    team/oej/astum/sounds/dictate/
    team/oej/astum/sounds/digits/
    team/oej/astum/sounds/dir-instr.gsm
    team/oej/astum/sounds/dir-intro-fn.gsm
    team/oej/astum/sounds/dir-intro.gsm
    team/oej/astum/sounds/dir-nomatch.gsm
    team/oej/astum/sounds/dir-nomore.gsm
    team/oej/astum/sounds/fpm-calm-river.mp3
    team/oej/astum/sounds/fpm-sunshine.mp3
    team/oej/astum/sounds/fpm-world-mix.mp3
    team/oej/astum/sounds/hello-world.gsm
    team/oej/astum/sounds/hours.gsm
    team/oej/astum/sounds/invalid.gsm
    team/oej/astum/sounds/letters/
    team/oej/astum/sounds/minutes.gsm
    team/oej/astum/sounds/pbx-invalid.gsm
    team/oej/astum/sounds/pbx-invalidpark.gsm
    team/oej/astum/sounds/pbx-transfer.gsm
    team/oej/astum/sounds/phonetic/
    team/oej/astum/sounds/priv-callee-options.gsm
    team/oej/astum/sounds/priv-callpending.gsm
    team/oej/astum/sounds/priv-introsaved.gsm
    team/oej/astum/sounds/priv-recordintro.gsm
    team/oej/astum/sounds/privacy-incorrect.gsm
    team/oej/astum/sounds/privacy-prompt.gsm
    team/oej/astum/sounds/privacy-thankyou.gsm
    team/oej/astum/sounds/privacy-unident.gsm
    team/oej/astum/sounds/queue-callswaiting.gsm
    team/oej/astum/sounds/queue-holdtime.gsm
    team/oej/astum/sounds/queue-less-than.gsm
    team/oej/astum/sounds/queue-minutes.gsm
    team/oej/astum/sounds/queue-periodic-announce.gsm
    team/oej/astum/sounds/queue-reporthold.gsm
    team/oej/astum/sounds/queue-seconds.gsm
    team/oej/astum/sounds/queue-thankyou.gsm
    team/oej/astum/sounds/queue-thereare.gsm
    team/oej/astum/sounds/queue-youarenext.gsm
    team/oej/astum/sounds/screen-callee-options.gsm
    team/oej/astum/sounds/seconds.gsm
    team/oej/astum/sounds/spy-agent.gsm
    team/oej/astum/sounds/spy-h323.gsm
    team/oej/astum/sounds/spy-iax.gsm
    team/oej/astum/sounds/spy-iax2.gsm
    team/oej/astum/sounds/spy-mgcp.gsm
    team/oej/astum/sounds/spy-sip.gsm
    team/oej/astum/sounds/spy-skinny.gsm
    team/oej/astum/sounds/spy-zap.gsm
    team/oej/astum/sounds/ss-noservice.gsm
    team/oej/astum/sounds/transfer.gsm
    team/oej/astum/sounds/tt-allbusy.gsm
    team/oej/astum/sounds/tt-monkeys.gsm
    team/oej/astum/sounds/tt-monkeysintro.gsm
    team/oej/astum/sounds/tt-somethingwrong.gsm
    team/oej/astum/sounds/tt-weasels.gsm
    team/oej/astum/sounds/vm-Cust1.gsm
    team/oej/astum/sounds/vm-Cust2.gsm
    team/oej/astum/sounds/vm-Cust3.gsm
    team/oej/astum/sounds/vm-Cust4.gsm
    team/oej/astum/sounds/vm-Cust5.gsm
    team/oej/astum/sounds/vm-Family.gsm
    team/oej/astum/sounds/vm-Friends.gsm
    team/oej/astum/sounds/vm-INBOX.gsm
    team/oej/astum/sounds/vm-Old.gsm
    team/oej/astum/sounds/vm-Work.gsm
    team/oej/astum/sounds/vm-advopts.gsm
    team/oej/astum/sounds/vm-and.gsm
    team/oej/astum/sounds/vm-calldiffnum.gsm
    team/oej/astum/sounds/vm-changeto.gsm
    team/oej/astum/sounds/vm-delete.gsm
    team/oej/astum/sounds/vm-deleted.gsm
    team/oej/astum/sounds/vm-dialout.gsm
    team/oej/astum/sounds/vm-enter-num-to-call.gsm
    team/oej/astum/sounds/vm-extension.gsm
    team/oej/astum/sounds/vm-first.gsm
    team/oej/astum/sounds/vm-for.gsm
    team/oej/astum/sounds/vm-forward.gsm
    team/oej/astum/sounds/vm-forwardoptions.gsm
    team/oej/astum/sounds/vm-from-extension.gsm
    team/oej/astum/sounds/vm-from-phonenumber.gsm
    team/oej/astum/sounds/vm-from.gsm
    team/oej/astum/sounds/vm-goodbye.gsm
    team/oej/astum/sounds/vm-helpexit.gsm
    team/oej/astum/sounds/vm-incorrect-mailbox.gsm
    team/oej/astum/sounds/vm-incorrect.gsm
    team/oej/astum/sounds/vm-instructions.gsm
    team/oej/astum/sounds/vm-intro.gsm
    team/oej/astum/sounds/vm-isonphone.gsm
    team/oej/astum/sounds/vm-isunavail.gsm
    team/oej/astum/sounds/vm-last.gsm
    team/oej/astum/sounds/vm-leavemsg.gsm
    team/oej/astum/sounds/vm-login.gsm
    team/oej/astum/sounds/vm-mailboxfull.gsm
    team/oej/astum/sounds/vm-message.gsm
    team/oej/astum/sounds/vm-messages.gsm
    team/oej/astum/sounds/vm-minutes.gsm
    team/oej/astum/sounds/vm-mismatch.gsm
    team/oej/astum/sounds/vm-msginstruct.gsm
    team/oej/astum/sounds/vm-msgsaved.gsm
    team/oej/astum/sounds/vm-newpassword.gsm
    team/oej/astum/sounds/vm-newuser.gsm
    team/oej/astum/sounds/vm-next.gsm
    team/oej/astum/sounds/vm-no.gsm
    team/oej/astum/sounds/vm-nobodyavail.gsm
    team/oej/astum/sounds/vm-nobox.gsm
    team/oej/astum/sounds/vm-nomore.gsm
    team/oej/astum/sounds/vm-nonumber.gsm
    team/oej/astum/sounds/vm-num-i-have.gsm
    team/oej/astum/sounds/vm-onefor.gsm
    team/oej/astum/sounds/vm-options.gsm
    team/oej/astum/sounds/vm-opts.gsm
    team/oej/astum/sounds/vm-passchanged.gsm
    team/oej/astum/sounds/vm-password.gsm
    team/oej/astum/sounds/vm-press.gsm
    team/oej/astum/sounds/vm-prev.gsm
    team/oej/astum/sounds/vm-reachoper.gsm
    team/oej/astum/sounds/vm-rec-busy.gsm
    team/oej/astum/sounds/vm-rec-name.gsm
    team/oej/astum/sounds/vm-rec-temp.gsm
    team/oej/astum/sounds/vm-rec-unv.gsm
    team/oej/astum/sounds/vm-received.gsm
    team/oej/astum/sounds/vm-reenterpassword.gsm
    team/oej/astum/sounds/vm-repeat.gsm
    team/oej/astum/sounds/vm-review.gsm
    team/oej/astum/sounds/vm-saved.gsm
    team/oej/astum/sounds/vm-savedto.gsm
    team/oej/astum/sounds/vm-savefolder.gsm
    team/oej/astum/sounds/vm-savemessage.gsm
    team/oej/astum/sounds/vm-saveoper.gsm
    team/oej/astum/sounds/vm-sorry.gsm
    team/oej/astum/sounds/vm-star-cancel.gsm
    team/oej/astum/sounds/vm-starmain.gsm
    team/oej/astum/sounds/vm-tempgreetactive.gsm
    team/oej/astum/sounds/vm-tempgreeting.gsm
    team/oej/astum/sounds/vm-tempgreeting2.gsm
    team/oej/astum/sounds/vm-tempremoved.gsm
    team/oej/astum/sounds/vm-then-pound.gsm
    team/oej/astum/sounds/vm-theperson.gsm
    team/oej/astum/sounds/vm-tocallback.gsm
    team/oej/astum/sounds/vm-tocallnum.gsm
    team/oej/astum/sounds/vm-tocancel.gsm
    team/oej/astum/sounds/vm-tocancelmsg.gsm
    team/oej/astum/sounds/vm-toenternumber.gsm
    team/oej/astum/sounds/vm-toforward.gsm
    team/oej/astum/sounds/vm-tohearenv.gsm
    team/oej/astum/sounds/vm-tomakecall.gsm
    team/oej/astum/sounds/vm-tooshort.gsm
    team/oej/astum/sounds/vm-toreply.gsm
    team/oej/astum/sounds/vm-torerecord.gsm
    team/oej/astum/sounds/vm-undelete.gsm
    team/oej/astum/sounds/vm-undeleted.gsm
    team/oej/astum/sounds/vm-unknown-caller.gsm
    team/oej/astum/sounds/vm-whichbox.gsm
    team/oej/astum/sounds/vm-youhave.gsm
Modified:
    team/oej/astum/   (props changed)
    team/oej/astum/.cleancount
    team/oej/astum/CREDITS
    team/oej/astum/Makefile
    team/oej/astum/UPGRADE.txt
    team/oej/astum/acl.c
    team/oej/astum/app.c
    team/oej/astum/apps/Makefile
    team/oej/astum/apps/app_adsiprog.c
    team/oej/astum/apps/app_alarmreceiver.c
    team/oej/astum/apps/app_amd.c
    team/oej/astum/apps/app_authenticate.c
    team/oej/astum/apps/app_cdr.c
    team/oej/astum/apps/app_chanisavail.c
    team/oej/astum/apps/app_channelredirect.c
    team/oej/astum/apps/app_chanspy.c
    team/oej/astum/apps/app_controlplayback.c
    team/oej/astum/apps/app_db.c
    team/oej/astum/apps/app_dial.c
    team/oej/astum/apps/app_dictate.c
    team/oej/astum/apps/app_directed_pickup.c
    team/oej/astum/apps/app_directory.c
    team/oej/astum/apps/app_disa.c
    team/oej/astum/apps/app_dumpchan.c
    team/oej/astum/apps/app_echo.c
    team/oej/astum/apps/app_exec.c
    team/oej/astum/apps/app_externalivr.c
    team/oej/astum/apps/app_festival.c
    team/oej/astum/apps/app_flash.c
    team/oej/astum/apps/app_forkcdr.c
    team/oej/astum/apps/app_getcpeid.c
    team/oej/astum/apps/app_hasnewvoicemail.c
    team/oej/astum/apps/app_ices.c
    team/oej/astum/apps/app_image.c
    team/oej/astum/apps/app_ivrdemo.c
    team/oej/astum/apps/app_lookupblacklist.c
    team/oej/astum/apps/app_lookupcidname.c
    team/oej/astum/apps/app_macro.c
    team/oej/astum/apps/app_meetme.c
    team/oej/astum/apps/app_milliwatt.c
    team/oej/astum/apps/app_mixmonitor.c
    team/oej/astum/apps/app_morsecode.c
    team/oej/astum/apps/app_mp3.c
    team/oej/astum/apps/app_nbscat.c
    team/oej/astum/apps/app_osplookup.c
    team/oej/astum/apps/app_page.c
    team/oej/astum/apps/app_parkandannounce.c
    team/oej/astum/apps/app_playback.c
    team/oej/astum/apps/app_privacy.c
    team/oej/astum/apps/app_queue.c
    team/oej/astum/apps/app_random.c
    team/oej/astum/apps/app_read.c
    team/oej/astum/apps/app_readfile.c
    team/oej/astum/apps/app_realtime.c
    team/oej/astum/apps/app_record.c
    team/oej/astum/apps/app_rpt.c
    team/oej/astum/apps/app_sayunixtime.c
    team/oej/astum/apps/app_senddtmf.c
    team/oej/astum/apps/app_sendtext.c
    team/oej/astum/apps/app_setcallerid.c
    team/oej/astum/apps/app_setcdruserfield.c
    team/oej/astum/apps/app_settransfercapability.c
    team/oej/astum/apps/app_skel.c
    team/oej/astum/apps/app_sms.c
    team/oej/astum/apps/app_softhangup.c
    team/oej/astum/apps/app_speech_utils.c
    team/oej/astum/apps/app_stack.c
    team/oej/astum/apps/app_system.c
    team/oej/astum/apps/app_talkdetect.c
    team/oej/astum/apps/app_test.c
    team/oej/astum/apps/app_transfer.c
    team/oej/astum/apps/app_url.c
    team/oej/astum/apps/app_userevent.c
    team/oej/astum/apps/app_verbose.c
    team/oej/astum/apps/app_voicemail.c
    team/oej/astum/apps/app_waitforring.c
    team/oej/astum/apps/app_waitforsilence.c
    team/oej/astum/apps/app_while.c
    team/oej/astum/apps/app_zapateller.c
    team/oej/astum/apps/app_zapbarge.c
    team/oej/astum/apps/app_zapras.c
    team/oej/astum/apps/app_zapscan.c
    team/oej/astum/ast_expr2.c
    team/oej/astum/ast_expr2.fl
    team/oej/astum/ast_expr2.y
    team/oej/astum/ast_expr2f.c
    team/oej/astum/asterisk.8
    team/oej/astum/asterisk.c
    team/oej/astum/astmm.c
    team/oej/astum/autoservice.c
    team/oej/astum/build_tools/cflags.xml
    team/oej/astum/build_tools/menuselect.c
    team/oej/astum/build_tools/menuselect.h
    team/oej/astum/build_tools/menuselect_curses.c
    team/oej/astum/build_tools/prep_moduledeps
    team/oej/astum/callerid.c
    team/oej/astum/cdr.c
    team/oej/astum/cdr/Makefile
    team/oej/astum/cdr/cdr_csv.c
    team/oej/astum/cdr/cdr_custom.c
    team/oej/astum/cdr/cdr_manager.c
    team/oej/astum/cdr/cdr_odbc.c
    team/oej/astum/cdr/cdr_pgsql.c
    team/oej/astum/cdr/cdr_radius.c
    team/oej/astum/cdr/cdr_sqlite.c
    team/oej/astum/cdr/cdr_tds.c
    team/oej/astum/channel.c
    team/oej/astum/channels/Makefile
    team/oej/astum/channels/chan_agent.c
    team/oej/astum/channels/chan_alsa.c
    team/oej/astum/channels/chan_features.c
    team/oej/astum/channels/chan_h323.c
    team/oej/astum/channels/chan_iax2.c
    team/oej/astum/channels/chan_jingle.c
    team/oej/astum/channels/chan_local.c
    team/oej/astum/channels/chan_mgcp.c
    team/oej/astum/channels/chan_misdn.c
    team/oej/astum/channels/chan_nbs.c
    team/oej/astum/channels/chan_oss.c
    team/oej/astum/channels/chan_phone.c
    team/oej/astum/channels/chan_sip.c
    team/oej/astum/channels/chan_skinny.c
    team/oej/astum/channels/chan_vpb.c
    team/oej/astum/channels/chan_zap.c
    team/oej/astum/channels/h323/h323.conf.sample
    team/oej/astum/channels/iax2-parser.c
    team/oej/astum/channels/iax2-provision.c
    team/oej/astum/channels/misdn/chan_misdn_config.h
    team/oej/astum/channels/misdn/ie.c
    team/oej/astum/channels/misdn/isdn_lib.c
    team/oej/astum/channels/misdn/isdn_lib.h
    team/oej/astum/channels/misdn/isdn_msg_parser.c
    team/oej/astum/channels/misdn_config.c
    team/oej/astum/chanvars.c
    team/oej/astum/cli.c
    team/oej/astum/codecs/Makefile
    team/oej/astum/codecs/codec_a_mu.c
    team/oej/astum/codecs/codec_adpcm.c
    team/oej/astum/codecs/codec_alaw.c
    team/oej/astum/codecs/codec_g723_1.c
    team/oej/astum/codecs/codec_g726.c
    team/oej/astum/codecs/codec_gsm.c
    team/oej/astum/codecs/codec_ilbc.c
    team/oej/astum/codecs/codec_lpc10.c
    team/oej/astum/codecs/codec_speex.c
    team/oej/astum/codecs/codec_ulaw.c
    team/oej/astum/codecs/gsm/Makefile
    team/oej/astum/codecs/gsm/src/preprocess.c
    team/oej/astum/codecs/lpc10/lpc10.h
    team/oej/astum/codecs/lpc10/lpcini.c
    team/oej/astum/config.c
    team/oej/astum/configs/alsa.conf.sample
    team/oej/astum/configs/extensions.conf.sample
    team/oej/astum/configs/indications.conf.sample
    team/oej/astum/configs/jabber.conf.sample
    team/oej/astum/configs/mgcp.conf.sample
    team/oej/astum/configs/misdn.conf.sample
    team/oej/astum/configs/musiconhold.conf.sample
    team/oej/astum/configs/oss.conf.sample
    team/oej/astum/configs/rtp.conf.sample
    team/oej/astum/configs/sip.conf.sample
    team/oej/astum/configs/skinny.conf.sample
    team/oej/astum/configs/voicemail.conf.sample
    team/oej/astum/configs/zapata.conf.sample
    team/oej/astum/configure
    team/oej/astum/configure.ac
    team/oej/astum/cryptostub.c
    team/oej/astum/db.c
    team/oej/astum/devicestate.c
    team/oej/astum/dns.c
    team/oej/astum/dnsmgr.c
    team/oej/astum/doc/asterisk-conf.txt
    team/oej/astum/doc/channelvariables.txt
    team/oej/astum/doc/smdi.txt
    team/oej/astum/doc/speechrec.txt
    team/oej/astum/dsp.c
    team/oej/astum/enum.c
    team/oej/astum/file.c
    team/oej/astum/formats/Makefile
    team/oej/astum/formats/format_g723.c
    team/oej/astum/formats/format_g726.c
    team/oej/astum/formats/format_g729.c
    team/oej/astum/formats/format_gsm.c
    team/oej/astum/formats/format_h263.c
    team/oej/astum/formats/format_h264.c
    team/oej/astum/formats/format_ilbc.c
    team/oej/astum/formats/format_jpeg.c
    team/oej/astum/formats/format_ogg_vorbis.c
    team/oej/astum/formats/format_pcm.c
    team/oej/astum/formats/format_sln.c
    team/oej/astum/formats/format_vox.c
    team/oej/astum/formats/format_wav.c
    team/oej/astum/formats/format_wav_gsm.c
    team/oej/astum/frame.c
    team/oej/astum/fskmodem.c
    team/oej/astum/funcs/Makefile
    team/oej/astum/funcs/func_base64.c
    team/oej/astum/funcs/func_callerid.c
    team/oej/astum/funcs/func_cdr.c
    team/oej/astum/funcs/func_curl.c
    team/oej/astum/funcs/func_cut.c
    team/oej/astum/funcs/func_db.c
    team/oej/astum/funcs/func_enum.c
    team/oej/astum/funcs/func_env.c
    team/oej/astum/funcs/func_groupcount.c
    team/oej/astum/funcs/func_language.c
    team/oej/astum/funcs/func_logic.c
    team/oej/astum/funcs/func_math.c
    team/oej/astum/funcs/func_md5.c
    team/oej/astum/funcs/func_moh.c
    team/oej/astum/funcs/func_odbc.c
    team/oej/astum/funcs/func_rand.c
    team/oej/astum/funcs/func_realtime.c
    team/oej/astum/funcs/func_sha1.c
    team/oej/astum/funcs/func_strings.c
    team/oej/astum/funcs/func_timeout.c
    team/oej/astum/funcs/func_uri.c
    team/oej/astum/http.c
    team/oej/astum/image.c
    team/oej/astum/include/   (props changed)
    team/oej/astum/include/asterisk/   (props changed)
    team/oej/astum/include/asterisk.h
    team/oej/astum/include/asterisk/alaw.h
    team/oej/astum/include/asterisk/astmm.h
    team/oej/astum/include/asterisk/callerid.h
    team/oej/astum/include/asterisk/channel.h
    team/oej/astum/include/asterisk/chanspy.h
    team/oej/astum/include/asterisk/compat.h
    team/oej/astum/include/asterisk/dnsmgr.h
    team/oej/astum/include/asterisk/doxyref.h
    team/oej/astum/include/asterisk/endian.h
    team/oej/astum/include/asterisk/file.h
    team/oej/astum/include/asterisk/frame.h
    team/oej/astum/include/asterisk/jabber.h
    team/oej/astum/include/asterisk/linkedlists.h
    team/oej/astum/include/asterisk/lock.h
    team/oej/astum/include/asterisk/logger.h
    team/oej/astum/include/asterisk/options.h
    team/oej/astum/include/asterisk/plc.h
    team/oej/astum/include/asterisk/rtp.h
    team/oej/astum/include/asterisk/stringfields.h
    team/oej/astum/include/asterisk/translate.h
    team/oej/astum/include/asterisk/udptl.h
    team/oej/astum/include/asterisk/ulaw.h
    team/oej/astum/include/asterisk/utils.h
    team/oej/astum/indications.c
    team/oej/astum/io.c
    team/oej/astum/jitterbuf.c
    team/oej/astum/loader.c
    team/oej/astum/logger.c
    team/oej/astum/makeopts.in
    team/oej/astum/manager.c
    team/oej/astum/md5.c
    team/oej/astum/netsock.c
    team/oej/astum/pbx.c
    team/oej/astum/pbx/Makefile
    team/oej/astum/pbx/ael/ael.flex
    team/oej/astum/pbx/ael/ael.tab.c
    team/oej/astum/pbx/ael/ael.y
    team/oej/astum/pbx/ael/ael_lex.c
    team/oej/astum/pbx/dundi-parser.c
    team/oej/astum/pbx/pbx_ael.c
    team/oej/astum/pbx/pbx_config.c
    team/oej/astum/pbx/pbx_dundi.c
    team/oej/astum/pbx/pbx_gtkconsole.c
    team/oej/astum/pbx/pbx_loopback.c
    team/oej/astum/pbx/pbx_realtime.c
    team/oej/astum/pbx/pbx_spool.c
    team/oej/astum/plc.c
    team/oej/astum/privacy.c
    team/oej/astum/res/Makefile
    team/oej/astum/res/res_adsi.c
    team/oej/astum/res/res_agi.c
    team/oej/astum/res/res_clioriginate.c
    team/oej/astum/res/res_config_odbc.c
    team/oej/astum/res/res_config_pgsql.c
    team/oej/astum/res/res_convert.c
    team/oej/astum/res/res_crypto.c
    team/oej/astum/res/res_features.c
    team/oej/astum/res/res_indications.c
    team/oej/astum/res/res_jabber.c
    team/oej/astum/res/res_monitor.c
    team/oej/astum/res/res_musiconhold.c
    team/oej/astum/res/res_odbc.c
    team/oej/astum/res/res_osp.c
    team/oej/astum/res/res_smdi.c
    team/oej/astum/res/res_snmp.c
    team/oej/astum/res/res_speech.c
    team/oej/astum/res/snmp/agent.c
    team/oej/astum/rtp.c
    team/oej/astum/say.c
    team/oej/astum/sched.c
    team/oej/astum/slinfactory.c
    team/oej/astum/sounds/   (props changed)
    team/oej/astum/sounds.txt
    team/oej/astum/srv.c
    team/oej/astum/stdtime/localtime.c
    team/oej/astum/strcompat.c
    team/oej/astum/tdd.c
    team/oej/astum/term.c
    team/oej/astum/translate.c
    team/oej/astum/udptl.c
    team/oej/astum/utils.c
    team/oej/astum/utils/Makefile
    team/oej/astum/utils/ael_main.c
    team/oej/astum/utils/astman.c
    team/oej/astum/utils/smsq.c

Propchange: team/oej/astum/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/astum/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/astum/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 19 08:30:33 2006
@@ -1,1 +1,1 @@
-/trunk:1-30585
+/trunk:1-34216

Modified: team/oej/astum/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/astum/.cleancount?rev=34812&r1=34811&r2=34812&view=diff
==============================================================================
--- team/oej/astum/.cleancount (original)
+++ team/oej/astum/.cleancount Mon Jun 19 08:30:33 2006
@@ -1,1 +1,1 @@
-17
+19

Modified: team/oej/astum/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/astum/CREDITS?rev=34812&r1=34811&r2=34812&view=diff
==============================================================================
--- team/oej/astum/CREDITS (original)
+++ team/oej/astum/CREDITS Mon Jun 19 08:30:33 2006
@@ -27,60 +27,110 @@
 * Thanks to QuickNet Technologies for their donation of an Internet
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
 
+* Thanks to VoipSupply for their donation of Sipura ATAs to the project for
+T.38 testing. (http://www.voipsupply.com)
+
+* Thanks to Grandstream for their donation of ATAs to the project for
+T.38 testing. (http://www.grandstream.com)
+
 === MISCELLANEOUS PATCHES ===
 Jim Dixon - Zapata Telephony and app_rpt
 	http://www.zapatatelephony.org/app_rpt.html
+
 Russell Bryant - Asterisk 1.0 maintainer and misc. enhancements
 	russelb at clemson.edu
+
 Anthony Minessale II - Countless big and small fixes, and relentless forward push
 	anthmct at yahoo.com              http://www.asterlink.com
+
 James Golovich - Innumerable contributions
 	You can find him and asterisk-perl at http://asterisk.gnuinter.net
+
 Andre Bierwirth - Extension hints and status
+
 Oliver Daudey - ISDN4Linux fixes
+
 Pauline Middelink - ISDN4Linux patches and some general patches.
 	She can be found at http://www.polyware.nl/~middelink/En/
+
 Jean-Denis Girard - Various contributions from the South Pacific Islands
 	jd-girard at esoft.pf             http://www.esoft.pf
+
 William Jordan / Vonage - MySQL enhancements to Voicemail
 	wjordan at vonage.com
+
 Jac Kersing - Various fixes
+
 Steven Critchfield - Seek and Trunc functions for playback and recording
 	critch at basesys.com
+
 Jefferson Noxon - app_lookupcidname, app_db, and various other contributions
+
 Klaus-Peter Junghanns - in-band DTMF on SIP and MGCP
+
 Ross Finlayson - Dynamic RTP payload support
+
 Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
 	format, and various fixes. Can be contacted at mahmut at oa.com.au
+
 James Dennis - Cisco SIP compatibility patches to work with SIP service
 	providers. Can be contacted at asterisk at jdennis.net
+
 Tilghman Lesher - ast_localtime(); ast_say_date_with_format(); 
 	GotoIfTime, Random, SayUnixTime, HasNewVoicemail applications;
 	CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, QUEUEAGENT* functions;
 	and other innumerable bug fixes. http://asterisk.drunkcoder.com/
+
 Jayson Vantuyl - Manager protocol changes, various other bugs.
 	jvantuyl at computingedge.net
+
 Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
 	dialplan include verification, route lookup on OpenBSD, SNMP agent
 	support (res_snmp), various other bugs. tholo at sigmasoft.com
+
 Brian West - ODBC support and Bug Marshaling  
+
 Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
 	and Bug Marshalling. - josh at asteriasgi.com, http://www.asteriasgi.com
+
 William Waites - syslog support, SIP NAT traversal for SIP-UA. ww at styx.org
+
 Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
 	rich at whiteoaklabs.com  http://whiteoaklabs.com
+
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
 	simon at slimey.org
+
 Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing
 	oej at edvina.net, http://edvina.net
+
 Steve Kann - new jitter buffer for IAX2
 	stevek at stevek.com
+
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
+
 Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
+
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
 	cpatry at gmail.com
+
 Miroslav Nachev, miro at space-comm.com COSMOS Software Enterprises, Ltd.
 	- for Variable for No Answer Timeout for Attended Transfer
+
+Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
+	Securax Ltd. info at securax.be
+
+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
+
+Steve Underwood - Provided T.38 pass through support.
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/oej/astum/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/astum/Makefile?rev=34812&r1=34811&r2=34812&view=diff
==============================================================================
--- team/oej/astum/Makefile (original)
+++ team/oej/astum/Makefile Mon Jun 19 08:30:33 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
@@ -143,9 +129,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]
@@ -187,7 +196,6 @@
       endif
     endif
   endif
-  MPG123TARG=linux
 endif
 
 GREP=grep
@@ -230,12 +238,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)
@@ -282,7 +288,7 @@
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
 	utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
-	cryptostub.o sha1.o http.o
+	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static
@@ -371,7 +377,7 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest defaults.h config.status menuselect.makeopts depend asterisk subdirs
+all: cleantest config.status menuselect.makeopts depend asterisk subdirs
 
 config.status: configure
 	@CFLAGS="" ./configure
@@ -503,19 +509,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
@@ -526,57 +532,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 \
@@ -628,11 +589,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
@@ -650,7 +611,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
@@ -754,20 +714,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 \
@@ -821,12 +767,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 \
@@ -897,6 +837,9 @@
 %_env:
 	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
 
+sounds:
+	$(MAKE) -C sounds all
+
 env:
 	env
 
@@ -907,6 +850,7 @@
 cleantest:
 	@if cmp -s .cleancount .lastclean ; then echo ; else \
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
+		$(MAKE) defaults.h;\
 	fi
 
 _uninstall:
@@ -915,10 +859,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 -----+"  
@@ -952,6 +896,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/astum/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/astum/UPGRADE.txt?rev=34812&r1=34811&r2=34812&view=diff
==============================================================================
--- team/oej/astum/UPGRADE.txt (original)
+++ team/oej/astum/UPGRADE.txt Mon Jun 19 08:30:33 2006
@@ -42,6 +42,39 @@
 If you would like to save your choices and have them applied against all
 builds, the file can be copied to '~/.asterisk.makeopts' or 
 '/etc/asterisk.makeopts'.
+
+Sound (prompt) and Music On Hold files:
+
+Beginning with Asterisk 1.4, the sound files and music on hold files supplied for
+use with Asterisk have been replaced with new versions produced from high quality
+master recordings, and are available in three languages (English, French and
+Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
+In addition, the music on hold files provided by FreePlay Music are now available
+in the same five formats, but no longer available in MP3 format.
+
+The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
+(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
+All of the other variations can be installed by running 'make menuselect' and
+selecting the packages you wish to install; when you run 'make install', those
+packages will be downloaded and installed along with the standard files included
+in the tarball.
+
+If for some reason you expect to not have Internet access at the time you will be
+running 'make install', you can make your package selections using menuselect and
+then run 'make sounds' to download (only) the sound packages; this will leave the
+sound packages in the 'sounds' subdirectory to be used later during installation.
+
+WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+instead of the alternate-language files being stored in subdirectories underneath
+the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+language itself, then places all the sound files for that language under that
+directory and its subdirectories. This is the layout that will be created if you
+select non-English languages to be installed via menuselect, HOWEVER Asterisk does
+not default to this layout and will not find the files in the places it expects them
+to be. If you wish to use this layout, make sure you put 'languageprefix=yes' in your
+/etc/asterisk/asterisk.conf file, so that Asterisk will know how the files were
+installed.
 
 PBX Core:
 
@@ -74,6 +107,12 @@
   and GetGroupMatchCount were all deprecated in version 1.2, and therefore have
   been removed in this version.  You should use the equivalent dialplan
   function in places where you have previously used one of these applications.
+
+* The application SetGlobalVar has been deprecated.  You should replace uses
+  of this application with the following combination of Set and GLOBAL():
+  Set(GLOBAL(name)=value).  You may also access global variables exclusively by
+  using the GLOBAL() dialplan function, instead of relying on variable
+  interpolation falling back to globals when no channel variable is set.
 
 * The application SetVar has been renamed to Set.  The syntax SetVar was marked
   deprecated in version 1.2 and is no longer recognized in this version.

[... 36156 lines stripped ...]


More information about the svn-commits mailing list