[vdr-plugin-fritzbox] 06/10: Merge tag 'upstream/1.5.3'

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdr-plugin-fritzbox.

commit 69f54efe6c01a290738cec48f767a96cbbbac45f
Merge: f725684 24d9fff
Author: etobi <git at e-tobi.net>
Date:   Sat Feb 14 16:11:10 2015 +0100

    Merge tag 'upstream/1.5.3'
    
    Upstream version 1.5.3
    
    Conflicts:
    	Makefile

 HISTORY                                            |   7 +
 Makefile                                           | 121 +--
 README                                             |   4 +-
 README.de                                          |   4 +-
 README => README.md                                |  84 +-
 fritzbox.c => fritzbox.cpp                         |  46 +-
 fritzbox.h                                         |   7 +-
 fritzeventhandler.c => fritzeventhandler.cpp       |   9 +-
 fritzeventhandler.h                                |   8 +-
 libconv++/CharsetConverter.cpp                     | 100 +++
 .../FritzFonbook.h => libconv++/CharsetConverter.h |  32 +-
 libconv++/EntityConverter.cpp                      | 177 +++++
 .../Nummerzoeker.h => libconv++/EntityConverter.h  |  24 +-
 libconv++/Makefile                                 |  25 +
 libfritz++/CMakeLists.txt                          |  26 +-
 libfritz++/CallList.cpp                            |  60 +-
 libfritz++/CallList.h                              |  25 +-
 libfritz++/Config.cpp                              |  26 +-
 libfritz++/Config.h                                |  42 +-
 libfritz++/Fonbook.cpp                             | 259 ++----
 libfritz++/Fonbook.h                               |  78 +-
 libfritz++/FonbookManager.cpp                      | 109 +--
 libfritz++/FonbookManager.h                        |  44 +-
 libfritz++/Fonbooks.cpp                            |   9 +-
 libfritz++/FritzClient.cpp                         | 324 ++++----
 libfritz++/FritzClient.h                           |  30 +-
 libfritz++/FritzFonbook.cpp                        |  58 +-
 libfritz++/FritzFonbook.h                          |  14 +-
 libfritz++/HISTORY                                 |   9 +
 libfritz++/HttpClient.cpp                          |  92 ---
 libfritz++/HttpClient.h                            |  47 --
 libfritz++/Listener.cpp                            | 106 +--
 libfritz++/Listener.h                              |  29 +-
 libfritz++/LocalFonbook.cpp                        |  51 +-
 libfritz++/LocalFonbook.h                          |   8 +-
 libfritz++/LookupFonbook.cpp                       |  14 +-
 libfritz++/LookupFonbook.h                         |  12 +-
 libfritz++/Makefile                                |  34 +-
 libfritz++/Nummerzoeker.cpp                        |  28 +-
 libfritz++/Nummerzoeker.h                          |   2 +-
 libfritz++/OertlichesFonbook.cpp                   |  24 +-
 libfritz++/OertlichesFonbook.h                     |   2 +-
 libfritz++/TcpClient.cpp                           |  40 -
 libfritz++/TelLocalChFonbook.cpp                   |  47 +-
 libfritz++/TelLocalChFonbook.h                     |   2 +-
 libfritz++/Tools.cpp                               | 145 +---
 libfritz++/Tools.h                                 |  81 --
 libfritz++/XmlFonbook.cpp                          |  65 +-
 libfritz++/XmlFonbook.h                            |  10 +-
 libfritz++/cc++/mime.cpp                           | 170 ----
 libfritz++/cc++/mime.h                             | 239 ------
 libfritz++/cc++/readme.txt                         |   3 -
 libfritz++/cc++/soap.cpp                           |  66 --
 libfritz++/cc++/soap.h                             |  63 --
 libfritz++/cc++/url.cpp                            | 871 ---------------------
 libfritz++/cc++/url.h                              | 552 -------------
 libfritz++/cc++/urlstring.cpp                      | 317 --------
 log.c => liblog++/CustomLogStream.cpp              |  46 +-
 log.h => liblog++/CustomLogStream.h                |  44 +-
 liblog++/Log.cpp                                   |  83 ++
 liblog++/Log.h                                     |  62 ++
 liblog++/Makefile                                  |  25 +
 libnet++/HttpClient.cpp                            | 187 +++++
 libnet++/HttpClient.h                              |  58 ++
 libnet++/Makefile                                  |  25 +
 {libfritz++ => libnet++}/SoapClient.cpp            |  22 +-
 {libfritz++ => libnet++}/SoapClient.h              |  14 +-
 libnet++/TcpClient.cpp                             |  76 ++
 {libfritz++ => libnet++}/TcpClient.h               |  19 +-
 menu.c => menu.cpp                                 |  69 +-
 notifyosd.c => notifyosd.cpp                       |   1 +
 po/de_DE.po                                        | 319 ++++----
 po/fr_FR.po                                        | 329 ++++----
 po/it_IT.po                                        | 323 ++++----
 po/ru_RU.po                                        | 327 ++++----
 po/tr_TR.po                                        | 301 ++++---
 setup.c => setup.cpp                               |  34 +-
 setup.h                                            |  12 +-
 78 files changed, 2612 insertions(+), 4645 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-fritzbox.git