[Pkg-voip-commits] [asterisk] 01/02: Merge branch 'master' into wheezy-backports
Jeremy Lainé
sharky at moszumanska.debian.org
Thu Aug 28 14:15:48 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 b1905826e73c7e553bac28cfd4c181658a682035
Merge: 7af8148 fb48503
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date: Wed Aug 20 15:55:49 2014 +0200
Merge branch 'master' into wheezy-backports
Conflicts:
debian/changelog
.version | 2 +-
ChangeLog | 219 +++++++++++++++
addons/chan_ooh323.c | 32 +--
addons/ooh323c/src/ooq931.c | 12 +-
addons/ooh323c/src/printHandler.c | 2 +-
apps/app_meetme.c | 10 +-
apps/app_queue.c | 4 +-
apps/app_skel.c | 3 +-
apps/app_speech_utils.c | 58 ++--
apps/app_voicemail.c | 6 +-
asterisk-11.11.0-summary.html | 394 ---------------------------
asterisk-11.11.0-summary.txt | 490 ----------------------------------
asterisk-11.12.0-summary.html | 180 +++++++++++++
asterisk-11.12.0-summary.txt | 237 ++++++++++++++++
channels/chan_sip.c | 187 ++-----------
channels/sig_pri.c | 8 +-
contrib/scripts/refcounter.py | 17 +-
debian/changelog | 19 +-
debian/control | 2 +-
debian/copyright | 9 +-
debian/patches/aelparse_enable.patch | 14 +
debian/patches/aelparse_manpage.patch | 39 +++
debian/patches/series | 2 +
debian/patches/smsq_manpage.patch | 3 +
debian/rules | 5 +-
funcs/func_frame_trace.c | 3 +-
funcs/func_jitterbuffer.c | 3 +-
funcs/func_uri.c | 10 +-
include/asterisk/xmpp.h | 84 +++---
main/astobj2.c | 17 +-
main/config.c | 9 +-
main/features.c | 10 +-
main/format.c | 22 +-
main/manager.c | 22 +-
main/pbx.c | 7 +-
main/tcptls.c | 7 +-
main/utils.c | 20 +-
pbx/pbx_lua.c | 4 +-
res/res_jabber.c | 4 +-
tests/test_abstract_jb.c | 13 +-
tests/test_aoc.c | 4 +-
tests/test_astobj2.c | 4 +-
tests/test_astobj2_thrash.c | 4 +-
tests/test_config.c | 16 +-
tests/test_event.c | 20 +-
tests/test_format_api.c | 4 +-
tests/test_hashtab_thrash.c | 4 +-
tests/test_logger.c | 26 +-
tests/test_voicemail_api.c | 14 +-
49 files changed, 1026 insertions(+), 1259 deletions(-)
diff --cc debian/changelog
index 880ef9e,159a7ee..0d74275
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,23 @@@
- asterisk (1:11.11.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.12.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Backport to wheezy.
+
- -- Jeremy Lainé <jeremy.laine at m4x.org> Fri, 11 Jul 2014 01:14:12 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org> Wed, 20 Aug 2014 15:55:30 +0200
++
+ asterisk (1:11.12.0~dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Drop pbx_lua_regression patch, fixed upstream.
+ * Make asterisk Provide asterisk-$$AST_BUILDOPT_SUM (Closes: #689109).
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org> Wed, 20 Aug 2014 15:23:03 +0200
+
+ asterisk (1:11.11.0~dfsg-2) unstable; urgency=medium
+
+ * Fix loading lua modules from pbx_lua (Closes: #756425).
+ * Ship the aelparse utility (Closes: #747866).
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org> Thu, 07 Aug 2014 13:00:58 +0200
asterisk (1:11.11.0~dfsg-1) unstable; urgency=medium
--
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