[saods9] 04/07: Adjust patches for new version.
Ole Streicher
olebole-guest at alioth.debian.org
Thu Sep 26 12:24:35 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 ddc9a47577850e6d0599f29d43ada0c9890dafbe
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Sep 26 12:05:25 2013 +0200
Adjust patches for new version.
---
debian/changelog | 6 +
debian/clean | 13 --
debian/copyright | 2 +-
debian/patches/ds9_add_about_debian.patch | 2 +-
debian/patches/ds9_fix_docdir.patch | 16 +-
debian/patches/ds9_make_linux.patch | 126 +++++-----
debian/patches/ds9_optional_doc_package.patch | 36 +--
debian/patches/ds9_use_external_libs.patch | 240 ++++++++++----------
debian/patches/ds9_use_filesystem.patch | 77 ++++---
debian/patches/saotk_avoid_compile_warnings.patch | 10 +-
debian/patches/series | 3 +-
.../{blt_fix_crash.patch => tlt_fix_crash.patch} | 97 +++-----
debian/rules | 2 +-
debian/saods9-blt.install | 11 +-
14 files changed, 287 insertions(+), 354 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59c6b8a..6755c35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3~b3+dfsg-1~exp1) experimental; urgency=low
+
+ * New (beta) upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Thu, 26 Sep 2013 12:14:34 +0200
+
saods9 (7.3~b2+dfsg-1~exp1) experimental; urgency=low
* New (beta) upstream version
diff --git a/debian/clean b/debian/clean
index 580b6f2..6d4ad1d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,18 +5,5 @@ 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/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
unix/libxxlib.a
unix/rotstr.o
diff --git a/debian/copyright b/debian/copyright
index 5b3ce86..031d40c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -125,7 +125,7 @@ License: BSD
since relicensed without the advertizing clause. Here, I only restate
the license included upstream.)
-Files: blt3.0/*
+Files: tlt3.0/*
Copyright: Copyright 1991-2009 George A Howlett,
Copyright (c) 1987-1994 The Regents of the University of California.
Copyright (c) 1994-1997 Sun Microsystems, Inc.
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index e5db3b2..22b2a10 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
-@@ -708,7 +708,7 @@
+@@ -709,7 +709,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 c75b717..0659b25 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -35,17 +35,17 @@ Description: Instead putting the documentation into the common shared
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -186,6 +186,7 @@
- # set to absolute path so that if -cd command is used,
- # so we can still find our files
- set ds9(root) "/usr/share/saods9"
-+set ds9(doc) "/usr/share/doc/saods9-doc"
+@@ -179,6 +179,7 @@
+ # set to absolute path so that if -cd command is used,
+ # so we can still find our files
+ set ds9(root) "/usr/share/saods9"
++ set ds9(doc) "/usr/share/doc/saods9-doc"
- package require msgcat
- package require http
+ package require msgcat
+ package require http
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -713,7 +713,7 @@
+@@ -714,7 +714,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_make_linux.patch b/debian/patches/ds9_make_linux.patch
index dee5a6e..a2af038 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -3,26 +3,27 @@ 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,26 +1,23 @@
+@@ -1,27 +1,24 @@
OS = unix
ARCH = linux
-X11INCLUDE=/usr/X11R6/include
-+X11INCLUDE=/usr/include/X11
++X11INCLUDE=X11INCLUDE=/usr/include/X11
X11LIB = /usr/X11R6/lib
--XX = -O2
+-XX =
+XX := $(CFLAGS) -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 =
+ # we need this to find M_PI and isfinite() in math.h
+-ZZ = -m32 -D_GNU_SOURCE
++ZZ = -D_GNU_SOURCE
-AA = -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+AA =
--#OPTS = ${XX} ${ZZ}
--OPTS = ${YY} ${ZZ}
+ OPTS = ${XX} ${ZZ}
+-#OPTS = ${YY} ${ZZ}
-NOPTS = ${YY} ${ZZ}
-+OPTS = ${XX} ${ZZ}
+NOPTS = ${XX} ${ZZ}
-#CXX = g++
@@ -37,47 +38,54 @@ Description: Set the compile flags according to the Debian environment. We
CCOPT = ${OPTS} ${AA}
CCNOPT = ${NOPTS} ${AA}
---- a/Makefile
-+++ b/Makefile
-@@ -210,9 +210,9 @@
-
- blt : FORCE
- @echo "Installing BLT..."
-- 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)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LDFLAGS) $(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
-+ $(MAKE) -C $(BLTDIR)/src -j $(JOBS) build_shared D_LDFLAGS='$(LDFLAGS)'
-+ cp $(BLTDIR)/src/*.so* lib/.
- cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-
- zlib : FORCE
-@@ -228,13 +228,13 @@
-
+--- a/Makefile.unix
++++ b/Makefile.unix
+@@ -35,12 +35,15 @@
+
+ tlt : FORCE
+ @echo "Installing TLT..."
+- cd $(TLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' \
++ cd $(TLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' \
++ CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' \
++ LDFLAGS='$(LDFLAGS) $(LIBS)' \
+ ./configure $(XFLAGS) \
+ --prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+- $(MAKE) -C $(TLTDIR) -j $(JOBS) install
++ $(MAKE) -C $(TLTDIR) -j $(JOBS)
++ cp $(TLTDIR)/*.so* lib/.
+
+ tktable : FORCE
+ @echo "Installing TkTable..."
+@@ -65,9 +68,9 @@
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
-+ cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LDFLAGS) $(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads
+ cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' \
++ CPPFLAGS='$(CPPFLAGS)' \
++ LDFLAGS='$(LDFLAGS)' \
+ ./configure $(XFLAGS) \
+- --with-tcl=$(root)/$(TCLDIRDIR) \
+- --with-tk=$(root)/$(TKDIRDIR) \
+ --prefix $(root) \
+ --disable-shared
$(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
-
- libtiff : FORCE
- @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..."
-@@ -242,7 +242,7 @@
-
+@@ -75,9 +78,9 @@
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)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS) $(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LDFLAGS) $(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
+ cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
++ CPPFLAGS='$(CPPFLAGS)' \
++ LDFLAGS='$(LDFLAGS)' \
+ $(root)/htmlwidget/configure $(XFLAGS) \
+- --with-tcl=$(root)/$(TCLDIR) \
+- --with-tk=$(root)/$(TKDIR) \
+ --prefix $(root) \
+ --enable-shared=no
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
- cp $(HTMLDIR)/libtkhtml.a lib/.
-
-@@ -305,7 +305,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -191,7 +191,7 @@
saotk : FORCE
@echo "Installing SAOTK..."
@@ -88,8 +96,8 @@ Description: Set the compile flags according to the Debian environment. We
@echo "Installing ZVFS..."
--- a/ds9/Makefile
+++ b/ds9/Makefile
-@@ -287,7 +287,7 @@
- #--------------------------support
+@@ -9,7 +9,7 @@
+ cp ds9.$(OS) ds9.C
$(MAIN).o : $(MAIN).c
- $(CC) $(CFLAGS) -DTK_LOCAL_APPINIT=SAOAppInit \
@@ -185,33 +193,3 @@ Description: Set the compile flags according to the Debian environment. We
append cc " @TARGET_X_INC@"
append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
puts "$n: $src $dep"
---- a/blt3.0.1/src/Makefile.in
-+++ b/blt3.0.1/src/Makefile.in
-@@ -10,6 +10,7 @@
- BLT_LIBRARY = @BLT_LIBRARY@
- CC = @CC@
- CFLAGS = @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
- DEFINES = @DEFINES@
- EXTRA_CFLAGS = @GCCFLAGS@ $(SO_CFLAGS)
- LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@
-@@ -22,7 +23,7 @@
- SO_EXT = @BLT_SO_EXT@
- SO_PREFIX = @BLT_SO_PREFIX@
- SO_LD = @BLT_SO_LD@
--SO_LDFLAGS = @BLT_SO_LDFLAGS@ @LD_RUN_PATH@
-+SO_LDFLAGS = $(D_LDFLAGS) @BLT_SO_LDFLAGS@ @LD_RUN_PATH@
-
- EXPAT_INC_SPEC = @EXPAT_INC_SPEC@
- EXPAT_LIB_SPEC = @EXPAT_LIB_SPEC@
-@@ -375,8 +376,8 @@
- $(srcdir)/bltTree.h \
- $(srcdir)/bltVector.h
-
--CC_OPTS = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
--MAIN_CC_OPTS = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
-+CC_OPTS = $(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
-+MAIN_CC_OPTS = $(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_ROOT =
diff --git a/debian/patches/ds9_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index 9b4a6f5..ad30b0c 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -2,48 +2,54 @@ 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
-@@ -8,30 +8,37 @@
+@@ -8,6 +8,7 @@
- proc HelpMenu {mb} {
+ proc HelpMainMenu {} {
global ds9
+ global help
- $mb add cascade -label [msgcat::mc {Help}] -menu $mb.help
+ switch $ds9(wm) {
+ x11 -
+@@ -20,28 +21,34 @@
+ }
+ }
+- $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
+ if [ file exists $help(refman) ] {
+ set helpstate normal
+ } else {
+ set helpstate disabled
+ }
+
- menu $mb.help
- $mb.help add command -label [msgcat::mc {Reference Manual}]\
++ $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
+ menu $ds9(mb).help
+ $ds9(mb).help add command -label [msgcat::mc {Reference Manual}]\
- -command HelpRef
+ -command HelpRef -state $helpstate
- $mb.help add command -label [msgcat::mc {User Manual}]\
+ $ds9(mb).help add command -label [msgcat::mc {User Manual}]\
- -command HelpUser
+ -command HelpUser -state $helpstate
- $mb.help add command -label [msgcat::mc {Mouse & Keyboard}] \
+ $ds9(mb).help add command -label [msgcat::mc {Mouse & Keyboard}] \
- -command HelpKeyboard
+ -command HelpKeyboard -state $helpstate
- $mb.help add separator
- $mb.help add command -label [msgcat::mc {FAQ}] \
+ $ds9(mb).help add separator
+ $ds9(mb).help add command -label [msgcat::mc {FAQ}] \
- -command HelpFAQ
+ -command HelpFAQ -state $helpstate
- $mb.help add command -label [msgcat::mc {New Features}] \
+ $ds9(mb).help add command -label [msgcat::mc {New Features}] \
- -command HelpNew
+ -command HelpNew -state $helpstate
- $mb.help add command -label [msgcat::mc {Release Notes}] \
+ $ds9(mb).help add command -label [msgcat::mc {Release Notes}] \
- -command HelpRelease
+ -command HelpRelease -state $helpstate
- $mb.help add command -label [msgcat::mc {Help Desk}] \
+ $ds9(mb).help add command -label [msgcat::mc {Help Desk}] \
- -command HelpDesk
+ -command HelpDesk -state $helpstate
- $mb.help add separator
- $mb.help add command -label [msgcat::mc {Story of SAOImage DS9}] \
+ $ds9(mb).help add separator
+ $ds9(mb).help add command -label [msgcat::mc {Story of SAOImage DS9}] \
- -command HelpStory
+ -command HelpStory -state $helpstate
- $mb.help add command -label [msgcat::mc {Acknowledgment}] \
+ $ds9(mb).help add command -label [msgcat::mc {Acknowledgment}] \
- -command HelpAck
+ -command HelpAck -state $helpstate
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 66ef403..70aac9b 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -1,30 +1,32 @@
Author: Sebastien Fabbro <bicatali at gentoo.org>, and others
Description: Compile against external libraries of wcstools, funtools, ast,
and tk etc. instead of the convienience copies provided by ds9.
---- a/ds9/Makefile
-+++ b/ds9/Makefile
-@@ -4,13 +4,7 @@
- #--------------------------defines
+--- a/ds9/Makefile.unix
++++ b/ds9/Makefile.unix
+@@ -2,20 +2,13 @@
- ZDIR = zipdir/zvfsmntpt
--FFILES = $(ZDIR)/$(TCLVER) \
+ CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
+
+-MAINDIR = ../$(TKDIR)/unix
++MAINDIR = /usr/share/tcltk/tk8.5
+ MAIN = tkAppInit
+
+ ZDIR = zipdir/zvfsmntpt
+ OBJS = ds9.o $(MAIN).o
+
+ FILES = \
+- $(ZDIR)/$(TCLVER) \
- $(ZDIR)/tcl8 \
- $(ZDIR)/$(TKVER) \
-- $(ZDIR)/$(BLTVER) \
+- $(ZDIR)/$(TLTVER) \
- $(ZDIR)/$(TCLLIBVER) \
- $(ZDIR)/$(TKCONVER) \
- $(ZDIR)/$(XMLRPCVER) \
-+FFILES = \
$(ZDIR)/src \
$(ZDIR)/msgs \
$(ZDIR)/doc \
-@@ -25,47 +19,19 @@
- endif
-
- # for unix, macosx
--MAINDIR = ../$(TKDIR)/unix
-+MAINDIR = /usr/share/tcltk/tk8.5
- MAIN = tkAppInit
+@@ -23,42 +16,15 @@
+ $(ZDIR)/template
LIBS = \
- ../lib/libsaotk.a \
@@ -58,17 +60,16 @@ Description: Compile against external libraries of wcstools, funtools, ast,
../lib/libcheckdns.a \
- ../lib/libsignal_ext.a \
- ../lib/libxxlib.a \
-- ../lib/libBLTX30.a \
-- ../lib/libBLTCore30.a \
+- ../lib/$(TLTVER)/libtlt3.0.a \
- ../lib/libtk8.6.a \
- ../lib/libtkstub8.6.a \
- ../lib/libtcl8.6.a \
-- ../lib/libtclstub8.6.a \
+- ../lib/libtclstub8.6.a
+ ../lib/libxxlib.a
- # if windows, redefine
- ifeq ($(OS),windows)
-@@ -141,11 +107,12 @@
+ #--------------------------main
+
+@@ -86,11 +52,12 @@
ds9Base : $(OBJS) $(LIBS)
$(RM) $@
@@ -80,18 +81,18 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+ $(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 \
++ -lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/tlt3.0 -ltlt3.0 \
+ -lwcstools -lfuntools -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
endif
---- a/ds9/ds9.C
-+++ b/ds9/ds9.C
-@@ -22,33 +22,13 @@
+--- a/ds9/ds9.unix
++++ b/ds9/ds9.unix
+@@ -22,29 +22,13 @@
+ int Zvfs_Mount(Tcl_Interp*, char*, char *);
- int Blt_core_Init(Tcl_Interp*);
- int Blt_x_Init(Tcl_Interp*);
+ int Tlt_Init(Tcl_Interp*);
- int Tktable_Init(Tcl_Interp*);
int Checkdns_Init(Tcl_Interp*);
int Saotk_Init(Tcl_Interp*);
@@ -115,23 +116,19 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- int Tclxml_Init(Tcl_Interp*);
- int Tclxml_libxml2_Init(Tcl_Interp*);
-
--#ifndef _GWIN32
-- int Signal_ext_Init(Tcl_Interp*);
--#endif
--
- #ifdef _MACOSX
- int Tkmacosx_Init(Tcl_Interp*);
- #endif
-@@ -157,7 +137,6 @@
+ int Signal_ext_Init(Tcl_Interp*);
+ }
+
+@@ -121,7 +105,6 @@
// Tk
- if (Tk_Init(interp))
+ if (Tk_Init(interp) == TCL_ERROR)
return TCL_ERROR;
- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- {
- Tcl_DString pwd;
-@@ -176,12 +155,6 @@
- Tcl_StaticPackage(interp, "blt_extra", Blt_x_Init,
+ // tlt
+ if (Tlt_Init(interp) == TCL_ERROR)
+@@ -129,12 +112,6 @@
+ Tcl_StaticPackage(interp, "tlt", Tlt_Init,
(Tcl_PackageInitProc*)NULL);
- // Tktable
@@ -143,7 +140,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// Checkdns
if (Checkdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -200,12 +173,6 @@
+@@ -153,12 +130,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
(Tcl_PackageInitProc*)NULL);
@@ -156,7 +153,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// IIS
if (Iis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -218,78 +185,6 @@
+@@ -171,75 +142,5 @@
Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
@@ -225,39 +222,38 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- (Tcl_PackageInitProc*)NULL);
-
- // Signal_Ext
--#ifndef _GWIN32
- if (Signal_ext_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "signal", Signal_ext_Init,
- (Tcl_PackageInitProc*)NULL);
--#endif
-
- #ifdef _MACOSX
- if (Tkmacosx_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
---- a/Makefile
-+++ b/Makefile
-@@ -327,15 +327,10 @@
- find . -name "*stackdump*" -exec rm {} \;
- endif
+ return TCL_OK;
+ }
+--- a/Makefile.unix
++++ b/Makefile.unix
+@@ -87,15 +87,10 @@
+ @echo "Installing unix..."
+ $(MAKE) -C unix -j $(JOBS) install
-distclean : tclclean tkclean \
-- tktableclean bltclean \
-- $(ZLIB)clean tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean iisclean checkdnsclean $(SIGNAL)clean funtoolsclean \
+- tktableclean tltclean \
+- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
+- xpaclean iisclean checkdnsclean signalclean funtoolsclean \
- astclean wcssubsclean \
- riceclean hcompressclean plioclean \
-- $(PORT)clean \
+- unixclean \
- saotkclean zvfsclean ds9clean srcclean \
- filesclean dirsclean
+distclean : filesclean \
-+ bltclean tkmpegclean tkhtmlclean iisclean checkdnsclean \
++ tltclean tkmpegclean tkhtmlclean iisclean checkdnsclean \
+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
- clean: FORCE
-
-@@ -345,31 +340,7 @@
+ unixclean : FORCE
+ $(MAKE) -C unix distclean
+--- a/Makefile
++++ b/Makefile
+@@ -221,32 +221,9 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -270,9 +266,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-tktableclean: FORCE
- $(MAKE) -C $(TKTABLEDIR) distclean
-
- bltclean: FORCE
-- $(MAKE) -C $(BLTDIR) distclean
--
+ tltclean: FORCE
+ $(MAKE) -C $(TLTDIR) distclean
+
-zlibclean: FORCE
- $(MAKE) -C $(ZLIBDIR) distclean
-
@@ -286,10 +282,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-
-libtiffclean: FORCE
- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
-
+-
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -378,27 +349,12 @@
+
+@@ -254,27 +231,12 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
@@ -317,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
$(MAKE) -C $(RICEDIR) distclean
-@@ -420,9 +376,6 @@
+@@ -287,9 +249,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -329,63 +326,62 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -188,33 +188,35 @@
- set ds9(root) "[pwd]/zvfsmntpt"
- #set ds9(root) "/tmp/zvfsmntpt"
-
--# tcl modules
--if {![namespace exists msgcat]} {
-- source $ds9(root)/tcl8/8.5/msgcat-1.5.0.tm
--}
--if {![namespace exists http]} {
-- source $ds9(root)/tcl8/8.6/http-2.8.5.tm
--}
--
--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
+@@ -180,32 +180,35 @@
+ # so we can still find our files
+ set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
+
+- if {![namespace exists msgcat]} {
+- source $ds9(root)/tcl8/8.5/msgcat-1.5.0.tm
+- }
+- if {![namespace exists http]} {
+- source $ds9(root)/tcl8/8.6/http-2.8.5.tm
+- }
+-
+- 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
+
-+package require base64
-+package require log
-+package require ftp
-+package require textutil::repeat
-+package require textutil::tabify
-+package require math::fuzzy
-
--source $ds9(root)/tkcon2.5/tkcon.tcl
--source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
-+package require tkcon
-+source $ds9(root)/src/xmlrpc.tcl
- source $ds9(root)/blt3.0/graph.tcl
-
-+package require Tktable
-+package require tclxpa
-+package require Signal
++ package require base64
++ package require log
++ package require ftp
++ package require textutil::repeat
++ package require textutil::tabify
++ package require math::fuzzy
+
+- source $ds9(root)/tkcon2.5/tkcon.tcl
+- source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
++ package require tkcon
++ source $ds9(root)/src/xmlrpc.tcl
+ source $ds9(root)/tlt3.0/graph.tcl
+
++ package require Tktable
++ package require tclxpa
++ package require Signal
+
-+package require img::base
-+package require img::jpeg
-+package require img::tiff
-+package require img::png
-+package require img::gif
-+package require img::ppm
-+package require img::bmp
-+package require img::xbm
-+package require img::window
++ package require img::base
++ package require img::jpeg
++ package require img::tiff
++ package require img::png
++ package require img::gif
++ package require img::ppm
++ package require img::bmp
++ package require img::xbm
++ package require img::window
+
- source $ds9(root)/src/source.tcl
+ source $ds9(root)/src/source.tcl
- # fix ::tk and msgcat
+ set tlt_library $ds9(root)/tlt3.0
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 0050040..1ba7c73 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -1,11 +1,11 @@
Author: Ole Streicher <debian at liska.ath.cx>
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
-@@ -91,13 +91,8 @@
+--- a/ds9/Makefile.unix
++++ b/ds9/Makefile.unix
+@@ -36,13 +36,8 @@
- all: ds9
+ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
-ds9 : ds9Base ds9.zip
- $(RM) $@
@@ -19,9 +19,25 @@ Description: Store all files in the usual FHS directories instead of
debug : ds9Base ds9.zip
$(RM) $@
---- a/ds9/ds9.C
-+++ b/ds9/ds9.C
-@@ -15,10 +15,7 @@
+@@ -94,13 +89,8 @@
+
+ CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
+
+-ds9 : ds9Base ds9.zip
+- $(RM) $@
+- strip ds9Base
+- cat ds9Base ds9.zip > ds9
+- zip -A ds9
+- chmod 755 ds9
+- cp ds9 ../bin/.
++ds9 : ds9Base $(FILES)
++ cp ds9Base ../bin/ds9
+
+ debug : ds9Base ds9.zip
+ $(RM) $@
+--- a/ds9/ds9.unix
++++ b/ds9/ds9.unix
+@@ -16,10 +16,7 @@
int SAOAppInit(Tcl_Interp *interp);
int SAOLocalMainHook(int* argc, char*** argv);
@@ -31,27 +47,24 @@ Description: Store all files in the usual FHS directories instead of
- 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*);
-@@ -66,16 +63,8 @@
- char** argv = *argvPtr;
- appname = dupstr(argv[0]);
+ int Tlt_Init(Tcl_Interp*);
+ int Checkdns_Init(Tcl_Interp*);
+@@ -52,13 +49,8 @@
+ // do this first
+ Tcl_FindExecutable((*argvPtr)[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.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
+ // startup script
- 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);
}
-@@ -90,46 +79,6 @@
+@@ -67,37 +59,6 @@
// save interp for cputs function
global_interp = interp;
@@ -67,25 +80,16 @@ Description: Store all files in the usual FHS directories instead of
- Tcl_DString pwd;
- Tcl_DStringInit(&pwd);
- Tcl_GetCwd(interp, &pwd);
+-
-#ifdef ZIPFILE
- ostringstream str;
--#ifndef _GWIN32
- str << (char *)Tcl_GetNameOfExecutable()
- << ".zip"
- << ends;
--#else
-- str << (char *)Tcl_GetNameOfExecutable()
-- << "/../ds9.zip"
-- << ends;
--#endif
- if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){
- char str[] = "ERROR: Unable to open the auxiliary ds9 file 'ds9.zip'. If you moved the ds9 program from its original location, please also move the zip file to the same place.";
-
--#ifndef _GWIN32
- cerr << str << endl;
--#else
-- MessageBox(NULL, str, "SAOImage DS9", MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
--#endif
- exit(1);
- }
-#else
@@ -96,17 +100,16 @@ Description: Store all files in the usual FHS directories instead of
- }
-
// Initialize Tcl and Tk
- if (Tcl_Init(interp))
+ if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR;
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -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"
+@@ -178,7 +178,7 @@
+ x11 {
+ # 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 [pwd] zvfsmntpt]]
++ set ds9(root) "/usr/share/saods9"
- package require msgcat
- package require http
+ package require msgcat
+ package require http
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 002c440..658cd07 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -2,7 +2,7 @@ Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compile time warnings in the saotk subsystem
--- a/saotk/fitsy++/outchannel.C
+++ b/saotk/fitsy++/outchannel.C
-@@ -7,7 +7,7 @@
+@@ -9,7 +9,7 @@
OutFitsChannel::OutFitsChannel(Tcl_Interp* interp, const char* ch)
{
int tclMode;
@@ -13,7 +13,7 @@ Description: Avoid compile time warnings in the saotk subsystem
--- a/saotk/fitsy++/outfile.C
+++ b/saotk/fitsy++/outfile.C
-@@ -6,7 +6,7 @@
+@@ -7,7 +7,7 @@
OutFitsFile::OutFitsFile(const char* fn)
{
@@ -22,7 +22,7 @@ Description: Avoid compile time warnings in the saotk subsystem
valid_ = 1;
}
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
OutFitsFileGZ::OutFitsFileGZ(const char* fn)
{
@@ -33,7 +33,7 @@ Description: Avoid compile time warnings in the saotk subsystem
--- a/saotk/fitsy++/strm.C
+++ b/saotk/fitsy++/strm.C
-@@ -397,7 +397,7 @@
+@@ -399,7 +399,7 @@
if (!(this->pExt_ || (this->pIndex_>0))) {
// we are only looking for a primary image
@@ -42,7 +42,7 @@ Description: Avoid compile time warnings in the saotk subsystem
this->found();
return;
}
-@@ -453,7 +453,7 @@
+@@ -455,7 +455,7 @@
this->head_ = NULL;
}
diff --git a/debian/patches/series b/debian/patches/series
index 85283f9..a759f60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
checkdns.patch
htmlwidget.patch
iis.patch
-blt_fix_crash.patch
-blt_remove_rpath.patch
+tlt_fix_crash.patch
saotk_add_ksearch.patch
saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
diff --git a/debian/patches/blt_fix_crash.patch b/debian/patches/tlt_fix_crash.patch
similarity index 64%
rename from debian/patches/blt_fix_crash.patch
rename to debian/patches/tlt_fix_crash.patch
index 8c50f87..71c98b1 100644
--- a/debian/patches/blt_fix_crash.patch
+++ b/debian/patches/tlt_fix_crash.patch
@@ -6,7 +6,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
a better fix.
--- a/saotk/frame/frblt.C
+++ b/saotk/frame/frblt.C
-@@ -797,7 +797,7 @@
+@@ -841,7 +841,7 @@
if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
goto error;
@@ -15,7 +15,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
TCL_OK)
goto error;
-@@ -805,7 +805,7 @@
+@@ -849,7 +849,7 @@
if (Blt_GetVector(interp, yname, &yv) != TCL_OK)
goto error;
@@ -24,8 +24,8 @@ Description: BLT crashes when it reaches this code. This seems to be some
TCL_OK)
goto error;
---- a/blt3.0.1/src/bltFont.h
-+++ b/blt3.0.1/src/bltFont.h
+--- a/tlt3.0/bltFont.h
++++ b/tlt3.0/bltFont.h
@@ -30,6 +30,8 @@
#ifndef _BLT_FONT_H
#define _BLT_FONT_H
@@ -35,70 +35,9 @@ Description: BLT crashes when it reaches this code. This seems to be some
#define FONT_ITALIC (1<<0)
#define FONT_BOLD (1<<1)
---- a/blt3.0.1/src/bltPictCmd.c
-+++ b/blt3.0.1/src/bltPictCmd.c
-@@ -88,6 +88,8 @@
- NUMFMTS
- };
-
-+#define PictFormat bltPictCmd_PictFormat
-+
- typedef struct {
- const char *name; /* Name of format. */
- unsigned int flags;
---- a/blt3.0.1/src/bltGrMesh.c
-+++ b/blt3.0.1/src/bltGrMesh.c
-@@ -1708,6 +1708,10 @@
- return 0;
- }
-
-+int
-+Blt_Triangulate(Tcl_Interp *interp, size_t nPoints, Point2f *points,
-+ int sorted, int *nTrianglesPtr, Triplet **trianglesPtr);
-+
- static void
- Triangulate(Tcl_Interp *interp, Mesh *meshPtr)
- {
---- a/blt3.0.1/src/bltBind.c
-+++ b/blt3.0.1/src/bltBind.c
-@@ -1244,6 +1244,12 @@
- {-1, NULL}
- };
-
-+void TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym,
-+ XEvent *eventPtr);
-+int TkFindStateNumObj (Tcl_Interp *interp, Tcl_Obj *optionPtr,
-+ const TkStateMap *mapPtr, Tcl_Obj *keyPtr);
-+KeySym TkStringToKeysym(char *name);
-+
- /*
- *---------------------------------------------------------------------------
- *
---- a/blt3.0.1/src/bltCoreInit.c
-+++ b/blt3.0.1/src/bltCoreInit.c
-@@ -301,7 +301,7 @@
- Tcl_Namespace *nsPtr;
- Tcl_ValueType args[2];
- const char *result;
-- const int isExact = 1;
-+ const int isExact = 0;
-
- #ifdef USE_TCL_STUBS
- if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) {
---- a/blt3.0.1/src/bltExtInit.c
-+++ b/blt3.0.1/src/bltExtInit.c
-@@ -142,7 +142,7 @@
- {
- Tcl_Namespace *nsPtr;
- Tcl_AppInitProc **p;
-- const int isExact = 1;
-+ const int isExact = 0;
-
- #ifdef USE_TCL_STUBS
- if (Tcl_InitStubs(interp, TCL_VERSION_LOADED, isExact) == NULL) {
--- a/saotk/frame/marker.C
+++ b/saotk/frame/marker.C
-@@ -1163,19 +1163,19 @@
+@@ -1174,19 +1174,19 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -122,7 +61,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPlot3dResult(char* xname, char* yname,
-@@ -1184,11 +1184,11 @@
+@@ -1195,11 +1195,11 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -136,7 +75,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPandaResult(double* x, double* y, double* e, int num)
-@@ -1205,15 +1205,15 @@
+@@ -1216,15 +1216,15 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -155,3 +94,25 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
Matrix Marker::fwdMatrix()
+--- a/tlt3.0/bltInt.h
++++ b/tlt3.0/bltInt.h
+@@ -317,8 +317,6 @@
+ extern Tcl_AppInitProc Blt_GraphCmdInitProc;
+ extern Tcl_AppInitProc Blt_VectorCmdInitProc;
+
+-extern int TclGetLong(Tcl_Interp *interp, const char *s, long *longPtr);
+-
+ extern int sprintf_s(char *s, size_t size, const char *fmt, /*args*/ ...);
+
+ extern void Blt_Panic TCL_VARARGS(const char *, args);
+--- a/tlt3.0/bltUtil.c
++++ b/tlt3.0/bltUtil.c
+@@ -56,7 +56,7 @@
+ }
+ }
+
+-int TclGetLong(
++int TclGetLong_unused(
+ Tcl_Interp *interp, /* Interpreter used for error reporting if not
+ * NULL. */
+ CONST char *src, /* String containing a (possibly signed) long
diff --git a/debian/rules b/debian/rules
index 529d977..5c924c0 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 tkhtml iis rice hcompress plio xmlrpc unix blt saotk ds9
+BUILDPARTS:=dirs checkdns tkmpeg tkhtml iis rice hcompress plio xmlrpc unix tlt saotk ds9
get-orig-source:
sh ./debian/repack-dfsg.sh
diff --git a/debian/saods9-blt.install b/debian/saods9-blt.install
index 4c342ce..a0f745f 100644
--- a/debian/saods9-blt.install
+++ b/debian/saods9-blt.install
@@ -1,7 +1,4 @@
-lib/libBLT*.so /usr/lib/saods9/blt3.0
-blt3.0.1/library/*.tcl /usr/share/saods9/blt3.0
-blt3.0.1/library/*.pro /usr/share/saods9/blt3.0
-blt3.0.1/library/*.xbm /usr/share/saods9/blt3.0
-blt3.0.1/library/*.cur /usr/share/saods9/blt3.0
-blt3.0.1/library/afm /usr/share/saods9/blt3.0
-blt3.0.1/library/dd_protocols /usr/share/saods9/blt3.0
+lib/libtlt*.so /usr/lib/saods9/tlt3.0
+tlt3.0/library/*.tcl /usr/share/saods9/tlt3.0
+tlt3.0/library/*.pro /usr/share/saods9/tlt3.0
+tlt3.0/library/afm /usr/share/saods9/tlt3.0
--
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