[SCM] image display tool for astronomy branch, debian, updated. b3f3e22b05a03c61742ba1e05602f098f3f59b71

Ole Streicher debian at liska.ath.cx
Mon Apr 9 17:01:33 UTC 2012


The following commit has been merged in the debian branch:
commit 8ae518297f931e2bb1fd1fb6e155c5653ed0715c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 9 16:50:21 2012 +0200

    Re-introduce BLT3 to avoid BLT compability errors (blt/tcl8.5/ds9)

diff --git a/debian/clean b/debian/clean
index bf26cdb..5388bc7 100644
--- a/debian/clean
+++ b/debian/clean
@@ -4,3 +4,11 @@ ds9/ds9tk.c
 ds9/ds9tk.h
 bin/ds9
 make.include
+blt3.0/demos/Makefile
+blt3.0/library/AFM/Makefile
+blt3.0/library/Makefile
+blt3.0/man/Makefile
+blt3.0/src/Makefile
+blt3.0/src/bltHash.h
+blt3.0/src/config.h
+blt3.0/src/shared/Makefile
diff --git a/debian/control b/debian/control
index c1d8e19..f2d1491 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 7.0.50), libtk-img-dev, zlib1g-dev, blt-dev,
+Build-Depends: debhelper (>= 7.0.50), libtk-img-dev, zlib1g-dev, libxrandr-dev,
  tcl-dev, tcllib, tk-dev, libxt-dev, tk-table (>= 2.9), libxml2-dev, 
  libwcstools-dev, libfuntools-dev, libstarlink-ast-dev, 
  autotools-dev, tcl-signal, zip
diff --git a/debian/patches/series b/debian/patches/series
index d4c2490..eccb9fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ add_psscale.patch
 avoid_compile_warnings_saotk.patch
 use_external_libs_saotk.patch
 use_external_libs_main.patch
