[saods9] 02/02: Adopt 7.3b1
Ole Streicher
olebole-guest at alioth.debian.org
Thu Aug 1 13:38:41 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository saods9.
commit df4924590ebdacf91cb11d40f41d4668ceb52d20
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Aug 1 15:26:04 2013 +0200
Adopt 7.3b1
---
debian/changelog | 6 +
debian/clean | 10 +-
debian/patches/blt_remove_rpath.patch | 2 +-
debian/patches/ds9_add_about_debian.patch | 2 +-
debian/patches/ds9_fix_docdir.patch | 4 +-
debian/patches/ds9_fix_documentation.patch | 92 --------
debian/patches/ds9_make_linux.patch | 42 ++--
debian/patches/ds9_use_external_libs.patch | 249 +++++++++++-----------
debian/patches/ds9_use_filesystem.patch | 90 +++-----
debian/patches/saotk_add_ksearch.patch | 2 +-
debian/patches/saotk_add_psscale.patch | 4 +-
debian/patches/saotk_fix_funtools_includes.patch | 4 +-
debian/patches/saotk_spellfix.patch | 2 +-
debian/patches/series | 1 -
debian/rules | 2 +-
15 files changed, 209 insertions(+), 303 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1b83f7..6efa1b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3~b2+dfsg-1) raring; urgency=low
+
+ * New (beta) upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 01 Aug 2013 10:21:38 +0200
+
saods9 (7.2+dfsg-1) unstable; urgency=low
* Change distribution to unstable
diff --git a/debian/clean b/debian/clean
index 473d016..580b6f2 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,12 +5,18 @@ ds9/ds9tk.h
ds9/ds9.1
bin/ds9
make.include
+blt3.0.1/Makefile
+blt3.0.1/config.log
+blt3.0.1/config.status
blt3.0.1/demos/Makefile
-blt3.0.1/library/afm/Makefile
blt3.0.1/library/Makefile
+blt3.0.1/library/afm/Makefile
blt3.0.1/man/Makefile
+blt3.0.1/src/*.o
+blt3.0.1/src/*.so
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
+unix/libxxlib.a
+unix/rotstr.o
diff --git a/debian/patches/blt_remove_rpath.patch b/debian/patches/blt_remove_rpath.patch
index 415a284..2236a73 100644
--- a/debian/patches/blt_remove_rpath.patch
+++ b/debian/patches/blt_remove_rpath.patch
@@ -4,7 +4,7 @@ Description: The BLT shared libraries are compiled with the RPATH set. This is
kFreebsd and Hurd similarly to Linux.
--- a/blt3.0.1/configure
+++ b/blt3.0.1/configure
-@@ -16441,11 +16441,11 @@
+@@ -16448,11 +16448,11 @@
fi
;;
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index ba86760..e5db3b2 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -13,7 +13,7 @@ Description: Add the Debian packager to the "About" box
saord at cfa.harvard.edu
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -702,7 +702,7 @@
+@@ -708,7 +708,7 @@
# Param
set f [frame $w.param -background white]
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 6d68a1a..c75b717 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -41,11 +41,11 @@ Description: Instead putting the documentation into the common shared
set ds9(root) "/usr/share/saods9"
+set ds9(doc) "/usr/share/doc/saods9-doc"
- # tcl modules
package require msgcat
+ package require http
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -707,7 +707,7 @@
+@@ -713,7 +713,7 @@
# can't use -file for zvfs
# set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif]
diff --git a/debian/patches/ds9_fix_documentation.patch b/debian/patches/ds9_fix_documentation.patch
deleted file mode 100644
index a573fcc..0000000
--- a/debian/patches/ds9_fix_documentation.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-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 @@
- <a href="#align">align</a><br>
- <a href="#analysis">analysis</a><br>
- <a href="#array">array</a><br>
-- <a href="asinh">asinh</a><br>
-+ <a href="#asinh">asinh</a><br>
- <a href="#background">background</a><br>
- <a href="#backup">backup</a><br>
- <a href="#bin">bin</a><br>
-@@ -39,7 +39,7 @@
- <a href="#colorbar">colorbar</a><br>
- <a href="#console">console</a><br>
- <a href="#contour">contour</a><br>
-- <a href="crop">crop</a><br>
-+ <a href="#crop">crop</a><br>
- <a href="#crosshair">crosshair</a><br>
- <a href="#cube">cube</a><br>
- <a href="#cursor">cursor</a><br>
-@@ -51,12 +51,12 @@
- <a href="#fifo">fifo</a><br>
- <a href="#fifo_only">fifo_only</a><br>
- <a href="#first">first</a><br>
-- <a href="command.html#fits">fits</a><br>
-+ <a href="#fits">fits</a><br>
- <a href="#frame">frame</a><br>
- <a href="#geometry">geometry</a><br>
- <a href="#gif">gif</a><br>
- <a href="#green">green</a><br>
-- <a href="#geometry">grid</a><br>
-+ <a href="#grid">grid</a><br>
- <a href="#header">header</a><br>
- <a href="#height">height</a><br>
- <a href="#help">help</a><br>
-@@ -78,12 +78,11 @@
- <a href="#mecube">mecube</a><br>
- <a href="#minmax">minmax</a><br>
- <a href="#mode">mode</a><br>
-- </tt><tt><a href="#mode"><tt></tt></a><tt><a href="#mosaic">mosaic</a></tt><br>
-+ <a href="#mosaic">mosaic</a><br>
- <a href="#mosaicimage">mosaicimage</a><br>
-- <a href="#movie">movie</a></tt><br>
-- <tt><tt><a
-- href="file:///Users/joye/saods9/doc/ref/command.html#msg">msg</a><br>
-- </tt><a href="#multiframe">multiframe</a><br>
-+ <a href="#movie">movie</a><br>
-+ <a href="#msg">msg</a><br>
-+ <a href="#multiframe">multiframe</a><br>
- <a href="#nameserver">nameserver</a><br>
- <a href="#nan">nan</a><br>
- <a href="#nrrd">nrrd</a><br>
-@@ -105,8 +104,8 @@
- <a href="#exit">quit</a><br>
- <a href="#raise">raise</a><br>
- <a href="#regions">regions</a><br>
-- </tt><tt><a href="#red">red</a><br>
-- </tt><tt><a href="#restore">restore</a><br>
-+ <a href="#red">red</a><br>
-+ <a href="#restore">restore</a><br>
- <a href="#rgb">rgb</a><br>
- <a href="#rgbarray">rgbarray</a><br>
- <a href="#rgbcube">rgbcube</a><br>
-@@ -257,16 +256,6 @@
- $ds9 -analysis text '{This is text}';<br>
- </tt>
- <p><b> <a name="array"></a>array</b></p>
-- <p>Load raw data array into current frame.<br>
-- </p>
-- <tt> Syntax:<br>
-- -array
--<filename>[[xdim=<x>,ydim=<y>|dim=<dim>],zdim=<z>,bitpix=<b>,skip=<s>,endian=[little|big]]<br>
-- <br>
-- Example: <br>
-- $ds9 -array foo.arr[dim=512,bitpix=-32,endian=little]</tt><br>
-- <tt>$cat foo.arr | ds9 -array -[dim=512,bitpix=-32,endian=little]</tt><br>
-- <p><b> <a name="array"></a>array</b></p>
- <p>Load an array. </p>
- <tt> Syntax: <br>
- -array
-@@ -1325,7 +1314,7 @@
- $ds9 -height 512<br>
- </tt>
- <p><b> <a name="help"></a>help</b></p>
-- <p>Display help information. To maintain backward compatability,
-+ <p>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.</p>
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 88bdbdc..123f50e 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -3,7 +3,7 @@ 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 @@
+@@ -1,26 +1,23 @@
OS = unix
ARCH = linux
@@ -12,13 +12,10 @@ Description: Set the compile flags according to the Debian environment. We
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/tcl -I/usr/include/tk -I/usr/include/freetype2
++XX = $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk -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 =
@@ -42,29 +39,30 @@ Description: Set the compile flags according to the Debian environment. We
--- a/Makefile
+++ b/Makefile
-@@ -283,7 +283,7 @@
+@@ -210,7 +210,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); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --disable-shared
++ cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
cp $(BLTDIR)/src/*.so* lib/.
cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-@@ -315,7 +315,7 @@
+@@ -242,7 +242,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
+ tkhtml : $(HTMLDIR)
+ @echo "Installing TKHTML..."
+- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
++ cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
+ $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
cp $(HTMLDIR)/libtkhtml.a lib/.
--- a/checkdns/Makefile
+++ b/checkdns/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
include ../make.include
+ # no ./configure
-CFLAGS = $(CCOPT) -I../include
+CFLAGS += $(CCOPT) -I../include
@@ -72,9 +70,10 @@ Description: Set the compile flags according to the Debian environment. We
--- a/hcompress/Makefile
+++ b/hcompress/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
include ../make.include
+ # no ./configure
-CFLAGS = $(CCOPT) -I.
+CFLAGS += $(CCOPT) -I.
@@ -82,9 +81,10 @@ Description: Set the compile flags according to the Debian environment. We
--- a/iis/Makefile
+++ b/iis/Makefile
-@@ -1,7 +1,7 @@
+@@ -1,8 +1,8 @@
include ../make.include
+ # no ./configure and we need HAVE_SYS_UN_H set
-CXXFLAGS = $(CXXOPT) -I../include
-CFLAGS = $(CCOPT) -I../include
+CXXFLAGS += $(CXXOPT) -I../include
@@ -94,9 +94,10 @@ Description: Set the compile flags according to the Debian environment. We
CSRC = iis.c util.c
--- a/plio/Makefile
+++ b/plio/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
include ../make.include
+ # no ./configure
-CFLAGS = $(CCOPT) -I.
+CFLAGS += $(CCOPT) -I.
@@ -104,9 +105,10 @@ Description: Set the compile flags according to the Debian environment. We
--- a/rice/Makefile
+++ b/rice/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
include ../make.include
+ # no ./configure
-CFLAGS = $(CCOPT) -I.
+CFLAGS += $(CCOPT) -I.
@@ -153,7 +155,7 @@ Description: Set the compile flags according to the Debian environment. We
DEFINES = @DEFINES@
EXTRA_CFLAGS = @GCCFLAGS@ $(SO_CFLAGS)
LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@
-@@ -374,8 +375,8 @@
+@@ -375,8 +376,8 @@
$(srcdir)/bltTree.h \
$(srcdir)/bltVector.h
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 039b1ec..5c2ca6e 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -18,7 +18,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
$(ZDIR)/src \
$(ZDIR)/msgs \
$(ZDIR)/doc \
-@@ -25,48 +19,19 @@
+@@ -25,47 +19,19 @@
endif
# for unix, macosx
@@ -39,7 +39,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- ../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 \
@@ -54,8 +53,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
../lib/libsaotk.a \
- ../lib/libwcs.a \
- ../lib/libzvfs.a \
-- ../lib/libzip.a \
-- ../lib/libz.a \
- ../lib/libxpa.a \
../lib/libiis.a \
../lib/libcheckdns.a \
@@ -63,58 +60,69 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- ../lib/libxxlib.a \
- ../lib/libBLTX30.a \
- ../lib/libBLTCore30.a \
-- ../lib/libtk8.5.a \
-- ../lib/libtcl8.5.a
+- ../lib/libtk8.6.a \
+- ../lib/libtkstub8.6.a \
+- ../lib/libtcl8.6.a \
+- ../lib/libtclstub8.6.a \
+ ../lib/libxxlib.a
# if windows, redefine
ifeq ($(OS),windows)
-@@ -150,14 +115,9 @@
+@@ -141,11 +107,12 @@
+
+ ds9Base : $(OBJS) $(LIBS)
+ $(RM) $@
+- $(CXX) ${OPTS} \
+- -o $@ $(OBJS) $(LIBS) \
+- -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss \
+- -lxml2 \
+- -lz -lpthread
++ $(CXX) $(OPTS) $(LDFLAGS) -o $@ 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 -ltk -ltcl -lz \
++ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
+
+ endif
+
+@@ -159,24 +126,23 @@
all: ds9
--ds9 : null.zip ds9Base $(FILES)
+-ds9 : ds9Base ds9.zip
+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
+- strip ds9Base
+- cp ds9Base ds9
- cp ds9 ../bin/.
+- cp ds9.zip ../bin/.
+ cp ds9Base ../bin/ds9
+ cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
- debug : null.zip ds9Base $(FILES)
+ debug : ds9Base ds9.zip
$(RM) $@
-@@ -354,18 +314,14 @@
- #--------------------------linux
+ cp ds9Base ds9
- 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 \
+- $(CXX) ${OPTS} \
- -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 \
+- -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
+- -lxml2
++ $(CXX) $(OPTS) $(LDFLAGS) -o $@ 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 -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
+
endif
- #--------------------------darwin
--- a/ds9/ds9.C
+++ b/ds9/ds9.C
-@@ -22,34 +22,13 @@
+@@ -22,33 +22,13 @@
int Blt_core_Init(Tcl_Interp*);
int Blt_x_Init(Tcl_Interp*);
@@ -133,7 +141,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- 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*);
@@ -142,14 +149,14 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- int Tclxml_Init(Tcl_Interp*);
- int Tclxml_libxml2_Init(Tcl_Interp*);
-
--#ifndef _WIN32
+-#ifndef _GWIN32
- int Signal_ext_Init(Tcl_Interp*);
-#endif
-
#ifdef _MACOSX
int Tkmacosx_Init(Tcl_Interp*);
#endif
-@@ -156,7 +135,6 @@
+@@ -157,7 +137,6 @@
// Tk
if (Tk_Init(interp))
return TCL_ERROR;
@@ -157,7 +164,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
{
Tcl_DString pwd;
-@@ -175,12 +153,6 @@
+@@ -176,12 +155,6 @@
Tcl_StaticPackage(interp, "blt_extra", Blt_x_Init,
(Tcl_PackageInitProc*)NULL);
@@ -170,7 +177,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -199,12 +171,6 @@
+@@ -200,12 +173,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
(Tcl_PackageInitProc*)NULL);
@@ -183,7 +190,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// IIS
if (Iis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -217,84 +183,6 @@
+@@ -218,78 +185,6 @@
Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
@@ -231,13 +238,13 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- if (Pngtcl_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
-- (Tcl_PackageInitProc*)NULL);
+- (Tcl_PackageInitProc*)NULL);
-
- // Tkimgpng
- if (Tkimgpng_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
-- (Tcl_PackageInitProc*)NULL);
+- (Tcl_PackageInitProc*)NULL);
-
- // Tkimggif
- if (Tkimggif_Init(interp) == TCL_ERROR)
@@ -245,12 +252,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- 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;
@@ -258,7 +259,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- (Tcl_PackageInitProc*)NULL);
-
- // Signal_Ext
--#ifndef _WIN32
+-#ifndef _GWIN32
- if (Signal_ext_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "signal", Signal_ext_Init,
@@ -270,173 +271,181 @@ Description: Compile against external libraries of wcstools, funtools, ast,
return TCL_ERROR;
--- a/Makefile
+++ b/Makefile
-@@ -283,9 +283,9 @@
+@@ -210,9 +210,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); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(BLTFLAGS) --disable-shared
- 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); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --disable-shared
+ 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 @@
+@@ -228,13 +228,13 @@
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
+- 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
++ cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads
+ $(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
libtiff : FORCE
-@@ -310,18 +310,18 @@
+ @echo "Installing LIBTIFF..."
+ cd $(TKIMGDIR)/compat/libtiff; CC='$(CC)' CFLAGS='$(OPTS)' CXX='$(CC)' CXXFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared
+- $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) install
++ $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) CXXOPT="$(CXXOPT)" install
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
+@@ -242,7 +242,7 @@
+
+ tkhtml : $(HTMLDIR)
+ @echo "Installing TKHTML..."
+- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
++ cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
+ $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
cp $(HTMLDIR)/libtkhtml.a lib/.
+@@ -251,7 +251,7 @@
+
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 $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) $(XPAFLAGS) --disable-shared
++ cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared
+ $(MAKE) -C $(XPADIR) -j $(JOBS) install
cd bin; strip xpa*
-@@ -376,7 +376,7 @@
+@@ -305,7 +305,7 @@
saotk : FORCE
@echo "Installing SAOTK..."
-- cd $(SAOTKDIR); $(MAKE) -j $(JOBS) install
-+ cd $(SAOTKDIR); $(MAKE) CXX="$(CXX)" -j $(JOBS) install
+- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
++ $(MAKE) -C $(SAOTKDIR) CXX="$(CXX)" -j $(JOBS) install
- zip : FORCE
- @echo "Installing ZIP..."
-@@ -400,15 +400,9 @@
+ zvfs : FORCE
+ @echo "Installing ZVFS..."
+@@ -327,15 +327,10 @@
+ find . -name "*stackdump*" -exec rm {} \;
endif
- distclean : filesclean \
-- tclclean tkclean \
+-distclean : tclclean tkclean \
- tktableclean bltclean \
-- zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \
-- xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \
+- $(ZLIB)clean tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
+- xpaclean iisclean checkdnsclean $(SIGNAL)clean funtoolsclean \
- astclean wcssubsclean \
- riceclean hcompressclean plioclean \
-- $(OPTDIRCLEAN) \
-- saotkclean zipclean zvfsclean ds9clean srcclean \
-- dirsclean
+- $(PORT)clean \
+- saotkclean zvfsclean ds9clean srcclean \
+- filesclean dirsclean
++distclean : filesclean \
+ bltclean tkmpegclean iisclean checkdnsclean \
+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
- filesclean: FORCE
- find . -name "myconfig.cache" -exec rm {} \;
-@@ -417,59 +411,18 @@
+ clean: FORCE
+
+@@ -345,60 +340,17 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
-tclclean : FORCE
-- cd $(TCLDIRDIR); $(MAKE) distclean
+- $(MAKE) -C $(TCLDIRDIR) distclean
-
-tkclean : FORCE
-- cd $(TKDIRDIR); $(MAKE) distclean
+- $(MAKE) -C $(TKDIRDIR) distclean
-
-tktableclean: FORCE
-- cd $(TKTABLEDIR); $(MAKE) distclean
+- $(MAKE) -C $(TKTABLEDIR) distclean
-
bltclean: FORCE
-- cd $(BLTDIR); $(MAKE) distclean
+- $(MAKE) -C $(BLTDIR) distclean
-
-zlibclean: FORCE
-- cd $(ZLIBDIR); $(MAKE) distclean
+- $(MAKE) -C $(ZLIBDIR) distclean
-
-tclxmlclean: FORCE
-- cd $(TCLXMLDIR); $(MAKE) distclean
+- $(MAKE) -C $(TCLXMLDIR) distclean
-
-tkimgclean: libtiffclean
- rm -fr $(TKIMGDIR)/Img/*
- rm -fr $(LIB)/Img1.*
-- cd $(TKIMGDIR); $(MAKE) distclean
+- $(MAKE) -C $(TKIMGDIR) distclean
-
-libtiffclean: FORCE
-- cd $(TKIMGDIR)/compat/libtiff; $(MAKE) distclean
-+ cd $(BLTDIR); $(MAKE) distclean || true
+- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
tkmpegclean: FORCE
- cd $(TKMPEGDIR); $(MAKE) distclean
+ $(MAKE) -C $(TKMPEGDIR) distclean
--htmlclean: FORCE
-- cd $(HTMLDIR); $(MAKE) distclean
+-tkhtmlclean: FORCE
+-# cd $(HTMLDIR); $(MAKE) distclean
+- rm -rf $(HTMLDIR)
-
-xpaclean : FORCE
-- cd $(XPADIR); $(MAKE) distclean
+- $(MAKE) -C $(XPADIR) distclean
-
iisclean : FORCE
- cd $(IISDIR); $(MAKE) distclean
+ $(MAKE) -C $(IISDIR) distclean
checkdnsclean : FORCE
- cd $(CHECKDNSDIR); $(MAKE) distclean
+ $(MAKE) -C $(CHECKDNSDIR) distclean
-signalclean : FORCE
-- cd $(SIGNALDIR); $(MAKE) distclean
+- $(MAKE) -C $(SIGNALDIR) distclean
-
-funtoolsclean: FORCE
-- cd $(FUNTOOLSDIR); $(MAKE) distclean
+- $(MAKE) -C $(FUNTOOLSDIR) distclean
-
-astclean: FORCE
-- cd $(ASTDIR); $(MAKE) distclean
+- $(MAKE) -C $(ASTDIR) distclean
-
-wcssubsclean: FORCE
-- cd $(WCSSUBSDIR); $(MAKE) distclean
+- $(MAKE) -C $(WCSSUBSDIR) distclean
-
riceclean: FORCE
- cd $(RICEDIR); $(MAKE) distclean
+ $(MAKE) -C $(RICEDIR) distclean
-@@ -485,9 +438,6 @@
- zipclean: FORCE
- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
+@@ -420,9 +372,6 @@
+ saotkclean : FORCE
+ $(MAKE) -C $(SAOTKDIR) distclean
-zvfsclean: FORCE
-- cd $(ZVFSDIR); $(MAKE) distclean
+- $(MAKE) -C $(ZVFSDIR) distclean
-
ds9clean : FORCE
- cd $(DS9DIR); $(MAKE) distclean
+ $(MAKE) -C $(DS9DIR) distclean
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -188,29 +188,35 @@
+@@ -188,33 +188,35 @@
set ds9(root) "[pwd]/zvfsmntpt"
+ #set ds9(root) "/tmp/zvfsmntpt"
- # tcl modules
+-# tcl modules
-if {![namespace exists msgcat]} {
-- source $ds9(root)/tcl8/8.5/msgcat-1.4.3.tm
+- source $ds9(root)/tcl8/8.5/msgcat-1.5.0.tm
-}
-if {![namespace exists http]} {
-- source $ds9(root)/tcl8/8.4/http-2.7.5.tm
+- source $ds9(root)/tcl8/8.6/http-2.8.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
+-source $ds9(root)/tk8.6/tearoff.tcl
+-source $ds9(root)/tk8.6/comdlg.tcl
+-source $ds9(root)/tk8.6/focus.tcl
+-source $ds9(root)/tk8.6/mkpsenc.tcl
+-source $ds9(root)/tk8.6/msgbox.tcl
+-source $ds9(root)/tk8.6/optMenu.tcl
+-source $ds9(root)/tk8.6/unsupported.tcl
+-
+-source $ds9(root)/tcllib1.15/base64/base64.tcl
+-source $ds9(root)/tcllib1.15/log/log.tcl
+-source $ds9(root)/tcllib1.15/ftp/ftp.tcl
+-source $ds9(root)/tcllib1.15/textutil/repeat.tcl
+-source $ds9(root)/tcllib1.15/textutil/tabify.tcl
+-source $ds9(root)/tcllib1.15/math/fuzzy.tcl
+package require msgcat
+package require http
+package require xml
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 9989bf2..f778886 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -3,64 +3,57 @@ 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 @@
-
+@@ -92,12 +92,7 @@
all: ds9
--ds9 : ds9Base ds9.zip
-+ds9 : ds9Base
- $(RM) $@
-- cp ds9Base ds9
-- strip ds9
+ ds9 : ds9Base ds9.zip
+- $(RM) $@
+- strip ds9Base
+- cat ds9Base ds9.zip > ds9
+- zip -A ds9
+- chmod 755 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 @@
+@@ -12,13 +12,11 @@
+ #include <tk.h>
- void TclSetStartupScriptFileName(const char*);
+ extern "C" {
++
+ int SAOAppInit(Tcl_Interp *interp);
+ int SAOLocalMainHook(int* argc, char*** argv);
+- void TclSetStartupScriptFileName(const char*);
+-
- int Zvfs_Init(Tcl_Interp*);
- int Zvfs_Mount(Tcl_Interp*, char*, char *);
--
++ void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
+
int Blt_core_Init(Tcl_Interp*);
int Blt_x_Init(Tcl_Interp*);
- int Checkdns_Init(Tcl_Interp*);
-@@ -66,13 +63,8 @@
+@@ -66,16 +64,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");
+- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.6");
+- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.6");
+- // putenv((char*)"TCL_LIBRARY=/tmp/zvfsmntpt/tcl8.6");
+- // putenv((char*)"TK_LIBRARY=/tmp/zvfsmntpt/tk8.6");
-
// invoke startup script
-- TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl");
-+ TclSetStartupScriptFileName("/usr/share/saods9/src/ds9.tcl");
+- Tcl_Obj *path = Tcl_NewStringObj("./zvfsmntpt/src/ds9.tcl",-1);
+- // Tcl_Obj *path = Tcl_NewStringObj("/tmp/zvfsmntpt/src/ds9.tcl",-1);
++ Tcl_Obj *path = Tcl_NewStringObj("/usr/share/saods9/src/ds9.tcl",-1);
+ Tcl_SetStartupScript(path, NULL);
}
- int SAOAppInit(Tcl_Interp *interp)
-@@ -86,48 +78,6 @@
+@@ -90,46 +80,6 @@
// save interp for cputs function
global_interp = interp;
@@ -69,9 +62,7 @@ Description: Store all files in the usual FHS directories instead of
- // its startup script files.
- if (Zvfs_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init,
-- (Tcl_PackageInitProc*)NULL);
--
+- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, (Tcl_PackageInitProc*)NULL);
-
- // find current working directory, and set as mount point
- {
@@ -80,7 +71,7 @@ Description: Store all files in the usual FHS directories instead of
- Tcl_GetCwd(interp, &pwd);
-#ifdef ZIPFILE
- ostringstream str;
--#ifndef _WIN32
+-#ifndef _GWIN32
- str << (char *)Tcl_GetNameOfExecutable()
- << ".zip"
- << ends;
@@ -92,7 +83,7 @@ Description: Store all files in the usual FHS directories instead of
- 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
+-#ifndef _GWIN32
- cerr << str << endl;
-#else
- MessageBox(NULL, str, "SAOImage DS9", MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
@@ -109,30 +100,15 @@ Description: Store all files in the usual FHS directories instead of
// 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 @@
+@@ -185,8 +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) "/tmp/zvfsmntpt"
+set ds9(root) "/usr/share/saods9"
- # tcl modules
package require msgcat
+ package require http
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 4c12f7f..70b6640 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -3,7 +3,7 @@ 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 @@
+@@ -30,7 +30,97 @@
extern "C" {
FitsHead* wcshead = NULL;
FitsHead* wcsprim = NULL;
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 7a9ee2e..80a971e 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -20,8 +20,8 @@ Description: The original code from ds9 uses a patched postscript code to allow
#endif
// copied from tkCanvPs.c
--#include "../../tk8.5.9/generic/tkCanvas.h"
+-#include "../../tk8.6.0/generic/tkCanvas.h"
+#include <tk-private/generic/tkCanvas.h>
typedef struct TkPostscriptInfo {
- Tk_Window tkwin; /* The canvas being printed. */
+ int x, y, width, height; /* Area to print, in canvas pixel
diff --git a/debian/patches/saotk_fix_funtools_includes.patch b/debian/patches/saotk_fix_funtools_includes.patch
index 105644f..f710d70 100644
--- a/debian/patches/saotk_fix_funtools_includes.patch
+++ b/debian/patches/saotk_fix_funtools_includes.patch
@@ -14,8 +14,8 @@ Description: Since the funtools include files have quite generic names, we
+#include <funtools/fitsy.h>
+#include <funtools/filter.h>
- #define FILTERSIZE 262144
- #define MULTWCS 27
+ #ifdef __CYGWIN__
+ // limit size, cygwin pipe to 64K / (4 args x 4 bytes)
--- a/saotk/fitsy++/hpx.C
+++ b/saotk/fitsy++/hpx.C
@@ -18,7 +18,7 @@
diff --git a/debian/patches/saotk_spellfix.patch b/debian/patches/saotk_spellfix.patch
index fd78a26..416d8f0 100644
--- a/debian/patches/saotk_spellfix.patch
+++ b/debian/patches/saotk_spellfix.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Spellfix; however this is unused at the end.
--- a/saotk/frame/ds9parser.C
+++ b/saotk/frame/ds9parser.C
-@@ -1016,7 +1016,7 @@
+@@ -1020,7 +1020,7 @@
"'='", "'+'", "'-'", "'&'", "'!'", "$accept", "start", "commands",
"command", "@1", "@2", "@3", "hash", "@4", "comment", "@5",
"shapeComment", "@6", "@7", "nonshapeComment", "@8", "@9", "terminator",
diff --git a/debian/patches/series b/debian/patches/series
index 4ca3e8b..85283f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@ ds9_use_filesystem.patch
ds9_fix_docdir.patch
ds9_optional_doc_package.patch
ds9_add_about_debian.patch
-ds9_fix_documentation.patch
diff --git a/debian/rules b/debian/rules
index 81b2828..529d977 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# 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
+BUILDPARTS:=dirs checkdns tkmpeg tkhtml iis rice hcompress plio xmlrpc unix blt saotk ds9
get-orig-source:
sh ./debian/repack-dfsg.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git
More information about the debian-science-commits
mailing list