[Debian-astro-commits] [saods9] 03/04: Adjust debian files for new experimental version

Ole Streicher olebole at moszumanska.debian.org
Thu May 19 19:50:05 UTC 2016 

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

olebole pushed a commit to branch experimental
in repository saods9.

commit ebd75cc4a7ffb4b732cb01f5f3c6e455cf46003c
Author: Ole Streicher <olebole at debian.org>
Date:   Wed May 18 17:37:12 2016 +0200

    Adjust debian files for new experimental version
---
 debian/changelog                                  |   6 +
 debian/patches/ds9_add_about_debian.patch         |   8 +-
 debian/patches/ds9_fix_docdir.patch               |   8 +-
 debian/patches/ds9_optional_doc_package.patch     |  12 +-
 debian/patches/ds9_support_blt.patch              |   8 +-
 debian/patches/ds9_use_system_libs.patch          |  80 +++++++++---
 debian/patches/ds9_use_tcltk_packages.patch       | 145 ++++++++++++----------
 debian/patches/fix_gcc-6.patch                    |   4 +-
 debian/patches/saotk_add_ksearch.patch            |   6 +-
 debian/patches/saotk_add_psscale.patch            |  10 +-
 debian/patches/saotk_avoid_compile_warnings.patch |  62 +++------
 debian/patches/saotk_fix_blt_crash.patch          |  18 +--
 debian/patches/saotk_spellfix.patch               |   4 +-
 debian/patches/saotk_use_system_libs.patch        |  78 +++---------
 debian/patches/tcliis.patch                       |   4 +-
 debian/patches/tkhtml.patch                       |  27 +++-
 debian/rules                                      |  16 +--
 debian/saods9-doc.docs                            |   2 +-
 debian/saods9.install                             |  10 +-
 19 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 248ed83..a62e6cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.5~b1+repack-1) UNRELEASED; urgency=low
+
+  * New upstream beta release; switch to experimental
+
+ -- Ole Streicher <olebole at debian.org>  Wed, 18 May 2016 09:56:46 +0200
+
 saods9 (7.4.1+repack-1) unstable; urgency=low
 
   * Update standards-version to 3.9.7 (no changes)
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 4b44c94..f859805 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -2,10 +2,10 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the Debian packager to the "About" box
 --- a/ds9/library/help.tcl
 +++ b/ds9/library/help.tcl
-@@ -21,6 +21,8 @@
-     set help(vo) "$ds9(doc)/ref/vo.html"
+@@ -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 (Smithsonian Astrophysical Observatory)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center [...]
+     set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, 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 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson ( [...]
 +
 +    append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
  }
@@ -13,7 +13,7 @@ Description: Add the Debian packager to the "About" box
  proc HelpRef {} {
 --- a/ds9/library/util.tcl
 +++ b/ds9/library/util.tcl
-@@ -685,7 +685,7 @@
+@@ -691,7 +691,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 dc2c53e..03668a7 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -31,11 +31,11 @@ Description: Instead putting the documentation into the common shared
 +    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 (Smithsonian Astrophysical Observatory)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center [...]
- }
+     set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
+     set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, 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 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson ( [...]
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -199,6 +199,7 @@
+@@ -182,6 +182,7 @@
  	# set to absolute path so that if -cd command is used,
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
  	package require http
 --- a/ds9/library/util.tcl
 +++ b/ds9/library/util.tcl
-@@ -690,7 +690,7 @@
+@@ -696,7 +696,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_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index 9e428cf..9f02a40 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -9,26 +9,26 @@ Description: Make the "-doc" package optional by disabling the help menu
 +    global help
  
      switch $ds9(wm) {
-  	x11 {}
+  	x11 -
 @@ -20,34 +21,39 @@
-  	win32 {}
+ 	}
      }
  
 +    if [ file exists $help(refman) ] {
-+	set helpstate normal
++      set helpstate normal
 +    } else {
-+	set helpstate disabled
++      set helpstate disabled
 +    }
      $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
      menu $ds9(mb).help
      switch $ds9(wm) {
-  	x11 {
+  	x11 -
+  	win32 {
  	    $ds9(mb).help add command -label [msgcat::mc {Reference Manual}]\
 -		-command HelpRef
 +		-command HelpRef -state $helpstate
  	}
   	aqua {}
-  	win32 {}
      }
      $ds9(mb).help add command -label [msgcat::mc {User Manual}]\
 -	-command HelpUser
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 3dc335e..013f746 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -41,7 +41,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  }
  
  proc UpdateGraphXAxis {which} {
-@@ -234,13 +232,13 @@
+@@ -208,13 +206,13 @@
  	    set yMax [expr $yMin + 1]
  	}
  
@@ -61,7 +61,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  
 --- a/ds9/library/scale.tcl
 +++ b/ds9/library/scale.tcl
-@@ -303,9 +303,9 @@
+@@ -314,9 +314,9 @@
  			 ]
  
      $dscale(hist) legend configure -hide yes
@@ -132,7 +132,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  	    }
 --- a/ds9/library/plotprint.tcl
 +++ b/ds9/library/plotprint.tcl
-@@ -40,18 +40,10 @@
+@@ -35,18 +35,10 @@
  	-titlefont "$var(axis,title,family) $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
  
      $var(graph) legend configure \
@@ -152,7 +152,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
      # Size
      set ww [expr [winfo width $var(top)]*$ps(scale)/100./[tk scaling]]
      set hh [expr [winfo height $var(top)]*$ps(scale)/100./[tk scaling]]
-@@ -107,6 +99,5 @@
+@@ -102,6 +94,5 @@
  	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
  
      $var(graph) legend configure \
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 207ca87..c8c1880 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -4,24 +4,63 @@ Description: Link against system libraries.
  copies provided by ds9, and use tcl/tk packages wherever possible.
 --- a/ds9/unix/Makefile.in
 +++ b/ds9/unix/Makefile.in
-@@ -37,13 +37,6 @@
+@@ -38,13 +38,7 @@
  OBJS	= ds9.o tkAppInit.o
  
  FILES	= \
 -	$(ZDIR)/$(TCLVER) \
 -	$(ZDIR)/tcl8 \
 -	$(ZDIR)/$(TKVER) \
--	$(ZDIR)/$(TKBLTDIR) \
--	$(ZDIR)/$(TCLLIBVER) \
--	$(ZDIR)/$(TKCONVER) \
--	$(ZDIR)/$(XMLRPCVER) \
+-	$(ZDIR)/tkblt \
+-	$(ZDIR)/tcllib \
+-	$(ZDIR)/tkcon \
+-	$(ZDIR)/xmlrpc \
++	$(ZDIR) \
  	$(ZDIR)/library \
  	$(ZDIR)/msgs \
  	$(ZDIR)/doc \
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -5,8 +5,8 @@
+ TKIMGFLAGS = @TKIMGFLAGS@
+ JOBS	= 4
+ 
+-WITHTCL =--with-tcl=$(ROOT)/$(TCLVER)/unix
+-WITHTK  =--with-tk=$(ROOT)/$(TKVER)/unix $(WITHTCL)
++WITHTCL =
++WITHTK  =
+ CACHE	=--config-cache --cache-file=../config.cache
+ 
+ include ./make.include
+@@ -15,11 +15,10 @@
+ 
+ .PHONY	: saods9 tcl tk
+ 
+-saods9	: dirs tcl tk \
+-	tclcheckdns tcliis tclsignal \
+-	tclzvfs tclxml xmlrpc xpa \
+-	tkblt tktable tkimg \
+-	tkmpeg tkhtml1 tkcon \
++saods9	: dirs \
++	tclcheckdns tcliis \
++	tclxml \
++	tkmpeg tkhtml1 \
+ 	tksao ds9
+ 
+ tcl	: $(TCLVER)/unix/Makefile
 --- a/make.include
 +++ b/make.include
-@@ -384,12 +384,10 @@
- .PHONY	: libtiffdistclean tkmpegdistclean tksaodistclean
+@@ -253,7 +253,7 @@
+ 
+ #-------------------------- tksao
+ 
+-tksao	: ast funtools tksao/Makefile
++tksao	: tksao/Makefile
+ 	@echo ""
+ 	@echo "*** Install tksao ***"
+ 	$(MAKE) -C tksao -j $(JOBS) install
+@@ -480,13 +480,10 @@
+ .PHONY	: tksaodistclean astdistclean funtoolsdistclean
  .PHONY	: tktabledistclean xpadistclean
  
 -distclean : tcldistclean tkdistclean \
@@ -30,15 +69,16 @@ Description: Link against system libraries.
 -	tkbltdistclean tktabledistclean tkimgdistclean \
 +distclean :  \
 +	tclcheckdnsdistclean tcliisdistclean \
-+	tclxmldistclean \
- 	tkmpegdistclean tkhtmldistclean \
+ 	tkmpegdistclean tkhtml1distclean \
 -	tk$(OS)distclean \
- 	tksaodistclean ds9distclean \
+-	tksaodistclean astdistclean funtoolsdistclean ds9distclean \
++	tksaodistclean astdistclean ds9distclean \
  	dirsdistclean localdistclean
  
+ dirsdistclean:
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -200,31 +200,33 @@
+@@ -183,31 +183,33 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
@@ -57,16 +97,16 @@ Description: Link against system libraries.
 -	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
+-	source $ds9(root)/tcllib/base64/base64.tcl
+-	source $ds9(root)/tcllib/log/log.tcl
+-	source $ds9(root)/tcllib/ftp/ftp.tcl
+-	source $ds9(root)/tcllib/textutil/repeat.tcl
+-	source $ds9(root)/tcllib/textutil/tabify.tcl
+-	source $ds9(root)/tcllib/math/fuzzy.tcl
 -
--	source $ds9(root)/tkcon2.5/tkcon.tcl
--	source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
--	source $ds9(root)/tkblt3.0/graph.tcl
+-	source $ds9(root)/tkcon/tkcon.tcl
+-	source $ds9(root)/xmlrpc/xmlrpc.tcl
+-	source $ds9(root)/tkblt/graph.tcl
 +	package require msgcat
 +	package require http
 +	package require xml
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 5a05dbc..73e1ce9 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -4,15 +4,15 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  initialization.
 --- a/ds9/unix/Makefile.in
 +++ b/ds9/unix/Makefile.in
-@@ -74,7 +74,7 @@
+@@ -77,6 +77,8 @@
+ .NOTPARALLEL :
+ .PHONY	: debug
  
- #--------------------------main
- 
--all: $(DS9CMD)
 +all: $(FILES)
++
+ ifeq (,$(findstring Darwin,$(system)))
  
- debug: $(DEBUGCMD)
- 
+ ds9	: ds9base ds9.zip
 --- /dev/null
 +++ b/ds9/ds9
 @@ -0,0 +1,2 @@
@@ -20,7 +20,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
 +exec wish8.6 -f ${DS9_HOME-/usr/share/saods9}/library/ds9.tcl $*
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -167,7 +167,7 @@
+@@ -150,7 +150,7 @@
  }
  
  # who are we?
@@ -29,7 +29,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  # Themes are now hardcoded
  switch $ds9(wm) {
-@@ -198,7 +198,7 @@
+@@ -181,7 +181,7 @@
      x11 {
  	# set to absolute path so that if -cd command is used,
  	# so we can still find our files
@@ -38,12 +38,12 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  	package require msgcat
  	package require http
-@@ -214,6 +214,11 @@
+@@ -197,6 +197,11 @@
  	package require tkcon
  	package require xmlrpc
  	package require BLT
 +	package require tksao
-+	package require tkhtml
++	package require tkhtml1
 +	package require tcliis
 +	package require tclcheckdns
 +	package require tkmpeg
@@ -52,125 +52,142 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	package require Signal
 --- a/make.include
 +++ b/make.include
-@@ -76,7 +76,7 @@
+@@ -80,7 +80,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tcliis	: $(TCLIISDIR)/Makefile
-@@ -91,7 +91,7 @@
+ #-------------------------- tcliis
+@@ -97,7 +97,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tclsignal: $(TCLSIGNALDIR)/Makefile
-@@ -106,7 +106,7 @@
+ #-------------------------- tclsignal
+@@ -114,7 +114,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- # no parallel
-@@ -122,7 +122,7 @@
- 	./configure \
+ #-------------------------- tclxml
+@@ -133,7 +133,7 @@
  	$(WITHTCL) \
+ 	$(TCLXMLFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tclzvfs	: $(TCLZVFSDIR)/Makefile
-@@ -137,7 +137,7 @@
+ #-------------------------- tclzvfs
+@@ -150,7 +150,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
+ 
+ #-------------------------- xpa
+@@ -169,7 +169,7 @@
+ 	$(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \
+ 	$(WITHTCL) \
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols \
++	--enable-shared --enable-symbols \
+ 	--with-x=disabled
  
- tkblt	: $(TKBLTDIR)/Makefile
-@@ -152,7 +152,7 @@
+ #-------------------------- tkblt
+@@ -186,7 +186,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tkcon	:
-@@ -175,7 +175,7 @@
+ #-------------------------- tkcon
+@@ -213,7 +213,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tkimg	: libtiff $(TKIMGDIR)/Makefile
-@@ -191,7 +191,7 @@
- 	./configure CFLAGS='-DPNG_NO_WRITE_gAMA' \
+ #-------------------------- tkimg
+@@ -232,7 +232,7 @@
+ 	CFLAGS='-DPNG_NO_WRITE_gAMA' \
  	$(WITHTK) $(TKIMGFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols
 +	--enable-shared --enable-symbols
  
- libtiff	: $(TKIMGDIR)/compat/libtiff/Makefile
- 	@echo ""
-@@ -206,7 +206,7 @@
- 	./configure \
- 	$(WITHTK) \
- 	--prefix $(ROOT) --exec-prefix $(ROOT) \
--	--disable-shared
-+	--enable-shared
+ #-------------------------- tkmpeg
  
- tkmpeg	: $(TKMPEGDIR)/Makefile
- 	@echo ""
-@@ -220,7 +220,7 @@
+@@ -248,7 +248,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+ 	$(CACHE)
  
- tksao	: $(TKSAODIR)/Makefile
-@@ -235,7 +235,7 @@
+ #-------------------------- tksao
+@@ -265,7 +265,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache \
- 	ASTDIR=$(ASTDIR) FUNTOOLSDIR=$(FUNTOOLSDIR)
+ 	$(CACHE)
  
-@@ -252,7 +252,7 @@
- 	./configure \
- 	$(WITHTK) $(TKTABLEFLAGS) \
+ #-------------------------- ast
+@@ -282,7 +282,7 @@
+ 	star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \
+ 	$(CONFIGFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
--	--disable-shared --enable-symbols \
-+	--enable-shared --enable-symbols \
- 	--config-cache --cache-file=../config.cache
+-	--disable-shared
++	--enable-shared
  
- xmlrpc	: 
-@@ -275,7 +275,7 @@
- 	./configure \
- 	$(WITHTCL) $(XPAFLAGS) \
+ ast/ast.h :
+ 	@echo ""
+@@ -341,24 +341,7 @@
+ 	--with-zlib=../lib --with-wcslib=../lib \
+ 	$(CONFIGFLAGS) $(TARGET) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared
+-
+-#-------------------------- tktable
+-
+-# no parallel
+-tktable	: tktable/Makefile
+-	@echo ""
+-	@echo "*** Install tktable ***"
+-	$(MAKE) -C tktable install
+-
+-tktable/Makefile :
+-	@echo ""
+-	@echo "*** Configure tktable ***"
+-	cd tktable; \
+-	./configure \
+-	$(WITHTK) \
+-	--prefix $(ROOT) --exec-prefix $(ROOT) \
 -	--disable-shared --enable-symbols \
 +	--enable-shared --enable-symbols \
- 	--with-x=disabled --enable-posix_spawn
+ 	$(CACHE)
  
- #--------------------------language
---- a/tksao1.0/saotk.C
-+++ b/tksao1.0/saotk.C
+ #-------------------------- xmlrpc
+--- a/tksao/saotk.C
++++ b/tksao/saotk.C
 @@ -27,6 +27,7 @@
  extern int PannerTrueColor_Init(Tcl_Interp*);
  
diff --git a/debian/patches/fix_gcc-6.patch b/debian/patches/fix_gcc-6.patch
index 457396a..802eb3e 100644
--- a/debian/patches/fix_gcc-6.patch
+++ b/debian/patches/fix_gcc-6.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Specify char[] constant as unsigned since it contains bytes > 0x7f
---- a/tksao1.0/fitsy++/outsocket.C
-+++ b/tksao1.0/fitsy++/outsocket.C
+--- a/tksao/fitsy++/outsocket.C
++++ b/tksao/fitsy++/outsocket.C
 @@ -61,7 +61,7 @@
    }
  
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 0ba19db..133aa1a 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -1,9 +1,9 @@
 Author: Sergio Pascual <sergiopr at fedoraproject.org>
 Description: Insert the "ksearchh" routine that was originated by Doub Mink
  in wcssubs so that fitsImage.c will compile.
---- a/tksao1.0/frame/fitsimage.C
-+++ b/tksao1.0/frame/fitsimage.C
-@@ -29,7 +29,97 @@
+--- a/tksao/frame/fitsimage.C
++++ b/tksao/frame/fitsimage.C
+@@ -33,7 +33,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 0ce000d..6f6b456 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -3,8 +3,8 @@ 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/tksao1.0/widget/widget.C
-+++ b/tksao1.0/widget/widget.C
+--- a/tksao/widget/widget.C
++++ b/tksao/widget/widget.C
 @@ -7,6 +7,8 @@
  #include "widget.h"
  #include "util.h"
@@ -23,13 +23,13 @@ Description: The original code from ds9 uses a patched postscript code to allow
    else
      cc = Tk_GetColor(interp, tkwin, str);
  
---- a/tksao1.0/util/tkpostscript.h
-+++ b/tksao1.0/util/tkpostscript.h
+--- a/tksao/util/tkpostscript.h
++++ b/tksao/util/tkpostscript.h
 @@ -13,7 +13,7 @@
  #endif
  
  // copied from tkCanvPs.c
--#include "../../tk8.6.4/generic/tkCanvas.h"
+-#include "../../tk8.6/generic/tkCanvas.h"
 +#include <tk-private/generic/tkCanvas.h>
  
  typedef struct TkPostscriptInfo {
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index d949951..582f955 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -1,7 +1,7 @@
 Author: Justin Pryzby <justinpryzby at users.sf.net>
 Description: Avoid compile time warnings in the saotk subsystem
---- a/tksao1.0/colorbar/cbgrid.C
-+++ b/tksao1.0/colorbar/cbgrid.C
+--- a/tksao/colorbar/cbgrid.C
++++ b/tksao/colorbar/cbgrid.C
 @@ -122,19 +122,19 @@
    if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"")))
      goto error;
@@ -36,9 +36,9 @@ Description: Avoid compile time warnings in the saotk subsystem
  
    // and now create astGrid
    astGrid2dPtr = this;
---- a/tksao1.0/frame/fitsimage.C
-+++ b/tksao1.0/frame/fitsimage.C
-@@ -1252,7 +1252,7 @@
+--- a/tksao/frame/fitsimage.C
++++ b/tksao/frame/fitsimage.C
+@@ -1259,7 +1259,7 @@
  	      if (ast_[0] && ast_[ii]) {
  		AstFrameSet* dep = (AstFrameSet*)astCopy(ast_[ii]);
  		astInvert(ast_[0]);
@@ -47,41 +47,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  		astSetI(dep,"current",4);
  		astAnnul(ast_[0]);
  		ast_[0] = dep;
-@@ -3035,24 +3035,24 @@
-   if (ii>=0 && ast_ && ast_[ii]) {
-     if (astIsASkyFrame(astGetFrame(ast_[ii], AST__CURRENT))) {
-       setAstSkyFrame(ast_[ii],sky);
--      for (int ii=0; ii<num; ii++) {
--	xin[ii] *= M_PI/180.;
--	yin[ii] *= M_PI/180.;
-+      for (int ii2=0; ii2<num; ii2++) {
-+	xin[ii2] *= M_PI/180.;
-+	yin[ii2] *= M_PI/180.;
-       }
-       astTran2(ast_[ii], num, xin, yin, 0, xout, yout);
-       if (astOK) {
--	for (int ii=0; ii<num; ii++)
--	  if (checkAst(xout[ii],yout[ii]))
--	    out[ii] = Vector(xout[ii],yout[ii]);
-+	for (int ii2=0; ii2<num; ii2++)
-+	  if (checkAst(xout[ii2],yout[ii2]))
-+	    out[ii2] = Vector(xout[ii2],yout[ii2]);
- 	return out;
-       }
-     }
-     else {
-       astTran2(ast_[ii], num, xin, yin, 0, xout, yout);
-       if (astOK) {
--	for (int ii=0; ii<num; ii++)
--	  if (checkAst(xout[ii],yout[ii]))
--	    out[ii] = Vector(xout[ii],yout[ii]);
-+	for (int ii2=0; ii2<num; ii2++)
-+	  if (checkAst(xout[ii2],yout[ii2]))
-+	    out[ii2] = Vector(xout[ii2],yout[ii2]);
- 	return out;
-       }
-     }
-@@ -3293,7 +3293,7 @@
+@@ -3305,7 +3305,7 @@
  
    ostringstream str;
    str << "Format(" << id << ")=" << format << ends;
@@ -90,7 +56,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  }
  
  void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
-@@ -3362,7 +3362,7 @@
+@@ -3374,7 +3374,7 @@
    astClearStatus;
  
    // new fitschan
@@ -99,7 +65,7 @@ Description: Avoid compile time warnings in the saotk subsystem
    if (!astOK || chan == AST__NULL)
      return NULL;
  
-@@ -3420,7 +3420,7 @@
+@@ -3432,7 +3432,7 @@
    astClearStatus;
  
    // new fitschan
@@ -108,8 +74,8 @@ Description: Avoid compile time warnings in the saotk subsystem
    if (!astOK || chan == AST__NULL)
      return NULL;
  
---- a/tksao1.0/frame/grid25d.C
-+++ b/tksao1.0/frame/grid25d.C
+--- a/tksao/frame/grid25d.C
++++ b/tksao/frame/grid25d.C
 @@ -114,7 +114,7 @@
    // and now create astGrid
    astGrid25dPtr = this;
@@ -139,8 +105,8 @@ Description: Avoid compile time warnings in the saotk subsystem
    astAddFrame(frameSet,AST__CURRENT,cmap,out);
  
    return frameSet;
---- a/tksao1.0/frame/grid2d.C
-+++ b/tksao1.0/frame/grid2d.C
+--- a/tksao/frame/grid2d.C
++++ b/tksao/frame/grid2d.C
 @@ -46,7 +46,7 @@
    AstFrameSet* frameSet = NULL;
    AstPlot* plot = NULL;
@@ -191,8 +157,8 @@ Description: Avoid compile time warnings in the saotk subsystem
  
    return 1;
  }
---- a/tksao1.0/frame/grid3d.C
-+++ b/tksao1.0/frame/grid3d.C
+--- a/tksao/frame/grid3d.C
++++ b/tksao/frame/grid3d.C
 @@ -121,16 +121,16 @@
        astSetI(wcs, "Base", idata);
  
diff --git a/debian/patches/saotk_fix_blt_crash.patch b/debian/patches/saotk_fix_blt_crash.patch
index 8d492cf..2ae87d3 100644
--- a/debian/patches/saotk_fix_blt_crash.patch
+++ b/debian/patches/saotk_fix_blt_crash.patch
@@ -3,9 +3,9 @@ Description: BLT crashes when it reaches this code. 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/tksao1.0/frame/frblt.C
-+++ b/tksao1.0/frame/frblt.C
-@@ -951,7 +951,7 @@
+--- a/tksao/frame/frblt.C
++++ b/tksao/frame/frblt.C
+@@ -950,7 +950,7 @@
    if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
      goto error;
  
@@ -14,7 +14,7 @@ Description: BLT crashes when it reaches this code. This fix is
        TCL_OK)
      goto error;
  
-@@ -959,7 +959,7 @@
+@@ -958,7 +958,7 @@
    if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
      goto error;
  
@@ -23,9 +23,9 @@ Description: BLT crashes when it reaches this code. This fix is
        TCL_OK)
      goto error;
  
---- a/tksao1.0/frame/marker.C
-+++ b/tksao1.0/frame/marker.C
-@@ -1258,19 +1258,19 @@
+--- a/tksao/frame/marker.C
++++ b/tksao/frame/marker.C
+@@ -1254,19 +1254,19 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -49,7 +49,7 @@ Description: BLT crashes when it reaches this code. This fix is
  }
  
  void Marker::analysisXYResult(char* xname, char* yname, double* x, double* y, 
-@@ -1278,11 +1278,11 @@
+@@ -1274,11 +1274,11 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -63,7 +63,7 @@ Description: BLT crashes when it reaches this code. This fix is
  }
  
  void Marker::analysisXYEResult(char* xname, char* yname, char* ename,
-@@ -1290,15 +1290,15 @@
+@@ -1286,15 +1286,15 @@
  {
    Blt_Vector* xx;
    Blt_GetVector(parent->getInterp(), xname, &xx);
diff --git a/debian/patches/saotk_spellfix.patch b/debian/patches/saotk_spellfix.patch
index 4b6ae34..b960773 100644
--- a/debian/patches/saotk_spellfix.patch
+++ b/debian/patches/saotk_spellfix.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Spellfix; however this is unused at the end.
---- a/tksao1.0/frame/ds9parser.C
-+++ b/tksao1.0/frame/ds9parser.C
+--- a/tksao/frame/ds9parser.C
++++ b/tksao/frame/ds9parser.C
 @@ -1022,7 +1022,7 @@
    "start", "commands", "command", "@1", "@2", "@3", "hash", "@4",
    "comment", "@5", "shapeComment", "@6", "@7", "nonshapeComment", "@8",
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 968e347..557c08b 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -1,44 +1,8 @@
 Author: Ole  Streicher <olebole at debian.org>
 Description: Compile against system library wcstools and funtools
---- a/tksao1.0/Makefile.in
-+++ b/tksao1.0/Makefile.in
-@@ -62,7 +62,7 @@
- PKG_LIB_FILE	= @PKG_LIB_FILE@
- PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
- 
--lib_BINARIES	= libfuntools.a libast.a libast_err.a libast_pal.a $(PKG_LIB_FILE) 
-+lib_BINARIES	= $(PKG_LIB_FILE)
- BINARIES	= $(lib_BINARIES)
- 
- SHELL		= @SHELL@
-@@ -196,8 +196,6 @@
- 
- libraries: 
- 
--$(PKG_OBJECTS) : $(ASTDIR)/ast.h
--
- libfuntools.a :
- 	$(MAKE) -C $(FUNTOOLSDIR) lib
- 	cd $(FUNTOOLSDIR); cp $@ ../.
-@@ -450,15 +448,11 @@
- #========================================================================
- 
- clean:
--	$(MAKE) -C $(FUNTOOLSDIR) clean
--	$(MAKE) -C $(ASTDIR) clean
- 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
- 	-rm -f $(PKG_OBJECTS) *.$(OBJEXT) core *.core
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean: clean
--	$(MAKE) -C $(FUNTOOLSDIR) distclean
--	$(MAKE) -C $(ASTDIR) distclean
- 	-rm -f *.tab.c
- 	-rm -f $(CONFIG_CLEAN_FILES)
- 	-rm -f config.cache config.log config.status
---- a/tksao1.0/configure.in
-+++ b/tksao1.0/configure.in
-@@ -266,25 +266,6 @@
+--- a/tksao/configure.in
++++ b/tksao/configure.in
+@@ -258,25 +258,6 @@
  util/util.C
  vector/vector.C
  vector/vector3d.C
@@ -64,27 +28,17 @@ Description: Compile against system library wcstools and funtools
  widget/truecolor16.C
  widget/truecolor24.C
  widget/truecolor8.C
-@@ -296,7 +277,7 @@
+@@ -285,7 +266,7 @@
  
  TEA_ADD_HEADERS([])
- TEA_ADD_INCLUDES([-I. -I./colorbar -I./fitsy++ -I./frame -I./list -I./magnifier -I./panner -I./util -I./vector -I./wcssubs -I./widget -I../include -I$FUNTOOLSDIR/filter -I$FUNTOOLSDIR/fitsy -I$FUNTOOLSDIR/util -I$ASTDIR -I/usr/include/libxml2])
--TEA_ADD_LIBS([$FUNTOOLSDIR/libfuntools.a $ASTDIR/libast.a $ASTDIR/libast_err.a $ASTDIR/libast_pal.a -lstdc++])
+ TEA_ADD_INCLUDES([-I. -I./colorbar -I./fitsy++ -I./frame -I./list -I./magnifier -I./panner -I./util -I./vector -I./wcssubs -I./widget -I${prefix}/include])
+-TEA_ADD_LIBS([-lstdc++])
 +TEA_ADD_LIBS([-lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2 -lstdc++])
  TEA_ADD_CFLAGS([])
  TEA_ADD_STUB_SOURCES([])
  TEA_ADD_TCL_SOURCES([])
-@@ -408,9 +389,6 @@
- CC=`echo $CC | sed -e 's/ .*$//'`
- 
- TEA_CONFIG_COLLECT
--TEA_CONFIG_SUBDIR($FUNTOOLSDIR, [--with-wcslib=../lib/libwcs.a --with-zlib=../lib/libz.a])
--TEA_CONFIG_SUBDIR($ASTDIR, [--enable-shared=no star_cv_cnf_trail_type=long])
--
- 
- #--------------------------------------------------------------------
- # Finally, substitute all of the various values into the Makefile.
---- a/tksao1.0/frame/fitsimage.h
-+++ b/tksao1.0/frame/fitsimage.h
+--- a/tksao/frame/fitsimage.h
++++ b/tksao/frame/fitsimage.h
 @@ -10,7 +10,7 @@
  #include "fitsdata.h"
  #include "coord.h"
@@ -94,23 +48,21 @@ Description: Compile against system library wcstools and funtools
  #include "head.h"
  
  #include "smooth.h"
---- a/tksao1.0/fitsy++/hist.C
-+++ b/tksao1.0/fitsy++/hist.C
-@@ -13,10 +13,10 @@
+--- a/tksao/fitsy++/hist.C
++++ b/tksao/fitsy++/hist.C
+@@ -13,8 +13,8 @@
  #include "hist.h"
  #include "util.h"
  
 -#include "fitsy.h"
-+#include <funtools/fitsy.h>
- 
- #ifndef __WIN32
 -#include "filter.h"
++#include <funtools/fitsy.h>
 +#include <funtools/filter.h>
- #endif
  
  #ifdef __CYGWIN__
---- a/tksao1.0/fitsy++/hpx.C
-+++ b/tksao1.0/fitsy++/hpx.C
+ // limit size, cygwin pipe to 64K / (4 args x 4 bytes)
+--- a/tksao/fitsy++/hpx.C
++++ b/tksao/fitsy++/hpx.C
 @@ -18,7 +18,7 @@
  #include "hpx.h"
  #include "util.h"
diff --git a/debian/patches/tcliis.patch b/debian/patches/tcliis.patch
index 7a8840b..096b466 100644
--- a/debian/patches/tcliis.patch
+++ b/debian/patches/tcliis.patch
@@ -1,8 +1,8 @@
 Author: Justin Pryzby <justinpryzby at users.sf.net>
 Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool" 
  protocol module. The code is K&R C.
---- a/tcliis1.0/iis.c
-+++ b/tcliis1.0/iis.c
+--- a/tcliis/iis.c
++++ b/tcliis/iis.c
 @@ -225,7 +225,7 @@
    }
   done:
diff --git a/debian/patches/tkhtml.patch b/debian/patches/tkhtml.patch
index 0dc8600..45a891c 100644
--- a/debian/patches/tkhtml.patch
+++ b/debian/patches/tkhtml.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Correct path for tk-private header file
---- a/tkhtml1.0/src/htmldraw.c
-+++ b/tkhtml1.0/src/htmldraw.c
+--- a/tkhtml1/src/htmldraw.c
++++ b/tkhtml1/src/htmldraw.c
 @@ -27,7 +27,7 @@
  #include <stdlib.h>
  #include "htmldraw.h"
@@ -11,8 +11,8 @@ Description: Correct path for tk-private header file
  #endif
  
  #define USE_TK_DRAWCHARS 1
---- a/tkhtml1.0/src/htmlwidget.c
-+++ b/tkhtml1.0/src/htmlwidget.c
+--- a/tkhtml1/src/htmlwidget.c
++++ b/tkhtml1/src/htmlwidget.c
 @@ -28,7 +28,7 @@
  #include <string.h>
  #include "htmlwidget.h"
@@ -22,3 +22,22 @@ Description: Correct path for tk-private header file
  #endif
  
  /*
+@@ -2021,7 +2021,7 @@
+ ** Tcl interpreter.  This is the only routine in this file with
+ ** external linkage.
+ */
+-DLL_EXPORT int Tkhtml_Init(Tcl_Interp *interp) {
++DLL_EXPORT int Tkhtml1_Init(Tcl_Interp *interp) {
+ 
+   if (Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0) == NULL)
+     return TCL_ERROR;
+--- a/tkhtml1/src/htmlwidget.h
++++ b/tkhtml1/src/htmlwidget.h
+@@ -1,6 +1,6 @@
+ /* This file was automatically generated.  Do not edit! */
+ #define DLL_EXPORT
+-DLL_EXPORT int Tkhtml_Init(Tcl_Interp *interp);
++DLL_EXPORT int Tkhtml1_Init(Tcl_Interp *interp);
+ #define INTERFACE 0
+ #define HtmlAlloc(A)      ((void*)Tcl_Alloc(A))
+ typedef struct HtmlWidget HtmlWidget;
diff --git a/debian/rules b/debian/rules
index addfdcf..2ed4c2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis tksao ds9
+BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml1 tcliis tksao ds9
 
 get-orig-source:
 	sh ./debian/repack.sh
@@ -13,23 +13,23 @@ get-orig-source:
 override_dh_autoreconf:
 	(cd unix; autoreconf -i -f)
 	(cd ds9/unix; autoreconf -i -f)
-	(cd tkhtml1.0; autoreconf -i -f)
-	(cd tkmpeg1.0; autoreconf -i -f)
-	(cd tcliis1.0; autoreconf -i -f)
-	(cd tclcheckdns1.1; autoreconf -i -f)
-	(cd tksao1.0; autoreconf -i -f)
+	(cd tkhtml1; autoreconf -i -f)
+	(cd tkmpeg; autoreconf -i -f)
+	(cd tcliis; autoreconf -i -f)
+	(cd tclcheckdns; autoreconf -i -f)
+	(cd tksao; autoreconf -i -f)
 
 override_dh_auto_configure:
 	unix/configure
 
 override_dh_auto_build:
 	dh_auto_build -- $(BUILDPARTS)
-	chmod ugo-x ds9/unix/zipdir/zvfsmntpt/library/*.tcl
+	chmod ugo-x ds9/unix/zvfsmntpt/library/*.tcl
 	chmod ugo+x ds9/ds9
 	perl -w debian/generate-man > ds9/ds9.1
 
 override_dh_auto_test:
-	DS9_HOME=ds9/unix/zipdir/zvfsmntpt \
+	DS9_HOME=ds9/unix/zvfsmntpt \
 	TCLLIBPATH=lib/ \
 	xvfb-run --server-args="-screen 0 1024x768x24" \
 	./ds9/ds9 -quit
diff --git a/debian/saods9-doc.docs b/debian/saods9-doc.docs
index 2df36a2..50f4c46 100644
--- a/debian/saods9-doc.docs
+++ b/debian/saods9-doc.docs
@@ -1 +1 @@
-ds9/unix/zipdir/zvfsmntpt/doc/*
+ds9/unix/zvfsmntpt/doc/*
diff --git a/debian/saods9.install b/debian/saods9.install
index 59d6365..0d987e5 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -1,8 +1,8 @@
 debian/ds9.xpm usr/share/pixmaps
 debian/saods9.desktop usr/share/applications
 ds9/ds9 /usr/bin
-ds9/unix/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
-ds9/unix/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
-ds9/unix/zipdir/zvfsmntpt/library /usr/share/saods9/
-ds9/unix/zipdir/zvfsmntpt/msgs /usr/share/saods9/
-ds9/unix/zipdir/zvfsmntpt/template /usr/share/saods9/
+ds9/unix/zvfsmntpt/cmaps /usr/share/saods9/
+ds9/unix/zvfsmntpt/doc/sun.gif /usr/share/saods9
+ds9/unix/zvfsmntpt/library /usr/share/saods9/
+ds9/unix/zvfsmntpt/msgs /usr/share/saods9/
+ds9/unix/zvfsmntpt/template /usr/share/saods9/

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

More information about the Debian-astro-commits mailing list