[Pkg-voip-commits] [asterisk] 01/01: Merge branch 'master' into wheezy-backports
Jeremy Lainé
sharky at moszumanska.debian.org
Mon May 26 21:25:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
sharky pushed a commit to branch wheezy-backports
in repository asterisk.
commit 188bb517293533713fddcb51aa315f638514ca19
Merge: 75376ca 11ffb13
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date: Mon May 26 23:24:51 2014 +0200
Merge branch 'master' into wheezy-backports
Conflicts:
debian/changelog
.version | 2 +-
CHANGES | 23 +
ChangeLog | 1257 ++++++++++++++++++++++++-
Makefile | 6 +-
Makefile.rules | 2 +-
UPGRADE.txt | 30 +-
addons/chan_ooh323.c | 7 +-
addons/ooh323c/src/ooCalls.h | 2 +-
addons/ooh323c/src/ooCapability.c | 16 +
addons/ooh323c/src/ooCmdChannel.c | 10 -
addons/ooh323c/src/ooGkClient.c | 16 +-
addons/ooh323c/src/oochannels.c | 3 +-
addons/ooh323c/src/ooh245.c | 8 +-
addons/ooh323c/src/ooh323.c | 12 +-
addons/ooh323c/src/ooq931.c | 2 +-
apps/app_chanspy.c | 10 +-
apps/app_confbridge.c | 53 +-
apps/app_dial.c | 12 +-
apps/app_forkcdr.c | 12 +-
apps/app_jack.c | 7 +-
apps/app_queue.c | 39 +-
apps/app_speech_utils.c | 8 +-
apps/app_stack.c | 23 +-
apps/app_transfer.c | 4 +-
apps/app_voicemail.c | 6 +-
apps/confbridge/conf_config_parser.c | 17 +-
apps/confbridge/conf_state.c | 3 +
apps/confbridge/conf_state_empty.c | 1 -
apps/confbridge/conf_state_inactive.c | 2 +-
apps/confbridge/conf_state_multi_marked.c | 26 +-
apps/confbridge/conf_state_single.c | 3 +
apps/confbridge/conf_state_single_marked.c | 3 +
apps/confbridge/include/confbridge.h | 9 +-
asterisk-11.8.1-summary.html | 63 --
asterisk-11.8.1-summary.txt | 94 --
asterisk-11.9.0-summary.html | 734 +++++++++++++++
asterisk-11.9.0-summary.txt | 930 ++++++++++++++++++
cdr/cdr_radius.c | 10 +-
cel/cel_manager.c | 9 +-
cel/cel_radius.c | 10 +-
channels/chan_dahdi.c | 99 +-
channels/chan_iax2.c | 185 +++-
channels/chan_local.c | 4 +-
channels/chan_mgcp.c | 50 +-
channels/chan_sip.c | 259 +++--
channels/chan_unistim.c | 78 +-
channels/sig_pri.c | 39 +-
channels/sip/include/sip.h | 9 +-
configs/agents.conf.sample | 5 -
configs/confbridge.conf.sample | 5 +-
configs/iax.conf.sample | 20 +-
configs/indications.conf.sample | 12 +-
configs/manager.conf.sample | 13 +-
configs/queues.conf.sample | 2 +-
configs/res_fax.conf.sample | 10 +-
configs/res_odbc.conf.sample | 8 +
configs/sip.conf.sample | 24 +-
configs/voicemail.conf.sample | 3 +-
configure | 151 ++-
configure.ac | 17 +-
contrib/scripts/astgenkey | 2 +-
contrib/scripts/astgenkey.8 | 2 +-
contrib/scripts/install_prereq | 6 +-
debian/asterisk.init | 34 +-
debian/asterisk.postrm | 4 +-
debian/asterisk.prerm | 4 +-
debian/changelog | 26 +-
debian/control | 2 +-
debian/patches/ASTERISK-23310.patch | 14 -
debian/patches/dahdi_pri_event_removed | 155 ---
debian/patches/escape_manpage_hyphen.patch | 19 +
debian/patches/freeradius-client | 74 --
debian/patches/hyphen | 267 ------
debian/patches/pjproject | 10 +-
debian/patches/pri_destroy_span_prilist.patch | 136 +++
debian/patches/series | 8 +-
debian/patches/sigpri_handle_enodev_1.patch | 77 ++
debian/patches/smsq_enable.patch | 2 +
debian/patches/smsq_manpage.patch | 154 +++
debian/upstream/signing-key.asc | 224 +++++
debian/watch | 2 +-
doc/asterisk.8 | 100 +-
formats/format_wav.c | 4 +-
funcs/func_audiohookinherit.c | 5 +
funcs/func_blacklist.c | 7 +-
funcs/func_callcompletion.c | 12 +-
funcs/func_callerid.c | 12 +-
funcs/func_channel.c | 30 +-
funcs/func_dialplan.c | 14 +-
funcs/func_frame_trace.c | 7 +-
funcs/func_global.c | 8 +-
funcs/func_groupcount.c | 21 +-
funcs/func_jitterbuffer.c | 7 +-
funcs/func_math.c | 7 +-
funcs/func_odbc.c | 7 +-
funcs/func_pitchshift.c | 7 +-
funcs/func_presencestate.c | 4 +-
funcs/func_speex.c | 7 +-
funcs/func_strings.c | 17 +-
funcs/func_volume.c | 11 +-
include/asterisk.h | 16 +
include/asterisk/autoconfig.h.in | 12 +
include/asterisk/channel.h | 5 +
include/asterisk/devicestate.h | 1 -
include/asterisk/frame.h | 26 +
include/asterisk/options.h | 2 +-
include/asterisk/res_odbc.h | 6 +
include/asterisk/rtp_engine.h | 4 +-
main/asterisk.c | 33 +-
main/astobj2.c | 3 +-
main/autoservice.c | 10 +-
main/callerid.c | 4 +-
main/cel.c | 275 ++++--
main/channel.c | 37 +-
main/config.c | 92 +-
main/db.c | 25 +-
main/devicestate.c | 4 +-
main/features.c | 32 +-
main/file.c | 4 +-
main/format.c | 8 +-
main/http.c | 9 +-
main/logger.c | 21 +-
main/manager.c | 414 ++++----
main/message.c | 22 +-
main/pbx.c | 21 +-
main/rtp_engine.c | 38 +-
main/say.c | 14 +-
main/tcptls.c | 16 +-
main/udptl.c | 4 +-
res/ael/pval.c | 3 +-
res/res_calendar.c | 7 +-
res/res_clialiases.c | 38 +-
res/res_config_odbc.c | 52 +-
res/res_config_pgsql.c | 45 +-
res/res_fax.c | 19 +-
res/res_fax_spandsp.c | 32 +-
res/res_http_websocket.c | 215 +++--
res/res_jabber.c | 6 +-
res/res_musiconhold.c | 10 +-
res/res_mutestream.c | 7 +-
res/res_odbc.c | 14 +-
res/res_odbc.exports.in | 1 +
res/res_pktccops.c | 4 +-
res/res_rtp_asterisk.c | 247 +++--
res/res_xmpp.c | 6 +-
utils/astman.c | 3 +-
utils/conf2ael.c | 4 +-
utils/extconf.c | 43 +-
148 files changed, 6171 insertions(+), 1729 deletions(-)
diff --cc debian/changelog
index c19a224,e4c95c3..0f69a5d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,24 +1,30 @@@
- asterisk (1:11.8.1~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.9.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Backport to wheezy.
+
- -- Jeremy Lainé <jeremy.laine at m4x.org> Sat, 15 Mar 2014 16:01:48 +0100
++ -- Jeremy Lainé <jeremy.laine at m4x.org> Mon, 26 May 2014 23:24:37 +0200
++
+ asterisk (1:11.9.0~dfsg-1) unstable; urgency=medium
+
+ [ Jeremy Lainé ]
+ * New upstream release.
+ - Drop ASTERISK-23310 patch, fixed upstream.
+ - Drop dahdi_pri_event_removed patch, fixed upstream.
+ - Drop freeradius-client patch, fixed upstream.
+ - Update pjproject patch.
+ * Provide a manpage for smsq.
+ * Use "set -e" in asterisk.(postrm|prerm) (fixes lintian warning).
+ * Add upstream GPG signature check to watch file.
+ * Add Daniel Pocock to uploaders.
+
+ [ Daniel Pocock ]
+ * Make init script more adaptable for multiple instances.
+
+ [ Tzafrir Cohen ]
+ * pri_destroy_span_prilist.patch, sigpri_handle_enodev_1.patch: fix
+ regressions due to dahdi_pri_event_removed.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org> Wed, 21 May 2014 12:03:09 +0200
asterisk (1:11.8.1~dfsg-1) unstable; urgency=high
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git
More information about the Pkg-voip-commits
mailing list