[saods9] 01/02: Merge branch 'upstream' into experimental

[Ole Streicher]

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

olebole pushed a commit to tag debian/7.4b1+repack-1
in repository saods9.

commit 1eecca7ee88ddda075dcc8bc3423490eb1116292
Merge: 0b55e76 b8d4230
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 11 10:10:16 2015 +0200

    Merge branch 'upstream' into experimental

 Makefile                                        |  13 ---
 Makefile.macosx                                 | 132 ++++++++++-----------
 Makefile.unix                                   | 130 +++++++++++----------
 Makefile.windows                                | 147 +++++++++++++++++-------
 doc/release/r7.0.html                           |   4 +-
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |   6 +-
 ds9/win/ds9.rc                                  |   8 +-
 make.cygwin64                                   |   1 +
 make.darwinlion                                 |  35 ------
 make.darwinmavericks                            |   3 +-
 make.darwinmountainlion                         |   3 +-
 make.darwinyosemite                             |   3 +-
 make.linux                                      |   1 +
 make.linux64                                    |   1 -
 make.linux64_5                                  |   1 -
 make.macosxlion                                 |  32 ------
 make.macosxmavericks                            |   1 -
 make.macosxmountainlion                         |   1 -
 make.macosxyosemite                             |   1 -
 make.pkgs                                       |   2 +-
 notes.txt                                       |  29 ++++-
 src/cat.tcl                                     |   5 +-
 src/ds9.tcl                                     |   6 +-
 src/manalysis.tcl                               | 116 ++++++++++---------
 src/medit.tcl                                   |  12 +-
 tclcheckdns1.1/configure                        |  40 ++++++-
 tclcheckdns1.1/configure.in                     |   5 +-
 tclcheckdns1.1/pkgIndex.tcl.in                  |   5 +
 tcliis1.0/configure                             |  40 ++++++-
 tcliis1.0/configure.in                          |   5 +-
 tcliis1.0/iis.c                                 |   6 +-
 tcliis1.0/pkgIndex.tcl.in                       |   5 +
 tkmpeg1.0/configure                             |  40 ++++++-
 tkmpeg1.0/configure.in                          |   5 +-
 tkmpeg1.0/pkgIndex.tcl.in                       |   5 +
 35 files changed, 496 insertions(+), 353 deletions(-)

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