[Pkg-voip-commits] [kamailio] 02/04: Merge tag 'upstream/4.1.5'

[Victor Seva Lopez]

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

maniac-guest pushed a commit to branch master
in repository kamailio.

commit 3c21c1890967459212d6112e45a9deafaad27a9a
Merge: 9d9ef9a ee9aba2
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Thu Aug 7 21:16:50 2014 +0200

    Merge tag 'upstream/4.1.5'
    
    Upstream version 4.1.5
    
    Conflicts:
    	ChangeLog
    	Makefile.defs
    	autover.h
    	modules/dialog/dlg_handlers.c
    	pkg/kamailio/centos/6/kamailio.spec
    	pkg/kamailio/deb/debian/backports/squeeze
    	pkg/kamailio/deb/debian/changelog
    	pkg/kamailio/deb/debian/control
    	pkg/kamailio/deb/debian/rules
    	pkg/kamailio/deb/jessie/changelog
    	pkg/kamailio/deb/jessie/control
    	pkg/kamailio/deb/jessie/rules
    	pkg/kamailio/deb/precise/changelog
    	pkg/kamailio/deb/precise/control
    	pkg/kamailio/deb/precise/rules
    	pkg/kamailio/deb/squeeze/changelog
    	pkg/kamailio/deb/squeeze/rules
    	pkg/kamailio/deb/wheezy/changelog
    	pkg/kamailio/deb/wheezy/control
    	pkg/kamailio/deb/wheezy/rules
    	pkg/kamailio/fedora/17/kamailio.spec
    	pkg/kamailio/rpm/kamailio.spec-4.1
    	pkg/kamailio/rpm/kamailio.spec.CenOS
    	pkg/kamailio/rpm/kamailio.spec.SuSE

 ChangeLog                                          | 189 ++++++++++++
 Makefile.defs                                      |   2 +-
 autover.h                                          |   4 +-
 cfg_parser.c                                       |   3 +-
 core_cmd.c                                         |   2 +-
 modules/app_java/Makefile                          |   4 +-
 modules/auth/README                                | 210 +++++--------
 modules/auth/doc/auth_functions.xml                |  12 +-
 modules/dialog/dlg_handlers.c                      |   3 +
 modules/geoip/geoip_pv.c                           |   4 +
 modules/msilo/msilo.c                              |   7 +
 modules/pua/pua.c                                  |   2 +-
 modules/pua_xmpp/simple2xmpp.h                     |   2 +-
 modules/registrar/save.c                           |   1 +
 modules/tm/h_table.c                               |  10 +-
 modules/tmx/t_var.c                                |   1 +
 modules/uac/replace.c                              |   3 +-
 modules/usrloc/ucontact.c                          |   8 +-
 modules/usrloc/ul_mi.c                             |  27 +-
 pkg/kamailio/centos/6/kamailio.spec                |   2 +-
 pkg/kamailio/deb/debian/backports/squeeze          |   3 +-
 pkg/kamailio/deb/debian/backports/trusty           |  19 ++
 pkg/kamailio/deb/debian/changelog                  |   6 +
 pkg/kamailio/deb/debian/control                    |   2 +-
 pkg/kamailio/deb/debian/rules                      |   3 +-
 pkg/kamailio/deb/jessie/changelog                  |   6 +
 pkg/kamailio/deb/jessie/control                    |   2 +-
 pkg/kamailio/deb/jessie/rules                      |   3 +-
 pkg/kamailio/deb/precise/changelog                 |   6 +
 pkg/kamailio/deb/precise/control                   |   2 +-
 pkg/kamailio/deb/precise/rules                     |   3 +-
 pkg/kamailio/deb/squeeze/changelog                 |   6 +
 pkg/kamailio/deb/squeeze/rules                     |   2 -
 pkg/kamailio/deb/{precise => trusty}/changelog     |   6 +
 pkg/kamailio/deb/trusty/compat                     |   1 +
 pkg/kamailio/deb/{jessie => trusty}/control        |   2 +-
 pkg/kamailio/deb/trusty/copyright                  | 335 +++++++++++++++++++++
 .../kamailio-autheph-modules.lintian-overrides     |   1 +
 pkg/kamailio/deb/trusty/kamailio-berkeley-bin.dirs |   1 +
 .../kamailio-dnssec-modules.lintian-overrides      |   1 +
 .../kamailio-outbound-modules.lintian-overrides    |   1 +
 .../trusty/kamailio-tls-modules.lintian-overrides  |   1 +
 .../kamailio-websocket-modules.lintian-overrides   |   1 +
 pkg/kamailio/deb/trusty/kamailio.README.Debian     |  39 +++
 pkg/kamailio/deb/trusty/kamailio.default           |  28 ++
 pkg/kamailio/deb/trusty/kamailio.examples          |   2 +
 pkg/kamailio/deb/trusty/kamailio.init              | 162 ++++++++++
 pkg/kamailio/deb/trusty/kamailio.lintian-overrides |   2 +
 pkg/kamailio/deb/trusty/kamailio.postinst          |  24 ++
 pkg/kamailio/deb/{jessie => trusty}/rules          |   3 +-
 pkg/kamailio/deb/trusty/source.lintian-overrides   |   1 +
 pkg/kamailio/deb/trusty/source/format              |   1 +
 pkg/kamailio/deb/trusty/watch                      |   3 +
 pkg/kamailio/deb/wheezy/changelog                  |   6 +
 pkg/kamailio/deb/wheezy/control                    |   2 +-
 pkg/kamailio/deb/wheezy/rules                      |   3 +-
 pkg/kamailio/fedora/17/kamailio.spec               |   2 +-
 pkg/kamailio/rpm/kamailio.spec-4.1                 |   2 +-
 pkg/kamailio/rpm/kamailio.spec.CenOS               |   2 +-
 pkg/kamailio/rpm/kamailio.spec.SuSE                |   2 +-
 utils/kamctl/kamctl                                |   2 +-
 61 files changed, 1009 insertions(+), 186 deletions(-)

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