[Debian-astro-commits] [saods9] 01/02: Merge branch 'upstream' into experimental
Ole Streicher
olebole at moszumanska.debian.org
Thu Sep 15 21:36:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit 2f11719cfa998be37da897a99e627c931f66e106
Merge: be11e33 1a4686b
Author: Ole Streicher <olebole at debian.org>
Date: Thu Sep 15 23:28:22 2016 +0200
Merge branch 'upstream' into experimental
ds9/doc/ref/command.html | 100 +-
ds9/doc/ref/contour.html | 225 +-
ds9/doc/ref/file.html | 40 +-
ds9/doc/ref/print.html | 79 +-
ds9/doc/ref/region.html | 103 +-
ds9/doc/ref/samp.html | 137 +-
ds9/doc/ref/xpa.html | 127 +-
ds9/doc/release/r7.0.html | 15 +
ds9/library/backup.tcl | 4 -
ds9/library/contour.tcl | 803 +-
ds9/library/crop.tcl | 12 +-
ds9/library/crosshair.tcl | 6 +-
ds9/library/ds9.tcl | 8 +-
ds9/library/frame.tcl | 3 +-
ds9/library/graph.tcl | 6 +-
ds9/library/htp.tcl | 22 +
ds9/library/info.tcl | 55 +-
ds9/library/layout.tcl | 19 +-
ds9/library/marker.tcl | 4 +-
ds9/library/markerbasepandarect.tcl | 2 +-
ds9/library/panner.tcl | 3 +-
ds9/library/panzoom.tcl | 8 +-
ds9/library/plotprint.tcl | 11 +-
ds9/library/prefs.tcl | 5 +-
ds9/library/print.tcl | 91 +-
ds9/library/stdfbox.tcl | 94 +-
ds9/library/tkfbox.tcl | 5 +-
ds9/library/url.tcl | 22 -
ds9/library/xmfbox.tcl | 22 +-
ds9/macosx/SAOImage DS9.app/Contents/Info.plist | 6 +-
ds9/win/ds9.rc | 2 +-
make.include | 10 +-
make.pkgs | 19 +-
mods/tcl8.6/win/Makefile.in | 10 -
mods/tcllib/configure | 10 -
mods/tk8.6/generic/tkCanvPs.c | 43 -
mods/tk8.6/library/xmfbox.tcl | 8 +-
mods/tk8.6/macosx/tkMacOSXXStubs.c | 29 -
tests/aux/ds9.ctr | 12142 ++++++++++++++++++++++
tests/command.sh | 41 +-
tests/cube.sh | 2 +-
tests/envi.sh | 20 +-
tests/fits.sh | 3 +-
tests/fits64.sh | 2 +-
tests/full.sh | 16 +-
tests/fullrgb.sh | 15 +-
tests/{regions.sh => gen.sh} | 241 +-
tests/gzip.sh | 2 +-
tests/hcompress.sh | 2 +-
tests/mecube.sh | 2 +-
tests/multiframe.sh | 9 +-
tests/nrrd.sh | 2 +-
tests/partial.sh | 11 +-
tests/plio.sh | 2 +-
tests/regions.sh | 204 +-
tests/regions/ciao.fk5.reg | 50 +-
tests/regions/ds9.color.reg | 14 +-
tests/regions/ds9.composite.reg | 46 +-
tests/regions/ds9.ecliptic.hms.reg | 22 +-
tests/regions/ds9.ecliptic.hms.strip.reg | 2 +-
tests/regions/ds9.ecliptic.reg | 46 +-
tests/regions/ds9.ecliptic.strip.reg | 2 +-
tests/regions/ds9.fk4.hms.reg | 72 +-
tests/regions/ds9.fk4.hms.strip.reg | 2 +-
tests/regions/ds9.fk4.reg | 46 +-
tests/regions/ds9.fk4.strip.reg | 2 +-
tests/regions/ds9.fk5.hms.reg | 72 +-
tests/regions/ds9.fk5.hms.strip.reg | 2 +-
tests/regions/ds9.fk5.reg | 46 +-
tests/regions/ds9.fk5.strip.reg | 2 +-
tests/regions/ds9.galactic.hms.reg | 22 +-
tests/regions/ds9.galactic.hms.strip.reg | 2 +-
tests/regions/ds9.galactic.reg | 46 +-
tests/regions/ds9.galactic.strip.reg | 2 +-
tests/regions/ds9.icrs.hms.reg | 72 +-
tests/regions/ds9.icrs.hms.strip.reg | 2 +-
tests/regions/ds9.icrs.reg | 46 +-
tests/regions/ds9.icrs.strip.reg | 2 +-
tests/regions/ds9.mosaic.ecliptic.hms.reg | 92 +-
tests/regions/ds9.mosaic.ecliptic.reg | 92 +-
tests/regions/ds9.mosaic.fk4.hms.reg | 140 +-
tests/regions/ds9.mosaic.fk4.reg | 92 +-
tests/regions/ds9.mosaic.fk5.hms.reg | 140 +-
tests/regions/ds9.mosaic.fk5.reg | 92 +-
tests/regions/ds9.mosaic.galactic.hms.reg | 92 +-
tests/regions/ds9.mosaic.galactic.reg | 92 +-
tests/regions/ds9.mosaic.icrs.hms.reg | 140 +-
tests/regions/ds9.mosaic.icrs.reg | 92 +-
tests/regions/pros.ecliptic.hms.reg | 8 +-
tests/regions/pros.ecliptic.reg | 32 +-
tests/regions/pros.fk4.hms.reg | 32 +-
tests/regions/pros.fk4.reg | 32 +-
tests/regions/pros.fk5.hms.reg | 32 +-
tests/regions/pros.fk5.reg | 32 +-
tests/regions/pros.galactic.hms.reg | 8 +-
tests/regions/pros.galactic.reg | 32 +-
tests/regions/pros.image.reg | 32 +-
tests/regions/pros.physical.reg | 32 +-
tests/regions/saotng.fk4.hms.reg | 26 +-
tests/regions/saotng.fk5.hms.reg | 26 +-
tests/regions/saotng.icrs.hms.reg | 26 +-
tests/regions/xml.ecliptic.hms.reg | 30 +-
tests/regions/xml.ecliptic.reg | 30 +-
tests/regions/xml.fk4.hms.reg | 54 +-
tests/regions/xml.fk4.reg | 30 +-
tests/regions/xml.fk5.hms.reg | 54 +-
tests/regions/xml.fk5.reg | 30 +-
tests/regions/xml.galactic.hms.reg | 30 +-
tests/regions/xml.galactic.reg | 30 +-
tests/regions/xml.icrs.hms.reg | 54 +-
tests/regions/xml.icrs.reg | 30 +-
tests/regions/xml.mosaic.ecliptic.hms.reg | 60 +-
tests/regions/xml.mosaic.ecliptic.reg | 60 +-
tests/regions/xml.mosaic.fk4.hms.reg | 104 +-
tests/regions/xml.mosaic.fk4.reg | 60 +-
tests/regions/xml.mosaic.fk5.hms.reg | 104 +-
tests/regions/xml.mosaic.fk5.reg | 60 +-
tests/regions/xml.mosaic.galactic.hms.reg | 60 +-
tests/regions/xml.mosaic.galactic.reg | 60 +-
tests/regions/xml.mosaic.icrs.hms.reg | 104 +-
tests/regions/xml.mosaic.icrs.reg | 60 +-
tests/regions/xy.ecliptic.reg | 52 +-
tests/regions/xy.fk4.hms.reg | 52 +-
tests/regions/xy.fk4.reg | 52 +-
tests/regions/xy.fk5.hms.reg | 52 +-
tests/regions/xy.fk5.reg | 52 +-
tests/regions/xy.galactic.reg | 52 +-
tests/regions/xy.icrs.hms.reg | 52 +-
tests/regions/xy.icrs.reg | 52 +-
tests/regions/xy.image.reg | 52 +-
tests/regions/xy.physical.reg | 52 +-
tests/rgbcube.sh | 2 +-
tests/rgbimage.sh | 2 +-
tests/rice.sh | 2 +-
tests/samp/contour.samp | 45 +-
tests/sfits.sh | 2 +-
tests/spartial.sh | 11 +-
tests/srgbcube.sh | 2 +-
tests/xpa.sh | 52 +-
tests/xpa/bin.xpa | 4 +-
tests/xpa/contour.xpa | 11341 +-------------------
tests/xpa/crop.xpa | 4 +-
tests/xpa/crosshair.xpa | 4 +-
tests/xpa/data.xpa | 48 +-
tests/xpa/fits.xpa | 4 +-
tests/xpa/pan.xpa | 4 +-
tests/xpa/regions.xpa | 2 +-
tests/xpa/scale.xpa | 2 +-
tksao/Makefile.in | 12 +-
tksao/colorbar/cbgrid.C | 2 -
tksao/colorbar/colorbar.C | 17 +-
tksao/colorbar/colorbar.h | 4 +-
tksao/colorbar/colorbarbase.C | 114 +-
tksao/colorbar/colorbarbase.h | 7 +-
tksao/colorbar/colorbarrgb.C | 25 +-
tksao/colorbar/colorbarrgb.h | 4 +-
tksao/configure | 4 +-
tksao/configure.in | 4 +-
tksao/fitsy++/column.C | 2 +-
tksao/fitsy++/head.C | 31 +-
tksao/fitsy++/head.h | 4 +
tksao/fitsy++/hist.C | 226 +-
tksao/fitsy++/hist.h | 1 +
tksao/fitsy++/savefits.C | 3 +-
tksao/frame/annulus.C | 183 +-
tksao/frame/annulus.h | 3 +
tksao/frame/base.C | 408 +-
tksao/frame/base.h | 105 +-
tksao/frame/basebox.C | 13 +-
tksao/frame/basecommand.C | 701 +-
tksao/frame/baseellipse.C | 32 +-
tksao/frame/baseline.C | 7 +
tksao/frame/baseline.h | 3 +
tksao/frame/basemarker.C | 134 +
tksao/frame/basemarker.h | 13 +
tksao/frame/basepanda.C | 152 -
tksao/frame/basepanda.h | 34 -
tksao/frame/basepolygon.C | 316 +
tksao/frame/{segment.h => basepolygon.h} | 45 +-
tksao/frame/box.C | 170 +-
tksao/frame/box.h | 3 +
tksao/frame/boxannulus.C | 186 +-
tksao/frame/boxannulus.h | 3 +
tksao/frame/bpanda.C | 483 +-
tksao/frame/bpanda.h | 19 +-
tksao/frame/circle.C | 153 +-
tksao/frame/circle.h | 3 +
tksao/frame/compass.C | 91 +-
tksao/frame/compass.h | 3 +
tksao/frame/composite.C | 42 +-
tksao/frame/context.C | 355 +-
tksao/frame/context.h | 75 +-
tksao/frame/contour.C | 372 +-
tksao/frame/contour.h | 77 +-
tksao/frame/contourlex.C | 2449 +++++
tksao/frame/contourlex.L | 244 +
tksao/frame/contourparser.C | 2486 +++++
tksao/frame/contourparser.H | 206 +
tksao/frame/contourparser.Y | 434 +
tksao/frame/cpanda.C | 503 +-
tksao/frame/cpanda.h | 21 +-
tksao/frame/ds9parser.C | 633 +-
tksao/frame/ds9parser.H | 2 +-
tksao/frame/ds9parser.Y | 6 +-
tksao/frame/ellipse.C | 185 +-
tksao/frame/ellipse.h | 3 +
tksao/frame/ellipseannulus.C | 191 +-
tksao/frame/ellipseannulus.h | 3 +
tksao/frame/epanda.C | 493 +-
tksao/frame/epanda.h | 19 +-
tksao/frame/fitsimage.C | 4 +-
tksao/frame/fitsimage.h | 10 +-
tksao/frame/fitsmap.C | 173 +-
tksao/frame/fr3dcommand.C | 16 +-
tksao/frame/frame.C | 2 +-
tksao/frame/frame3dbase.C | 13 +-
tksao/frame/frame3dbase.h | 3 +-
tksao/frame/framebase.C | 21 +-
tksao/frame/framebase.h | 3 +-
tksao/frame/framergb.C | 15 +-
tksao/frame/frcommand.C | 16 +-
tksao/frame/frmarker.C | 666 +-
tksao/frame/frsave.C | 5 +-
tksao/frame/fvcontour.C | 239 +-
tksao/frame/fvcontour.h | 52 +-
tksao/frame/grid25d.C | 1 -
tksao/frame/grid2d.C | 1 -
tksao/frame/grid3d.C | 1 -
tksao/frame/line.C | 80 +-
tksao/frame/marker.C | 254 +-
tksao/frame/marker.h | 16 +-
tksao/frame/parser.C | 10297 +++++++++---------
tksao/frame/parser.Y | 769 +-
tksao/frame/point.C | 168 +-
tksao/frame/point.h | 3 +
tksao/frame/polygon.C | 405 +-
tksao/frame/polygon.h | 38 +-
tksao/frame/projection.C | 107 +-
tksao/frame/projection.h | 3 +
tksao/frame/ruler.C | 77 +-
tksao/frame/segment.C | 324 +-
tksao/frame/segment.h | 23 +-
tksao/frame/text.C | 59 +-
tksao/frame/text.h | 3 +
tksao/frame/vect.C | 81 +-
tksao/frame/vect.h | 3 +
tksao/list/list.C | 1 +
tksao/magnifier/magnifier.C | 10 +-
tksao/magnifier/magnifiertrue.C | 2 +-
tksao/panner/panner.C | 7 +-
tksao/panner/pannertrue.C | 2 +-
tksao/util/gridbase.C | 31 +-
tksao/util/gridbase.h | 2 +-
tksao/util/ps.C | 74 +-
tksao/util/ps.h | 13 +-
tksao/util/tkpostscript.h | 63 -
tksao/vector/vector.C | 23 +-
tksao/vector/vector.h | 49 +
tksao/widget/widget.C | 45 +-
tksao/widget/widget.h | 9 +-
win/Makefile.in | 25 +-
261 files changed, 31697 insertions(+), 25205 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