-use_blt24.patch
diff --git a/debian/patches/use_blt24.patch b/debian/patches/use_blt24.patch
deleted file mode 100644
index 939c1b0..0000000
--- a/debian/patches/use_blt24.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/graph.tcl
-+++ b/src/graph.tcl
-@@ -124,11 +124,11 @@ proc UpdateGraphGrid {} {
-     global pgraph
-     global ds9
- 
--    $ds9(graph,horz) xaxis configure -grid $pgraph(horz,grid) -tickdefault 4
--    $ds9(graph,horz) y2axis configure -grid $pgraph(horz,grid)
-+    $ds9(graph,horz) xaxis configure
-+    $ds9(graph,horz) y2axis configure
- 
--    $ds9(graph,vert) x2axis configure -grid $pgraph(vert,grid)
--    $ds9(graph,vert) yaxis configure -grid $pgraph(vert,grid) -tickdefault 4
-+    $ds9(graph,vert) x2axis configure
-+    $ds9(graph,vert) yaxis configure
- }
- 
- proc UpdateGraphXAxis {} {
-@@ -228,13 +228,13 @@ proc UpdateGraphYAxisHV {which log} {
- 	    set yMax [expr $yMin + 1]
- 	}
- 
--	$which yaxis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
--	$which y2axis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
-+	$which yaxis configure -min $yMin -max $yMax -logscale $log
-+	$which y2axis configure -min $yMin -max $yMax -logscale $log
-     } else {
- 	$which yaxis configure -min $igraph(y,min) -max $igraph(y,max) \
--	    -logscale $log -tickdefault 4
-+	    -logscale $log
- 	$which y2axis configure -min $igraph(y,min) -max $igraph(y,max) \
--	    -logscale $log -tickdefault 4
-+	    -logscale $log
-     }
- }
- 
---- a/src/plotsup.tcl
-+++ b/src/plotsup.tcl
-@@ -397,11 +397,11 @@ proc APUpdateGraph {varname} {
-     $var(graph) configure -plotpadx 0 -plotpady 0 \
- 	-title $var(graph,title) \
- 	-font "$ds9($var(titleFont)) $var(titleSize) $var(titleWeight) $var(titleSlant)"
--    $var(graph) xaxis configure -grid $var(grid) -logscale $xlog \
-+    $var(graph) xaxis configure -logscale $xlog \
- 	-min $xmin -max $xmax -title $var(graph,xaxis) \
- 	-tickfont "$ds9($var(numlabFont)) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
- 	-titlefont "$ds9($var(textlabFont)) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
--    $var(graph) yaxis configure -grid $var(grid) -logscale $ylog \
-+    $var(graph) yaxis configure -logscale $ylog \
- 	-min $ymin -max $ymax -title $var(graph,yaxis) \
- 	-tickfont "$ds9($var(numlabFont)) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
- 	-titlefont "$ds9($var(textlabFont)) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
---- a/src/scale.tcl
-+++ b/src/scale.tcl
-@@ -297,9 +297,9 @@ proc ScaleDialog {} {
- 			 ]
- 
-     $dscale(hist) legend configure -hide yes
--    $dscale(hist) xaxis configure -hide yes -grid no -ticklength 3 \
-+    $dscale(hist) xaxis configure -hide yes -ticklength 3 \
- 	-tickfont [font actual TkDefaultFont]
--    $dscale(hist) yaxis configure -hide yes -grid yes -ticklength 3 \
-+    $dscale(hist) yaxis configure -hide yes -ticklength 3 \
- 	-tickfont [font actual TkDefaultFont]
- 
-     set dscale(xdata) histX
diff --git a/debian/patches/use_external_libs_main.patch b/debian/patches/use_external_libs_main.patch
index 5998ef0..0b2ccfa 100644
--- a/debian/patches/use_external_libs_main.patch
+++ b/debian/patches/use_external_libs_main.patch
@@ -18,7 +18,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	$(ZDIR)/src \
  	$(ZDIR)/msgs \
  	$(ZDIR)/doc \
-@@ -24,51 +18,18 @@ FILES	= $(FFILES)
+@@ -24,51 +18,17 @@ FILES	= $(FFILES)
  endif
  
  ifeq ($(OS),unix)
@@ -27,7 +27,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
    MAIN	= tkAppInit
  
    LIBS	= \
- 	../lib/libsaotk.a \
+-	../lib/libsaotk.a \
 -	../lib/libtkhtml.a \
  	../lib/libtkmpeg.a \
 -	../lib/$(TCLXMLVER)/libTclxml3.2.a \
@@ -68,11 +68,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	../lib/libBLTCore30.a \
 -	../lib/libtk8.5.a \
 -	../lib/libtcl8.5.a
-+	../lib/libcheckdns.a 
++	../lib/libcheckdns.a
  endif
  
  ifeq ($(OS),windows)
-@@ -182,12 +143,9 @@ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE) -DZIPFILE
+@@ -182,12 +142,9 @@ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE) -DZIPFILE
  
  all: ds9
  
@@ -87,7 +87,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  	cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
  
  debug	: ds9Base ds9.zip
-@@ -203,14 +161,9 @@ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
+@@ -203,14 +160,9 @@ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
  
  all: ds9
  
@@ -104,7 +104,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  debug	: null.zip ds9Base $(FILES)
  	$(RM) $@
-@@ -389,17 +342,16 @@ endif
+@@ -389,17 +341,16 @@ endif
  #--------------------------linux
  
  ifneq (,$(findstring linux,$(ARCH)))
@@ -115,24 +115,25 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	ln -s `$(CXX) ${OPTS} -print-file-name=libstdc++.a` .
 -	$(CXX) ${OPTS} -static-libgcc -Wl,--export-dynamic \
 -	-o $@ $(OBJS) $(LIBS) \
