[eso-midas] 01/03: Merge branch 'upstream' into debian

Ole Streicher olebole at moszumanska.debian.org
Tue Mar 17 15:59:44 UTC 2015


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

olebole pushed a commit to branch debian
in repository eso-midas.

commit a6c208b9c1ddf1537ee9d15549aab85639f71a7f
Merge: 0318a27 f0f537a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 17 16:56:55 2015 +0100

    Merge branch 'upstream' into debian

 applic/display/src/makefile.com                |   16 +
 applic/fit/libsrc/makefile.com                 |  142 ++
 applic/fit/src/makefile.com                    |   16 +
 applic/general/libsrc/makefile.com             |   21 +
 applic/general/src/makefile                    |    2 +-
 applic/general/src/makefile.com                |   15 +
 applic/general/src/sortrow.c                   |   50 +-
 applic/plot/libsrc/makefile.com                |   24 +
 applic/plot/src/makefile.com                   |   16 +
 applic/statist/libsrc/makefile.com             |   19 +
 applic/statist/src/makefile.com                |   16 +
 applic/table/src/makefile.com                  |   16 +
 contrib/astromet/libsrc/makefile.com           |   23 +
 contrib/astromet/src/makefile.com              |   16 +
 contrib/cloud/src/makefile.com                 |   16 +
 contrib/daophot/libsrc/makefile.com            |   36 +
 contrib/daophot/src/makefile.com               |   16 +
 contrib/esolv/libsrc/makefile.com              |   17 +
 contrib/esolv/src/makefile.com                 |   16 +
 contrib/geotest/src/makefile.com               |   16 +
 contrib/imres/libsrc/makefile.com              |   18 +
 contrib/imres/src/makefile.com                 |   17 +
 contrib/invent/libsrc/makefile.com             |  101 +
 contrib/invent/src/makefile.com                |   16 +
 contrib/iue/libsrc/makefile.com                |   27 +
 contrib/iue/src/makefile.com                   |   16 +
 contrib/lyman/src/makefile.com                 |   23 +
 contrib/mva/libsrc/makefile.com                |   30 +
 contrib/mva/src/makefile.com                   |   16 +
 contrib/pepsys/libsrc/makefile.com             |   36 +
 contrib/pepsys/src/makefile.com                |   16 +
 contrib/rgb/src/makefile.com                   |   16 +
 contrib/romafot/libsrc/makefile.com            |   42 +
 contrib/romafot/src/makefile.com               |   16 +
 contrib/surfphot/libsrc/makefile.com           |   54 +
 contrib/surfphot/src/makefile.com              |   16 +
 contrib/template/libsrc/makefile.com           |   17 +
 contrib/template/src/makefile.com              |   15 +
 contrib/tsa/libsrc/makefile.com                |   37 +
 contrib/tsa/src/makefile.com                   |   16 +
 contrib/wavelet/libsrc/makefile.com            |   18 +
 contrib/wavelet/src/makefile.com               |   15 +
 gui/GraphLib/libsrc/Comm/makefile.com          |   16 +
 gui/GraphLib/libsrc/uimxR5/src/makefile.com    |   16 +
 gui/resource/Xechelle                          | 3219 ------------------------
 incl/mutil.h                                   |   68 +-
 libsrc/agl/makefile.com                        |   15 +
 libsrc/astro/makefile.com                      |   16 +
 libsrc/display/makefile.com                    |   16 +
 libsrc/ftoc                                    |    1 +
 libsrc/ftoc-old/makefile.com                   |   16 +
 libsrc/idi/cidi/makefile.com                   |   15 +
 libsrc/idi/cidi/x11/makefile.com               |   16 +
 libsrc/idi/fidi/deanza/makefile.com            |   28 +
 libsrc/idi/fidi/makefile.com                   |   24 +
 libsrc/idi/fidi/newdev/makefile.com            |   24 +
 libsrc/idi/fidi/nodeanza/makefile.com          |   25 +
 libsrc/idi/fnidi/makefile.com                  |   24 +
 libsrc/math/heapsort.c                         |  269 ++
 libsrc/math/indexx.c                           |  124 -
 libsrc/math/makefile                           |    2 +-
 libsrc/math/makefile.com                       |   17 +
 libsrc/math/mutil.c                            |  106 +-
 libsrc/math/nrutil.c                           |    2 +-
 libsrc/math/sort.c                             |  126 +-
 libsrc/nag/makefile.com                        |   17 +
 libsrc/os/vms/makefile.com                     |   16 +
 libsrc/plot/makefile.com                       |   15 +
 libsrc/st/makefile.com                         |   20 +
 libsrc/tbl/makefile.com                        |   15 +
 libsrc/tw/makefile.com                         |   16 +
 libsrc/xcon/makefile.com                       |   16 +
 monit/catal.c                                  |    9 +-
 monit/makefile.com                             |   16 +
 monit/syskeys.datorg                           |    2 +-
 monit/xnews.txt                                |    2 +-
 prim/dio/libsrc/makefile.com                   |   15 +
 prim/dio/src/makefile.com                      |   15 +
 prim/display/libsrc/makefile.com               |   15 +
 prim/display/src/makefile.com                  |   15 +
 prim/edit/libsrc/makefile.com                  |   16 +
 prim/general/libsrc/iqefunc.c                  |   48 +-
 prim/general/libsrc/makefile                   |    2 +-
 prim/general/libsrc/makefile.com               |   35 +
 prim/general/libsrc/sort.c                     |  194 +-
 prim/general/src/averag.c                      |   62 +-
 prim/general/src/makefile                      |    6 +-
 prim/general/src/makefile.com                  |   16 +
 prim/help/WCS.alq                              |   33 -
 prim/help/wcs.alq                              |   10 +-
 prim/plot/libsrc/makefile.com                  |   15 +
 prim/plot/src/makefile.com                     |   15 +
 prim/table/libsrc/makefile.com                 |   57 +
 prim/table/src/makefile.com                    |   15 +
 prim/tc3/libsrc/makefile.com                   |   17 +
 prim/tw3/libsrc/makefile.com                   |   19 +
 {prim/general => stdred/ccdred}/libsrc/exmed.c |    0
 stdred/ccdred/libsrc/makefile                  |    2 +-
 stdred/ccdred/libsrc/makefile.com              |   17 +
 stdred/ccdred/libsrc/nrmed.c                   |    6 +-
 stdred/ccdred/libsrc/sort.c                    |  200 +-
 stdred/ccdred/src/makefile                     |   14 +-
 stdred/ccdred/src/makefile.com                 |   16 +
 stdred/ccdtest/src/ccdrebin.c                  |   85 +-
 stdred/ccdtest/src/makefile                    |    2 +-
 stdred/ccdtest/src/makefile.com                |   15 +
 stdred/do/libsrc/makefile.com                  |   16 +
 stdred/do/src/makefile.com                     |   15 +
 stdred/echelle/libsrc/makefile.com             |   16 +
 stdred/echelle/src/makefile                    |    8 +-
 stdred/echelle/src/makefile.com                |   16 +
 stdred/echelle/src/nechough.c                  |   52 +-
 stdred/echelle/src/necoffset.c                 |   46 +-
 stdred/feros/libsrc/makefile.com               |   17 +
 stdred/feros/libsrc/wavecal.c                  |    4 +-
 stdred/feros/src/makefile.com                  |   15 +
 stdred/irac2/src/makefile.com                  |   16 +
 stdred/irspec/src/makefile.com                 |   16 +
 stdred/long/src/makefile.com                   |   16 +
 stdred/mmf/src/makefile.com                    |   16 +
 stdred/mos/libsrc/makefile.com                 |   16 +
 stdred/mos/libsrc/misc.c                       |    2 +-
 stdred/mos/src/makefile.com                    |   15 +
 stdred/optopus/libsrc/makefile.com             |   18 +
 stdred/optopus/src/makefile.com                |   16 +
 stdred/spec/libsrc/makefile.com                |   29 +
 stdred/spec/src/makefile.com                   |   15 +
 stdred/spec/src/splocext.c                     |  497 ----
 system/idiserv/libsrc/makefile.com             |   16 +
 system/idiserv/src/makefile.com                |   15 +
 system/vms/tapeio/makefile.com                 |   19 +
 test/fits/makefile.com                         |   15 +
 util/bdf2ps/makefile.com                       |   15 +
 util/libsrc/makefile.com                       |   16 +
 util/ltape/makefile.com                        |   15 +
 135 files changed, 2808 insertions(+), 4573 deletions(-)

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



More information about the debian-science-commits mailing list