[cpl] 01/02: Merge branch 'upstream' into debian

Ole Streicher olebole at moszumanska.debian.org
Thu Nov 20 16:59:32 UTC 2014


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

olebole pushed a commit to branch debian
in repository cpl.

commit 18ae877d5cc6aa01ec1b2ee92e7eb819f14b2433
Merge: 258517a 0304a6b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Nov 20 17:32:49 2014 +0100

    Merge branch 'upstream' into debian

 Makefile.in                                    |    2 +-
 NEWS                                           |    7 +-
 admin/ltmain.sh                                | 5489 +++++++++-----
 config.h.in                                    |    3 +-
 configure                                      | 1701 ++---
 configure.ac                                   |    4 +-
 cplcore/Makefile.am                            |   16 +-
 cplcore/Makefile.in                            |   19 +-
 cplcore/cpl_column.c                           |  563 +-
 cplcore/cpl_image_basic_body.h                 |    1 +
 cplcore/cpl_image_iqe.c                        |  489 +-
 cplcore/cpl_mpfit.c                            | 2296 ++++++
 cplcore/cpl_mpfit.h                            |  196 +
 cplui/cpl_frameset.c                           |    2 +-
 cplui/cpl_plugin.c                             |    2 +-
 cplui/cpl_plugin.h                             |    4 +-
 html/annotated.html                            |    2 +-
 html/classes.html                              |    2 +-
 html/deprecated.html                           |    2 +-
 html/dir_0893a83ae506d6342ff4de074eaf5145.html |    2 +-
 html/dir_283883d147ab9a845d7032d17e09a122.html |    2 +-
 html/dir_5cd28bf58103222faf21a5533c3a1fe9.html |    2 +-
 html/dir_d94ae846f16019cf15b4979bbb4258a2.html |    6 +-
 html/functions.html                            |    2 +-
 html/functions_vars.html                       |    2 +-
 html/group__cpl__apertures.html                |    2 +-
 html/group__cpl__array.html                    |    2 +-
 html/group__cpl__bivector.html                 |    2 +-
 html/group__cpl__detector.html                 |    2 +-
 html/group__cpl__dfs.html                      |    2 +-
 html/group__cpl__error.html                    |    2 +-
 html/group__cpl__errorstate.html               |    2 +-
 html/group__cpl__fft.html                      |    2 +-
 html/group__cpl__filter.html                   |    2 +-
 html/group__cpl__fit.html                      |    2 +-
 html/group__cpl__fits.html                     |    2 +-
 html/group__cpl__frame.html                    |    2 +-
 html/group__cpl__framedata.html                |    2 +-
 html/group__cpl__frameset.html                 |    2 +-
 html/group__cpl__frameset__io.html             |    2 +-
 html/group__cpl__frameset__iterator.html       |    2 +-
 html/group__cpl__geom__img.html                |    2 +-
 html/group__cpl__image.html                    |    2 +-
 html/group__cpl__imagelist.html                |    2 +-
 html/group__cpl__init.html                     |    2 +-
 html/group__cpl__io.html                       |    2 +-
 html/group__cpl__mask.html                     |    2 +-
 html/group__cpl__math.html                     |    2 +-
 html/group__cpl__matrix.html                   |    2 +-
 html/group__cpl__memory.html                   |    2 +-
 html/group__cpl__msg.html                      |    2 +-
 html/group__cpl__multiframe.html               |    2 +-
 html/group__cpl__parameter.html                |    2 +-
 html/group__cpl__parameterlist.html            |    2 +-
 html/group__cpl__photom.html                   |    2 +-
 html/group__cpl__plot.html                     |    2 +-
 html/group__cpl__plugin.html                   |    4 +-
 html/group__cpl__pluginlist.html               |    2 +-
 html/group__cpl__polynomial.html               |    2 +-
 html/group__cpl__ppm.html                      |    2 +-
 html/group__cpl__property.html                 |    2 +-
 html/group__cpl__propertylist.html             |    2 +-
 html/group__cpl__recipe.html                   |    2 +-
 html/group__cpl__recipeconfig.html             |    2 +-
 html/group__cpl__recipedefine.html             |    2 +-
 html/group__cpl__regex.html                    |    2 +-
 html/group__cpl__stats.html                    |    2 +-
 html/group__cpl__table.html                    |    2 +-
 html/group__cpl__test.html                     |    2 +-
 html/group__cpl__type.html                     |    2 +-
 html/group__cpl__vector.html                   |    2 +-
 html/group__cpl__version.html                  |    2 +-
 html/group__cpl__wcs.html                      |    2 +-
 html/group__cpl__wlcalib.html                  |    2 +-
 html/index.html                                |    2 +-
 html/modules.html                              |    2 +-
 html/pages.html                                |    2 +-
 html/struct__cpl__framedata__-members.html     |    2 +-
 html/struct__cpl__framedata__.html             |    2 +-
 html/struct__cpl__plugin__-members.html        |    2 +-
 html/struct__cpl__plugin__.html                |    8 +-
 html/struct__cpl__recipe__-members.html        |    2 +-
 html/struct__cpl__recipe__.html                |    2 +-
 libcext/Makefile.in                            |    6 +-
 libcext/admin/ltmain.sh                        | 5489 +++++++++-----
 libcext/config.h.in                            |    3 +-
 libcext/configure                              | 1629 ++--
 libcext/m4/libtool.m4                          | 2059 ++---
 libcext/m4/ltoptions.m4                        |   72 +-
 libcext/m4/ltsugar.m4                          |    7 +-
 libcext/m4/ltversion.m4                        |   12 +-
 libcext/m4/lt~obsolete.m4                      |    7 +-
 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 +-
 146 files changed, 16242 insertions(+), 34876 deletions(-)

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



More information about the debian-science-commits mailing list