[esorex] 01/02: 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 8d6b7b65980d655d3240c3a8a065ae00e13becb1
Merge: 2a5c8e8 45f0701
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jan 29 12:31:10 2015 +0100

    Merge branch 'upstream' into debian

 ChangeLog                     |   30 +
 Makefile.in                   |    2 +-
 README                        |   15 +-
 admin/ltmain.sh               | 5489 ++++++++++++++---------
 config.h.in                   |    3 +-
 configure                     | 1667 +++----
 configure.ac                  |    2 +-
 libltdl/COPYING.LIB           |   77 +-
 libltdl/Makefile.am           |   25 +-
 libltdl/Makefile.in           |  715 +--
 libltdl/README                |    2 +-
 libltdl/aclocal.m4            |  704 +--
 libltdl/argz.c                |    7 +-
 libltdl/argz_.h               |   15 +-
 libltdl/config-h.in           |    5 +-
 libltdl/config/compile        |  310 --
 libltdl/config/config.guess   | 1519 -------
 libltdl/config/config.sub     | 1767 --------
 libltdl/config/depcomp        |  630 ---
 libltdl/config/install-sh     |  527 ---
 libltdl/config/ltmain.sh      | 9655 -----------------------------------------
 libltdl/config/missing        |  376 --
 libltdl/configure             | 2342 +++++-----
 libltdl/configure.ac          |   13 +-
 libltdl/libltdl/lt__alloc.h   |   14 +-
 libltdl/libltdl/lt__dirent.h  |   13 +-
 libltdl/libltdl/lt__glibc.h   |   11 +-
 libltdl/libltdl/lt__private.h |   22 +-
 libltdl/libltdl/lt__strl.h    |   16 +-
 libltdl/libltdl/lt_dlloader.h |    7 +-
 libltdl/libltdl/lt_error.h    |    9 +-
 libltdl/libltdl/lt_system.h   |   52 +-
 libltdl/libltdl/slist.h       |   19 +-
 libltdl/loaders/dld_link.c    |    6 +-
 libltdl/loaders/dlopen.c      |   34 +-
 libltdl/loaders/dyld.c        |   42 +-
 libltdl/loaders/load_add_on.c |    4 +-
 libltdl/loaders/loadlibrary.c |   16 +-
 libltdl/loaders/preopen.c     |   26 +-
 libltdl/loaders/shl_load.c    |   18 +-
 libltdl/lt__alloc.c           |    3 +-
 libltdl/lt__dirent.c          |    9 +-
 libltdl/lt__strl.c            |   24 +-
 libltdl/lt_dlloader.c         |    7 +-
 libltdl/lt_error.c            |    5 +-
 libltdl/ltdl.c                |   85 +-
 libltdl/ltdl.h                |   10 +-
 libltdl/m4/libtool.m4         | 7982 ----------------------------------
 libltdl/m4/ltdl.m4            |  817 ----
 libltdl/m4/ltoptions.m4       |  384 --
 libltdl/m4/ltsugar.m4         |  123 -
 libltdl/m4/ltversion.m4       |   23 -
 libltdl/m4/lt~obsolete.m4     |   98 -
 libltdl/slist.c               |   10 +-
 {libltdl/m4 => m4}/argz.m4    |   20 +-
 m4/libtool.m4                 | 2059 ++++-----
 m4/ltdl.m4                    |  139 +-
 m4/ltoptions.m4               |   72 +-
 m4/ltsugar.m4                 |    7 +-
 m4/ltversion.m4               |   12 +-
 m4/lt~obsolete.m4             |    7 +-
 src/er_paf.c                  |   19 +-
 src/er_plugin.c               |   76 +-
 63 files changed, 8049 insertions(+), 30148 deletions(-)

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