[Pkg-voip-commits] [ring] 05/12: Merge tag 'upstream/20160630.2.b3d131f_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 9195bb519b1b3e2c22f379e53423e9f92522e841
Merge: dfaca21 7635c82
Author: aviau <alexandre at alexandreviau.net>
Date:   Thu Jun 30 20:36:10 2016 +0200

    Merge tag 'upstream/20160630.2.b3d131f_dfsg1'
    
    Upstream version 20160630.2.b3d131f~dfsg1

 client-gnome/src/accountgeneraltab.cpp             |   5 +-
 daemon/README                                      |   2 +-
 .../bin/dbus/cx.ring.Ring.ConfigurationManager.xml |   7 +-
 daemon/bin/dbus/dbusconfigurationmanager.cpp       |   6 -
 daemon/bin/dbus/dbusconfigurationmanager.h         |   1 -
 daemon/configure.ac                                |  17 -
 daemon/contrib/src/iax/rules.mak                   |  25 --
 daemon/contrib/src/main.mak                        |   2 +-
 daemon/src/Makefile.am                             |  12 +-
 daemon/src/account.cpp                             |   2 +-
 daemon/src/account.h                               |   2 +-
 daemon/src/account_factory.cpp                     |   8 -
 daemon/src/client/configurationmanager.cpp         |  13 -
 daemon/src/dring/account_const.h                   |   1 -
 daemon/src/dring/configurationmanager_interface.h  |   1 -
 daemon/src/iax/Makefile.am                         |  21 -
 daemon/src/iax/iaxaccount.cpp                      | 232 ----------
 daemon/src/iax/iaxaccount.h                        | 158 -------
 daemon/src/iax/iaxcall.cpp                         | 249 -----------
 daemon/src/iax/iaxcall.h                           | 154 -------
 daemon/src/iax/iaxvoiplink.cpp                     | 450 -------------------
 daemon/src/iax/iaxvoiplink.h                       | 163 -------
 daemon/src/im/instant_messaging.cpp                |  12 -
 daemon/src/im/instant_messaging.h                  |   9 -
 daemon/src/manager.cpp                             |   2 +-
 daemon/src/preferences.cpp                         |  14 +-
 daemon/src/preferences.h                           |   2 -
 .../tools/build-system/hudson-sflphone-script.sh   |   4 +-
 .../build-system/launch-build-machine-jenkins.sh   |   1 -
 daemon/tools/dringctrl/dring.functest.yml          |   1 -
 daemon/tools/dringctrl/dringctrl_testdbus.py       |   3 -
 .../{ => dev}/compiling_and_installing/daemon.rst  |   0
 .../compiling_and_installing/gnome_client.rst      |   0
 .../{ => dev}/compiling_and_installing/index.rst   |   2 +
 .../{ => dev}/compiling_and_installing/lrc.rst     |   0
 .../compiling_and_installing/ring-project.rst      |   0
 docs/source/{ => dev}/contributing.rst             |   2 +
 docs/source/dev/daemon                             |   1 +
 docs/source/dev/gnome-client                       |   1 +
 docs/source/dev/lrc                                |   1 +
 docs/source/{ => dev}/releasing.rst                |   0
 docs/source/getting_started.rst                    |   4 -
 docs/source/index.rst                              |  55 ++-
 docs/source/intro/getting_started.rst              |   8 +
 docs/source/{ => users}/connecting_to_ldap.rst     |   0
 docs/source/{ => users}/setting_up_turn_stun.rst   |   0
 lrc/src/account.cpp                                |  40 +-
 lrc/src/account.h                                  |   3 +-
 lrc/src/accountmodel.cpp                           |  11 -
 lrc/src/accountmodel.h                             |   2 -
 lrc/src/availableaccountmodel.cpp                  |   3 -
 lrc/src/contactmethod.cpp                          |   6 -
 lrc/src/credentialmodel.cpp                        |   8 +-
 lrc/src/hookmanager.cpp                            |  15 -
 lrc/src/hookmanager.h                              |   4 -
 lrc/src/numbercompletionmodel.cpp                  |  23 +-
 lrc/src/private/accountmodel_p.h                   |   2 -
 lrc/src/protocolmodel.cpp                          |   7 +-
 lrc/src/qtwrapper/configurationmanager_wrap.h      |   5 -
 lrc/src/uri.cpp                                    |  27 +-
 lrc/src/uri.h                                      |  14 +-
 lrc/src/useractionmodel.cpp                        |  50 +--
 lrc/translations/lrc_ar.ts                         |  28 +-
 lrc/translations/lrc_bg.ts                         |   2 +-
 lrc/translations/lrc_ca.ts                         |  28 +-
 lrc/translations/lrc_da_DK.ts                      |  12 +-
 lrc/translations/{lrc_hr.ts => lrc_el.ts}          | 260 +++++------
 lrc/translations/lrc_en.ts                         | 223 +++++-----
 lrc/translations/lrc_es.ts                         |   8 +-
 lrc/translations/{lrc_ca.ts => lrc_fi.ts}          |  14 +-
 lrc/translations/lrc_hr.ts                         | 244 +++++------
 lrc/translations/lrc_lt.ts                         |  12 +-
 lrc/translations/{lrc_da_DK.ts => lrc_nl.ts}       | 484 ++++++++++-----------
 lrc/translations/{lrc_ca.ts => lrc_nl_NL.ts}       |  14 +-
 lrc/translations/lrc_pl.ts                         |  10 +-
 lrc/translations/lrc_pt_BR.ts                      |   2 +-
 76 files changed, 804 insertions(+), 2410 deletions(-)

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