- bump asterisk version to latest LTS

- fix building on Ubuntu 12 (by removing workaround for Ubuntu 10)


git-svn-id: http://wush.net/svn/range/software/commercial/asterisk/trunk@6870 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Michael Iedema 2013-11-20 10:24:54 +00:00
parent eab7e92fb5
commit 56b0accceb
4 changed files with 9 additions and 12 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=11.4.0 VERSION=11.6.0
sayAndDo () { sayAndDo () {
echo $@ echo $@

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
range-asterisk (11.4.0.1) UNRELEASED; urgency=low range-asterisk (11.6.0.1) UNRELEASED; urgency=low
* Test * Test

4
debian/control vendored
View File

@ -7,11 +7,11 @@ Build-Depends: build-essential, debhelper (>= 7), pkg-config, autoconf
Standards-Version: 3.7.3 Standards-Version: 3.7.3
Package: range-asterisk Package: range-asterisk
Version: 11.4.0.1 Version: 11.6.0.1
Section: comm Section: comm
Priority: optional Priority: optional
Architecture: i386 Architecture: i386
Essential: no Essential: no
Depends: sqlite, sqlite3, libosip2-4, libglib2.0-0, libgl1-mesa-glx, libc6-i686, libasound2, pkg-config, libpcre3, gawk, libsqliteodbc, unixodbc Depends: sqlite3, libc6-i686, pkg-config, libsqliteodbc, unixodbc
Description: Range Networks - Tested Version of Asterisk Description: Range Networks - Tested Version of Asterisk

View File

@ -3,12 +3,12 @@ MENUSELECT_APPS=app_flash app_skel app_dahdiras app_fax app_ivrdemo app_jack app
MENUSELECT_BRIDGES= MENUSELECT_BRIDGES=
MENUSELECT_CDR=cdr_pgsql cdr_radius cdr_tds cdr_sqlite MENUSELECT_CDR=cdr_pgsql cdr_radius cdr_tds cdr_sqlite
MENUSELECT_CEL=cel_pgsql cel_radius cel_tds MENUSELECT_CEL=cel_pgsql cel_radius cel_tds
MENUSELECT_CHANNELS=chan_dahdi chan_motif chan_alsa chan_console chan_misdn chan_nbs chan_vpb chan_gtalk chan_h323 chan_jingle MENUSELECT_CHANNELS=chan_dahdi chan_motif chan_alsa chan_console chan_mgcp chan_misdn chan_nbs chan_oss chan_phone chan_skinny chan_unistim chan_vpb chan_gtalk chan_h323 chan_jingle
MENUSELECT_CODECS=codec_dahdi codec_speex MENUSELECT_CODECS=codec_dahdi codec_speex
MENUSELECT_FORMATS=format_ogg_vorbis MENUSELECT_FORMATS=format_ogg_vorbis
MENUSELECT_FUNCS=func_curl func_speex MENUSELECT_FUNCS=func_curl func_speex
MENUSELECT_PBX=pbx_dundi pbx_lua MENUSELECT_PBX=pbx_lua
MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_curl res_crypto res_curl res_format_attr_celt res_format_attr_h263 res_format_attr_h264 res_format_attr_silk res_http_post res_srtp res_timing_dahdi res_xmpp res_config_ldap res_config_pgsql res_config_sqlite res_corosync res_fax_spandsp res_http_websocket res_pktccops res_snmp res_timing_kqueue res_jabber MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_curl res_curl res_format_attr_celt res_format_attr_h263 res_format_attr_h264 res_format_attr_silk res_http_post res_timing_dahdi res_xmpp res_config_ldap res_config_pgsql res_corosync res_fax_spandsp res_pktccops res_snmp res_timing_kqueue res_jabber
MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils test_voicemail_api test_xml_escape MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils test_voicemail_api test_xml_escape
MENUSELECT_CFLAGS=LOADABLE_MODULES MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_OPTS_app_voicemail=FILE_STORAGE MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
@ -18,7 +18,7 @@ MENUSELECT_EMBED=
MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM
MENUSELECT_MOH=MOH-OPSOUND-GSM MENUSELECT_MOH=MOH-OPSOUND-GSM
MENUSELECT_EXTRA_SOUNDS= MENUSELECT_EXTRA_SOUNDS=
MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_confbridge res_monitor res_agi res_adsi res_smdi res_odbc res_ael_share G711_NEW_ALGORITHM MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_confbridge res_monitor res_agi res_adsi res_smdi res_odbc res_crypto res_http_websocket res_ael_share G711_NEW_ALGORITHM
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_flash
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_dahdiras
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
@ -40,22 +40,18 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_curl MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_curl
MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_dundi
MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_curl MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_curl
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_crypto
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_curl MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_curl
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_srtp
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_dahdi
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_xmpp MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_xmpp
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_corosync MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_corosync
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_fax_spandsp MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_fax_spandsp
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
@ -96,3 +92,4 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape
MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE