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

Ole Streicher olebole at moszumanska.debian.org
Fri Sep 18 11:44:29 UTC 2015 

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

olebole pushed a commit to branch experimental
in repository saods9.

commit 0fb92407fa27cf246326259281e49a4b4c5d49ed
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Sep 18 11:00:31 2015 +0200

    Adjust debian files for new version
---
 debian/changelog                                  |   6 ++
 debian/clean                                      |   3 -
 debian/copyright                                  |   2 +-
 debian/generate-man                               |   4 +-
 debian/patches/ds9_add_about_debian.patch         |  14 +--
 debian/patches/ds9_fix_docdir.patch               |  16 ++--
 debian/patches/ds9_make_linux.patch               |  14 ---
 debian/patches/ds9_optional_doc_package.patch     |   4 +-
 debian/patches/ds9_support_blt.patch              |  26 ++---
 debian/patches/ds9_use_system_libs.patch          |  60 +++++-------
 debian/patches/ds9_use_tcltk_packages.patch       | 112 +++++++++++-----------
 debian/patches/saotk_add_psscale.patch            |   4 +-
 debian/patches/saotk_avoid_compile_warnings.patch |   8 +-
 debian/patches/saotk_use_system_libs.patch        |  63 ++++++------
 debian/patches/series                             |   1 -
 debian/rules                                      |  19 ++--
 debian/saods9-doc.docs                            |   2 +-
 debian/saods9.install                             |  10 +-
 18 files changed, 176 insertions(+), 192 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6304eb1..33b4f6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b7+repack-1) experimental; urgency=low
+
+  * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org>  Fri, 18 Sep 2015 13:15:53 +0200
+
 saods9 (7.4~b6+repack-1) experimental; urgency=low
 
   * New upstream beta version
diff --git a/debian/clean b/debian/clean
index d7942ee..1ab7a4f 100644
--- a/debian/clean
+++ b/debian/clean
@@ -4,8 +4,5 @@ ds9/ds9tk.c
 ds9/ds9tk.h
 ds9/ds9.1
 bin/ds9
-make.include
 unix/libxxlib.a
 unix/rotstr.o
-htmlwidget/configure
-tlt3.0.1/configure
diff --git a/debian/copyright b/debian/copyright
index 58b2261..5aa30ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -39,7 +39,7 @@ License: GPL
  wjoye at cfa.harvard.edu
  http://hea-www.harvard.edu/RD/ds9/
 
-Files: src/tkfbox.tcl src/xmfbox.tcl
+Files: ds9/library/tkfbox.tcl ds9/library/xmfbox.tcl
 Copyright: Copyright (c) 1994-1998 Sun Microsystems, Inc.
  Copyright (c) 1998-2000 Scriptics Corporation
 License: sun-BSD
diff --git a/debian/generate-man b/debian/generate-man
index 7d01f9e..4bbfe7c 100644
--- a/debian/generate-man
+++ b/debian/generate-man
@@ -6,9 +6,9 @@
 
 use strict;
 
-my $s=`html2text doc/ref/command.html |grep -Ev '^ *\\* \\[[0-9]+\\]'` || die;
+my $s=`html2text ds9/doc/ref/command.html |grep -Ev '^ *\\* \\[[0-9]+\\]'` || die;
 
-my @opts=split("\n", `fgrep "<a href=\\"#" doc/ref/command.html | cut -d\\# -f2|cut -d\\" -f1` || die);
+my @opts=split("\n", `fgrep "<a href=\\"#" ds9/doc/ref/command.html | cut -d\\# -f2|cut -d\\" -f1` || die);
 
 print <<EOF;
 .TH DS9 1 "03 Jul 2012"
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 3bc672d..f9f6969 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -1,24 +1,24 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the Debian packager to the "About" box
---- a/src/help.tcl
-+++ b/src/help.tcl
+--- a/ds9/library/help.tcl
++++ b/ds9/library/help.tcl
 @@ -21,6 +21,8 @@
      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 Cente [...]
+     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 [...]
 +
 +    append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
  }
  
  proc HelpRef {} {
---- a/src/util.tcl
-+++ b/src/util.tcl
+--- a/ds9/library/util.tcl
++++ b/ds9/library/util.tcl
 @@ -684,7 +684,7 @@
  
      # Param
      set f [frame $w.param -background white]
--    canvas $f.c -background white -height 350 -width 500
-+    canvas $f.c -background white -height 385 -width 500
+-    canvas $f.c -background white -height 450 -width 500
++    canvas $f.c -background white -height 485 -width 500
      pack $f.c -fill both -expand true
      
      # can't use -file for zvfs
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index b378b4f..b826114 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -2,8 +2,8 @@ Author: Ole Streicher <debian at liska.ath.cx>
 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
+--- a/ds9/library/help.tcl
++++ b/ds9/library/help.tcl
 @@ -8,17 +8,17 @@
      global help
      global ds9
@@ -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 Cente [...]
+     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 [...]
  }
---- a/src/ds9.tcl
-+++ b/src/ds9.tcl
-@@ -198,6 +198,7 @@
+--- a/ds9/library/ds9.tcl
++++ b/ds9/library/ds9.tcl
+@@ -199,6 +199,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]] ..]]
@@ -43,8 +43,8 @@ Description: Instead putting the documentation into the common shared
  
  	package require msgcat
  	package require http
---- a/src/util.tcl
-+++ b/src/util.tcl
+--- a/ds9/library/util.tcl
++++ b/ds9/library/util.tcl
 @@ -689,7 +689,7 @@
      
      # can't use -file for zvfs
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
deleted file mode 100644
index b9a2554..0000000
--- a/debian/patches/ds9_make_linux.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate the standard CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS.
---- a/ds9/Makefile.unix
-+++ b/ds9/Makefile.unix
-@@ -61,9 +61,6 @@ all: ds9
- 
- ifneq (,$(findstring linux,$(ARCH)))
- 
--CFLAGS= -g -I../include -I/usr/include/X11
--CXXFLAGS = $(CFLAGS)
--
- ds9	: ds9Base ds9.zip
- 	$(RM) $@
- 	strip ds9Base
diff --git a/debian/patches/ds9_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index bb11b2b..9e428cf 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Make the "-doc" package optional by disabling the help menu 
---- a/src/mhelp.tcl
-+++ b/src/mhelp.tcl
+--- a/ds9/library/mhelp.tcl
++++ b/ds9/library/mhelp.tcl
 @@ -8,6 +8,7 @@
  
  proc HelpMainMenu {} {
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index 4183d4e..38ab21f 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -1,7 +1,7 @@
 Author: Ole Streicher <olebole at debian.org>
 Description: Allow the use of a standard BLT 2.X instead of tkblt 
---- a/src/graph.tcl
-+++ b/src/graph.tcl
+--- a/ds9/library/graph.tcl
++++ b/ds9/library/graph.tcl
 @@ -58,10 +58,10 @@
      $ds9(graph,horz) legend configure -hide yes
      $ds9(graph,horz) crosshairs configure -color green
@@ -59,9 +59,9 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
      }
  }
  
---- a/src/scale.tcl
-+++ b/src/scale.tcl
-@@ -293,9 +293,9 @@
+--- a/ds9/library/scale.tcl
++++ b/ds9/library/scale.tcl
+@@ -309,9 +309,9 @@
  			 ]
  
      $dscale(hist) legend configure -hide yes
@@ -73,8 +73,8 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  	-tickfont [font actual TkDefaultFont]
      set dscale(xdata) histX
      set dscale(ydata) histY
---- a/src/plotbar.tcl
-+++ b/src/plotbar.tcl
+--- a/ds9/library/plotbar.tcl
++++ b/ds9/library/plotbar.tcl
 @@ -149,8 +149,7 @@
  			-highlightthickness 0 \
  		       ]
@@ -85,8 +85,8 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  
      pack $var(graph) -expand yes -fill both
      PlotChangeMode $varname
---- a/src/plot.tcl
-+++ b/src/plot.tcl
+--- a/ds9/library/plot.tcl
++++ b/ds9/library/plot.tcl
 @@ -1196,20 +1196,19 @@
  	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
  
@@ -112,8 +112,8 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  }
  
  proc PlotCreateElement {varname} {
---- a/src/plotdialog.tcl
-+++ b/src/plotdialog.tcl
+--- a/ds9/library/plotdialog.tcl
++++ b/ds9/library/plotdialog.tcl
 @@ -200,14 +200,13 @@
  
      global ds9
@@ -130,8 +130,8 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  		win32 {Blt_ZoomStack $var(graph) -mode release}
  		aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"}
  	    }
---- a/src/plotprint.tcl
-+++ b/src/plotprint.tcl
+--- a/ds9/library/plotprint.tcl
++++ b/ds9/library/plotprint.tcl
 @@ -40,18 +40,10 @@
  	-titlefont "$var(axis,title,family) $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
  
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index 4ec915c..50f4e8b 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -2,17 +2,10 @@ Author: Ole Streicher <olebole at debian.org>
 Description: Link against system libraries.
  Use system provided libs of funtools, ast etc. instead of the convienience
  copies provided by ds9, and use tcl/tk packages wherever possible.
---- a/ds9/Makefile.unix
-+++ b/ds9/Makefile.unix
-@@ -1,19 +1,12 @@
- #--------------------------defines
- 
--MAINDIR	= ../$(TKDIR)/unix
-+MAINDIR	= /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
- MAIN	= tkAppInit
- 
- ZDIR = zipdir/zvfsmntpt
- OBJS	= ds9.o $(MAIN).o
+--- a/ds9/unix/Makefile.in
++++ b/ds9/unix/Makefile.in
+@@ -38,13 +38,6 @@
+ OBJS	= ds9.o tkAppInit.o
  
  FILES	= \
 -	$(ZDIR)/$(TCLVER) \
@@ -22,31 +15,30 @@ Description: Link against system libraries.
 -	$(ZDIR)/$(TCLLIBVER) \
 -	$(ZDIR)/$(TKCONVER) \
 -	$(ZDIR)/$(XMLRPCVER) \
- 	$(ZDIR)/src \
+ 	$(ZDIR)/library \
  	$(ZDIR)/msgs \
  	$(ZDIR)/doc \
---- a/Makefile.unix
-+++ b/Makefile.unix
-@@ -29,13 +29,9 @@
- 	--enable-symbols
- 	$(MAKE) -C $(TKDIRDIR) -j $(JOBS) install
- 
--distclean : tclclean tkclean \
--	tktableclean tkbltclean \
--	tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
--	xpaclean tcliisclean tclcheckdnsclean tclsignalclean \
--	astclean \
--	tksaoclean tclzvfsclean ds9clean \
--	srcclean filesclean dirsclean
-+distclean : \
-+	tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
-+	tksaoclean ds9clean srcclean filesclean dirsclean
+--- a/make.include
++++ b/make.include
+@@ -368,12 +368,10 @@
+ .PHONY	: libtiffdistclean tkmpegdistclean tksaodistclean
+ .PHONY	: tktabledistclean xpadistclean
  
- #--------------------------distribution
+-distclean : tcldistclean tkdistclean \
+-	tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
+-	tclzvfsdistclean tclxmldistclean xpadistclean \
+-	tkbltdistclean tktabledistclean tkimgdistclean \
++distclean :  \
++	tclcheckdnsdistclean tcliisdistclean \
++	tclxmldistclean \
+ 	tkmpegdistclean tkhtmldistclean \
+-	tk$(OS)distclean \
+ 	tksaodistclean ds9distclean \
+ 	dirsdistclean localdistclean
  
---- a/src/ds9.tcl
-+++ b/src/ds9.tcl
-@@ -199,31 +199,33 @@
+--- a/ds9/library/ds9.tcl
++++ b/ds9/library/ds9.tcl
+@@ -200,31 +200,33 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
@@ -87,7 +79,7 @@ Description: Link against system libraries.
 +	package require math::fuzzy
 +
 +	package require tkcon
