[Pkg-amule-commits] [amule] 02/13: Merge tag 'upstream/2.3.1+git20151120.0023527bc2'

Sandro Tosi morph at moszumanska.debian.org
Sun Nov 29 12:37:15 UTC 2015


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

morph pushed a commit to branch master
in repository amule.

commit 8ee7feb12d770ddf241c67b775016582f746673d
Merge: 4c09c5d 8c208e4
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 21 21:49:21 2015 +0000

    Merge tag 'upstream/2.3.1+git20151120.0023527bc2'
    
    Upstream version 2.3.1+git20151120.0023527bc2

 .svn-revision                                      |     1 -
 ABOUT-NLS                                          |   435 -
 Compilation.flags.in                               |   269 -
 Makefile.in                                        |   979 -
 acinclude.m4                                       |   132 +-
 aclocal.m4                                         |  1052 --
 config.guess                                       |  1501 --
 config.h.in                                        |   573 -
 config.rpath                                       |   513 -
 config.sub                                         |  1705 --
 configure                                          | 17659 -------------------
 configure.in                                       |   183 +-
 depcomp                                            |   630 -
 docs/Changelog                                     |    25 +-
 docs/Makefile.in                                   |   747 -
 docs/man/Makefile.am                               |     1 +
 docs/man/Makefile.in                               |   557 -
 docs/man/amule.ro.1                                |    96 +
 docs/man/amulecmd.ro.1                             |   284 +
 docs/man/amuled.ro.1                               |    98 +
 docs/man/amulegui.ro.1                             |    69 +
 docs/man/amuleweb.ro.1                             |   219 +
 docs/man/ed2k.ro.1                                 |    85 +
 docs/man/po/manpages-ro.add                        |     1 +
 docs/man/po/manpages-ro.po                         |  1718 ++
 docs/man/po4a.config                               |     2 +-
 install-sh                                         |   520 -
 intl/ChangeLog                                     |     4 -
 intl/Makefile.in                                   |   338 -
 intl/VERSION                                       |     1 -
 intl/bindtextdom.c                                 |   369 -
 intl/config.charset                                |   466 -
 intl/dcgettext.c                                   |    59 -
 intl/dcigettext.c                                  |  1206 --
 intl/dcngettext.c                                  |    61 -
 intl/dgettext.c                                    |    59 -
 intl/dngettext.c                                   |    61 -
 intl/eval-plural.h                                 |   114 -
 intl/explodename.c                                 |   192 -
 intl/finddomain.c                                  |   198 -
 intl/gettext.c                                     |    64 -
 intl/gettextP.h                                    |   242 -
 intl/gmo.h                                         |   148 -
 intl/hash-string.h                                 |    59 -
 intl/intl-compat.c                                 |   131 -
 intl/l10nflist.c                                   |   453 -
 intl/libgnuintl.h                                  |   296 -
 intl/loadinfo.h                                    |   156 -
 intl/loadmsgcat.c                                  |  1316 --
 intl/localcharset.c                                |   369 -
 intl/locale.alias                                  |    78 -
 intl/localealias.c                                 |   419 -
 intl/localename.c                                  |   772 -
 intl/ngettext.c                                    |    68 -
 intl/os2compat.c                                   |    98 -
 intl/os2compat.h                                   |    46 -
 intl/osdep.c                                       |    24 -
 intl/plural-exp.c                                  |   156 -
 intl/plural-exp.h                                  |   126 -
 intl/plural.c                                      |  1322 --
 intl/plural.y                                      |   409 -
 intl/ref-add.sin                                   |    31 -
 intl/ref-del.sin                                   |    26 -
 intl/textdomain.c                                  |   142 -
 m4/bfd.m4                                          |    96 +
 m4/boost.m4                                        |  1086 +-
 m4/fallocate.m4                                    |     4 +-
 m4/gettext.m4                                      |     6 +-
 m4/mmap.m4                                         |   224 +
 m4/muleboost.m4                                    |   105 +
 m4/wxwin.m4                                        |     2 +-
 m4/zlib.m4                                         |     2 +-
 missing                                            |   376 -
 mkinstalldirs                                      |   162 -
 .../Windows/MSVC12/aMule-MSVC12E-ExtLibs30.sln     |   217 +-
 .../Windows/MSVC12/libs/libext/buildlibext.vcxproj |   159 +-
 po/LINGUAS                                         |     1 +
 po/Makefile.in.in                                  |   319 -
 po/amule.pot                                       |   867 +-
 po/ar.po                                           |   876 +-
 po/ast.po                                          |   887 +-
 po/bg.po                                           |   869 +-
 po/ca.po                                           |   883 +-
 po/cs.po                                           |   873 +-
 po/da.po                                           |   874 +-
 po/de.po                                           |   881 +-
 po/el.po                                           |   886 +-
 po/en_GB.po                                        |   865 +-
 po/es.po                                           |   881 +-
 po/et_EE.po                                        |   879 +-
 po/eu.po                                           |   884 +-
 po/fi.po                                           |   884 +-
 po/fr.po                                           |   880 +-
 po/gl.po                                           |   884 +-
 po/he.po                                           |   883 +-
 po/hr.po                                           |   881 +-
 po/hu.po                                           |   879 +-
 po/it.po                                           |   882 +-
 po/it_CH.po                                        |   887 +-
 po/ja.po                                           |   888 +-
 po/ko_KR.po                                        |   886 +-
 po/lt.po                                           |   886 +-
 po/nl.po                                           |   883 +-
 po/nn.po                                           |   884 +-
 po/pl.po                                           |   879 +-
 po/pt_BR.po                                        |   884 +-
 po/pt_PT.po                                        |   878 +-
 po/{nl.po => ro.po}                                |  4762 +++--
 po/ru.po                                           |   877 +-
 po/sl.po                                           |   883 +-
 po/sq.po                                           |   888 +-
 po/sv.po                                           |   873 +-
 po/tr.po                                           |   880 +-
 po/uk.po                                           |   883 +-
 po/zh_CN.po                                        |   883 +-
 po/zh_TW.po                                        |   882 +-
 src/CanceledFileList.cpp                           |     6 +-
 src/ClientCreditsList.cpp                          |    14 +-
 src/Constants.h                                    |    12 +
 src/DataToText.cpp                                 |     7 +-
 src/ECSpecialMuleTags.cpp                          |    28 -
 src/ED2KLinkParser.cpp                             |     4 +-
 src/EMSocket.cpp                                   |     2 +-
 src/EncryptedDatagramSocket.cpp                    |     2 +-
 src/EncryptedDatagramSocket.h                      |     2 +-
 src/EncryptedStreamSocket.cpp                      |     4 +-
 src/EncryptedStreamSocket.h                        |     2 +-
 src/ExternalConn.cpp                               |     5 +-
 src/ExternalConnector.cpp                          |     2 +-
 src/FileArea.cpp                                   |    32 +-
 src/FriendList.cpp                                 |     5 +-
 src/IPFilter.cpp                                   |    16 +-
 src/KnownFile.cpp                                  |     9 +-
 src/KnownFileList.cpp                              |     5 +-
 src/LibSocket.h                                    |    45 +
 src/LibSocketAsio.cpp                              |    16 +-
 src/ListenSocket.cpp                               |     2 +-
 src/Logger.cpp                                     |    10 +-
 src/Logger.h                                       |     2 -
 src/MD4Hash.h                                      |    14 -
 src/Makefile.am                                    |     9 +-
 src/Makefile.in                                    |  5767 ------
 src/MuleCollection.cpp                             |     2 +-
 src/MuleUDPSocket.cpp                              |     2 +-
 src/PartFile.cpp                                   |     8 +-
 src/PartFileConvert.h                              |    21 +-
 src/Preferences.cpp                                |    17 +-
 src/Preferences.h                                  |    26 +-
 src/PrefsUnifiedDlg.cpp                            |     6 +-
 src/Proxy.cpp                                      |    39 +-
 src/Proxy.h                                        |     8 +-
 src/SHAHashSet.cpp                                 |     4 +-
 src/Scanner.l                                      |    10 +-
 src/SearchFile.cpp                                 |     5 +
 src/ServerList.cpp                                 |    20 +-
 src/ServerListCtrl.cpp                             |     1 +
 src/ServerSocket.cpp                               |    33 +-
 src/SharedFileList.cpp                             |     2 +-
 src/StateMachine.cpp                               |     3 +-
 src/StateMachine.h                                 |     1 -
 src/Statistics.cpp                                 |     7 +-
 src/TextClient.cpp                                 |    63 +-
 src/ThreadTasks.cpp                                |     6 +-
 src/UPnPBase.cpp                                   |   355 +-
 src/UPnPBase.h                                     |   124 +-
 src/amule-remote-gui.cpp                           |     1 -
 src/amule.cpp                                      |    47 +-
 src/amule.h                                        |     1 -
 src/amuleAppCommon.cpp                             |    40 +-
 src/amuleDlg.cpp                                   |     6 +-
 src/amuleDlg.h                                     |     2 -
 src/extern/wxWidgets/listctrl.cpp                  |     2 +-
 src/extern/wxWidgets/listctrl.h                    |     2 +-
 src/kademlia/kademlia/Indexed.cpp                  |     7 +-
 src/kademlia/kademlia/Prefs.cpp                    |     2 +-
 src/kademlia/routing/RoutingZone.cpp               |     2 +-
 src/libs/Makefile.in                               |   684 -
 src/libs/common/Makefile.in                        |   658 -
 src/libs/ec/Makefile.in                            |   719 -
 src/libs/ec/abstracts/ECCodes.abstract             |    22 +-
 src/libs/ec/cpp/ECCodes.h                          |    22 -
 src/libs/ec/cpp/ECMuleSocket.cpp                   |    44 +-
 src/libs/ec/cpp/ECMuleSocket.h                     |     2 +-
 src/libs/ec/cpp/Makefile.am                        |     2 +-
 src/libs/ec/cpp/Makefile.in                        |   648 -
 src/libs/ec/cpp/RemoteConnect.cpp                  |     2 +-
 src/libs/ec/cpp/RemoteConnect.h                    |    17 -
 src/libs/ec/java/ECCodes.java                      |    11 -
 src/pixmaps/Makefile.in                            |   694 -
 src/pixmaps/flags_xpm/CountryFlags.h               |   509 -
 src/pixmaps/flags_xpm/Makefile.am                  |   245 -
 src/pixmaps/flags_xpm/Makefile.in                  |   722 -
 src/skins/Makefile.in                              |   537 -
 src/utils/Makefile.in                              |   709 -
 src/utils/aLinkCreator/Makefile.in                 |   758 -
 src/utils/aLinkCreator/docs/Makefile.am            |     1 +
 src/utils/aLinkCreator/docs/Makefile.in            |   532 -
 src/utils/aLinkCreator/docs/alc.ro.1               |    29 +
 src/utils/aLinkCreator/docs/alcc.ro.1              |    43 +
 src/utils/aLinkCreator/src/Makefile.in             |   836 -
 src/utils/cas/Makefile.in                          |   969 -
 src/utils/cas/docs/Makefile.am                     |     2 +-
 src/utils/cas/docs/Makefile.in                     |   522 -
 src/utils/cas/docs/cas.ro.1                        |    61 +
 src/utils/fileview/FileView.cpp                    |     2 +
 src/utils/fileview/Makefile.in                     |   776 -
 src/utils/fileview/Print.cpp                       |     2 +-
 src/utils/fileview/eD2kFiles.cpp                   |    22 +-
 src/utils/fileview/eD2kFiles.h                     |     1 +
 src/utils/plasmamule/Makefile.in                   |   962 -
 src/utils/wxCas/Makefile.in                        |   756 -
 src/utils/wxCas/docs/Makefile.am                   |     2 +-
 src/utils/wxCas/docs/Makefile.in                   |   522 -
 src/utils/wxCas/docs/wxcas.ro.1                    |    34 +
 src/utils/wxCas/src/Makefile.in                    |   678 -
 src/utils/xas/Makefile.in                          |   774 -
 src/utils/xas/docs/Makefile.am                     |     4 +-
 src/utils/xas/docs/Makefile.in                     |   593 -
 src/utils/xas/docs/xas.ro.1                        |    35 +
 src/webserver/Makefile.in                          |   682 -
 src/webserver/default/Makefile.in                  |   600 -
 src/webserver/src/Makefile.in                      |   965 -
 src/webserver/src/WebServer.cpp                    |    21 +-
 src/webserver/src/WebServer.h                      |    13 +-
 src/webserver/src/WebSocket.cpp                    |     5 +
 unittests/Makefile.in                              |   686 -
 unittests/muleunit/Makefile.in                     |   723 -
 unittests/tests/Makefile.in                        |  1164 --
 228 files changed, 24016 insertions(+), 83139 deletions(-)

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



More information about the Pkg-amule-commits mailing list