-+#	rm -f libstdc++.a
-+#	ln -s `$(CXX) -print-file-name=libstdc++.a` .
-+	$(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o $(MAIN).o $(LIBS) \
- 	-Wl,-Bstatic -L. -lstdc++ \
+-	-Wl,-Bstatic -L. -lstdc++ \
 -	-Wl,-Bdynamic \
 -	-L$(X11LIB) -lX11 -lXss -lXext -lXft -lXrandr -lXrender \
 -	-ldl -lpthread -lxml2
 -	rm -f libstdc++.a
-+	-Wl,-Bdynamic -L$(X11LIB) -lX11 \
-+	-ldl -lpthread -lxml2 \
-+	-lstarlink_ast -lstarlink_ast_err -lstarlink_ast_grf3d \
-+	-lz -lBLT -ltk -ltcl -lwcstools -lfuntools -L../lib -lsaotk
++#	rm -f libstdc++.a
++#	ln -s `$(CXX) -print-file-name=libstdc++.a` .
++	$(CXX) $(OPTS) $(LDFLAGS) -o ds9Base ds9.o tkAppInit.o ../lib/libsaotk.a \
++	-Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err -lstarlink_ast_grf3d \
++	-Wl,-Bstatic -L. -lstdc++  -L../lib -lsaotk -lhcomp -lrice -lplio \
++	-liis -ltkmpeg -lcheckdns -L../blt3.0/src -lBLTX30 -lBLTCore30 \
++	-Wl,-Bdynamic -lwcstools -lfuntools  -ltk -ltcl -lz \
++	-L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
  endif
  
  #--------------------------darwin
 --- a/ds9/ds9.C
 +++ b/ds9/ds9.C
-@@ -13,41 +13,12 @@ extern "C" {
+@@ -13,41 +13,14 @@ extern "C" {
  
    void TclSetStartupScriptFileName(const char*);
  
@@ -140,7 +141,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -  int Zvfs_Mount(Tcl_Interp*, char*, char *);
 -
 -  int Blt_core_Init(Tcl_Interp*);
--  int Blt_x_Init(Tcl_Interp*);
++ int Blt_core_Init(Tcl_Interp*);
+   int Blt_x_Init(Tcl_Interp*);
 -  int Tktable_Init(Tcl_Interp*);
    int Checkdns_Init(Tcl_Interp*);
    int Saotk_Init(Tcl_Interp*);
@@ -174,7 +176,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  #ifdef _MACOSX
    int Tkmacosx_Init(Tcl_Interp*);
  #endif
-@@ -73,13 +44,8 @@ int SAOLocalMainHook(int* argcPtr, char*** argvPtr)
+@@ -73,13 +46,8 @@ int SAOLocalMainHook(int* argcPtr, char*** argvPtr)
    char** argv = *argvPtr;
    appname = dupstr(argv[0]);
  
@@ -189,7 +191,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  }
  
  Tcl_Interp *global_interp;
-@@ -95,35 +61,6 @@ int SAOAppInit(Tcl_Interp *interp)
+@@ -95,35 +63,6 @@ int SAOAppInit(Tcl_Interp *interp)
    // save interp for cputs function
    global_interp = interp;
  
@@ -225,7 +227,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
    // Initialize Tcl and Tk
    if (Tcl_Init(interp))
      return TCL_ERROR;
-@@ -131,7 +68,6 @@ int SAOAppInit(Tcl_Interp *interp)
+@@ -131,7 +70,6 @@ int SAOAppInit(Tcl_Interp *interp)
    // Tk
    if (Tk_Init(interp))
      return TCL_ERROR;
@@ -233,20 +235,10 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
    {
      Tcl_DString pwd;
-@@ -140,22 +76,6 @@ int SAOAppInit(Tcl_Interp *interp)
-     Tcl_DStringFree(&pwd);
-   }
+@@ -150,12 +88,6 @@ int SAOAppInit(Tcl_Interp *interp)
+   Tcl_StaticPackage(interp, "blt_extra", Blt_x_Init,
+ 		    (Tcl_PackageInitProc*)NULL);
  
--  // Blt
--  if (Blt_core_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage(interp, "blt_core", Blt_core_Init, 
--		    (Tcl_PackageInitProc*)NULL);
--  if (Blt_x_Init(interp) == TCL_ERROR)
--    return TCL_ERROR;
--  Tcl_StaticPackage(interp, "blt_extra", Blt_x_Init,
--		    (Tcl_PackageInitProc*)NULL);
--
 -  // Tktable
 -  if (Tktable_Init(interp) == TCL_ERROR)
 -    return TCL_ERROR;
@@ -256,7 +248,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
    // Checkdns
    if (Checkdns_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
-@@ -168,18 +88,6 @@ int SAOAppInit(Tcl_Interp *interp)
+@@ -168,18 +100,6 @@ int SAOAppInit(Tcl_Interp *interp)
    Tcl_StaticPackage (interp, "saotk", Saotk_Init,
  		     (Tcl_PackageInitProc*)NULL);
  
@@ -275,7 +267,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
    // IIS
    if (Iis_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
-@@ -192,96 +100,6 @@ int SAOAppInit(Tcl_Interp *interp)
+@@ -192,96 +112,6 @@ int SAOAppInit(Tcl_Interp *interp)
    Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init, 
  		     (Tcl_PackageInitProc*)NULL);
  
@@ -372,7 +364,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  #ifdef _MACOSX
    if (Tkmacosx_Init(interp) == TCL_ERROR)
      return TCL_ERROR;
-@@ -296,15 +114,6 @@ int SAOAppInit(Tcl_Interp *interp)
+@@ -296,15 +126,6 @@ int SAOAppInit(Tcl_Interp *interp)
  		     (Tcl_PackageInitProc*)NULL);
  #endif
  
@@ -429,6 +421,15 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
 --- a/Makefile
 +++ b/Makefile
+@@ -286,7 +286,7 @@ else
+ blt	: FORCE
+ endif
+ 	@echo "Installing BLT..."
+-	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR)/unix --with-tk=$(root)/$(TKDIR)/unix $(BLTFLAGS) 
++	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec_prefix $(root)/bin $(BLTFLAGS) 
+ 	cd $(BLTDIR); $(MAKE); $(MAKE) install
+ 
+ zlib  : FORCE
 @@ -301,23 +301,23 @@ tclxml	: FORCE
  
  tkimg	: FORCE
@@ -467,7 +468,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  
  zip	: FORCE
  	@echo "Installing ZIP..."
-@@ -398,76 +398,23 @@ zvfs	: FORCE
+@@ -398,76 +398,26 @@ zvfs	: FORCE
  scrub : FORCE
  	find . -name "*[~#]" -exec rm {} \;
  
@@ -480,7 +481,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	$(OPTDIRCLEAN) \
 -	saotkclean zipclean zvfsclean ds9clean srcclean \
 -	dirsclean 
-+distclean :  tkmpegclean iisclean checkdnsclean  \
++distclean :  bltclean tkmpegclean iisclean checkdnsclean  \
 +	hcompressclean plioclean $(OPTDIRCLEAN) \
 +	saotkclean ds9clean srcclean dirsclean 
  	$(RM) core *~ *#
@@ -500,9 +501,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -tcllibclean: FORCE
 -	cd $(TCLLIBDIR); $(MAKE) distclean
 -
--bltclean: FORCE
--	cd $(BLTDIR); $(MAKE) distclean
--
+ bltclean: FORCE
+ 	cd $(BLTDIR); $(MAKE) distclean
+ 
 -zlibclean: FORCE
 -	cd $(ZLIBDIR); $(MAKE) distclean
 -
@@ -547,7 +548,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  riceclean: FORCE
  	cd $(RICEDIR); $(MAKE) distclean
  
-@@ -483,9 +430,6 @@ saotkclean : FORCE
+@@ -483,9 +433,6 @@ saotkclean : FORCE
  zipclean: FORCE
  	cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
  
@@ -557,11 +558,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  ds9clean : FORCE
  	cd $(DS9DIR); $(MAKE) distclean
  
-diff --git a/src/ds9.tcl b/src/ds9.tcl
-index af6e5a6..c64e0ee 100755
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -35,26 +35,36 @@ option add {*Listbox*background} #d9d9d9
+@@ -35,26 +35,35 @@ option add {*Listbox*background} #d9d9d9
  
  # set to absolute path so that if -cd command is used,
  # so we can still find our files
@@ -597,9 +596,8 @@ index af6e5a6..c64e0ee 100755
 +package require textutil::repeat
 +package require textutil::tabify
 +
-+#package require tkcon
++package require tkcon
 +
-+package require BLT
 +package require Tktable 
 +package require tclxpa
 +package require Signal
diff --git a/debian/rules b/debian/rules
index e4974db..4895ae2 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 iis rice hcompress plio saotk ds9
+BUILDPARTS:=dirs blt checkdns tkmpeg iis rice hcompress plio saotk ds9
 
 get-orig-source:
 	sh ./debian/repack;
diff --git a/debian/saods9.install b/debian/saods9.install
index 03a33b4..7a14e14 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -2,4 +2,5 @@ bin/ds9 usr/bin/
 debian/saods9.desktop usr/share/applications
 debian/ds9.xpm usr/share/pixmaps
 src/* /usr/share/ds9/src
+blt3.0/library /usr/share/ds9/blt3.0
 doc/* /usr/share/ds9/doc

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list