[Pkg-voip-commits] [ring] 02/03: Merge tag 'upstream/20160712.1.66bea8b_dfsg1'

[Alexandre Viau]

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

aviau pushed a commit to branch master
in repository ring.

commit 2719728c989b85d57e132b2cd483539e2c70398c
Merge: 84710ac 5cae43c
Author: aviau <alexandre at alexandreviau.net>
Date:   Wed Jul 13 09:55:32 2016 -0400

    Merge tag 'upstream/20160712.1.66bea8b_dfsg1'
    
    Upstream version 20160712.1.66bea8b~dfsg1

 .gitmodules                                        |   3 +
 client-gnome/CMakeLists.txt                        |   2 +
 client-gnome/po/ar.po                              |   2 +-
 client-gnome/po/bg.po                              |   6 +-
 client-gnome/po/ca.po                              | 269 +++++++-------
 client-gnome/po/{ca.po => el.po}                   |  39 +-
 client-gnome/po/es.po                              |   7 +-
 client-gnome/po/{nl.po => fi.po}                   |  32 +-
 client-gnome/po/he.po                              |  20 +-
 client-gnome/po/hr.po                              | 167 ++++-----
 client-gnome/po/nl.po                              | 331 ++++++++---------
 client-gnome/po/{ca.po => nl_NL.po}                |  45 ++-
 client-gnome/po/pt_BR.po                           |   7 +-
 client-gnome/src/accountimportexportview.cpp       | 411 +++++++++++++++++++++
 client-gnome/src/accountimportexportview.h         |  40 ++
 client-gnome/src/accountview.cpp                   | 138 +++++--
 client-gnome/src/ring_client.cpp                   |  22 +-
 client-gnome/ui/accountimportexportview.ui         | 211 +++++++++++
 client-gnome/ui/accountview.ui                     |  28 +-
 client-gnome/ui/ringiconmenu.ui                    |  18 -
 client-gnome/ui/ui.gresource.xml                   |   2 +-
 daemon/configure.ac                                |  56 +--
 daemon/contrib/src/ffmpeg/rules.mak                |  15 +-
 daemon/contrib/src/gmp/rules.mak                   |   2 +-
 daemon/contrib/src/gnutls/SHA512SUMS               |   2 +-
 .../src/gnutls/dtls-packet-reordering.patch        |   5 -
 daemon/contrib/src/gnutls/format-security.patch    |   6 -
 daemon/contrib/src/gnutls/rules.mak                |   8 +-
 daemon/contrib/src/gsm/include_ios.patch           |  11 +
 daemon/contrib/src/gsm/rules.mak                   |   1 +
 daemon/contrib/src/jsoncpp/SHA512SUMS              |   2 +-
 daemon/contrib/src/jsoncpp/rules.mak               |   2 +-
 daemon/contrib/src/natpmp/SHA512SUMS               |   1 +
 daemon/contrib/src/natpmp/rules.mak                |  21 ++
 daemon/contrib/src/nettle/rules.mak                |  13 +-
 daemon/contrib/src/opus/rules.mak                  |   4 -
 daemon/contrib/src/pjproject/gnutls.patch          |   8 +-
 daemon/contrib/src/speexdsp/rules.mak              |   2 +-
 daemon/contrib/src/uuid/rules.mak                  |   4 +
 daemon/contrib/src/vpx/rules.mak                   |  18 +-
 daemon/contrib/src/x264/rules.mak                  |   2 +
 daemon/src/Makefile.am                             |  37 +-
 daemon/src/account.cpp                             |   4 -
 daemon/src/account_factory.cpp                     |   4 -
 daemon/src/call.h                                  |   2 -
 daemon/src/client/callmanager.cpp                  |   2 -
 daemon/src/client/configurationmanager.cpp         |  26 --
 daemon/src/manager.cpp                             |  12 -
 daemon/src/manager.h                               |   4 -
 daemon/src/media/audio/Makefile.am                 |   8 +
 daemon/src/media/audio/coreaudio/Makefile.am       |   4 +
 daemon/src/media/audio/coreaudio/audiodevice.cpp   |   4 +
 daemon/src/media/audio/coreaudio/audiodevice.h     |   6 +
 daemon/src/media/audio/coreaudio/corelayer.cpp     |  18 +-
 daemon/src/media/audio/coreaudio/corelayer.h       |   2 +
 daemon/src/media/video/Makefile.am                 |   3 +-
 daemon/src/ringdht/Makefile.am                     |   4 -
 daemon/src/ringdht/ringaccount.cpp                 |  11 +
 daemon/src/sip/sdp.cpp                             |   4 -
 daemon/src/sip/sipaccount.cpp                      |  28 +-
 daemon/src/sip/sipaccount.h                        |   4 -
 daemon/src/sip/sipcall.cpp                         |   8 -
 daemon/src/sip/sipcall.h                           |   2 -
 daemon/src/sip/siptransport.cpp                    |  12 +-
 daemon/src/sip/siptransport.h                      |   6 -
 daemon/src/sip/sipvoiplink.cpp                     |  10 -
 daemon/src/upnp/upnp_context.cpp                   | 407 +++++++++++++++-----
 daemon/src/upnp/upnp_context.h                     | 124 ++++---
 daemon/src/upnp/upnp_control.cpp                   |  18 +-
 daemon/src/upnp/upnp_igd.h                         |  93 ++++-
 docs/source/dev/releasing.rst                      |   2 +-
 lrc/src/macromodel.cpp                             |   7 +-
 lrc/src/private/videorenderermanager.cpp           | 113 +++---
 lrc/src/recentmodel.cpp                            |   4 +-
 lrc/src/tlsmethodmodel.cpp                         |  17 +-
 lrc/src/tlsmethodmodel.h                           |   3 +-
 make-ring.py                                       |  28 +-
 77 files changed, 1999 insertions(+), 1025 deletions(-)

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