[Debian-astro-commits] [cpl-plugin-uves] 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 cpl-plugin-uves.

commit 8ea120fd95b9edd7f4c71ae69cc10e858d559c9b
Merge: 00f1011 c96107c
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 13:54:59 2016 +0200

    Merge branch 'upstream' into debian

 ChangeLog                       |   4 +
 Makefile.am                     |  12 +--
 Makefile.in                     | 109 +++++++++++----------
 acinclude.m4                    |   6 +-
 admin/doxygen.am                |  85 +++++++++++++++++
 admin/html.am                   |  77 ---------------
 admin/mkinstalldirs             | 150 -----------------------------
 calib/gasgano/config/UVES.prefs |   2 +-
 calib/gasgano/config/UVES.rul   | Bin 21718 -> 0 bytes
 configure                       |  91 ++++++++++++++----
 configure.ac                    |   8 +-
 doxygen/Doxyfile.in             |   9 +-
 flames/Makefile.in              |   7 +-
 flames/tests/Makefile.in        |   8 +-
 irplib/Makefile.in              |   7 +-
 irplib/irplib_slitpos.c         |   3 +
 irplib/tests/Makefile.in        |   8 +-
 recipes/Makefile.in             |   7 +-
 recipes/tests/Makefile.in       |   6 +-
 reflex/Makefile.in              |   7 +-
 reflex/uves-fibre.xml.in        |  62 ++++++++----
 reflex/uves.xml                 |  14 +--
 reflex/uves_fibre.oca           | 204 ++++++++++++++++++++--------------------
 regtests/Makefile.in            |   6 +-
 regtests/tests/Makefile.in      |   6 +-
 uves/Makefile.in                |   7 +-
 uves/tests/Makefile.in          |   8 +-
 uves/tests/uves_save-test.c     |   1 +
 uves/uves_reduce_scired.c       |  24 ++---
 29 files changed, 450 insertions(+), 488 deletions(-)

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