[Pkg-voip-commits] [asterisk] 01/01: Merge branch 'master' into wheezy-backports

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch wheezy-backports
in repository asterisk.

commit 7af8148072bb2d455c21992b928123b8b75fb390
Merge: acee1f1 ccfc58a
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Jul 11 01:14:46 2014 +0200

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 .version                             |   2 +-
 ChangeLog                            | 707 +++++++++++++++++++++++++++---
 Makefile                             |   1 -
 Makefile.rules                       |   2 +
 UPGRADE.txt                          |  24 +
 addons/chan_ooh323.c                 |  37 +-
 apps/app_confbridge.c                |  26 +-
 apps/app_mixmonitor.c                |   2 +-
 apps/app_queue.c                     |  18 +-
 apps/confbridge/include/confbridge.h |   2 +-
 asterisk-11.10.2-summary.html        |  68 ---
 asterisk-11.10.2-summary.txt         | 103 -----
 asterisk-11.11.0-summary.html        | 394 +++++++++++++++++
 asterisk-11.11.0-summary.txt         | 490 +++++++++++++++++++++
 autoconf/ast_ext_tool_check.m4       |  62 ++-
 cdr/cdr_sqlite3_custom.c             |  16 +-
 cel/cel_sqlite3_custom.c             |  19 +-
 channels/chan_dahdi.c                |   6 +-
 channels/chan_sip.c                  | 123 ++++--
 channels/chan_unistim.c              |   4 +-
 channels/sig_pri.c                   |  26 +-
 channels/sig_pri.h                   |   6 +
 channels/sip/include/sip.h           |   4 +-
 channels/sip/reqresp_parser.c        |   6 +-
 channels/sip/sdp_crypto.c            |   6 +-
 configs/chan_dahdi.conf.sample       |  17 +
 configs/extensions.lua.sample        |  22 +-
 configs/features.conf.sample         | 151 ++++---
 configs/sip.conf.sample              |  16 +-
 configure                            | 818 +++++++++++++++++------------------
 contrib/scripts/refcounter.py        |  47 +-
 contrib/scripts/safe_asterisk        | 135 +++---
 debian/asterisk.init                 |   2 +-
 debian/changelog                     |  14 +-
 debian/patches/pjproject             |  10 +-
 debian/patches/safe_asterisk-config  |  26 --
 debian/patches/safe_asterisk-nobg    |  32 --
 debian/patches/series                |   2 -
 debian/watch                         |   2 +-
 funcs/func_odbc.c                    | 267 ++++++------
 funcs/func_strings.c                 |  14 +-
 include/asterisk/autoconfig.h.in     |   5 +
 include/asterisk/config.h            |  10 +
 include/asterisk/http_websocket.h    |  13 +
 include/asterisk/manager.h           |  14 +-
 include/asterisk/rtp_engine.h        |  27 +-
 main/astobj2.c                       |  15 +-
 main/autoservice.c                   |  18 +-
 main/bridging.c                      |   6 +-
 main/config.c                        | 218 ++++++----
 main/db.c                            |   8 +-
 main/format.c                        |   8 +-
 main/http.c                          |   2 +-
 main/logger.c                        |  12 +-
 main/manager.c                       |  12 +-
 main/pbx.c                           |  39 +-
 main/rtp_engine.c                    |  21 +-
 main/tcptls.c                        |   2 +-
 main/test.c                          |  22 +-
 main/udptl.c                         |   8 +-
 main/utils.c                         |  11 +-
 menuselect/menuselect.c              |  12 +-
 pbx/pbx_lua.c                        |   8 +-
 res/res_config_odbc.c                | 202 ++++++---
 res/res_config_sqlite3.c             |   3 +-
 res/res_http_websocket.c             |  24 +-
 res/res_http_websocket.exports.in    |   1 +
 res/res_musiconhold.c                |  14 +-
 res/res_rtp_asterisk.c               | 502 ++++++++++++++-------
 69 files changed, 3442 insertions(+), 1524 deletions(-)

diff --cc debian/changelog
index 99e9b0e,6a7500b..880ef9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,18 @@@
- asterisk (1:11.10.2~dfsg-1~bpo70+1) wheezy-backports; urgency=high
++asterisk (1:11.11.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Sun, 15 Jun 2014 10:03:48 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 11 Jul 2014 01:14:12 +0200
++
+ asterisk (1:11.11.0~dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Drop safe_asterisk-config and safe_asterisk-nobg patches, fixed upstream
+       in bug ASTERISK-23492.
+     - Update pjproject patch.
+   * Remove svn-upgrade from watch file.
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 11 Jul 2014 00:59:13 +0200
  
  asterisk (1:11.10.2~dfsg-1) unstable; urgency=high
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git