[Debian-astro-commits] [esorex] 02/04: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository esorex.

commit b324ca78b21fda0833a1f8862cff02c7b4cf1e36
Merge: 178b759 227fe3c
Author: Ole Streicher <ole at aip.de>
Date:   Fri Feb 19 10:04:06 2016 +0100

    Merge branch 'upstream' into debian

 Makefile.am                              |    4 +-
 Makefile.in                              |   64 +-
 aclocal.m4                               |   67 +-
 admin/compile                            |    2 +-
 admin/config.guess                       |  173 +-
 admin/config.sub                         |   36 +-
 admin/depcomp                            |    2 +-
 admin/install-sh                         |  366 +-
 admin/ltmain.sh                          |  143 +-
 admin/missing                            |    2 +-
 admin/test-driver                        |   15 +-
 config.h.in                              |    9 +
 configure                                | 5372 ++++++++++++++++++++++++++++--
 configure.ac                             |    9 +-
 etc/Makefile.in                          |   29 +-
 etc/esorex.rc.in                         |   50 +-
 libltdl/Makefile.am                      |   22 +-
 libltdl/Makefile.in                      |   90 +-
 libltdl/README                           |    2 +-
 libltdl/aclocal.m4                       |   67 +-
 libltdl/config-h.in                      |    3 +
 libltdl/configure                        |  663 +++-
 libltdl/configure.ac                     |    2 +-
 libltdl/libltdl/lt__alloc.h              |    2 +-
 libltdl/{argz_.h => libltdl/lt__argz_.h} |    2 +-
 libltdl/libltdl/lt__dirent.h             |    2 +-
 libltdl/libltdl/lt__glibc.h              |    9 +-
 libltdl/libltdl/lt__private.h            |    2 +-
 libltdl/libltdl/lt__strl.h               |    2 +-
 libltdl/libltdl/lt_dlloader.h            |    2 +-
 libltdl/libltdl/lt_error.h               |    2 +-
 libltdl/libltdl/lt_system.h              |    2 +-
 libltdl/libltdl/slist.h                  |    2 +-
 libltdl/loaders/dld_link.c               |   12 +-
 libltdl/loaders/dlopen.c                 |   50 +-
 libltdl/loaders/dyld.c                   |    6 +-
 libltdl/loaders/load_add_on.c            |   12 +-
 libltdl/loaders/loadlibrary.c            |   12 +-
 libltdl/loaders/preopen.c                |   14 +-
 libltdl/loaders/shl_load.c               |   12 +-
 libltdl/lt__alloc.c                      |    2 +-
 libltdl/{argz.c => lt__argz.c}           |    6 +-
 libltdl/lt__dirent.c                     |    2 +-
 libltdl/lt__strl.c                       |    2 +-
 libltdl/lt_dlloader.c                    |    2 +-
 libltdl/lt_error.c                       |    2 +-
 libltdl/ltdl.c                           |    4 +-
 libltdl/ltdl.h                           |    2 +-
 libltdl/slist.c                          |    2 +-
 m4/libtool.m4                            |  534 ++-
 m4/{argz.m4 => ltargz.m4}                |   23 +-
 m4/ltdl.m4                               |  123 +-
 m4/ltoptions.m4                          |   57 +-
 m4/ltsugar.m4                            |    2 +-
 m4/ltversion.m4                          |   12 +-
 m4/lt~obsolete.m4                        |    2 +-
 src/Makefile.am                          |   10 +-
 src/Makefile.in                          |  108 +-
 src/er_fileutils.c                       |  177 +-
 src/er_fileutils.h                       |   13 +-
 src/er_help.c                            |   47 +-
 src/er_help.h                            |   13 +-
 src/er_json.c                            |   12 +-
 src/er_json.h                            |   14 +-
 src/{er_main.c => er_main.cpp}           |   16 +-
 src/er_main.h                            |   14 +-
 src/er_paf.c                             |   20 +-
 src/er_paf.h                             |   12 +-
 src/er_params.c                          |   14 +-
 src/er_params.h                          |   16 +-
 src/er_paramutils.c                      |   16 +-
 src/er_paramutils.h                      |   14 +-
 src/er_plugin.c                          |   66 +-
 src/er_plugin.h                          |   15 +-
 src/er_pluginlist.c                      |   18 +-
 src/er_pluginlist.h                      |   13 +-
 src/er_stringarray.c                     |   12 +-
 src/er_stringarray.h                     |   24 +-
 src/er_stringutils.c                     |   12 +-
 src/er_stringutils.h                     |   14 +-
 src/getopt.c                             |    6 +-
 src/getopt.h                             |    6 +-
 src/getopt1.c                            |    6 +-
 src/tests/Makefile.am                    |    8 +-
 src/tests/Makefile.in                    |   32 +-
 src/tests/esorex_json-test.c             |   12 +-
 86 files changed, 7243 insertions(+), 1631 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/esorex.git