-+	source $ds9(root)/src/xmlrpc.tcl
++	source $ds9(root)/library/xmlrpc.tcl
 +	package require BLT
 +	package require Tktable
 +	package require tclxpa
@@ -103,5 +95,5 @@ Description: Link against system libraries.
 +	package require img::xbm
 +	package require img::window
  
- 	source $ds9(root)/src/source.tcl
+ 	source $ds9(root)/library/source.tcl
  
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 52dec12..867feb3 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -2,25 +2,25 @@ Author: Ole Streicher <olebole at debian.org>
 Description: Don't load TclTk extensions as shared libs, but as packages.
  This allows to start DS9 as a normal tk application without special
  initialization.
---- a/ds9/Makefile.unix
-+++ b/ds9/Makefile.unix
-@@ -48,7 +48,7 @@
+--- a/ds9/unix/Makefile.in
++++ b/ds9/unix/Makefile.in
+@@ -75,7 +75,7 @@
  
  #--------------------------main
  
--all: ds9
+-all: $(DS9CMD)
 +all: $(FILES)
  
- #--------------------------linux
- 
+ tkAppInit.o : tkAppInit.c
+ 	$(CC) $(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
 --- /dev/null
 +++ b/ds9/ds9
 @@ -0,0 +1,2 @@
 +#!/bin/sh
-+exec wish8.6 -f ${DS9_HOME-/usr/share/saods9}/src/ds9.tcl $*
---- a/src/ds9.tcl
-+++ b/src/ds9.tcl
-@@ -166,7 +166,7 @@
++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 @@
  }
  
  # 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) {
-@@ -197,7 +197,7 @@
+@@ -198,7 +198,7 @@
      x11 {
  	# set to absolute path so that if -cd command is used,
  	# so we can still find our files
@@ -38,9 +38,9 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  	package require msgcat
  	package require http
-@@ -213,6 +213,11 @@
+@@ -214,6 +214,11 @@
  	package require tkcon
- 	source $ds9(root)/src/xmlrpc.tcl
+ 	source $ds9(root)/library/xmlrpc.tcl
  	package require BLT
 +	package require tksao
 +	package require tkhtml
@@ -50,62 +50,62 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	package require Tktable
  	package require tclxpa
  	package require Signal
---- a/Makefile
-+++ b/Makefile
-@@ -119,7 +119,7 @@
+--- a/make.include
++++ b/make.include
+@@ -72,7 +72,7 @@
  	./configure \
  	$(WITHTCL) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols
++	--enable-shared --enable-symbols
  
-@@ -129,7 +129,7 @@
+ tcliis	: $(TCLIISDIR)/Makefile
+ 	@echo ""
+@@ -86,7 +86,7 @@
  	./configure \
  	$(WITHTCL) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols
++	--enable-shared --enable-symbols
  
-@@ -139,7 +139,7 @@
+ tclsignal: $(TCLSIGNALDIR)/Makefile
+ 	@echo ""
+@@ -115,7 +115,7 @@
  	./configure \
  	$(WITHTCL) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TCLSIGNALDIR) install
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols
++	--enable-shared --enable-symbols
  
-@@ -187,7 +187,7 @@
+ tclzvfs	: $(TCLZVFSDIR)/Makefile
+ 	@echo ""
+@@ -165,7 +165,7 @@
  	./configure \
- 	$(WITHTCL) $(WITHTK) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TKHTMLDIR) install
- 
-@@ -213,7 +213,7 @@
+ 	$(WITHTK) \
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols
++	--enable-shared --enable-symbols
+ 
+ tkimg	: libtiff $(TKIMGDIR)/Makefile
+ 	@echo ""
+@@ -208,7 +208,7 @@
  	./configure \
