debian/0000755000000000000000000000000012230510211007151 5ustar debian/repack-dfsg.sh0000755000000000000000000000131212230505302011700 0ustar #!/bin/sh # ./debian/repack # Repackage the DS9 source files as a DFSG tarball, with unnecessary # files removed. ver=$2 orig_tar=$3 tardir=$(dirname $orig_tar) wd=$(mktemp -d) echo $ver $orig_tar $tardir $wd tar xf $orig_tar -C $wd srcdir=$wd/* for subdir in funtools\* tcl8.\* tcllib-\* tk8.\* tkimg\* signal_ext\* \ tktable\* tkcon-\* tclxml-\* wcssubs-\* xpa-\* \ zip-\* zlib-\* compilers ast-\* zvfs ; do rm -rf $srcdir/$subdir done find $srcdir/ -name config.status |xargs rm -f find $srcdir/ -name conf.h |xargs rm -f dfsg_tar=$tardir/saods9_$ver+dfsg.orig.tar.gz tar czf $dfsg_tar -C $wd . rm -rf $wd exec uupdate --no-symlink --upstream-version $ver+dfsg $dfsg_tar debian/saods9-data.install0000644000000000000000000000042712221236761012674 0ustar ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/ ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/ ds9/zipdir/zvfsmntpt/src /usr/share/saods9/ ds9/zipdir/zvfsmntpt/template /usr/share/saods9/ ds9/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9 xmlrpc-0.3/xmlrpc.tcl /usr/share/saods9/src debian/saods9.menu0000644000000000000000000000017012221236761011256 0ustar ?package(saods9):needs="X11" section="Applications/Science/Astronomy" \ title="SAOImage DS9" command="/usr/bin/ds9" debian/clean0000644000000000000000000000047712230505302010173 0ustar ds9/tkAppInit.c ds9/ds9Base ds9/ds9tk.c ds9/ds9tk.h ds9/ds9.1 bin/ds9 make.include blt3.0.1/demos/Makefile blt3.0.1/library/afm/Makefile blt3.0.1/library/Makefile blt3.0.1/man/Makefile blt3.0.1/src/Makefile blt3.0.1/src/bltHash.h blt3.0.1/src/config.h blt3.0.1/src/shared/Makefile blt3.0.1/src/*.o htmlwidget/configure debian/saods9.desktop0000644000000000000000000000044512221236761011770 0ustar [Desktop Entry] Version=1.0 Name=SAOImage DS9 GenericName=Image Viewer GenericName[en_GB]=Image Viewer Comment=Astronomical Data Visualization Application Comment[en_GB]=Astronomical Data Visualization Application Type=Application Exec=ds9 %F Icon=ds9 Categories=Education;Science;Astronomy; debian/compat0000644000000000000000000000000212221236761010366 0ustar 9 debian/changelog0000644000000000000000000001414112230507142011035 0ustar saods9 (7.2+dfsg-4) unstable; urgency=low [Sergei Golovan] * Use tcl8.5-dev and tk8.5-dev build dependencies instead of tcl-dev and tk-dev because of FTBFS in case of upgrading tcl-dev and tk-dev to 8.6. Closes: #726758 -- Ole Streicher Fri, 18 Oct 2013 21:48:14 +0400 saods9 (7.2+dfsg-3) unstable; urgency=low * Re-create htmlwidget/configure. Fixes FTBS on MIPS. -- Ole Streicher Sat, 28 Sep 2013 15:29:28 +0200 saods9 (7.2+dfsg-2) unstable; urgency=low * Create make.linux on clean, closes: #724082 -- Ole Streicher Thu, 26 Sep 2013 18:26:11 +0200 saods9 (7.2+dfsg-1) unstable; urgency=low * Change distribution to unstable -- Ole Streicher Wed, 24 Apr 2013 18:39:50 +0200 saods9 (7.2+dfsg-1~exp1) experimental; urgency=low * New upstream version * Copyright changed to GPL-3+ * Push standards-version t 3.9.4 (no change needed) -- Ole Streicher Tue, 16 Apr 2013 11:28:43 +0200 saods9 (7.1+dfsg-1~exp3) experimental; urgency=low * Remove explicite link to tcl8.5 in htmlwidget; fixes FTBS on alpha and sh4 -- Ole Streicher Tue, 22 Jan 2013 11:10:00 +0100 saods9 (7.1+dfsg-1~exp2) experimental; urgency=low * Fix crashes on 2D marker plots, closes: #693807 * Remove obsolete DMUA Flag -- Ole Streicher Mon, 17 Dec 2012 13:20:43 +0100 saods9 (7.1+dfsg-1~exp1) experimental; urgency=low * New upstream release -- Ole Streicher Sun, 14 Oct 2012 13:47:27 +0200 saods9 (7.0.2+dfsg-1~exp1) experimental; urgency=low * New upstream release * Propagate hardening flags -- Ole Streicher Tue, 19 Jul 2012 11:30:00 +0200 saods9 (7.0.1+dfsg-1) unstable; urgency=low * New upstream release -- Ole Streicher Sat, 16 Jun 2012 10:30:00 +0200 saods9 (6.2+dfsg-2) unstable; urgency=low * Fix FTBS for hurd and kfreebsd, closes: #675899 * Set DM-Upload-Allowed -- Ole Streicher Tue, 05 Jun 2012 11:06:04 +0200 saods9 (6.2+dfsg-1) unstable; urgency=low * Re-insert removed package, closes: #655648 * New maintainer. * New upstream version * Push to policy version 3.9.3 * Use external libraries instead of convienence copies where possible. -- Ole Streicher Sun, 13 May 2012 18:00:00 +0200 saods9 (4.0b7-2) unstable; urgency=low * QA upload. * Orphan package * Put package to collab-maint git * Fix gcc-4.3 build, closes: #461710 * Import changes from ubuntu: + Transition to gfortran, closes: #449456 + Fix tcl/tk location, closes: #450475 + Add .desktop file and icon for it, closes: #377452 - remove dpatch usage: die die die * Ack NMU's; closes: #377113, #444563, #344317 -- Riku Voipio Sun, 30 Mar 2008 15:19:23 +0300 saods9 (4.0b7-1.5) unstable; urgency=low * Non-maintainer upload. * Switched to dynamic loading of tcllib packages. It fixes FTBFS caused by tcllib upgrade (closes: #409488). * Added build-dependency on libtk-img-dev because of libtk-img splitting. * Switched to dynamic loading of Img package. It fixed FTBFS caused by libtk-img upgrade. Also, it fixes loading of incorrect Img libraries (closes: #429332). * Included patch by Martin Michlmayr which fixes FTBFS with GCC 4.3 (closes: #417681). -- Sergei Golovan Sat, 29 Sep 2007 14:35:47 +0400 saods9 (4.0b7-1.4) unstable; urgency=low * NMU (credativ BSP) * (Build-)depend on libtktable2.9, to kill off the old version. This also replaces the dep on the -dev package, which was unneeded (.so is in the lib package). This will allow us to kill off libtktable, which is rc-buggy -- Marc 'HE' Brockschmidt Fri, 15 Sep 2006 11:36:22 +0200 saods9 (4.0b7-1.3) unstable; urgency=high * Non-maintainer upload. * Add a manual dependency from saods9 to libtktable, as dpkg-shlibdeps refuses to add automatic dependency information for any soname not on the form "foo.so.bar" or "foo-bar.so", and "libTkTable2.9.so" is neither. (Closes: #374795) -- Steinar H. Gunderson Thu, 6 Jul 2006 20:52:00 +0200 saods9 (4.0b7-1.2) unstable; urgency=low * NMU * Fix FTBFS with gcc-4.1 (Closes: #356979) * Use /usr/lib/tcllib1.8 instead of 1.7 * Link against tktable2.9 * Build-depends on libtktable-dev -- Julien Danjou Mon, 29 May 2006 15:42:39 +0200 saods9 (4.0b7-1.1) unstable; urgency=low * Non-maintainer upload at request of maintainer. * make.linux: Change /usr/X11R6/include to /usr/include/X11 in preparation for the coming X directory rearrangement (Closes: #344317). -- Kevin B. McCarty Tue, 10 Jan 2006 10:08:27 -0500 saods9 (4.0b7-1) unstable; urgency=low * New upstream release; Along with a 3-line patch, fixes FTBFS with new GCC (Closes: #318042); Causes rebuild with GCC 4, as needed for transition. * Bump Standards-Version to 3.6.2 (no changes required). * ./debian/rules: get_orig_source now exists to generate a DFSG .orig tarball using fortran CVS copy of SLALIB, the C implementation of which is not GPL; the sources distributed by CfA are obfuscated (Closes: #336098). * Rewrite copyright file; include the unmodified license as distributed by CfA; document all copyright holders and licenses for packages included in the DFSG .orig tarball (Closes: #303665). * ./debian/control: Priority: extra (Closes: #315690). * Include generated manpage; a first step towards closing #303651. * Include documentation relevent to package; (Closes: #303668); selected items from ./ds9/doc/ and ./xpa/doc/; also include docbase templates. -- Justin Pryzby Thu, 17 Nov 2005 23:56:09 -0500 saods9 (3.0.3-1) unstable; urgency=low * Initial Release (Closes: #289371) - Thanks Aurelien Jarno. * Revert commented-out include in saotk/hal/Makefile. - Thanks Michael Weber. * Remove rpath from ds9 binary. -- Justin Pryzby Tue, 22 Mar 2005 11:29:52 -0500 debian/control0000644000000000000000000000670212230505371010574 0ustar Source: saods9 Section: science Priority: optional Maintainer: Debian Science Maintainers Uploaders: Ole Streicher Build-Depends: autotools-dev, debhelper (>= 9), dh-autoreconf, html2text, cpio, libfuntools-dev, libstarlink-ast-dev (>= 7.0.4), libtk-img-dev, libwcstools-dev, libxml2-dev, libxrandr-dev, libxt-dev, perl, tcl8.5-dev, tk8.5-dev, zlib1g-dev Standards-Version: 3.9.4 Homepage: http://hea-www.harvard.edu/RD/ds9/site/Home.html Vcs-Git: git://anonscm.debian.org/debian-science/packages/saods9.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/saods9.git Package: saods9 Architecture: any Depends: libtk-img, saods9-data (= ${source:Version}), saods9-blt, tcl-signal, tcl-xpa, tcllib, tclxml, tk-table (>= 2.9), tkcon, ${misc:Depends}, ${shlibs:Depends} Recommends: saods9-doc Suggests: xpa-tools, python-pyds9 Description: Image display tool for astronomy SAOImage DS9 is an astronomical imaging and data visualization application. DS9 supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps. It provides for easy communication with external analysis tasks and is highly configurable and extensible via XPA and SAMP. . All versions and platforms support a consistent set of GUI and functional capabilities. . DS9 supports advanced features such as 2-D, 3-D and RGB frame buffers, mosaic images, tiling, blinking, geometric markers, colormap manipulation, scaling, arbitrary zoom, cropping, rotation, pan, and a variety of coordinate systems. . The GUI for DS9 is user configurable. GUI elements such as the coordinate display, panner, magnifier, horizontal and vertical graphs, button bar, and color bar can be configured via menus or the command line. Package: saods9-blt Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: BLT subpackage for saods9 DS9 is an application for astronomical imaging and data visualization. . This package contains an updated and patched version of BLT for the use in saods9. Package: saods9-doc Architecture: all Section: doc Depends: ${misc:Depends} Description: Image display tool for astronomy (help files/documentation) SAOImage DS9 is an astronomical imaging and data visualization application. DS9 supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps. It provides for easy communication with external analysis tasks and is highly configurable and extensible via XPA and SAMP. . This package contains the documentation and help pages. Package: saods9-data Architecture: all Depends: ${misc:Depends} Description: Image display tool for astronomy (shared data) SAOImage DS9 is an astronomical imaging and data visualization application. DS9 supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps. It provides for easy communication with external analysis tasks and is highly configurable and extensible via XPA and SAMP. . This package contains the architecture independent files. debian/saods9.docs0000644000000000000000000000001212221236761011235 0ustar notes.txt debian/ds9.xpm0000644000000000000000000000503612221236761010421 0ustar /* XPM */ static char * sun_xpm[] = { "48 48 3 1", " c None", ". c #04ACCE", "+ c #E6D913", " ", " ", " ............ ", " .................. ", " ..+++......+......++.. ", " ....+++.....+.......+... ", " ......+++...++......+++.... ", " .......+++...++......+++..... ", " ........+++...++.....++++...... ", " .+.......+++...+++..+++++.....+.. ", " ...++.....++++..+++.+++++....++.... ", " .....++....++++.++++.++++....+++.... ", " ......++++..++++++++++++++...+++...... ", " .......++++.++++++++++++++.++++........ ", " ........++++++++++++++++++.+++++........ ", " .+++++...+++++++++++++++++++++++.......+. ", " .+++++++...+++++++++++++++++++++.......++. ", " ....+++++..++++++++++++++++++++.+++++++++. ", " .....+++++++++++++++++++++++++++++++++++... ", " ......+++++++++++++++++++++++++++++++++.... ", " ........++++++++++++++++++++++++++++........ ", " .........+++++++++++++++++++++++++.......... ", " ..........+++++++++++++++++++++++++......... ", " .....+++++++++++++++++++++++++++++++++++.... ", " ..+++++++++++++++++++++++++++++++++++++++++. ", " .......+++++++++++++++++++++++++++++++...... ", " ...........+++++++++++++++++++++++.......... ", " ..........++++++++++++++++++++++++++........ ", " .....++++++++++++++++++++++++++++++++....... ", " ...++++++++++++++++++++++++++++++++++...... ", " ..+++++++++++++++++++++++++++++++++++..... ", " ..++...+++.++++++++++++++++++++...+++++.++ ", " ++.......++++++++++++++++++++++...++++++. ", " .........+++++++++++++++++++++++...++++. ", " .......+++++.++++++++++++++++++........ ", " .......++++..+++++++++++++..++++...... ", " .....+++...+++++++++.+++++..+++...... ", " ....++.....+++++++++..++++....++.... ", " ...+.....+++++..+++..++++.....++.. ", " .+.....+++++...+++..+++.......+. ", " ......+++.....++...+++........ ", " .....++......++...+++....... ", " ....++......++....+++..... ", " ...++.......+.....+++... ", " ..+................. ", " ................ ", " ........ ", " "}; debian/saods9.manpages0000644000000000000000000000001212221236761012100 0ustar ds9/ds9.1 debian/copyright0000644000000000000000000002057412230505302011121 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ds9 Upstream-Author: William Joye Source: http://hea-www.harvard.edu/RD/ds9/site/Download.html Files: * Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory, Cambridge, MA, USA Copyright (c) 2002 Ingo Oppermann (ingo_opp@users.sourceforge.net) Copyright (c) 1993 Association of Universities for Research in Astronomy. Copyright (c) 1997-2000 D. Richard Hipp Copyright (C) 1984-2003 Free Software Foundation, Inc. Comment: Some original authors: plio/: Doug Tody and Mike Fitzpatrick, NOAO iis/: Doug Tody, NOAO rice/: Richard White xmlrpc-0.3/: Eric Yeh License: GPLv3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . Correspondence concerning SAOImage DS9 should be addressed as follows: . William Joye Smithsonian Astrophysical Observatory 60 Garden St. Cambridge, MA 02138 USA wjoye@cfa.harvard.edu http://hea-www.harvard.edu/RD/ds9/ Files: src/tkfbox.tcl src/xmfbox.tcl Copyright: Copyright (c) 1994-1998 Sun Microsystems, Inc. Copyright (c) 1998-2000 Scriptics Corporation License: sun-BSD This software is copyrighted by the Regents of the University of California, Sun Microsystems, Inc., and other parties. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. . The authors hereby grant permission to use, copy, modify, distribute, and license this software and its documentation for any purpose, provided that existing copyright notices are retained in all copies and that this notice is included verbatim in any distributions. No written agreement, license, or royalty fee is required for any of the authorized uses. Modifications to this software may be copyrighted by their authors and need not follow the licensing terms described here, provided that the new terms are clearly indicated on the first page of each file where they apply. . IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. . THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. . GOVERNMENT USE: If you are acquiring this software on behalf of the U.S. government, the Government shall have only "Restricted Rights" in the software and related documentation as defined in the Federal Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you are acquiring the software on behalf of the Department of Defense, the software shall be classified as "Commercial Computer Software" and the Government shall have only "Restricted Rights" as defined in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the authors grant the U.S. Government and others acting in its behalf permission to use and distribute the software in accordance with the terms specified in this license. Files: saotk/util/fdstream.hpp Copyright: (C) Copyright Nicolai M. Josuttis 2001. License: BSD Permission to copy, use, modify, sell and distribute this software is granted provided this copyright notice appears in all copies. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose. Files: saotk/util/FlexLexer.h Copyright: Kent Williams and Tom Epperly. License: BSD This code is derived from software contributed to Berkeley by Kent Williams and Tom Epperly. . Redistribution and use in source and binary forms with or without modification are permitted provided that: (1) source distributions retain this entire copyright notice and comment, and (2) distributions including binaries display the following acknowledgement: ``This product includes software developed by the University of California, Berkeley and its contributors'' in the documentation or other materials provided with the distribution and in all advertising materials mentioning features or use of this software. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. . (It is my understanding that this is the original "BSD with advertizing clause", and, since it is licensed by Berkeley, has been since relicensed without the advertizing clause. Here, I only restate the license included upstream.) Files: blt3.0/* Copyright: Copyright 1991-2009 George A Howlett, Copyright (c) 1987-1994 The Regents of the University of California. Copyright (c) 1994-1997 Sun Microsystems, Inc. Copyright (c) 1985-1991 Massachusetts Institute of Technology, Copyright (c) 1987 by Digital Equipment Corporation, Maynard, Massachusetts Copyright (c) 1990-1993, David Koblas. (koblas@netcom.com) Copyright (c) 1991-1998, Thomas G. Lane. Copyright (c) 1998-1999 by Scriptics Corporation Copyright (c) 1993-1998 Lucent Technologies, Inc Copyright (c) 1989 by Jef Poskanzer License: MIT/X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: htmlwidget/src/* Copyright: Copyright (c) 1997-2000 D. Richard Hipp License: LGPL This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. . On Debian systems, the complete text of the GNU Library General Public License can be found in `/usr/share/common-licenses/LGPL-2'. . Author contact information: drh@acm.org http://www.hwaci.com/drh/ Files: debian/* Copyright: not applicable License: public-domain This package was debianized by Justin Pryzby on Tue, 4 Jan 2005 21:53:52 -0500. The Debian .diff is hereby placed into the public domain. . Based on Justin's diff, the debianization is completely rewritten for the updstream version 6.2 by Ole Streicher . Contributions came from the Gentoo packaging by Sebastien Fabbro . debian/saods9-blt.install0000644000000000000000000000051312230505302012526 0ustar lib/libBLT*.so /usr/lib/saods9/blt3.0 blt3.0.1/library/*.tcl /usr/share/saods9/blt3.0 blt3.0.1/library/*.pro /usr/share/saods9/blt3.0 blt3.0.1/library/*.xbm /usr/share/saods9/blt3.0 blt3.0.1/library/*.cur /usr/share/saods9/blt3.0 blt3.0.1/library/afm /usr/share/saods9/blt3.0 blt3.0.1/library/dd_protocols /usr/share/saods9/blt3.0 debian/watch0000644000000000000000000000031312230505302010204 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://hea-www.harvard.edu/RD/ds9/site/Download.html \ http://hea-www.harvard.edu/.+/source/ds9\.(.*)\.tar\.gz \ debian \ debian/repack-dfsg.sh debian/patches/0000755000000000000000000000000012230505371010613 5ustar debian/patches/saotk_fix_wcstools_includes.patch0000644000000000000000000000070612221236761017455 0ustar Author: Ole Streicher Description: There is a ambiguity in the name "wcs.h" which could either come from wcslilb or from wcstools. saotk wants the wcstools one here. So, we prepend the right directory prefix. --- a/saotk/frame/fitsimage.h +++ b/saotk/frame/fitsimage.h @@ -10,7 +10,7 @@ #include "fitsdata.h" #include "coord.h" #include "file.h" -#include "wcs.h" +#include extern "C" { #include "ast.h" debian/patches/iis.patch0000644000000000000000000001074212221236761012430 0ustar Author: Justin Pryzby Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool" protocol module. The code is K&R C. --- a/iis/iis.c +++ b/iis/iis.c @@ -5,10 +5,14 @@ #include #include #include +#include #ifdef HAVE_SYS_UN_H #include #endif #include +#include +#include +#include #include "iis.h" #include "xim.h" @@ -111,7 +115,7 @@ * UNIX domain socket connection. All three types of server ports are * simultaneously ready to receive client connections. */ -xim_iisOpen (xim) +int xim_iisOpen (xim) register XimDataPtr xim; { int nopen = 0; @@ -141,7 +145,7 @@ chan = &xim->chan[i]; if (chan->id) { xim_removeInput (xim, chan->id); - chan->id = NULL; + chan->id = 0; } switch (chan->type) { @@ -296,7 +300,7 @@ fcntl(s, F_SETFD, FD_CLOEXEC); /* Allocate and fill in i/o channel descriptor. */ - if (chan = get_iochan(xim)) { + if ((chan = get_iochan(xim))) { chan->xim = (XtPointer) xim; chan->type = IO_INET; chan->datain = s; @@ -367,7 +371,7 @@ fcntl(s, F_SETFD, FD_CLOEXEC); /* Allocate and fill in i/o channel descriptor. */ - if (chan = get_iochan(xim)) { + if ((chan = get_iochan(xim))) { chan->xim = (XtPointer) xim; chan->type = IO_UNIX; chan->datain = s; @@ -421,7 +425,7 @@ } */ /* Allocate and fill in i/o channel descriptor. */ - if (chan = get_iochan(xim)) { + if ((chan = get_iochan(xim))) { chan->xim = (XtPointer) xim; chan->type = chan_port->type; chan->datain = s; @@ -448,7 +452,7 @@ close (chan->datain); if (chan->id) { xim_removeInput (chan->xim, chan->id); - chan->id = NULL; + chan->id = 0; } chan->type = 0; break; @@ -464,7 +468,6 @@ get_iochan (xim) register XimDataPtr xim; { - register IoChanPtr chan; register int i; for (i=0; i < XtNumber(xim->chan); i++) @@ -505,7 +508,7 @@ if ((n = chan_read (datain, (char *)&iis, sizeof(iis))) < sizeof(iis)) { if (n != 0) fprintf (stderr, - "ximtool: command input read error, n=%d of %d, errno=%d\n", + "ximtool: command input read error, n=%d of %lu, errno=%d\n", n, sizeof(iis), errno); if (n <= 0) xim_disconnectClient (chan); @@ -751,7 +754,7 @@ */ char emsg[SZ_WCSBUF]; char *text; - int frame, wcsnum; + int frame; memset ((char *)emsg, 0, SZ_WCSBUF); @@ -1038,7 +1041,7 @@ /* DECODE_FRAMENO -- Decode encoded IIS register frame number. */ -static +static int decode_frameno (z) register int z; { @@ -1391,6 +1394,8 @@ * elsewhere if needed, our only purpose here is to extract the frame WCS. */ +void print_mappings (FrameBufPtr fr); + static void add_mapping (xim, ctran, wcsbuf, fr) register XimDataPtr xim; @@ -1482,8 +1487,7 @@ /* PRINT_MAPPINGS -- Debug routine to print all mappings on a frame. */ -print_mappings (fr) -FrameBufPtr fr; +void print_mappings (FrameBufPtr fr) { MappingPtr mp; register int i; --- a/iis/iistcl.C +++ b/iis/iistcl.C @@ -42,6 +42,7 @@ return copy; } +#if 0 static char* toLower(char* str) { char* ptr = str; @@ -51,6 +52,7 @@ } return str; } +#endif int Iis_Init(Tcl_Interp* interp) { @@ -150,7 +152,7 @@ xim.chan[i].dataout = 0; // output channel xim.chan[i].keepalive = 0; // used to keep input fifo ready xim.chan[i].path[0] = '\0'; // for unix sockets - xim.chan[i].reference_frame;// reference (cmd i/o) frame + xim.chan[i].reference_frame=0;// reference (cmd i/o) frame xim.chan[i].rf_p = NULL; // reference frame descriptor } } --- a/iis/xim.C +++ b/iis/xim.C @@ -19,7 +19,7 @@ void iisIO(void* data, int mask) { - int fd = (long)data; + int fd = *(long *)data; if (IISDebug) cerr << "iisIO() " << fd << ' ' << mask << endl; @@ -43,7 +43,7 @@ iis->chan[fd] = chan; #ifndef __WIN32__ Tcl_CreateFileHandler(fd, TCL_READABLE, (void (*)(void*,int))iisIO, - (void*)fd); + &fd); #else Tcl_CreateEventSource(setupProc, checkProc, (void*)fd); #endif --- a/iis/ximtool.h +++ b/iis/ximtool.h @@ -149,7 +149,7 @@ /* Client IIS I/O channel. */ typedef struct { XtPointer xim; /* backpointer to xim descriptor */ - XtPointer id; /* input callback id */ + int id; /* input callback id */ int type; /* channel type */ int datain; /* input channel */ int dataout; /* output channel */ debian/patches/ds9_fix_docdir.patch0000644000000000000000000000574712230505302014534 0ustar Author: Ole Streicher Description: Instead putting the documentation into the common shared dir of ds9, debian wants it in /usr/share/doc. This requires the help browser to be adjusted. --- a/src/help.tcl +++ b/src/help.tcl @@ -8,17 +8,17 @@ global help global ds9 - set help(refman) "$ds9(root)/doc/ref/index.html" - set help(command) "$ds9(root)/doc/ref/command.html" - set help(userman) "$ds9(root)/doc/user/index.html" - set help(keyboard) "$ds9(root)/doc/ref/keyboard.html" - set help(faq) "$ds9(root)/doc/faq.html" - set help(new) "$ds9(root)/doc/new.html" - set help(release) "$ds9(root)/doc/release/r7.0.html" - set help(helpdesk) "$ds9(root)/doc/helpdesk.html" - set help(story) "$ds9(root)/doc/story.html" - set help(ack) "$ds9(root)/doc/acknowledgment.html" - set help(vo) "$ds9(root)/doc/ref/vo.html" + set help(refman) "$ds9(doc)/ref/index.html" + set help(command) "$ds9(doc)/ref/command.html" + set help(userman) "$ds9(doc)/user/index.html" + set help(keyboard) "$ds9(doc)/ref/keyboard.html" + set help(faq) "$ds9(doc)/faq.html" + set help(new) "$ds9(doc)/new.html" + set help(release) "$ds9(doc)/release/r7.0.html" + set help(helpdesk) "$ds9(doc)/helpdesk.html" + set help(story) "$ds9(doc)/story.html" + set help(ack) "$ds9(doc)/acknowledgment.html" + set help(vo) "$ds9(doc)/ref/vo.html" set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observatory)\nMasahiro Tsujimoto (Japan Aerospace Exploration Agency)\nPetr Kubánek (Institute of Physics, Prague)\nAlbert Kong (National Tsing Hua University)\nHao-Yuan Duan (National Tsing Hua University)\n\nSAOImage DS9 development has been made possible by funding from the Chandra X-ray Science Center (CXC) and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3-D data visualization." --- a/src/ds9.tcl +++ b/src/ds9.tcl @@ -186,6 +186,7 @@ # set to absolute path so that if -cd command is used, # so we can still find our files set ds9(root) "/usr/share/saods9" +set ds9(doc) "/usr/share/doc/saods9-doc" # tcl modules package require msgcat --- a/src/util.tcl +++ b/src/util.tcl @@ -707,7 +707,7 @@ # can't use -file for zvfs # set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif] - set ch [open $ds9(root)/doc/sun.gif r] + set ch [open $ds9(root)/sun.gif r] fconfigure $ch -translation binary -encoding binary set dd [read $ch] close $ch debian/patches/saotk_add_ksearch.patch0000644000000000000000000000644212230505302015265 0ustar Author: Sergio Pascual Description: Insert the "ksearchh" routine that was originated by Doub Mink in wcssubs so that fitsImage.c will compile. --- a/saotk/frame/fitsimage.C +++ b/saotk/frame/fitsimage.C @@ -29,7 +29,97 @@ extern "C" { FitsHead* wcshead = NULL; FitsHead* wcsprim = NULL; - char* ksearchh(char*, char*); + char* ksearchh(char* hstring, char* keyword) + { +/* Find entry for keyword keyword in FITS header string hstring. + (the keyword may have a maximum of eight letters) + NULL is returned if the keyword is not found */ + +/* char *hstring; character string containing fits-style header + information in the format = {/ } + the default is that each entry is 80 characters long; + however, lines may be of arbitrary length terminated by + nulls, carriage returns or linefeeds, if packed is true. */ +/*char *keyword; character string containing the name of the variable + to be returned. ksearch searches for a line beginning + with this string. The string may be a character + literal or a character variable terminated by a null + or '$'. it is truncated to 8 characters. */ + char *loc, *headnext, *headlast, *pval, *lc, *line; + int icol, nextchar, lkey, nleft, lhead, lmax; + +#ifdef USE_SAOLIB + int iel=1, ip=1, nel, np, ier; + char *get_fits_head_str(); + + if( !use_saolib ){ +#endif + + pval = 0; +static int lhead0 = 0; +/* Find current length of header string */ + if (lhead0) + lmax = lhead0; + else + lmax = 256000; + for (lhead = 0; lhead < lmax; lhead++) { + if (hstring[lhead] == (char) 0) + break; + } + +/* Search header string for variable name */ + headlast = hstring + lhead; + headnext = hstring; + pval = NULL; + while (headnext < headlast) { + nleft = headlast - headnext; + loc = strncsrch (headnext, keyword, nleft); + + /* Exit if keyword is not found */ + if (loc == NULL) { + break; + } + + icol = (loc - hstring) % 80; + lkey = strlen (keyword); + nextchar = (int) *(loc + lkey); + + /* If this is not in the first 8 characters of a line, keep searching */ + if (icol > 7) + headnext = loc + 1; + + /* If parameter name in header is longer, keep searching */ + else if (nextchar != 61 && nextchar > 32 && nextchar < 127) + headnext = loc + 1; + + /* If preceeding characters in line are not blanks, keep searching */ + else { + line = loc - icol; + for (lc = line; lc < loc; lc++) { + if (*lc != ' ') + headnext = loc + 1; + } + + /* Return pointer to start of line if match */ + if (loc >= headnext) { + pval = line; + break; + } + } + } +/* Return pointer to calling program */ + return (pval); + +#ifdef USE_SAOLIB + } + else { + if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL) + return(hstring); + else + return(NULL); + } +#endif + } char* findit(char* cards, char* key) { debian/patches/saotk_add_missing_grf.patch0000644000000000000000000000057112221236761016163 0ustar Author: Ole Streicher Description: The new AST library defines a few more routines for which we just need to create dummies. --- a/saotk/util/grf.C +++ b/saotk/util/grf.C @@ -534,3 +534,11 @@ int astGCap(int cap, int value) { return astGridPtr->gCap(cap,value); } + +int astGBBuf( void ){ + return 0; +} + +int astGEBuf( void ){ + return 0; +} debian/patches/ds9_optional_doc_package.patch0000644000000000000000000000312512230505302016533 0ustar Author: Ole Streicher Description: Make the "-doc" package optional by disabling the help menu --- a/src/mhelp.tcl +++ b/src/mhelp.tcl @@ -8,30 +8,37 @@ proc HelpMenu {mb} { global ds9 + global help $mb add cascade -label [msgcat::mc {Help}] -menu $mb.help + if [ file exists $help(refman) ] { + set helpstate normal + } else { + set helpstate disabled + } + menu $mb.help $mb.help add command -label [msgcat::mc {Reference Manual}]\ - -command HelpRef + -command HelpRef -state $helpstate $mb.help add command -label [msgcat::mc {User Manual}]\ - -command HelpUser + -command HelpUser -state $helpstate $mb.help add command -label [msgcat::mc {Mouse & Keyboard}] \ - -command HelpKeyboard + -command HelpKeyboard -state $helpstate $mb.help add separator $mb.help add command -label [msgcat::mc {FAQ}] \ - -command HelpFAQ + -command HelpFAQ -state $helpstate $mb.help add command -label [msgcat::mc {New Features}] \ - -command HelpNew + -command HelpNew -state $helpstate $mb.help add command -label [msgcat::mc {Release Notes}] \ - -command HelpRelease + -command HelpRelease -state $helpstate $mb.help add command -label [msgcat::mc {Help Desk}] \ - -command HelpDesk + -command HelpDesk -state $helpstate $mb.help add separator $mb.help add command -label [msgcat::mc {Story of SAOImage DS9}] \ - -command HelpStory + -command HelpStory -state $helpstate $mb.help add command -label [msgcat::mc {Acknowledgment}] \ - -command HelpAck + -command HelpAck -state $helpstate switch $ds9(wm) { x11 - debian/patches/series0000644000000000000000000000066612230505302012032 0ustar checkdns.patch htmlwidget.patch iis.patch blt_fix_crash.patch blt_remove_rpath.patch saotk_add_ksearch.patch saotk_add_psscale.patch saotk_avoid_compile_warnings.patch saotk_fix_wcstools_includes.patch saotk_fix_funtools_includes.patch saotk_spellfix.patch ds9_use_external_libs.patch ds9_make_linux.patch ds9_use_filesystem.patch ds9_fix_docdir.patch ds9_optional_doc_package.patch ds9_add_about_debian.patch ds9_fix_documentation.patch debian/patches/saotk_spellfix.patch0000644000000000000000000000140012230505302014650 0ustar Author: Ole Streicher Description: Spellfix; however this is unused at the end. --- a/saotk/frame/ds9parser.C +++ b/saotk/frame/ds9parser.C @@ -1016,7 +1016,7 @@ "'='", "'+'", "'-'", "'&'", "'!'", "$accept", "start", "commands", "command", "@1", "@2", "@3", "hash", "@4", "comment", "@5", "shapeComment", "@6", "@7", "nonshapeComment", "@8", "@9", "terminator", - "numeric", "debug", "yesno", "sp", "bp", "ep", "conjuction", "optangle", + "numeric", "debug", "yesno", "sp", "bp", "ep", "conjunction", "optangle", "angle", "value", "vvalue", "numberof", "sexagesimal", "hms", "dms", "coord", "coordSystem", "wcsSystem", "skyFrame", "skyDist", "property", "callBack", "global", "globalProperty", "globalRuler", "globalCompass", debian/patches/ds9_make_linux.patch0000644000000000000000000001156012230505371014552 0ustar Author: Ole Streicher Description: Set the compile flags according to the Debian environment. We also need to propagate the standard CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS here. --- a/make.linux +++ b/make.linux @@ -1,29 +1,26 @@ OS = unix ARCH = linux -X11INCLUDE=/usr/X11R6/include +X11INCLUDE=/usr/include/X11 X11LIB = /usr/X11R6/lib -XX = -O2 +XX = $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl8.5 -I/usr/include/freetype2 YY = -gstabs+ -fno-inline ZZ = # note: bug with gcc 4.1 and 4.2 # can't use -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 # AA = -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -AA = -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +AA = -#OPTS = ${XX} ${ZZ} -OPTS = ${YY} ${ZZ} -NOPTS = ${YY} ${ZZ} +OPTS = ${XX} ${ZZ} +NOPTS = ${XX} ${ZZ} -#CXX = g++ -CXX = g++44 +CXX = g++ CXXOPT = ${OPTS} ${AA} CXXNOPT = ${NOPTS} ${AA} -#CC = gcc -CC = gcc44 +CC = gcc CCOPT = ${OPTS} ${AA} CCNOPT = ${NOPTS} ${AA} --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ TCLFLAGS = $(XFLAGS) $(EXTTCLFLAGS) TKTABLEFLAGS = $(XFLAGS) - BLTFLAGS = $(XFLAGS) $(BLTWITHOUT) + BLTFLAGS = $(XFLAGS) --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 $(BLTWITHOUT) TKIMGFLAGS = $(XFLAGS) XPAFLAGS = $(XFLAGS) @@ -283,7 +283,7 @@ blt : FORCE @echo "Installing BLT..." - cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE) + cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) $(CFLAGS)' LDFLAGS='$(LDFLAGS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE) cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared cp $(BLTDIR)/src/*.so* lib/. cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/. @@ -315,7 +315,7 @@ html : FORCE @echo "Installing HTMLWIDGET..." - cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE) + cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) $(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE) cd $(HTMLDIR); $(MAKE) headers libtkhtml.a cp $(HTMLDIR)/libtkhtml.a lib/. --- a/checkdns/Makefile +++ b/checkdns/Makefile @@ -1,6 +1,6 @@ include ../make.include -CFLAGS = $(CCOPT) -I../include +CFLAGS += $(CCOPT) -I../include SRC = checkdns.c --- a/hcompress/Makefile +++ b/hcompress/Makefile @@ -1,6 +1,6 @@ include ../make.include -CFLAGS = $(CCOPT) -I. +CFLAGS += $(CCOPT) -I. SRC = hdecompress.c --- a/iis/Makefile +++ b/iis/Makefile @@ -1,7 +1,7 @@ include ../make.include -CXXFLAGS = $(CXXOPT) -I../include -CFLAGS = $(CCOPT) -I../include +CXXFLAGS += $(CXXOPT) -I../include +CFLAGS += $(CCOPT) -I../include SRC = iistcl.C xim.C CSRC = iis.c util.c --- a/plio/Makefile +++ b/plio/Makefile @@ -1,6 +1,6 @@ include ../make.include -CFLAGS = $(CCOPT) -I. +CFLAGS += $(CCOPT) -I. SRC = pliocomp.c --- a/rice/Makefile +++ b/rice/Makefile @@ -1,6 +1,6 @@ include ../make.include -CFLAGS = $(CCOPT) -I. +CFLAGS += $(CCOPT) -I. SRC = ricecomp.c --- a/saotk/Makefile +++ b/saotk/Makefile @@ -5,7 +5,7 @@ #--------------------------defines -CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE) +CXXFLAGS += $(CXXOPT) -I../include -I$(X11INCLUDE) DIRS = widget frame colorbar panner magnifier vector list fitsy++ util --- a/htmlwidget/makemake.tcl.in +++ b/htmlwidget/makemake.tcl.in @@ -91,7 +91,7 @@ global BEXE set n "${name}$BEXE" puts "$n: $src" - puts " @BUILD_CC@ @BUILD_CFLAGS@ -o $n $src $libs" + puts " @BUILD_CC@ @CPPFLAGS@ @BUILD_CFLAGS@ -o $n $src $libs" puts "" global cleanable; lappend cleanable $n } @@ -196,7 +196,7 @@ # proc MakeObj {name src {dep {}}} { set n $name - set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@" + set cc "@TARGET_CC@ @CPPFLAGS@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@" append cc " @TARGET_X_INC@" append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@" puts "$n: $src $dep" --- a/blt3.0.1/src/Makefile.in +++ b/blt3.0.1/src/Makefile.in @@ -10,6 +10,7 @@ BLT_LIBRARY = @BLT_LIBRARY@ CC = @CC@ CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ DEFINES = @DEFINES@ EXTRA_CFLAGS = @GCCFLAGS@ $(SO_CFLAGS) LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@ @@ -374,8 +375,8 @@ $(srcdir)/bltTree.h \ $(srcdir)/bltVector.h -CC_OPTS = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) -MAIN_CC_OPTS = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) +CC_OPTS = $(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) +MAIN_CC_OPTS = $(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_ROOT = debian/patches/ds9_fix_documentation.patch0000644000000000000000000000733712230505302016136 0ustar Author: Ole Streicher Description: Fix some minor documentation glitches that produce an errornous manpage. --- a/doc/ref/command.html +++ b/doc/ref/command.html @@ -27,7 +27,7 @@ align
analysis
array
- asinh
+ asinh
background
backup
bin
@@ -39,7 +39,7 @@ colorbar
console
contour
- crop
+ crop
crosshair
cube
cursor
@@ -51,12 +51,12 @@ fifo
fifo_only
first
- fits
+ fits
frame
geometry
gif
green
- grid
+ grid
header
height
help
@@ -78,12 +78,11 @@ mecube
minmax
mode
- mosaic
+ mosaic
mosaicimage
- movie

