[Debian-astro-commits] [eso-midas] 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 eso-midas.

commit 28446198c7a5a0323759381154cfafb2a1ae9442
Merge: d3df07f 71c188f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Sep 11 11:11:10 2015 +0200

    Merge branch 'upstream' into debian

 applic/display/src/makefile.com             |  2 +-
 applic/fit/libsrc/makefile.com              |  2 +-
 applic/fit/src/makefile.com                 |  2 +-
 applic/general/libsrc/makefile.com          |  2 +-
 applic/general/src/makefile.com             |  2 +-
 applic/plot/libsrc/makefile.com             |  2 +-
 applic/plot/src/makefile.com                |  2 +-
 applic/statist/libsrc/makefile.com          |  2 +-
 applic/statist/src/makefile.com             |  2 +-
 applic/table/src/makefile.com               |  2 +-
 contrib/astromet/libsrc/makefile.com        |  2 +-
 contrib/astromet/src/makefile.com           |  2 +-
 contrib/cloud/src/makefile.com              |  2 +-
 contrib/daophot/libsrc/makefile.com         |  2 +-
 contrib/daophot/src/makefile.com            |  2 +-
 contrib/esolv/libsrc/makefile.com           |  2 +-
 contrib/esolv/src/makefile.com              |  2 +-
 contrib/geotest/src/makefile.com            |  2 +-
 contrib/imres/libsrc/makefile.com           |  2 +-
 contrib/imres/src/makefile.com              |  2 +-
 contrib/invent/libsrc/makefile.com          |  2 +-
 contrib/invent/src/makefile.com             |  2 +-
 contrib/iue/libsrc/makefile.com             |  2 +-
 contrib/iue/src/makefile.com                |  2 +-
 contrib/lyman/src/makefile.com              |  2 +-
 contrib/mva/libsrc/makefile.com             |  2 +-
 contrib/mva/src/makefile.com                |  2 +-
 contrib/pepsys/libsrc/makefile.com          |  2 +-
 contrib/pepsys/src/makefile.com             |  2 +-
 contrib/rgb/src/makefile.com                |  2 +-
 contrib/romafot/libsrc/makefile.com         |  2 +-
 contrib/romafot/src/makefile.com            |  2 +-
 contrib/surfphot/libsrc/makefile.com        |  2 +-
 contrib/surfphot/src/makefile.com           |  2 +-
 contrib/template/libsrc/makefile.com        |  2 +-
 contrib/template/src/makefile.com           |  2 +-
 contrib/tsa/libsrc/makefile.com             |  2 +-
 contrib/tsa/src/makefile.com                |  2 +-
 contrib/wavelet/libsrc/makefile.com         |  2 +-
 contrib/wavelet/src/makefile.com            |  2 +-
 gui/GraphLib/libsrc/Comm/makefile.com       |  2 +-
 gui/GraphLib/libsrc/uimxR5/src/makefile.com |  2 +-
 incl/idistruct.h                            |  4 +-
 libsrc/agl/makefile.com                     |  2 +-
 libsrc/astro/makefile.com                   |  2 +-
 libsrc/display/makefile.com                 |  2 +-
 libsrc/ftoc-old/makefile.com                |  2 +-
 libsrc/idi/cidi/makefile.com                |  2 +-
 libsrc/idi/cidi/x11/iid1.c                  | 45 +++++++++++++------
 libsrc/idi/cidi/x11/makefile.com            |  2 +-
 libsrc/idi/fidi/deanza/makefile.com         |  2 +-
 libsrc/idi/fidi/makefile.com                |  2 +-
 libsrc/idi/fidi/newdev/makefile.com         |  2 +-
 libsrc/idi/fidi/nodeanza/makefile.com       |  2 +-
 libsrc/idi/fnidi/makefile.com               |  2 +-
 libsrc/math/makefile.com                    |  2 +-
 libsrc/nag/makefile.com                     |  2 +-
 libsrc/os/vms/makefile.com                  |  2 +-
 libsrc/plot/makefile.com                    |  2 +-
 libsrc/st/makefile.com                      |  2 +-
 libsrc/tbl/makefile.com                     |  2 +-
 libsrc/tw/makefile.com                      |  2 +-
 libsrc/xcon/makefile.com                    |  2 +-
 monit/makefile.com                          |  2 +-
 monit/syskeys.datorg                        |  2 +-
 prim/dio/libsrc/makefile.com                |  2 +-
 prim/dio/src/makefile.com                   |  2 +-
 prim/display/libsrc/makefile.com            |  2 +-
 prim/display/src/makefile.com               |  2 +-
 prim/edit/libsrc/makefile.com               |  2 +-
 prim/general/libsrc/makefile.com            |  2 +-
 prim/general/src/makefile.com               |  2 +-
 prim/plot/libsrc/labstr.c                   | 69 ++++++++++++++++++++++-------
 prim/plot/libsrc/makefile.com               |  2 +-
 prim/plot/src/makefile.com                  |  2 +-
 prim/table/libsrc/makefile.com              |  2 +-
 prim/table/src/makefile.com                 |  2 +-
 prim/tc3/libsrc/makefile.com                |  2 +-
 prim/tw3/libsrc/makefile.com                |  2 +-
 stdred/ccdred/libsrc/makefile.com           |  2 +-
 stdred/ccdred/src/makefile.com              |  2 +-
 stdred/ccdtest/src/makefile.com             |  2 +-
 stdred/do/libsrc/makefile.com               |  2 +-
 stdred/do/src/makefile.com                  |  2 +-
 stdred/echelle/libsrc/makefile.com          |  2 +-
 stdred/echelle/src/makefile.com             |  2 +-
 stdred/feros/libsrc/makefile.com            |  2 +-
 stdred/feros/src/makefile.com               |  2 +-
 stdred/irac2/src/makefile.com               |  2 +-
 stdred/irspec/src/makefile.com              |  2 +-
 stdred/long/src/makefile.com                |  2 +-
 stdred/mmf/src/makefile.com                 |  2 +-
 stdred/mos/libsrc/makefile.com              |  2 +-
 stdred/mos/src/makefile.com                 |  2 +-
 stdred/optopus/libsrc/makefile.com          |  2 +-
 stdred/optopus/src/makefile.com             |  2 +-
 stdred/spec/libsrc/makefile.com             |  2 +-
 stdred/spec/src/makefile.com                |  2 +-
 system/idiserv/libsrc/makefile.com          |  2 +-
 system/idiserv/src/makefile.com             |  2 +-
 system/vms/tapeio/makefile.com              |  2 +-
 test/fits/makefile.com                      |  2 +-
 util/bdf2ps/makefile.com                    |  2 +-
 util/libsrc/makefile.com                    |  2 +-
 util/ltape/makefile.com                     |  2 +-
 105 files changed, 190 insertions(+), 132 deletions(-)

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