- 	$(WITHTCL) $(WITHTK) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TKMPEGDIR) -j $(JOBS) install
- 
-@@ -223,7 +223,7 @@
+ 	$(WITHTK) \
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols
++	--enable-shared --enable-symbols
+ 
+ tksao	: $(TKSAODIR)/Makefile
+ 	@echo ""
+@@ -222,7 +222,7 @@
  	./configure \
- 	$(WITHTCL) $(WITHTK) \
- 	--prefix $(root) --exec-prefix $(root) \
--	--disable-shared \
-+	--enable-shared \
- 	--enable-symbols
- 	$(MAKE) -C $(TKSAODIR) -j $(JOBS) install
+ 	$(WITHTK) \
+ 	--prefix $(ROOT) --exec-prefix $(ROOT) \
+-	--disable-shared --enable-symbols \
++	--enable-shared --enable-symbols \
+ 	ASTDIR=$(ASTDIR) FUNTOOLSDIR=$(FUNTOOLSDIR)
  
+ # no parallel
 --- a/tksao1.0/saotk.C
 +++ b/tksao1.0/saotk.C
 @@ -27,6 +27,7 @@
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 6bcf7f8..0ce000d 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -5,7 +5,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
  which Doug Mink hacked into to get the scaling.
 --- a/tksao1.0/widget/widget.C
 +++ b/tksao1.0/widget/widget.C
-@@ -5,6 +5,8 @@
+@@ -7,6 +7,8 @@
  #include "widget.h"
  #include "util.h"
  
@@ -14,7 +14,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
  // Tk Canvas Widget Functions Declaration
  
  int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item, 
-@@ -585,7 +587,7 @@
+@@ -587,7 +589,7 @@
    XColor* cc= NULL;
    // starting with tk8.6, colors are W3C based, not X11
    if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 438f776..116cf6e 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -47,7 +47,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  		astSetI(dep,"current",4);
  		astAnnul(ast[0]);
  		ast[0] = dep;
-@@ -3021,24 +3021,24 @@
+@@ -3020,24 +3020,24 @@
    if (ii>=0 && ast && ast[ii]) {
      if (astIsASkyFrame(astGetFrame(ast[ii], AST__CURRENT))) {
        setAstSkyFrame(ast[ii],sky);
@@ -81,7 +81,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  	return out;
        }
      }
-@@ -3253,7 +3253,7 @@
+@@ -3252,7 +3252,7 @@
  
    ostringstream str;
    str << "Format(" << id << ")=" << format << ends;
@@ -90,7 +90,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  }
  
  void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
-@@ -3324,7 +3324,7 @@
+@@ -3323,7 +3323,7 @@
    astClearStatus;
  
    // new fitschan
@@ -99,7 +99,7 @@ Description: Avoid compile time warnings in the saotk subsystem
    if (!astOK || chan == AST__NULL)
      return NULL;
  
-@@ -3386,7 +3386,7 @@
+@@ -3385,7 +3385,7 @@
    astClearStatus;
  
    // new fitschan
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index c4aae40..5f711f3 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -2,31 +2,40 @@ 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
-@@ -192,7 +192,7 @@
+@@ -62,7 +62,7 @@
+ PKG_LIB_FILE	= @PKG_LIB_FILE@
+ PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
  
- binaries: $(BINARIES)
+-lib_BINARIES	= libfuntools.a libast.a libast_err.a libast_pal.a $(PKG_LIB_FILE) 
++lib_BINARIES	= $(PKG_LIB_FILE)
+ BINARIES	= $(lib_BINARIES)
  
--libraries: funtools 
-+libraries:
+ SHELL		= @SHELL@
+@@ -196,8 +196,6 @@
  
- funtools :
- 	make -C funtools-1.4.5 lib
-@@ -434,15 +434,11 @@
+ 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)
--	cd funtools-1.4.5; \
--	make clean
  
  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
--	cd funtools-1.4.5; \
--	make distclean
- 
- #========================================================================
- # Install binary object libraries.  On Windows this includes both .dll and
 --- a/tksao1.0/configure.in
 +++ b/tksao1.0/configure.in
 @@ -266,25 +266,6 @@
