[asterisk-commits] branch oej/jitterbuffer-1.2 r12612 - in /team/oej/jitterbuffer-1.2: ./ apps/ ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Mar 12 11:54:35 MST 2006


Author: oej
Date: Sun Mar 12 12:51:01 2006
New Revision: 12612

URL: http://svn.digium.com/view/asterisk?rev=12612&view=rev
Log:
Update to svn branch 1.2 head

Added:
    team/oej/jitterbuffer-1.2/channels/misdn/mISDN.patch   (contents, props changed)
      - copied, changed from r12577, branches/1.2/channels/misdn/mISDN.patch
    team/oej/jitterbuffer-1.2/channels/misdn/mISDNuser.patch   (props changed)
      - copied unchanged from r12577, branches/1.2/channels/misdn/mISDNuser.patch
Removed:
    team/oej/jitterbuffer-1.2/ChangeLog
    team/oej/jitterbuffer-1.2/ast_expr.y
    team/oej/jitterbuffer-1.2/patches/
    team/oej/jitterbuffer-1.2/redhat/asterisk
Modified:
    team/oej/jitterbuffer-1.2/   (props changed)
    team/oej/jitterbuffer-1.2/Makefile
    team/oej/jitterbuffer-1.2/README
    team/oej/jitterbuffer-1.2/UPGRADE.txt
    team/oej/jitterbuffer-1.2/app.c
    team/oej/jitterbuffer-1.2/apps/Makefile
    team/oej/jitterbuffer-1.2/apps/app_chanspy.c
    team/oej/jitterbuffer-1.2/apps/app_cut.c
    team/oej/jitterbuffer-1.2/apps/app_dial.c
    team/oej/jitterbuffer-1.2/apps/app_directed_pickup.c
    team/oej/jitterbuffer-1.2/apps/app_externalivr.c
    team/oej/jitterbuffer-1.2/apps/app_festival.c
    team/oej/jitterbuffer-1.2/apps/app_hasnewvoicemail.c
    team/oej/jitterbuffer-1.2/apps/app_macro.c
    team/oej/jitterbuffer-1.2/apps/app_meetme.c
    team/oej/jitterbuffer-1.2/apps/app_milliwatt.c
    team/oej/jitterbuffer-1.2/apps/app_mixmonitor.c
    team/oej/jitterbuffer-1.2/apps/app_page.c
    team/oej/jitterbuffer-1.2/apps/app_privacy.c
    team/oej/jitterbuffer-1.2/apps/app_queue.c
    team/oej/jitterbuffer-1.2/apps/app_sms.c
    team/oej/jitterbuffer-1.2/apps/app_stack.c
    team/oej/jitterbuffer-1.2/apps/app_voicemail.c
    team/oej/jitterbuffer-1.2/apps/app_waitforsilence.c
    team/oej/jitterbuffer-1.2/ast_expr2.c
    team/oej/jitterbuffer-1.2/ast_expr2.fl
    team/oej/jitterbuffer-1.2/ast_expr2.h
    team/oej/jitterbuffer-1.2/ast_expr2.y
    team/oej/jitterbuffer-1.2/ast_expr2f.c
    team/oej/jitterbuffer-1.2/asterisk.c
    team/oej/jitterbuffer-1.2/asterisk.sgml
    team/oej/jitterbuffer-1.2/build_tools/make_build_h
    team/oej/jitterbuffer-1.2/build_tools/make_svn_branch_name
    team/oej/jitterbuffer-1.2/cdr.c
    team/oej/jitterbuffer-1.2/cdr/Makefile
    team/oej/jitterbuffer-1.2/cdr/cdr_manager.c
    team/oej/jitterbuffer-1.2/cdr/cdr_odbc.c
    team/oej/jitterbuffer-1.2/cdr/cdr_pgsql.c
    team/oej/jitterbuffer-1.2/cdr/cdr_tds.c
    team/oej/jitterbuffer-1.2/channel.c
    team/oej/jitterbuffer-1.2/channels/Makefile
    team/oej/jitterbuffer-1.2/channels/chan_agent.c
    team/oej/jitterbuffer-1.2/channels/chan_alsa.c
    team/oej/jitterbuffer-1.2/channels/chan_features.c
    team/oej/jitterbuffer-1.2/channels/chan_iax2.c
    team/oej/jitterbuffer-1.2/channels/chan_local.c
    team/oej/jitterbuffer-1.2/channels/chan_mgcp.c
    team/oej/jitterbuffer-1.2/channels/chan_misdn.c
    team/oej/jitterbuffer-1.2/channels/chan_misdn_config.c
    team/oej/jitterbuffer-1.2/channels/chan_modem.c
    team/oej/jitterbuffer-1.2/channels/chan_oss.c
    team/oej/jitterbuffer-1.2/channels/chan_sip.c
    team/oej/jitterbuffer-1.2/channels/chan_zap.c
    team/oej/jitterbuffer-1.2/channels/misdn/Makefile
    team/oej/jitterbuffer-1.2/channels/misdn/chan_misdn_config.h
    team/oej/jitterbuffer-1.2/channels/misdn/ie.c
    team/oej/jitterbuffer-1.2/channels/misdn/isdn_lib.c
    team/oej/jitterbuffer-1.2/channels/misdn/isdn_lib.h
    team/oej/jitterbuffer-1.2/channels/misdn/isdn_lib_intern.h
    team/oej/jitterbuffer-1.2/channels/misdn/isdn_msg_parser.c
    team/oej/jitterbuffer-1.2/cli.c
    team/oej/jitterbuffer-1.2/codecs/gsm/Makefile
    team/oej/jitterbuffer-1.2/config.c
    team/oej/jitterbuffer-1.2/configs/iax.conf.sample
    team/oej/jitterbuffer-1.2/configs/res_odbc.conf.sample
    team/oej/jitterbuffer-1.2/configs/sip.conf.sample
    team/oej/jitterbuffer-1.2/configs/voicemail.conf.sample
    team/oej/jitterbuffer-1.2/configs/zapata.conf.sample
    team/oej/jitterbuffer-1.2/contrib/firmware/iax/iaxy.bin   (contents, props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.debian.asterisk   (contents, props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.gentoo.asterisk   (props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.mandrake.asterisk   (contents, props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.mandrake.zaptel   (props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.redhat.asterisk   (contents, props changed)
    team/oej/jitterbuffer-1.2/contrib/init.d/rc.slackware.asterisk   (props changed)
    team/oej/jitterbuffer-1.2/db.c
    team/oej/jitterbuffer-1.2/devicestate.c
    team/oej/jitterbuffer-1.2/dnsmgr.c
    team/oej/jitterbuffer-1.2/doc/CODING-GUIDELINES
    team/oej/jitterbuffer-1.2/doc/README.ael
    team/oej/jitterbuffer-1.2/doc/README.cdr
    team/oej/jitterbuffer-1.2/doc/README.jitterbuffer
    team/oej/jitterbuffer-1.2/doc/README.misdn
    team/oej/jitterbuffer-1.2/doc/README.mp3
    team/oej/jitterbuffer-1.2/doc/README.realtime
    team/oej/jitterbuffer-1.2/doc/README.variables
    team/oej/jitterbuffer-1.2/doc/cdr.txt
    team/oej/jitterbuffer-1.2/editline/np/vis.c
    team/oej/jitterbuffer-1.2/editline/readline.c
    team/oej/jitterbuffer-1.2/file.c
    team/oej/jitterbuffer-1.2/formats/format_pcm.c
    team/oej/jitterbuffer-1.2/formats/format_pcm_alaw.c
    team/oej/jitterbuffer-1.2/formats/format_sln.c
    team/oej/jitterbuffer-1.2/funcs/func_enum.c
    team/oej/jitterbuffer-1.2/funcs/func_moh.c
    team/oej/jitterbuffer-1.2/funcs/func_strings.c
    team/oej/jitterbuffer-1.2/include/asterisk.h
    team/oej/jitterbuffer-1.2/include/asterisk/cdr.h
    team/oej/jitterbuffer-1.2/include/asterisk/channel.h
    team/oej/jitterbuffer-1.2/include/asterisk/chanspy.h
    team/oej/jitterbuffer-1.2/include/asterisk/linkedlists.h
    team/oej/jitterbuffer-1.2/include/asterisk/logger.h
    team/oej/jitterbuffer-1.2/include/asterisk/manager.h
    team/oej/jitterbuffer-1.2/include/asterisk/pbx.h
    team/oej/jitterbuffer-1.2/include/asterisk/strings.h
    team/oej/jitterbuffer-1.2/jitterbuf.c
    team/oej/jitterbuffer-1.2/loader.c
    team/oej/jitterbuffer-1.2/logger.c
    team/oej/jitterbuffer-1.2/manager.c
    team/oej/jitterbuffer-1.2/pbx.c
    team/oej/jitterbuffer-1.2/pbx/pbx_ael.c
    team/oej/jitterbuffer-1.2/pbx/pbx_config.c
    team/oej/jitterbuffer-1.2/pbx/pbx_dundi.c
    team/oej/jitterbuffer-1.2/pbx/pbx_spool.c
    team/oej/jitterbuffer-1.2/res/res_agi.c
    team/oej/jitterbuffer-1.2/res/res_config_odbc.c
    team/oej/jitterbuffer-1.2/res/res_features.c
    team/oej/jitterbuffer-1.2/res/res_monitor.c
    team/oej/jitterbuffer-1.2/res/res_odbc.c
    team/oej/jitterbuffer-1.2/rtp.c
    team/oej/jitterbuffer-1.2/sounds/agent-alreadyon.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-incorrect.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-loggedoff.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-loginok.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-newlocation.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-pass.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/agent-user.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/auth-incorrect.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/auth-thankyou.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/beep.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/beeperr.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-adminmenu.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-enteringno.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-errormenu.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-getchannel.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-getconfno.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-getpin.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-hasjoin.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-hasleft.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-invalid.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-invalidpin.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-kicked.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-leaderhasleft.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-locked.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-lockednow.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-muted.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-noempty.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-onlyone.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-onlyperson.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-otherinparty.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-placeintoconf.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-thereare.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-unlockednow.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-unmuted.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-usermenu.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-userswilljoin.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-userwilljoin.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/conf-waitforleader.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-abouttotry.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-congrats.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-echodone.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-echotest.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-enterkeywords.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-instruct.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-moreinfo.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-nogo.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-nomatch.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/demo-thanks.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/both_help.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/enter_filename.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/forhelp.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/pause.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/paused.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/play_help.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/playback.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/playback_mode.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/record.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/record_help.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/record_mode.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dictate/truncating_audio.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/0.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/1.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/10.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/11.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/12.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/13.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/14.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/15.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/16.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/17.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/18.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/19.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/20.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/3.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/30.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/4.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/40.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/5.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/50.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/6.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/60.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/7.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/70.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/8.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/80.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/9.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/90.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/a-m.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/at.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-0.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-1.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-3.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-4.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-5.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/day-6.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/dollars.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-1.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-10.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-11.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-12.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-13.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-14.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-15.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-16.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-17.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-18.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-19.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-20.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-3.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-30.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-4.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-5.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-6.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-7.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-8.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/h-9.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/hundred.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/million.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/minus.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-0.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-1.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-10.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-11.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-3.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-4.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-5.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-6.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-7.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-8.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/mon-9.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/oclock.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/oh.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/p-m.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/pound.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/star.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/thousand.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/today.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/tomorrow.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/digits/yesterday.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dir-instr.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dir-intro-fn.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dir-intro.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dir-nomatch.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/dir-nomore.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/fpm-calm-river.mp3   (props changed)
    team/oej/jitterbuffer-1.2/sounds/fpm-sunshine.mp3   (props changed)
    team/oej/jitterbuffer-1.2/sounds/fpm-world-mix.mp3   (props changed)
    team/oej/jitterbuffer-1.2/sounds/hello-world.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/hours.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/invalid.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/a.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/at.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/b.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/c.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/d.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/dash.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/dollar.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/dot.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/e.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/equals.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/exclaimation-point.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/f.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/g.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/h.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/i.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/j.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/k.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/l.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/m.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/n.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/o.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/plus.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/q.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/r.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/s.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/slash.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/space.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/t.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/u.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/v.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/w.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/x.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/y.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/z.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/letters/zed.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/minutes.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/pbx-invalid.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/pbx-invalidpark.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/pbx-transfer.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/9_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/a_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/b_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/c_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/d_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/e_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/f_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/g_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/h_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/i_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/j_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/k_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/l_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/m_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/n_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/o_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/p_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/q_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/r_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/s_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/t_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/u_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/v_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/w_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/x_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/y_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/phonetic/z_p.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/priv-callee-options.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/priv-callpending.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/priv-introsaved.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/priv-recordintro.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/privacy-incorrect.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/privacy-prompt.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/privacy-thankyou.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/privacy-unident.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-callswaiting.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-holdtime.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-less-than.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-minutes.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-periodic-announce.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-reporthold.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-seconds.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-thankyou.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-thereare.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/queue-youarenext.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/screen-callee-options.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/seconds.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-agent.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-h323.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-iax.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-iax2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-mgcp.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-sip.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-skinny.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/spy-zap.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/ss-noservice.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/transfer.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/tt-allbusy.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/tt-monkeys.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/tt-monkeysintro.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/tt-somethingwrong.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/tt-weasels.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Cust1.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Cust2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Cust3.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Cust4.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Cust5.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Family.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Friends.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-INBOX.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Old.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-Work.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-advopts.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-and.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-calldiffnum.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-changeto.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-delete.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-deleted.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-dialout.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-enter-num-to-call.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-extension.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-first.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-for.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-forward.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-forwardoptions.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-from-extension.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-from-phonenumber.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-from.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-goodbye.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-helpexit.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-incorrect-mailbox.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-incorrect.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-instructions.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-intro.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-isonphone.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-isunavail.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-last.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-leavemsg.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-login.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-mailboxfull.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-message.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-messages.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-minutes.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-mismatch.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-msginstruct.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-msgsaved.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-newpassword.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-newuser.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-next.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-no.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-nobodyavail.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-nobox.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-nomore.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-nonumber.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-num-i-have.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-onefor.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-options.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-opts.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-passchanged.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-password.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-press.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-prev.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-reachoper.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-rec-busy.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-rec-name.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-rec-temp.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-rec-unv.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-received.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-reenterpassword.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-repeat.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-review.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-saved.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-savedto.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-savefolder.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-savemessage.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-saveoper.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-sorry.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-star-cancel.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-starmain.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tempgreeting.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tempgreeting2.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tempremoved.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-then-pound.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-theperson.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tocallback.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tocallnum.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tocancel.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tocancelmsg.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-toenternumber.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-toforward.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tohearenv.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tomakecall.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-tooshort.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-toreply.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-torerecord.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-undelete.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-undeleted.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-unknown-caller.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-whichbox.gsm   (props changed)
    team/oej/jitterbuffer-1.2/sounds/vm-youhave.gsm   (props changed)
    team/oej/jitterbuffer-1.2/translate.c
    team/oej/jitterbuffer-1.2/utils.c
    team/oej/jitterbuffer-1.2/utils/astman.c

Propchange: team/oej/jitterbuffer-1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 12 12:51:01 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7221
+/branches/1.2:1-12610

Modified: team/oej/jitterbuffer-1.2/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer-1.2/Makefile?rev=12612&r1=12611&r2=12612&view=diff
==============================================================================
--- team/oej/jitterbuffer-1.2/Makefile (original)
+++ team/oej/jitterbuffer-1.2/Makefile Sun Mar 12 12:51:01 2006
@@ -35,6 +35,8 @@
 
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
+
+PWD=$(shell pwd)
 
 ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
 ######### More GSM codec optimization
@@ -212,12 +214,13 @@
   MPG123TARG=linux
 endif
 
-PWD=$(shell pwd)
 GREP=grep
+ID=id
 
 ifeq ($(OSARCH),SunOS)
   GREP=/usr/xpg4/bin/grep
   M4=/usr/local/bin/m4
+  ID=/usr/xpg4/bin/id
 endif
 
 INCLUDE+=-Iinclude -I../include
@@ -325,8 +328,6 @@
   ifneq ($(wildcard .svn),)
     ASTERISKVERSIONNUM=999999
     ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
-  else
-    ASTERISKVERSIONNUM=000000
   endif
 endif
 
@@ -336,7 +337,9 @@
 ASTCFLAGS+= $(MALLOC_DEBUG)
 ASTCFLAGS+= $(BUSYDETECT)
 ASTCFLAGS+= $(OPTIONS)
+ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
 ASTCFLAGS+= -fomit-frame-pointer 
+endif
 SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
 
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
@@ -542,7 +545,7 @@
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
@@ -596,17 +599,16 @@
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 
 update: 
-	@if [ -d CVS ]; then \
-		if [ -f patches/.applied ]; then \
-			patches=`cat patches/.applied`; \
-		fi; \
-		if [ ! -z "$$patches" ]; then \
-			for x in $$patches; do \
-				echo "Unapplying $$x..."; \
-				patch -R -p0 < patches/$$x; \
-			done; \
-			rm -f patches/.applied; \
+	@if [ -d .svn ]; then \
+		echo "Updating from Subversion..." ; \
+		svn update | tee update.out; \
+		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -b4- ; \
 		fi ; \
+		rm -f update.out; \
+	elif [ -d CVS ]; then \
 		echo "Updating from CVS..." ; \
 		cvs -q -z3 update -Pd | tee update.out; \
 		rm -f .version; \
@@ -615,19 +617,8 @@
 			grep ^C update.out | cut -d' ' -f2- ; \
 		fi ; \
 		rm -f update.out; \
-		if [ ! -z "$$patches" ]; then \
-			for x in $$patches; do \
-				if [ -f patches/$$x ]; then \
-					echo "Applying patch $$x..."; \
-					patch -p0 < patches/$$x; \
-					echo $$x >> patches/.applied; \
-				else \
-					echo "Patch $$x no longer relevant"; \
-				fi; \
-			done; \
-		fi; \
 	else \
-		echo "Not CVS";  \
+		echo "Not under version control";  \
 	fi
 
 NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
@@ -840,12 +831,12 @@
 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
 	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
-	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
+	cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
 
 progdocs:
 	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
-	echo "PROJECT_NUMBER=$(ASTERISKVERSION)  -  $(ASTERISKVERSIONNUM)") | doxygen - 
+	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
 
 mpg123:
 	@wget -V >/dev/null || (echo "You need wget" ; false )
@@ -915,47 +906,3 @@
 	if cmp -s .cleancount .lastclean ; then echo ; else \
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
-
-patchlist:
-	@echo "Experimental Patches:"
-	@for x in patches/*; do \
-		patch=`basename $$x`; \
-		if [ "$$patch" = "CVS" ]; then \
-			continue; \
-		fi; \
-		if grep -q ^$$patch$$ patches/.applied; then \
-			echo "$$patch (applied)"; \
-		else \
-			echo "$$patch (available)"; \
-		fi; \
-	done
-
-apply: 
-	@if [ -z "$(PATCH)" ]; then \
-		echo "Usage: make PATCH=<patchname> apply"; \
-	elif grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
-		echo "Patch $(PATCH) is already applied"; \
-	elif [ -f "patches/$(PATCH)" ]; then \
-		echo "Applying patch $(PATCH)"; \
-		patch -p0 < patches/$(PATCH); \
-		echo "$(PATCH)" >> patches/.applied; \
-	else \
-		echo "No such patch $(PATCH) in patches directory"; \
-	fi
-
-unapply: 
-	@if [ -z "$(PATCH)" ]; then \
-		echo "Usage: make PATCH=<patchname> unapply"; \
-	elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
-		echo "Patch $(PATCH) is not applied"; \
-	elif [ -f "patches/$(PATCH)" ]; then \
-		echo "Un-applying patch $(PATCH)"; \
-		patch -p0 -R < patches/$(PATCH); \
-		rm -f patches/.tmpapplied || :; \
-		mv patches/.applied patches/.tmpapplied; \
-		cat patches/.tmpapplied | grep -v ^$(PATCH)$$ > patches/.applied; \
-		rm -f patches/.tmpapplied; \
-	else \
-		echo "No such patch $(PATCH) in patches directory"; \
-	fi
-

Modified: team/oej/jitterbuffer-1.2/README
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer-1.2/README?rev=12612&r1=12611&r2=12612&view=diff
==============================================================================
--- team/oej/jitterbuffer-1.2/README (original)
+++ team/oej/jitterbuffer-1.2/README Sun Mar 12 12:51:01 2006
@@ -67,7 +67,7 @@
   In order to discover new features to use, please check the configuration
 examples in the /configs directory of the source code distribution. 
 To discover the major new features of Asterisk 1.2, please visit 
-http://www.astricon.net/asterisk1-2/
+http://edvina.net/asterisk1-2/
 
 * NEW INSTALLATIONS
 

Modified: team/oej/jitterbuffer-1.2/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer-1.2/UPGRADE.txt?rev=12612&r1=12611&r2=12612&view=diff
==============================================================================
--- team/oej/jitterbuffer-1.2/UPGRADE.txt (original)
+++ team/oej/jitterbuffer-1.2/UPGRADE.txt Sun Mar 12 12:51:01 2006
@@ -130,6 +130,11 @@
   mailbox. This greeting can be recorded by using option 4 in the
   'mailbox options' menu, and 'change your password' option has been
   moved to option 5.
+
+* The application VoiceMailMain now only matches the 'default' context if
+  none is specified in the arguments.  (This was the previously 
+  documented behavior, however, we didn't follow that behavior.)  The old
+  behavior can be restored by setting searchcontexts=yes in voicemail.conf.
 
 Queues:
 

Modified: team/oej/jitterbuffer-1.2/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer-1.2/app.c?rev=12612&r1=12611&r2=12612&view=diff
==============================================================================
--- team/oej/jitterbuffer-1.2/app.c (original)
+++ team/oej/jitterbuffer-1.2/app.c Sun Mar 12 12:51:01 2006
@@ -316,8 +316,12 @@
 				}
 			}
 		}
-		if (peer)
-			res = ast_autoservice_stop(peer);
+		if (peer) {
+			/* Stop autoservice on the peer channel, but don't overwrite any error condition 
+			   that has occurred previously while acting on the primary channel */	
+			if (ast_autoservice_stop(peer) && !res)
+				res = -1;
+		}
 	}
 	return res;
 }
@@ -430,11 +434,11 @@
 			   const char *stop, const char *pause,

[... 12592 lines stripped ...]


More information about the asterisk-commits mailing list