[Debian-astro-commits] [saods9] 01/03: Merge branch 'upstream' into debian

Ole Streicher olebole at moszumanska.debian.org
Wed Nov 11 12:26:04 UTC 2015


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

olebole pushed a commit to branch debian
in repository saods9.

commit 271bf48eed502a0dde0775b9e12b6c1ede940d59
Merge: 1bdf91c 9b34a6e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 11 12:33:38 2015 +0100

    Merge branch 'upstream' into debian

 ds9/doc/ref/analysis.html                       |   22 +-
 ds9/doc/ref/file.html                           |  326 +-
 ds9/doc/release/r7.0.html                       |   22 +-
 ds9/library/analysis.tcl                        |   10 -
 ds9/library/backup.tcl                          |    5 +
 ds9/library/bin.tcl                             |    3 +
 ds9/library/block.tcl                           |   12 +-
 ds9/library/catflt.tcl                          |   80 +-
 ds9/library/colorbar.tcl                        |   32 +-
 ds9/library/command.tcl                         |    1 -
 ds9/library/contour.tcl                         |   39 +-
 ds9/library/crop.tcl                            |    4 +
 ds9/library/crosshair.tcl                       |  185 +-
 ds9/library/cube.tcl                            |   12 +-
 ds9/library/ds9.tcl                             |    3 +-
 ds9/library/frame.tcl                           |   35 +-
 ds9/library/graph.tcl                           |    6 +
 ds9/library/header.tcl                          |   52 +-
 ds9/library/iis.tcl                             |   16 +-
 ds9/library/imgsvr.tcl                          |    1 -
 ds9/library/info.tcl                            |   13 +
 ds9/library/manalysis.tcl                       |    4 +
 ds9/library/marker.tcl                          |    4 +-
 ds9/library/mask.tcl                            |    2 +-
 ds9/library/mscale.tcl                          |   21 +-
 ds9/library/scale.tcl                           |  111 +-
 ds9/library/smooth.tcl                          |    1 +
 ds9/library/stdfbox.tcl                         |   33 +-
 ds9/library/util.tcl                            |    1 +
 ds9/library/wcs.tcl                             |    7 +
 ds9/macosx/Makefile.in                          |   12 +
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |    6 +-
 ds9/macosx/configure                            |  122 +-
 ds9/macosx/configure.in                         |    4 +-
 ds9/msgs/cs.msg                                 |    8 +-
 ds9/msgs/da.msg                                 |    8 +-
 ds9/msgs/de.msg                                 |    8 +-
 ds9/msgs/es.msg                                 |    8 +-
 ds9/msgs/fr.msg                                 |    8 +-
 ds9/msgs/ja.msg                                 |    8 +-
 ds9/msgs/pt.msg                                 |    8 +-
 ds9/msgs/zh.msg                                 |    8 +-
 ds9/unix/Makefile.in                            |   48 +-
 ds9/unix/configure                              |  449 +-
 ds9/unix/configure.in                           |   17 +-
 ds9/unix/tclconfig/tcl.m4                       |    1 -
 {util => ds9/util}/mergedict.tcl                |    0
 ds9/win/ds9.C                                   |   29 +-
 ds9/win/ds9.rc                                  |    2 +-
 macosx/Makefile.in                              |    2 +-
 make.include                                    |   11 +-
 make.pkgs                                       |    2 +-
 mods/xmlrpc/xmlrpc.tcl                          | 1288 +++-
 notes.txt                                       |  234 +-
 tests/analysis.sh                               |   74 +-
 tests/analysis/analysis.ans                     |   10 -
 tests/command.sh                                |    2 +-
 tests/samp.sh                                   |    3 +-
 tests/samp/block.samp                           |    1 +
 tests/samp/minmax.samp                          |    2 -
 tests/xpa.sh                                    |    2 -
 tests/xpa/minmax.xpa                            |    1 -
 tests/xpa/scale.xpa                             |    2 +-
 tksao1.0/Makefile.in                            |   26 +-
 tksao1.0/fitsy++/file.C                         |   22 +-
 tksao1.0/fitsy++/file.h                         |   68 +-
 tksao1.0/fitsy++/head.C                         |    9 +-
 tksao1.0/fitsy++/hist.C                         |   12 +
 tksao1.0/fitsy++/lex.C                          |  358 +-
 tksao1.0/fitsy++/lex.L                          |    5 -
 tksao1.0/fitsy++/map.C                          |   22 +-
 tksao1.0/fitsy++/mapincr.C                      |   57 +-
 tksao1.0/fitsy++/mmap.C                         |   12 +-
 tksao1.0/fitsy++/mmapincr.C                     |   15 +-
 tksao1.0/fitsy++/outsocket.C                    |   40 +-
 tksao1.0/fitsy++/parser.C                       |  959 ++-
 tksao1.0/fitsy++/parser.H                       |  132 +-
 tksao1.0/fitsy++/parser.Y                       |  138 +-
 tksao1.0/fitsy++/share.C                        |    9 +-
 tksao1.0/fitsy++/smap.C                         |   22 +-
 tksao1.0/fitsy++/smmap.C                        |   16 +-
 tksao1.0/fitsy++/socket.C                       |    9 +
 tksao1.0/fitsy++/socketgz.C                     |   15 +-
 tksao1.0/fitsy++/sshare.C                       |   11 +-
 tksao1.0/fitsy++/strm.C                         |   48 +-
 tksao1.0/frame/base.C                           |   21 +-
 tksao1.0/frame/base.h                           |   10 +-
 tksao1.0/frame/basecommand.C                    |  317 +-
 tksao1.0/frame/context.C                        | 1142 ++--
 tksao1.0/frame/context.h                        |   65 +-
 tksao1.0/frame/fitsanalysis.C                   |   47 +
 tksao1.0/frame/fitsbin.C                        |   64 +-
 tksao1.0/frame/fitsblock.C                      |  187 +-
 tksao1.0/frame/fitsdata.C                       | 1077 +--
 tksao1.0/frame/fitsdata.h                       |  124 +-
 tksao1.0/frame/fitsimage.C                      |  696 +-
 tksao1.0/frame/fitsimage.h                      |  105 +-
 tksao1.0/frame/fr3dcommand.C                    |   73 +-
 tksao1.0/frame/frame.C                          |   22 +-
 tksao1.0/frame/frame3d.C                        |   74 +-
 tksao1.0/frame/frame3dbase.C                    |   53 +-
 tksao1.0/frame/frame3dbase.h                    |    4 +-
 tksao1.0/frame/framebase.C                      |   21 +
 tksao1.0/frame/framebase.h                      |    2 +
 tksao1.0/frame/framergb.C                       |   22 +-
 tksao1.0/frame/framergbtruecolor.C              |   14 +-
 tksao1.0/frame/frametruecolor.C                 |   14 +-
 tksao1.0/frame/frblt.C                          |   14 +-
 tksao1.0/frame/frcommand.C                      |   14 +-
 tksao1.0/frame/frload.C                         |    8 +-
 tksao1.0/frame/frmarker.C                       |    2 +-
 tksao1.0/frame/frsave.C                         |    2 +-
 tksao1.0/frame/frscale.C                        |    3 -
 tksao1.0/frame/frscale.h                        |    5 +-
 tksao1.0/frame/fvcontour.C                      |   27 +-
 tksao1.0/frame/fvcontour.h                      |   10 +
 tksao1.0/frame/grid3d.C                         |    5 +-
 tksao1.0/frame/parser.C                         | 7913 +++++++++++------------
 tksao1.0/frame/parser.Y                         |   18 +-
 tksao1.0/util/smooth.C                          |   32 -
 tksao1.0/util/smooth.h                          |   10 -
 unix/Makefile.in                                |    2 +-
 win/Makefile.in                                 |    6 +-
 xmlrpc-0.3/CHANGES                              |    9 -
 xmlrpc-0.3/INSTALL                              |   25 -
 xmlrpc-0.3/gpl.txt                              |  340 -
 xmlrpc-0.3/testclient.tcl                       |    8 -
 xmlrpc-0.3/testserver.tcl                       |   10 -
 xmlrpc-0.3/xmlrpc.tcl                           |  854 ---
 129 files changed, 9916 insertions(+), 9011 deletions(-)

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



More information about the Debian-astro-commits mailing list