@@ -55,31 +64,25 @@ Description: Compile against system library wcstools and funtools
  widget/truecolor16.C
  widget/truecolor24.C
  widget/truecolor8.C
-@@ -292,7 +273,6 @@
- ])
+@@ -296,7 +277,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 -Ifuntools-1.4.5/filter -Ifuntools-1.4.5/fitsy -Ifuntools-1.4.5/util -I/usr/include/libxml2])
--TEA_ADD_LIBS([funtools-1.4.5/libfuntools.a])
+ 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_LIBS([-lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2 -lstdc++])
  TEA_ADD_CFLAGS([])
  TEA_ADD_STUB_SOURCES([])
  TEA_ADD_TCL_SOURCES([])
-@@ -377,7 +357,7 @@
- 
- AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
- #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
--SHLIB_LD_LIBS='${LIBS} -lstdc++'
-+SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
- 
- #--------------------------------------------------------------------
- # This macro generates a line to use when building a library.  It
-@@ -405,7 +385,6 @@
+@@ -408,9 +389,6 @@
  CC=`echo $CC | sed -e 's/ .*$//'`
  
  TEA_CONFIG_COLLECT
--TEA_CONFIG_SUBDIR(funtools-1.4.5, [--with-wcslib=../lib/libwcs.a --with-zlib=../lib/libz.a])
- 
+-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
 @@ -10,7 +10,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index d0a3463..3208b65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-ds9_make_linux.patch
 ds9_use_system_libs.patch
 ds9_use_tcltk_packages.patch
 ds9_support_blt.patch
diff --git a/debian/rules b/debian/rules
index 9001929..30a6d16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,31 +10,32 @@ get-orig-source:
 %:
 	dh $@ --with autoreconf,autotools_dev
 
-make.include:
-	ln -sf make.linux make.include
-
 override_dh_autoreconf:
+	(cd 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)
 
-override_dh_auto_build: make.include
+override_dh_auto_configure:
+	unix/configure
+
+override_dh_auto_build:
 	dh_auto_build -- $(BUILDPARTS)
-	cp xmlrpc-0.3/xmlrpc.tcl ds9/zipdir/zvfsmntpt/src
-	chmod ugo-x ds9/zipdir/zvfsmntpt/src/*.tcl
+	cp xmlrpc-0.3/xmlrpc.tcl ds9/unix/zipdir/zvfsmntpt/library
+	chmod ugo-x ds9/unix/zipdir/zvfsmntpt/library/*.tcl
 	chmod ugo+x ds9/ds9
 	perl -w debian/generate-man > ds9/ds9.1
 
 override_dh_auto_test:
-	DS9_HOME=ds9/zipdir/zvfsmntpt \
+	DS9_HOME=ds9/unix/zipdir/zvfsmntpt \
 	TCLLIBPATH=lib/ \
 	xvfb-run --server-args="-screen 0 1024x768x24" \
 	./ds9/ds9 -quit
 
 override_dh_installchangelogs:
-	dh_installchangelogs doc/release/r7.0.html
+	dh_installchangelogs ds9/doc/release/r7.0.html
 
-override_dh_auto_clean: make.include
+override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/saods9-doc.docs b/debian/saods9-doc.docs
index 26dd9d5..2df36a2 100644
--- a/debian/saods9-doc.docs
+++ b/debian/saods9-doc.docs
@@ -1 +1 @@
-ds9/zipdir/zvfsmntpt/doc/*
+ds9/unix/zipdir/zvfsmntpt/doc/*
diff --git a/debian/saods9.install b/debian/saods9.install
index 476607b..5116739 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/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
-ds9/zipdir/zvfsmntpt/doc/sun.gif /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/unix/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
+ds9/unix/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
+ds9/unix/zipdir/zvfsmntpt/msgs /usr/share/saods9/
+ds9/unix/zipdir/zvfsmntpt/library /usr/share/saods9/
+ds9/unix/zipdir/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