- msg
-
multiframe
+ movie
+ msg
+ multiframe
nameserver
nan
nrrd
@@ -105,8 +104,8 @@ quit
raise
regions
-
red
-
restore
+ red
+ restore
rgb
rgbarray
rgbcube
@@ -257,16 +256,6 @@ $ds9 -analysis text '{This is text}';

array

-

Load raw data array into current frame.
-

- Syntax:
- -array -<filename>[[xdim=<x>,ydim=<y>|dim=<dim>],zdim=<z>,bitpix=<b>,skip=<s>,endian=[little|big]]
-  
- Example:
- $ds9 -array foo.arr[dim=512,bitpix=-32,endian=little]

- $cat foo.arr | ds9 -array -[dim=512,bitpix=-32,endian=little]
-

array

Load an array.

Syntax:
-array @@ -1325,7 +1314,7 @@ $ds9 -height 512

help

-

Display help information. To maintain backward compatability, +

Display help information. To maintain backward compatibility, -help will display a brief help message and exit. --help will display all command line options within the built-in help facility.

debian/patches/ds9_use_external_libs.patch0000644000000000000000000003223712230505371016131 0ustar Author: Sebastien Fabbro , and others Description: Compile against external libraries of wcstools, funtools, ast, and tk etc. instead of the convienience copies provided by ds9. --- a/ds9/Makefile +++ b/ds9/Makefile @@ -4,13 +4,7 @@ #--------------------------defines ZDIR = zipdir/zvfsmntpt -FFILES = $(ZDIR)/$(TCLVER) \ - $(ZDIR)/tcl8 \ - $(ZDIR)/$(TKVER) \ - $(ZDIR)/$(BLTVER) \ - $(ZDIR)/$(TCLLIBVER) \ - $(ZDIR)/$(TKCONVER) \ - $(ZDIR)/$(XMLRPCVER) \ +FFILES = \ $(ZDIR)/src \ $(ZDIR)/msgs \ $(ZDIR)/doc \ @@ -25,48 +19,19 @@ endif # for unix, macosx -MAINDIR = ../$(TKDIR)/unix +MAINDIR = /usr/share/tcltk/tk8.5 MAIN = tkAppInit LIBS = \ - ../lib/libsaotk.a \ ../lib/libtkhtml.a \ ../lib/libtkmpeg.a \ - ../lib/$(TCLXMLVER)/libTclxml3.2.a \ - ../lib/$(TKTABLEVER)/libTktable2.10.a \ - ../lib/$(TKIMGVER)/libtkimgpng1.4.a \ - ../lib/$(TKIMGVER)/libpngtcl1.4.3.a \ - ../lib/$(TKIMGVER)/libtkimgtiff1.4.a \ - ../lib/$(TKIMGVER)/libtifftcl3.9.4.a \ - ../lib/$(TKIMGVER)/libtkimgjpeg1.4.a \ - ../lib/$(TKIMGVER)/libjpegtcl8.2.a \ - ../lib/$(TKIMGVER)/libtkimggif1.4.a \ - ../lib/$(TKIMGVER)/libtkimgppm1.4.a \ - ../lib/$(TKIMGVER)/libtkimgwindow1.4.a \ - ../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \ - ../lib/$(TKIMGVER)/libtkimg1.4.a \ - ../lib/libtiff.a \ - ../lib/libfuntools.a \ ../lib/librice.a \ ../lib/libhcomp.a \ ../lib/libplio.a \ - ../lib/libast.a \ - ../lib/libast_err.a \ - ../lib/libast_pal.a \ ../lib/libsaotk.a \ - ../lib/libwcs.a \ - ../lib/libzvfs.a \ - ../lib/libzip.a \ - ../lib/libz.a \ - ../lib/libxpa.a \ ../lib/libiis.a \ ../lib/libcheckdns.a \ - ../lib/libsignal_ext.a \ - ../lib/libxxlib.a \ - ../lib/libBLTX30.a \ - ../lib/libBLTCore30.a \ - ../lib/libtk8.5.a \ - ../lib/libtcl8.5.a + ../lib/libxxlib.a # if windows, redefine ifeq ($(OS),windows) @@ -150,14 +115,9 @@ all: ds9 -ds9 : null.zip ds9Base $(FILES) +ds9 : ds9Base $(FILES) $(RM) $@ - cp ds9Base ds9.zip - strip ds9.zip - cat null.zip >> ds9.zip - cd zipdir; ../../bin/zip -rA9 ../ds9.zip * - mv ds9.zip ds9 - cp ds9 ../bin/. + cp ds9Base ../bin/ds9 debug : null.zip ds9Base $(FILES) $(RM) $@ @@ -354,18 +314,14 @@ #--------------------------linux ifneq (,$(findstring linux,$(ARCH))) -ds9Base : $(OBJS) $(LIBS) +ds9Base : $(MAIN).o $(OBJS) $(LIBS) $(RM) $@ - rm -f libstdc++.a - ln -s `$(CXX) ${OPTS} -print-file-name=libstdc++.a` . - $(CXX) ${OPTS} -static-libgcc -Wl,--export-dynamic \ - -o $@ $(OBJS) $(LIBS) \ - -Wl,-Bstatic -L. -lstdc++ \ - -Wl,-Bdynamic \ - -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss \ - -lxml2 \ - -ldl -lpthread - rm -f libstdc++.a + $(CXX) $(OPTS) $(LDFLAGS) -o ds9Base ds9.o tkAppInit.o ../lib/libsaotk.a \ + -Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \ + -lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \ + -lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0 -lBLTX30 -lBLTCore30 \ + -lwcstools -lfuntools -ltk8.5 -ltcl8.5 -lz \ + -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr endif #--------------------------darwin --- a/ds9/ds9.C +++ b/ds9/ds9.C @@ -22,34 +22,13 @@ int Blt_core_Init(Tcl_Interp*); int Blt_x_Init(Tcl_Interp*); - int Tktable_Init(Tcl_Interp*); int Checkdns_Init(Tcl_Interp*); int Saotk_Init(Tcl_Interp*); int Tkhtml_Init(Tcl_Interp*); int Tkmpeg_Init(Tcl_Interp*); - int Tkimg_Init(Tcl_Interp*); - int Zlibtcl_Init(Tcl_Interp*); - int Jpegtcl_Init(Tcl_Interp*); - int Tkimgjpeg_Init(Tcl_Interp*); - int Tifftcl_Init(Tcl_Interp*); - int Tkimgtiff_Init(Tcl_Interp*); - int Pngtcl_Init(Tcl_Interp*); - int Tkimgpng_Init(Tcl_Interp*); - int Tkimggif_Init(Tcl_Interp*); - int Tkimgppm_Init(Tcl_Interp*); - int Tkimgwindow_Init(Tcl_Interp*); - - int Tclxpa_Init(Tcl_Interp*); int Iis_Init(Tcl_Interp*); - int Tclxml_Init(Tcl_Interp*); - int Tclxml_libxml2_Init(Tcl_Interp*); - -#ifndef _WIN32 - int Signal_ext_Init(Tcl_Interp*); -#endif - #ifdef _MACOSX int Tkmacosx_Init(Tcl_Interp*); #endif @@ -156,7 +135,6 @@ // Tk if (Tk_Init(interp)) return TCL_ERROR; - Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); { Tcl_DString pwd; @@ -175,12 +153,6 @@ Tcl_StaticPackage(interp, "blt_extra", Blt_x_Init, (Tcl_PackageInitProc*)NULL); - // Tktable - if (Tktable_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "Tktable", Tktable_Init, - (Tcl_PackageInitProc*)NULL); - // Checkdns if (Checkdns_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -199,12 +171,6 @@ Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init, (Tcl_PackageInitProc*)NULL); - // Tclxpa - if (Tclxpa_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init, - (Tcl_PackageInitProc*)NULL); - // IIS if (Iis_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -217,84 +183,6 @@ Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init, (Tcl_PackageInitProc*)NULL); - // Tclxml - if (Tclxml_Init(interp) == TCL_ERROR) - return TCL_ERROR; - - // Tkimg - if (Tkimg_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "img", Tkimg_Init, - (Tcl_PackageInitProc*)NULL); - - // zlibtcl - if (Zlibtcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init, - (Tcl_PackageInitProc*)NULL); - - // jpegtcl - if (Jpegtcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgjpeg - if (Tkimgjpeg_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init, - (Tcl_PackageInitProc*)NULL); - - // Tifftcl - if (Tifftcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgtiff - if (Tkimgtiff_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init, - (Tcl_PackageInitProc*)NULL); - - // Pngtcl - if (Pngtcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgpng - if (Tkimgpng_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "png", Tkimgpng_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimggif - if (Tkimggif_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "gif", Tkimggif_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgppm - if (Tkimgppm_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "ppm", Tkimgppm_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgwindow - if (Tkimgwindow_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "window", Tkimgwindow_Init, - (Tcl_PackageInitProc*)NULL); - - // Signal_Ext -#ifndef _WIN32 - if (Signal_ext_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "signal", Signal_ext_Init, - (Tcl_PackageInitProc*)NULL); -#endif - #ifdef _MACOSX if (Tkmacosx_Init(interp) == TCL_ERROR) return TCL_ERROR; --- a/Makefile +++ b/Makefile @@ -283,9 +283,9 @@ blt : FORCE @echo "Installing BLT..." - cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(BLTFLAGS) --disable-shared --cache-file=$(CACHE) - cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static - cp $(BLTDIR)/src/*.a lib/. + cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE) + cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared + cp $(BLTDIR)/src/*.so* lib/. cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/. zlib : FORCE @@ -300,7 +300,7 @@ tkimg : libtiff @echo "Installing TKIMG..." - cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(TKIMGFLAGS) --disable-shared --disable-threads --cache-file=$(LOCALCACHE) + cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(TKIMGFLAGS) --disable-shared --disable-threads --cache-file=$(LOCALCACHE) cd $(TKIMGDIR); $(MAKE) -j $(JOBS) all; $(MAKE) install libtiff : FORCE @@ -310,18 +310,18 @@ tkmpeg : FORCE @echo "Installing TKMPEG..." - cd $(TKMPEGDIR); $(MAKE) -j $(JOBS) + cd $(TKMPEGDIR); $(MAKE) -j $(JOBS) CXXOPT="$(CXXOPT)" cd $(TKMPEGDIR); $(MAKE) install html : FORCE @echo "Installing HTMLWIDGET..." - cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE) + cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE) cd $(HTMLDIR); $(MAKE) headers libtkhtml.a cp $(HTMLDIR)/libtkhtml.a lib/. xpa : FORCE @echo "Installing XPA..." - cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) $(XPAFLAGS) --disable-shared --cache-file=$(CACHE) + cd $(XPADIR); CC='$(CC)' CFLAGS='$(CCOPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure --prefix $(root) $(XPAFLAGS) --disable-shared --cache-file=$(CACHE) cd $(XPADIR); $(MAKE) -j $(JOBS); $(MAKE) install cd bin; strip xpa* @@ -376,7 +376,7 @@ saotk : FORCE @echo "Installing SAOTK..." - cd $(SAOTKDIR); $(MAKE) -j $(JOBS) install + cd $(SAOTKDIR); $(MAKE) CXX="$(CXX)" -j $(JOBS) install zip : FORCE @echo "Installing ZIP..." @@ -400,15 +400,9 @@ endif distclean : filesclean \ - tclclean tkclean \ - tktableclean bltclean \ - zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \ - xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \ - astclean wcssubsclean \ - riceclean hcompressclean plioclean \ - $(OPTDIRCLEAN) \ - saotkclean zipclean zvfsclean ds9clean srcclean \ - dirsclean + bltclean tkmpegclean iisclean checkdnsclean \ + riceclean hcompressclean plioclean $(OPTDIRCLEAN) \ + saotkclean ds9clean srcclean dirsclean filesclean: FORCE find . -name "myconfig.cache" -exec rm {} \; @@ -417,59 +411,18 @@ dirsclean: FORCE @for d in $(DIRS); do rm -rf $$d; done -tclclean : FORCE - cd $(TCLDIRDIR); $(MAKE) distclean - -tkclean : FORCE - cd $(TKDIRDIR); $(MAKE) distclean - -tktableclean: FORCE - cd $(TKTABLEDIR); $(MAKE) distclean - bltclean: FORCE - cd $(BLTDIR); $(MAKE) distclean - -zlibclean: FORCE - cd $(ZLIBDIR); $(MAKE) distclean - -tclxmlclean: FORCE - cd $(TCLXMLDIR); $(MAKE) distclean - -tkimgclean: libtiffclean - rm -fr $(TKIMGDIR)/Img/* - rm -fr $(LIB)/Img1.* - cd $(TKIMGDIR); $(MAKE) distclean - -libtiffclean: FORCE - cd $(TKIMGDIR)/compat/libtiff; $(MAKE) distclean + cd $(BLTDIR); $(MAKE) distclean || true tkmpegclean: FORCE cd $(TKMPEGDIR); $(MAKE) distclean -htmlclean: FORCE - cd $(HTMLDIR); $(MAKE) distclean - -xpaclean : FORCE - cd $(XPADIR); $(MAKE) distclean - iisclean : FORCE cd $(IISDIR); $(MAKE) distclean checkdnsclean : FORCE cd $(CHECKDNSDIR); $(MAKE) distclean -signalclean : FORCE - cd $(SIGNALDIR); $(MAKE) distclean - -funtoolsclean: FORCE - cd $(FUNTOOLSDIR); $(MAKE) distclean - -astclean: FORCE - cd $(ASTDIR); $(MAKE) distclean - -wcssubsclean: FORCE - cd $(WCSSUBSDIR); $(MAKE) distclean - riceclean: FORCE cd $(RICEDIR); $(MAKE) distclean @@ -485,9 +438,6 @@ zipclean: FORCE cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean -zvfsclean: FORCE - cd $(ZVFSDIR); $(MAKE) distclean - ds9clean : FORCE cd $(DS9DIR); $(MAKE) distclean --- a/src/ds9.tcl +++ b/src/ds9.tcl @@ -188,29 +188,35 @@ set ds9(root) "[pwd]/zvfsmntpt" # tcl modules -if {![namespace exists msgcat]} { - source $ds9(root)/tcl8/8.5/msgcat-1.4.3.tm -} -if {![namespace exists http]} { - source $ds9(root)/tcl8/8.4/http-2.7.5.tm -} - -source $ds9(root)/tk8.5/tearoff.tcl -source $ds9(root)/tk8.5/comdlg.tcl -source $ds9(root)/tk8.5/focus.tcl -source $ds9(root)/tk8.5/msgbox.tcl - -source $ds9(root)/tcllib1.14/base64/base64.tcl -source $ds9(root)/tcllib1.14/log/log.tcl -source $ds9(root)/tcllib1.14/ftp/ftp.tcl -source $ds9(root)/tcllib1.14/textutil/repeat.tcl -source $ds9(root)/tcllib1.14/textutil/tabify.tcl -source $ds9(root)/tcllib1.14/math/fuzzy.tcl +package require msgcat +package require http +package require xml + +package require base64 +package require log +package require ftp +package require textutil::repeat +package require textutil::tabify +package require math::fuzzy -source $ds9(root)/tkcon2.5/tkcon.tcl -source $ds9(root)/xmlrpc0.3/xmlrpc.tcl +package require tkcon +source $ds9(root)/src/xmlrpc.tcl source $ds9(root)/blt3.0/graph.tcl +package require Tktable +package require tclxpa +package require Signal + +package require img::base +package require img::jpeg +package require img::tiff +package require img::png +package require img::gif +package require img::ppm +package require img::bmp +package require img::xbm +package require img::window + source $ds9(root)/src/source.tcl # fix ::tk and msgcat debian/patches/blt_remove_rpath.patch0000644000000000000000000000176212230505302015170 0ustar Author: Ole Streicher Description: The BLT shared libraries are compiled with the RPATH set. This is against the Debian policy, and is also not needed at all. Also, configure kFreebsd and Hurd similarly to Linux. --- a/blt3.0.1/configure +++ b/blt3.0.1/configure @@ -16441,11 +16441,11 @@ fi ;; - *-linux*) + *-linux*|*-kfreebsd*|*-gnu0*) SO_CFLAGS="-fPIC" SO_LD="${CC}" SO_LDFLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' - LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" +# LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" LDFLAGS="" EXTRA_LIBS="-ldl" --- a/blt3.0.1/configure.in +++ b/blt3.0.1/configure.in @@ -1485,11 +1485,11 @@ fi ;; - *-linux*) + *-linux*|*-kfreebsd*|*-gnu0*) SO_CFLAGS="-fPIC" SO_LD="${CC}" SO_LDFLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' - LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" +# LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" LDFLAGS="" EXTRA_LIBS="-ldl" debian/patches/saotk_avoid_compile_warnings.patch0000644000000000000000000000237312230505302017556 0ustar Author: Justin Pryzby Description: Avoid compile time warnings in the saotk subsystem --- a/saotk/fitsy++/outchannel.C +++ b/saotk/fitsy++/outchannel.C @@ -7,7 +7,7 @@ OutFitsChannel::OutFitsChannel(Tcl_Interp* interp, const char* ch) { int tclMode; - if (ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode)) + if ((ch_ = Tcl_GetChannel(interp, (char*)ch, &tclMode))) valid_ = 1; } --- a/saotk/fitsy++/outfile.C +++ b/saotk/fitsy++/outfile.C @@ -6,7 +6,7 @@ OutFitsFile::OutFitsFile(const char* fn) { - if (fd_ = fopen(fn, "wb")) + if ((fd_ = fopen(fn, "wb"))) valid_ = 1; } @@ -34,7 +34,7 @@ OutFitsFileGZ::OutFitsFileGZ(const char* fn) { - if (fd_ = gzopen(fn, "wb")) + if ((fd_ = gzopen(fn, "wb"))) valid_ = 1; } --- a/saotk/fitsy++/strm.C +++ b/saotk/fitsy++/strm.C @@ -397,7 +397,7 @@ if (!(this->pExt_ || (this->pIndex_>0))) { // we are only looking for a primary image - if (this->head_ = this->headRead()) { + if ((this->head_ = this->headRead())) { this->found(); return; } @@ -453,7 +453,7 @@ this->head_ = NULL; } - if (this->head_ = this->headRead()) { + if ((this->head_ = this->headRead())) { this->ext_++; this->found(); return; debian/patches/ds9_add_about_debian.patch0000644000000000000000000000323012230505302015627 0ustar Author: Ole Streicher Description: Add the Debian packager to the "About" box --- a/src/help.tcl +++ b/src/help.tcl @@ -22,6 +22,8 @@ set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observatory)\nMasahiro Tsujimoto (Japan Aerospace Exploration Agency)\nPetr Kubánek (Institute of Physics, Prague)\nAlbert Kong (National Tsing Hua University)\nHao-Yuan Duan (National Tsing Hua University)\n\nSAOImage DS9 development has been made possible by funding from the Chandra X-ray Science Center (CXC) and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3-D data visualization." + append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)" + set help(email) "If you encounter any problems or have suggestions with ds9, please contact us at: saord@cfa.harvard.edu --- a/src/util.tcl +++ b/src/util.tcl @@ -702,7 +702,7 @@ # Param set f [frame $w.param -background white] - canvas $f.c -background white -height 450 -width 550 + canvas $f.c -background white -height 485 -width 550 pack $f.c -fill both -expand true # can't use -file for zvfs debian/patches/htmlwidget.patch0000644000000000000000000000245412223251521014006 0ustar Author: Ole Streicher Description: The configure script of htmklwidget does not find tk.tcl and tk.h because buggy search. This patch fixes this q&d directly in "configure". Since ds9.7 will have an updated htmlwidget, I guess it makes no sense to provide a general patch here. --- a/htmlwidget/configure.in +++ b/htmlwidget/configure.in @@ -332,9 +332,6 @@ else AC_MSG_RESULT(unknown) fi -if test "$CYGWIN" != "yes"; then - AC_CYGWIN -fi if test "$CYGWIN" = "yes"; then BUILD_EXEEXT=.exe else @@ -540,7 +537,7 @@ cat > conftest.tcl <<\EOF regsub {^([A-Za-z]):/} [info library] {//\1/} out regsub {/tcl7.6} $out {tk4.2} out - regsub {/tcl([^/]*)} $out {/tk\1} out + regsub {/tcl8([^/]*)} $out {/tk8\1} out puts -nonewline $out exit EOF @@ -613,11 +610,11 @@ AC_CHECK_HEADER(tcl.h, [found=yes]) fi if test "$found" = "no"; then - for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do - n=$dir/include/tcl.h - AC_CHECK_FILE($dir/include/tcl.h, found=yes) + for dir in /usr/include /usr/include/tcl /usr/include/tcl8.* ; do + n=$dir/tcl.h + AC_CHECK_FILE($dir/tcl.h, found=yes) if test "$found" = "yes"; then - TARGET_TCL_INC="-I$dir/include" + TARGET_TCL_INC="-I$dir" break fi done debian/patches/ds9_use_filesystem.patch0000644000000000000000000000745412230505302015457 0ustar Author: Ole Streicher Description: Store all files in the usual FHS directories instead of building a zipfile and using a special tcl filesystem driver to access it. --- a/ds9/Makefile +++ b/ds9/Makefile @@ -94,12 +94,9 @@ all: ds9 -ds9 : ds9Base ds9.zip +ds9 : ds9Base $(RM) $@ - cp ds9Base ds9 - strip ds9 - cp ds9 ../bin/. - cp ds9.zip ../bin/. + cp ds9Base ../bin/ds9 cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9 debug : ds9Base ds9.zip @@ -187,12 +184,9 @@ all: ds9 -ds9 : ds9Base ds9.zip +ds9 : ds9Base $(FILES) $(RM) $@ - cp ds9Base ds9 - strip ds9 - cp ds9 ../bin/. - cp ds9.zip ../bin/. + cp ds9.Base ../bin/ds9 debug : ds9Base ds9.zip $(RM) $@ --- a/ds9/ds9.C +++ b/ds9/ds9.C @@ -17,9 +17,6 @@ void TclSetStartupScriptFileName(const char*); - int Zvfs_Init(Tcl_Interp*); - int Zvfs_Mount(Tcl_Interp*, char*, char *); - int Blt_core_Init(Tcl_Interp*); int Blt_x_Init(Tcl_Interp*); int Checkdns_Init(Tcl_Interp*); @@ -66,13 +63,8 @@ char** argv = *argvPtr; appname = dupstr(argv[0]); - // so that tcl and tk know where to find their libs - // we do it here before InitLibraryPath is called - putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.5"); - putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.5"); - // invoke startup script - TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl"); + TclSetStartupScriptFileName("/usr/share/saods9/src/ds9.tcl"); } int SAOAppInit(Tcl_Interp *interp) @@ -86,48 +78,6 @@ // save interp for cputs function global_interp = interp; - // We have to initialize the virtual filesystem before calling - // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find - // its startup script files. - if (Zvfs_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, - (Tcl_PackageInitProc*)NULL); - - - // find current working directory, and set as mount point - { - Tcl_DString pwd; - Tcl_DStringInit(&pwd); - Tcl_GetCwd(interp, &pwd); -#ifdef ZIPFILE - ostringstream str; -#ifndef _WIN32 - str << (char *)Tcl_GetNameOfExecutable() - << ".zip" - << ends; -#else - str << (char *)Tcl_GetNameOfExecutable() - << "/../ds9.zip" - << ends; -#endif - if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){ - char str[] = "ERROR: Unable to open the auxiliary ds9 file 'ds9.zip'. If you moved the ds9 program from its original location, please also move the zip file to the same place."; - -#ifndef _WIN32 - cerr << str << endl; -#else - MessageBox(NULL, str, "SAOImage DS9", MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); -#endif - exit(1); - } -#else - Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(), - Tcl_DStringValue(&pwd)); -#endif - Tcl_DStringFree(&pwd); - } - // Initialize Tcl and Tk if (Tcl_Init(interp)) return TCL_ERROR; @@ -197,15 +147,6 @@ (Tcl_PackageInitProc*)NULL); #endif - // Variables - Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.5 ./zvfsmntpt/tcl8/8.3 ./zvfsmntpt/tcl8/8.4 ./zvfsmntpt/tcl8/8.5 ./zvfsmntpt/tk8.5 ./zvfsmntpt/blt3.0 ./zvfsmntpt/tcllib1.10 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.5", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt3.0", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt3.0", TCL_GLOBAL_ONLY); - Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY); - - //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); - return TCL_OK; } --- a/src/ds9.tcl +++ b/src/ds9.tcl @@ -185,7 +185,7 @@ # set to absolute path so that if -cd command is used, # so we can still find our files -set ds9(root) "[pwd]/zvfsmntpt" +set ds9(root) "/usr/share/saods9" # tcl modules package require msgcat debian/patches/saotk_fix_funtools_includes.patch0000644000000000000000000000146012230505302017435 0ustar Author: Ole Streicher Description: Since the funtools include files have quite generic names, we replace append the directory prefix "funtools/" instead of just adding /usr/include/funtools to the include path. This should prevent from accidently using the wrong include files. --- a/saotk/fitsy++/hist.C +++ b/saotk/fitsy++/hist.C @@ -13,8 +13,8 @@ #include "hist.h" #include "util.h" -#include "fitsy.h" -#include "filter.h" +#include +#include #define FILTERSIZE 262144 #define MULTWCS 27 --- a/saotk/fitsy++/hpx.C +++ b/saotk/fitsy++/hpx.C @@ -18,7 +18,7 @@ #include "hpx.h" #include "util.h" -#include "fitsy.h" +#include "funtools/fitsy.h" FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll, int cc, int qq) debian/patches/saotk_add_psscale.patch0000644000000000000000000000156612230505302015301 0ustar Author: Ole Streicher Description: The original code from ds9 uses a patched postscript code to allow scaling. Since we use standard Tk, we cannor support this (postscript scaling is silently ignored), but we need to support the global variable "psScale" which Doug Mink hacked into to get the scaling. --- a/saotk/widget/widget.C +++ b/saotk/widget/widget.C @@ -5,6 +5,8 @@ #include "widget.h" #include "util.h" +float psScale = 1.0; + // Tk Canvas Widget Functions Declaration int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, --- a/saotk/util/tkpostscript.h +++ b/saotk/util/tkpostscript.h @@ -13,7 +13,7 @@ #endif // copied from tkCanvPs.c -#include "../../tk8.5.9/generic/tkCanvas.h" +#include typedef struct TkPostscriptInfo { Tk_Window tkwin; /* The canvas being printed. */ debian/patches/checkdns.patch0000644000000000000000000000047712221236761013432 0ustar Author: Justin Pryzby Description: Avoid compilation error in (Tcl) DNS checker --- a/checkdns/checkdns.c +++ b/checkdns/checkdns.c @@ -15,6 +15,8 @@ #include #if HAVE_TCL #include +#include +#include #else #include #include debian/patches/blt_fix_crash.patch0000644000000000000000000001141512230505302014437 0ustar Author: Ole Streicher Description: BLT crashes when it reaches this code. This seems to be some remaining bug in the BLT-3.0 distributed with ds9. However; This fix is pragmatic -- I will not guarantee that this is not a memore hole. I would very much appreciate if someone could review this and provide a better fix. --- a/saotk/frame/frblt.C +++ b/saotk/frame/frblt.C @@ -797,7 +797,7 @@ if (Blt_GetVector(interp, xname, &xv) != TCL_OK) goto error; - if (Blt_ResetVector(xv, xx, length, length*sizeof(double), TCL_DYNAMIC) != + if (Blt_ResetVector(xv, xx, length, length*sizeof(double), TCL_STATIC) != TCL_OK) goto error; @@ -805,7 +805,7 @@ if (Blt_GetVector(interp, yname, &yv) != TCL_OK) goto error; - if (Blt_ResetVector(yv, yy, length, length*sizeof(double), TCL_DYNAMIC) != + if (Blt_ResetVector(yv, yy, length, length*sizeof(double), TCL_STATIC) != TCL_OK) goto error; --- a/blt3.0.1/src/bltFont.h +++ b/blt3.0.1/src/bltFont.h @@ -30,6 +30,8 @@ #ifndef _BLT_FONT_H #define _BLT_FONT_H +#include + #define FONT_ITALIC (1<<0) #define FONT_BOLD (1<<1) --- a/blt3.0.1/src/bltPictCmd.c +++ b/blt3.0.1/src/bltPictCmd.c @@ -88,6 +88,8 @@ NUMFMTS }; +#define PictFormat bltPictCmd_PictFormat + typedef struct { const char *name; /* Name of format. */ unsigned int flags; --- a/blt3.0.1/src/bltGrMesh.c +++ b/blt3.0.1/src/bltGrMesh.c @@ -1708,6 +1708,10 @@ return 0; } +int +Blt_Triangulate(Tcl_Interp *interp, size_t nPoints, Point2f *points, + int sorted, int *nTrianglesPtr, Triplet **trianglesPtr); + static void Triangulate(Tcl_Interp *interp, Mesh *meshPtr) { --- a/blt3.0.1/src/bltBind.c +++ b/blt3.0.1/src/bltBind.c @@ -1244,6 +1244,12 @@ {-1, NULL} }; +void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym, + XEvent *eventPtr); +int TkFindStateNumObj (Tcl_Interp *interp, Tcl_Obj *optionPtr, + const TkStateMap *mapPtr, Tcl_Obj *keyPtr); +KeySym TkStringToKeysym(char *name); + /* *--------------------------------------------------------------------------- * --- a/blt3.0.1/src/bltCoreInit.c +++ b/blt3.0.1/src/bltCoreInit.c @@ -301,7 +301,7 @@ Tcl_Namespace *nsPtr; Tcl_ValueType args[2]; const char *result; - const int isExact = 1; + const int isExact = 0; #ifdef USE_TCL_STUBS if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) { --- a/blt3.0.1/src/bltExtInit.c +++ b/blt3.0.1/src/bltExtInit.c @@ -142,7 +142,7 @@ { Tcl_Namespace *nsPtr; Tcl_AppInitProc **p; - const int isExact = 1; + const int isExact = 0; #ifdef USE_TCL_STUBS if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) { --- a/saotk/frame/marker.C +++ b/saotk/frame/marker.C @@ -1163,19 +1163,19 @@ { Blt_Vector* xx; Blt_GetVector(parent->getInterp(), xname, &xx); - Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC); Blt_Vector* yy; Blt_GetVector(parent->getInterp(), yname, &yy); - Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC); Blt_Vector* xxc; Blt_GetVector(parent->getInterp(), xcname, &xxc); - Blt_ResetVector(xxc, xc, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(xxc, xc, num, num*sizeof(double), TCL_STATIC); Blt_Vector* yyc; Blt_GetVector(parent->getInterp(), ycname, &yyc); - Blt_ResetVector(yyc, yc, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(yyc, yc, num, num*sizeof(double), TCL_STATIC); } void Marker::analysisPlot3dResult(char* xname, char* yname, @@ -1184,11 +1184,11 @@ { Blt_Vector* xx; Blt_GetVector(parent->getInterp(), xname, &xx); - Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC); Blt_Vector* yy; Blt_GetVector(parent->getInterp(), yname, &yy); - Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC); } void Marker::analysisPandaResult(double* x, double* y, double* e, int num) @@ -1205,15 +1205,15 @@ { Blt_Vector* xx; Blt_GetVector(parent->getInterp(), xname, &xx); - Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(xx, x, num, num*sizeof(double), TCL_STATIC); Blt_Vector* yy; Blt_GetVector(parent->getInterp(), yname, &yy); - Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(yy, y, num, num*sizeof(double), TCL_STATIC); Blt_Vector* ee; Blt_GetVector(parent->getInterp(), ename, &ee); - Blt_ResetVector(ee, e, num, num*sizeof(double), TCL_DYNAMIC); + Blt_ResetVector(ee, e, num, num*sizeof(double), TCL_STATIC); } Matrix Marker::fwdMatrix() debian/rules0000755000000000000000000000117512230505302010242 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 BUILDPARTS:=dirs checkdns tkmpeg html iis rice hcompress plio xmlrpc unix blt saotk ds9 get-orig-source: sh ./debian/repack-dfsg.sh %: dh $@ --with autoreconf make.include: ln -sf make.linux make.include override_dh_autoreconf: (cd htmlwidget; autoreconf -i -f) override_dh_auto_build: make.include dh_auto_build -- $(BUILDPARTS) chmod ugo-x ds9/zipdir/zvfsmntpt/src/*.tcl perl -w debian/generate-man > ds9/ds9.1 override_dh_installchangelogs: dh_installchangelogs doc/release/r7.0.html override_dh_auto_clean: make.include dh_auto_clean debian/saods9-doc.docs0000644000000000000000000000003312221236761012003 0ustar ds9/zipdir/zvfsmntpt/doc/* debian/README.Debian0000644000000000000000000000123212221236761011227 0ustar saods9 for Debian ----------------- The upstream ds9 source contains convienience copies of many 3rd-party software that is replaced by dependencies to . This includes: * wcssubs-3.8.4 (dependency from libwcstools) * funtools-1.4.5 * ast-7.0.5 (dependency from starlink-ast) * xpa-2.1.14 * zip-2.31, zlib-1.2.5 * tcl8.5.9, tk8.5.9, tcllib-1.14 * signal_ext1.4 (dependency from tk-signal) * tktable2.10 (dependency from tk-table) * tkimg1.4, tkcon-2.5, tclxml-3.2, xmlrpc-0.3 Also, ds9 here is not distributed as a single executable but is split into individual files according to the FHS. -- Ole Streicher , Tue, 03 Jul 2012 11:00:00 +0200 debian/generate-man0000644000000000000000000000412512221236761011460 0ustar #!/usr/bin/perl -w # ./debian/generate-man # Generate a manual page for DS9 from HTML documentation. # This is a work of Justin Pryzby during the year of 2005, # patched by Ole Streicher 2012, hereby placed into the public domain. use strict; my $s=`html2text doc/ref/command.html |grep -Ev '^ *\\* \\[[0-9]+\\]'` || die; my @opts=split("\n", `fgrep "\]])/$1 /gs; $optinfo=~s/\\\$/\$/gs; print "$optinfo"; print "\n.RE\n.RE\n\n"; } print < Abstract: SAOImage DS9 is an astronomical imaging and data visualization application. DS9 supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps. It provides for easy communication with external analysis tasks and is highly configurable and extensible. DS9 is a stand-alone application. It requires no installation or support files. Versions of DS9 currently exist for Sun Solaris, Sun Solaris64, Linux, Linux64, LinuxPPC, MacOSX, Darwin, and Windows NT/2000/XP. All versions and platforms support a consistent set of GUI and functional capabilities. DS9 supports advanced features such as multiple frame buffers, mosaic images, tiling, blinking, geometric markers, colormap manipulation, scaling, arbitrary zoom, rotation, pan, and a variety of coordinate systems. DS9 also supports FTP and HTTP access. The GUI for DS9 is user configurable. GUI elements such as the coordinate display, panner, magnifier, horizontal and vertical graphs, button bar, and colorbar can be configured via menus or the command line. DS9 is a Tk/Tcl application which utilizes the SAOTk widget set. It also incorporates the X Public Access (XPA) mechanism to allow external processes to access and control its data, GUI functions, and algorithms. Section: Science/Astronomy Format: HTML Index: /usr/share/doc/saods9-doc/ref/index.html Files: /usr/share/doc/saods9-doc/ref/*.html debian/ds9_diffs/0000755000000000000000000000000012221236761011042 5ustar debian/ds9_diffs/README0000644000000000000000000000016612221236761011725 0ustar This directory contains the differences between (some of) the packages that were included in ds9 and their originals. debian/ds9_diffs/tk8.5.8.diff0000644000000000000000000001016612221236761012717 0ustar Description: Difference between original tk8.5.8 and the version included in saods9. Command: diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\)' tk8.5.8 ds9/tk8.5.8/ --- tk8.5.8/generic/tkArgv.c 2008-10-05 13:34:46.000000000 +0200 +++ ds9/tk8.5.8//generic/tkArgv.c 2010-06-03 17:47:44.000000000 +0200 @@ -21,8 +21,8 @@ */ static Tk_ArgvInfo defaultTable[] = { - {"-help", TK_ARGV_HELP, NULL, NULL, - "Print summary of command-line options and abort"}, + /* {"-help", TK_ARGV_HELP, NULL, NULL, + "Print summary of command-line options and abort"},*/ {NULL, TK_ARGV_END, NULL, NULL, NULL} }; --- tk8.5.8/generic/tkCanvPs.c 2009-04-10 13:07:32.000000000 +0200 +++ ds9/tk8.5.8//generic/tkCanvPs.c 2010-06-03 17:47:45.000000000 +0200 @@ -18,6 +18,10 @@ #include "tkCanvas.h" #include "tkFont.h" +/*** waj ***/ +float psScale =1; +/*** waj ***/ + /* * See tkCanvas.h for key data structures used to implement canvases. */ @@ -506,6 +510,21 @@ Tcl_AppendResult(interp, string, " lineto closepath clip newpath\n", NULL); } + + /*** waj ***/ + sprintf(string, "%g %g translate\n", + (Tk_PostscriptY((double) psInfo.x, (Tk_PostscriptInfo) &psInfo) - + Tk_PostscriptY((double) psInfo.x2, (Tk_PostscriptInfo) &psInfo)) + *(1.-psScale)/2., + (Tk_PostscriptY((double) psInfo.y, (Tk_PostscriptInfo) &psInfo) - + Tk_PostscriptY((double) psInfo.y2, (Tk_PostscriptInfo) &psInfo)) + *(1.-psScale)/2.); + Tcl_AppendResult(interp, string, (char *) NULL); + + sprintf(string, "%.4g %.4g scale\n", psScale, psScale); + Tcl_AppendResult(interp, string, (char *) NULL); + /*** waj ***/ + if (psInfo.chan != NULL) { Tcl_Write(psInfo.chan, Tcl_GetStringResult(interp), -1); Tcl_ResetResult(canvasPtr->interp); --- tk8.5.8/macosx/tkMacOSXDraw.c 2008-02-27 01:12:33.000000000 +0100 +++ ds9/tk8.5.8//macosx/tkMacOSXDraw.c 2010-06-11 20:55:56.000000000 +0200 @@ -842,12 +842,12 @@ void XDrawRectangles( Display *display, - Drawable drawable, + Drawable d, GC gc, XRectangle *rectArr, int nRects) { - MacDrawable *macWin = (MacDrawable *) drawable; + MacDrawable *macWin = (MacDrawable *) d; TkMacOSXDrawingContext dc; XRectangle * rectPtr; int i, lw = gc->line_width; --- tk8.5.8/unix/configure 2009-11-13 19:38:48.000000000 +0100 +++ ds9/tk8.5.8//unix/configure 2010-06-11 20:41:28.000000000 +0200 @@ -6175,6 +6175,7 @@ cat >>confdefs.h <<\_ACEOF #define MAC_OSX_TCL 1 +#define TK_MACOSXDRAW_UNUSED 1 _ACEOF PLAT_OBJS='${MAC_OSX_OBJS}' --- tk8.5.8/win/configure 2009-11-13 19:38:48.000000000 +0100 +++ ds9/tk8.5.8//win/configure 2010-06-07 22:15:56.000000000 +0200 @@ -2982,15 +2982,15 @@ fi echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5 echo "${ECHO_T}$ac_cv_cygwin" >&6 -if test "$ac_cv_cygwin" = "yes" ; then - { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&5 -echo "$as_me: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&2;} - { (exit 1); exit 1; }; } -fi +#if test "$ac_cv_cygwin" = "yes" ; then +# { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported. +#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README +#file for information about building with Mingw." >&5 +#echo "$as_me: error: Compiling under Cygwin is not currently supported. +#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README +#file for information about building with Mingw." >&2;} +# { (exit 1); exit 1; }; } +#fi #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) --- tk8.5.8/win/tkWinPort.h 2005-09-28 20:31:57.000000000 +0200 +++ ds9/tk8.5.8//win/tkWinPort.h 2010-06-07 22:18:39.000000000 +0200 @@ -123,7 +123,7 @@ * Define timezone for gettimeofday. */ -struct timezone { +struct timezonee { int tz_minuteswest; int tz_dsttime; }; debian/ds9_diffs/tcl8.5.8.diff0000644000000000000000000002126412221236761013064 0ustar diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/generic/tclIOUtil.c ds9/tcl8.5.8//generic/tclIOUtil.c --- tcl8.5.8/generic/tclIOUtil.c 2008-11-14 01:22:39.000000000 +0100 +++ ds9/tcl8.5.8//generic/tclIOUtil.c 2010-06-01 21:26:40.000000000 +0200 @@ -245,7 +245,8 @@ * support, I suggest all these hooks are removed. */ -#undef USE_OBSOLETE_FS_HOOKS +/*#undef USE_OBSOLETE_FS_HOOKS*/ +#define USE_OBSOLETE_FS_HOOKS 1 #ifdef USE_OBSOLETE_FS_HOOKS diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/configure ds9/tcl8.5.8//win/configure --- tcl8.5.8/win/configure 2009-11-13 19:38:45.000000000 +0100 +++ ds9/tcl8.5.8//win/configure 2010-06-07 19:28:31.000000000 +0200 @@ -2994,15 +2994,15 @@ fi echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5 echo "${ECHO_T}$ac_cv_cygwin" >&6 -if test "$ac_cv_cygwin" = "yes" ; then - { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&5 -echo "$as_me: error: Compiling under Cygwin is not currently supported. -A maintainer for the Cygwin port of Tcl/Tk is needed. See the README -file for information about building with Mingw." >&2;} - { (exit 1); exit 1; }; } -fi +#if test "$ac_cv_cygwin" = "yes" ; then +# { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported. +#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README +#file for information about building with Mingw." >&5 +#echo "$as_me: error: Compiling under Cygwin is not currently supported. +#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README +#file for information about building with Mingw." >&2;} +# { (exit 1); exit 1; }; } +#fi echo "$as_me:$LINENO: checking for SEH support in compiler" >&5 diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/Makefile.in ds9/tcl8.5.8//win/Makefile.in --- tcl8.5.8/win/Makefile.in 2009-11-13 19:38:45.000000000 +0100 +++ ds9/tcl8.5.8//win/Makefile.in 2010-06-07 22:06:38.000000000 +0200 @@ -657,15 +657,19 @@ install-tzdata: @echo "Installing time zone data" - @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \ +# @TCL_LIBRARY=${LIBRARY_DIR}; export TCL_LIBRARY; \ ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata" + /usr/bin/tclsh "$(ROOT_DIR)/tools/installData.tcl" \ + "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata" install-msgs: @echo "Installing message catalogs" - @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \ +# @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \ ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \ "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs" + /usr/bin/tclsh "$(ROOT_DIR)/tools/installData.tcl" \ + "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs" install-doc: doc diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinDde.c ds9/tcl8.5.8//win/tclWinDde.c --- tcl8.5.8/win/tclWinDde.c 2006-09-26 02:05:03.000000000 +0200 +++ ds9/tcl8.5.8//win/tclWinDde.c 2010-06-07 20:33:55.000000000 +0200 @@ -15,7 +15,7 @@ #include "tclInt.h" #include #include -#include +/*#include */ /* * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the Dde_Init @@ -630,7 +630,7 @@ for (riPtr = tsdPtr->interpListPtr; riPtr != NULL; riPtr = riPtr->nextPtr) { - if (stricmp(utilString, riPtr->name) == 0) { + if (strcmp(utilString, riPtr->name) == 0) { Tcl_DStringFree(&dString); return (HDDEDATA) TRUE; } @@ -654,7 +654,7 @@ CP_WINANSI); for (riPtr = tsdPtr->interpListPtr; riPtr != NULL; riPtr = riPtr->nextPtr) { - if (stricmp(riPtr->name, utilString) == 0) { + if (strcmp(riPtr->name, utilString) == 0) { convPtr = (Conversation *) ckalloc(sizeof(Conversation)); convPtr->nextPtr = tsdPtr->currentConversations; convPtr->returnPackagePtr = NULL; @@ -719,7 +719,7 @@ utilString = Tcl_DStringValue(&dString); DdeQueryString(ddeInstance, ddeItem, utilString, (DWORD) len + 1, CP_WINANSI); - if (stricmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) { + if (strcmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) { returnString = Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len); ddeReturn = DdeCreateDataHandle(ddeInstance, returnString, @@ -1500,7 +1500,7 @@ for (riPtr = tsdPtr->interpListPtr; riPtr != NULL; riPtr = riPtr->nextPtr) { - if (stricmp(serviceName, riPtr->name) == 0) { + if (strcmp(serviceName, riPtr->name) == 0) { break; } } diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinFile.c ds9/tcl8.5.8//win/tclWinFile.c --- tcl8.5.8/win/tclWinFile.c 2009-03-18 18:13:45.000000000 +0100 +++ ds9/tcl8.5.8//win/tclWinFile.c 2010-06-07 20:12:28.000000000 +0200 @@ -1262,8 +1262,8 @@ } } - } else if (!stricmp(path, "prn") || !stricmp(path, "nul") - || !stricmp(path, "aux")) { + } else if (!strcmp(path, "prn") || !strcmp(path, "nul") + || !strcmp(path, "aux")) { /* * Have match for 'prn', 'nul' or 'aux'. */ @@ -1776,9 +1776,9 @@ * Use wide-char case-insensitive comparison */ - if ((_wcsicmp(path+len-3, L"exe") == 0) - || (_wcsicmp(path+len-3, L"com") == 0) - || (_wcsicmp(path+len-3, L"bat") == 0)) { + if ((_wcscmp(path+len-3, L"exe") == 0) + || (_wcscmp(path+len-3, L"com") == 0) + || (_wcscmp(path+len-3, L"bat") == 0)) { return 1; } } else { @@ -1797,9 +1797,9 @@ * executable, whereas access did not. */ - if ((stricmp(p, "exe") == 0) - || (stricmp(p, "com") == 0) - || (stricmp(p, "bat") == 0)) { + if ((strcmp(p, "exe") == 0) + || (strcmp(p, "com") == 0) + || (strcmp(p, "bat") == 0)) { /* * File that ends with .exe, .com, or .bat is executable. */ diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinPipe.c ds9/tcl8.5.8//win/tclWinPipe.c --- tcl8.5.8/win/tclWinPipe.c 2007-02-21 00:24:07.000000000 +0100 +++ ds9/tcl8.5.8//win/tclWinPipe.c 2010-06-07 20:15:24.000000000 +0200 @@ -1424,7 +1424,7 @@ Tcl_DStringFree(&ds); ext = strrchr(fullName, '.'); - if ((ext != NULL) && (stricmp(ext, ".bat") == 0)) { + if ((ext != NULL) && (strcmp(ext, ".bat") == 0)) { applType = APPL_DOS; break; } @@ -1448,7 +1448,7 @@ */ CloseHandle(hFile); - if ((ext != NULL) && (stricmp(ext, ".com") == 0)) { + if ((ext != NULL) && (strcmp(ext, ".com") == 0)) { applType = APPL_DOS; break; } diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinSerial.c ds9/tcl8.5.8//win/tclWinSerial.c --- tcl8.5.8/win/tclWinSerial.c 2008-01-14 01:11:44.000000000 +0100 +++ ds9/tcl8.5.8//win/tclWinSerial.c 2010-06-07 20:17:11.000000000 +0200 @@ -1744,16 +1744,16 @@ dcb.XonLim = (WORD) (infoPtr->sysBufRead*1/2); dcb.XoffLim = (WORD) (infoPtr->sysBufRead*1/4); - if (strnicmp(value, "NONE", vlen) == 0) { + if (strncmp(value, "NONE", vlen) == 0) { /* * Leave all handshake options disabled. */ - } else if (strnicmp(value, "XONXOFF", vlen) == 0) { + } else if (strncmp(value, "XONXOFF", vlen) == 0) { dcb.fOutX = dcb.fInX = TRUE; - } else if (strnicmp(value, "RTSCTS", vlen) == 0) { + } else if (strncmp(value, "RTSCTS", vlen) == 0) { dcb.fOutxCtsFlow = TRUE; dcb.fRtsControl = RTS_CONTROL_HANDSHAKE; - } else if (strnicmp(value, "DTRDSR", vlen) == 0) { + } else if (strncmp(value, "DTRDSR", vlen) == 0) { dcb.fOutxDsrFlow = TRUE; dcb.fDtrControl = DTR_CONTROL_HANDSHAKE; } else { @@ -1863,7 +1863,7 @@ result = TCL_ERROR; break; } - if (strnicmp(argv[i], "DTR", strlen(argv[i])) == 0) { + if (strncmp(argv[i], "DTR", strlen(argv[i])) == 0) { if (!EscapeCommFunction(infoPtr->handle, (DWORD) (flag ? SETDTR : CLRDTR))) { if (interp != NULL) { @@ -1872,7 +1872,7 @@ result = TCL_ERROR; break; } - } else if (strnicmp(argv[i], "RTS", strlen(argv[i])) == 0) { + } else if (strncmp(argv[i], "RTS", strlen(argv[i])) == 0) { if (!EscapeCommFunction(infoPtr->handle, (DWORD) (flag ? SETRTS : CLRRTS))) { if (interp != NULL) { @@ -1881,7 +1881,7 @@ result = TCL_ERROR; break; } - } else if (strnicmp(argv[i], "BREAK", strlen(argv[i])) == 0) { + } else if (strncmp(argv[i], "BREAK", strlen(argv[i])) == 0) { if (!EscapeCommFunction(infoPtr->handle, (DWORD) (flag ? SETBREAK : CLRBREAK))) { if (interp != NULL) { debian/ds9_diffs/tcllib-1.10.diff0000644000000000000000000000131512221236761013522 0ustar diff -ur -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcllib-1.10/configure ds9/tcllib-1.10//configure --- tcllib-1.10/configure 2005-01-27 19:22:56.000000000 +0100 +++ ds9/tcllib-1.10//configure 2007-12-06 19:57:12.000000000 +0100 @@ -556,7 +556,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'` + search_path=`echo ${PATH}:${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin | sed -e 's/:/ /g'` for dir in $search_path ; do for j in `ls -r $dir/tclsh[8-9]*${EXEEXT} 2> /dev/null` \ `ls -r $dir/tclsh*${EXEEXT} 2> /dev/null` ; do