[saods9] 02/02: Replace tkblt by system provided BLT
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Oct 14 12:24:24 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository saods9.
commit 6993a43d39ced927af9176f696ba4a302cc4987c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Oct 14 08:47:01 2014 +0200
Replace tkblt by system provided BLT
---
debian/changelog | 6 +++
debian/control | 24 +++------
debian/copyright | 34 ------------
debian/patches/ds9_make_linux.patch | 43 +++++++++++++++
debian/patches/ds9_support_blt.patch | 61 ++++++++++++++++++++++
debian/patches/ds9_use_external_libs.patch | 58 ++++++++++----------
...t_fix_crash.patch => saotk_fix_blt_crash.patch} | 16 +-----
debian/patches/series | 3 +-
debian/{repack-dfsg.sh => repack.sh} | 11 ++--
debian/rules | 5 +-
debian/saods9-blt.install | 2 -
debian/saods9-data.install | 2 +-
12 files changed, 158 insertions(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38ba578..e04cd9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.3.2+repack-1) UNRELEASED; urgency=low
+
+ * Remove private BLT lib
+
+ -- Ole Streicher <olebole at debian.org> Mon, 13 Oct 2014 23:28:04 +0200
+
saods9 (7.3.2+dfsg-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index 46a9f75..f9d3b31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,11 @@ Priority: optional
Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <olebole at debian.org>
Build-Depends: autotools-dev,
+ blt-dev (>= 2.5.3),
+ cpio,
debhelper (>= 9),
- dh-autoreconf,
+ dh-autoreconf,
html2text,
- cpio,
libfuntools-dev,
libstarlink-ast-dev (>= 7.0.4),
libtk-img-dev,
@@ -26,9 +27,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/saods9.gi
Package: saods9
Architecture: any
-Depends: libtk-img,
+Depends: blt (>= 2.5.3),
+ libtk-img,
saods9-data (= ${source:Version}),
- saods9-blt,
tcl-signal,
tcl-xpa,
tcllib,
@@ -38,7 +39,7 @@ Depends: libtk-img,
${misc:Depends},
${shlibs:Depends}
Recommends: saods9-doc
-Suggests: xpa-tools, python-pyds9
+Suggests: python-pyds9, xpa-tools
Description: Image display tool for astronomy
SAOImage DS9 is an astronomical imaging and data visualization
application. DS9 supports FITS images and binary tables, multiple frame
@@ -47,7 +48,7 @@ Description: Image display tool for astronomy
configurable and extensible via XPA and SAMP.
.
All versions and platforms support a consistent set of GUI and
- functional capabilities.
+ functional capabilities.
.
DS9 supports advanced features such as 2-D, 3-D and RGB frame buffers, mosaic
images, tiling, blinking, geometric markers, colormap manipulation, scaling,
@@ -58,17 +59,6 @@ Description: Image display tool for astronomy
display, panner, magnifier, horizontal and vertical graphs, button bar, and
color bar can be configured via menus or the command line.
-Package: saods9-blt
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: BLT subpackage for saods9
- DS9 is an application for astronomical imaging and data
- visualization.
- .
- This package contains an updated and patched version of BLT for the use
- in saods9.
-
Package: saods9-doc
Architecture: all
Section: doc
diff --git a/debian/copyright b/debian/copyright
index 54c0ed1..c1c7890 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -125,40 +125,6 @@ License: BSD-2-clause
since relicensed without the advertizing clause. Here, I only restate
the license included upstream.)
-Files: tkblt3.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.
- Copyright (c) 1985-1991 Massachusetts Institute of Technology,
- Copyright (c) 1987 by Digital Equipment Corporation, Maynard, Massachusetts
- Copyright (c) 1990-1993, David Koblas. (koblas at netcom.com)
- Copyright (c) 1991-1998, Thomas G. Lane.
- Copyright (c) 1998-1999 by Scriptics Corporation
- Copyright (c) 1993-1998 Lucent Technologies, Inc
- Copyright (c) 1989 by Jef Poskanzer
-License: MIT/X11
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the
- Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
- KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
Files: htmlwidget/src/*
Copyright: Copyright (c) 1997-2000 D. Richard Hipp
License: LGPL
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 9f07de1..3e47455 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -156,3 +156,46 @@ 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/src/plot.tcl
++++ b/src/plot.tcl
+@@ -1197,12 +1197,12 @@
+ -font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
+
+ $var(graph) xaxis configure \
+- -grid $var(axis,x,grid) -logscale $var(axis,x,log) \
++ -logscale $var(axis,x,log) \
+ -title $var(axis,x,title) \
+ -tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
+ -titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+ $var(graph) yaxis configure \
+- -grid $var(axis,y,grid) -logscale $var(axis,y,log) \
++ -logscale $var(axis,y,log) \
+ -title $var(axis,y,title) \
+ -tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
+ -titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+--- a/src/plotbar.tcl
++++ b/src/plotbar.tcl
+@@ -149,8 +149,7 @@
+ -highlightthickness 0 \
+ ]
+
+- $var(graph) xaxis configure -grid no -stepsize 0
+- $var(graph) yaxis configure -grid yes
++ $var(graph) xaxis configure -stepsize 0
+
+ pack $var(graph) -expand yes -fill both
+ PlotChangeMode $varname
+--- a/src/scale.tcl
++++ b/src/scale.tcl
+@@ -292,9 +292,9 @@
+ ]
+
+ $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
+ set dscale(ydata) histY
diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
new file mode 100644
index 0000000..3308307
--- /dev/null
+++ b/debian/patches/ds9_support_blt.patch
@@ -0,0 +1,61 @@
+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
+@@ -58,10 +58,10 @@
+ $ds9(graph,horz) legend configure -hide yes
+ $ds9(graph,horz) crosshairs configure -color green
+
+- $ds9(graph,horz) xaxis configure -hide no -showticks no -bg $ds9(bg)
++ $ds9(graph,horz) xaxis configure -hide no -showticks no -background $ds9(bg)
+ $ds9(graph,horz) x2axis configure -hide yes
+ $ds9(graph,horz) yaxis configure -hide yes
+- $ds9(graph,horz) y2axis configure -hide no -bg $ds9(bg) \
++ $ds9(graph,horz) y2axis configure -hide no -background $ds9(bg) \
+ -tickfont [font actual TkDefaultFont]
+
+ $ds9(graph,horz) element create line1 -xdata graphHorzX -ydata graphHorzY \
+@@ -94,9 +94,9 @@
+
+ $ds9(graph,vert) xaxis configure -hide yes -descending yes
+ $ds9(graph,vert) x2axis configure -hide no -descending yes \
+- -showticks no -bg $ds9(bg)
++ -showticks no -background $ds9(bg)
+ $ds9(graph,vert) yaxis configure -hide no -descending yes \
+- -bg $ds9(bg) -tickfont [font actual TkDefaultFont]
++ -background $ds9(bg) -tickfont [font actual TkDefaultFont]
+ $ds9(graph,vert) y2axis configure -hide yes -descending yes
+
+ $ds9(graph,vert) element create line1 -xdata graphVertX -ydata graphVertY \
+@@ -127,11 +127,9 @@
+ 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) grid configure -hide 0
+
+- $ds9(graph,vert) x2axis configure -grid $pgraph(vert,grid)
+- $ds9(graph,vert) yaxis configure -grid $pgraph(vert,grid) -tickdefault 4
++ $ds9(graph,vert) grid configure -hide 0
+ }
+
+ proc UpdateGraphXAxis {which} {
+@@ -228,13 +226,13 @@
+ set yMax [expr $yMin + 1]
+ }
+
+- $what yaxis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
+- $what y2axis configure -min $yMin -max $yMax -logscale $log -tickdefault 4
++ $what yaxis configure -min $yMin -max $yMax -logscale $log
++ $what y2axis configure -min $yMin -max $yMax -logscale $log
+ } else {
+ $what yaxis configure -min $igraph(y,min) -max $igraph(y,max) \
+- -logscale $log -tickdefault 4
++ -logscale $log
+ $what y2axis configure -min $igraph(y,min) -max $igraph(y,max) \
+- -logscale $log -tickdefault 4
++ -logscale $log
+ }
+ }
+
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 358daa1..f17cbed 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -82,8 +82,8 @@ 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 \
-+ -ltcliis1.0 -ltkmpeg1.0 -ltkhtml -ltclcheckdns1.1 -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/tkblt3.0 -ltkblt3.0 \
-+ -lwcstools -lfuntools -ltk -ltcl -lz \
++ -ltcliis1.0 -ltkmpeg1.0 -ltkhtml -ltclcheckdns1.1 -Wl,-Bdynamic \
++ -lBLT -lwcstools -lfuntools -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
endif
@@ -120,28 +120,27 @@ Description: Compile against external libraries of wcstools, funtools, ast,
int Signal_ext_Init(Tcl_Interp*);
}
-@@ -123,7 +107,6 @@
+@@ -123,19 +107,6 @@
// Tk
if (Tk_Init(interp) == TCL_ERROR)
return TCL_ERROR;
- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
-
- // Tkblt
- if (Tkblt_Init(interp) == TCL_ERROR)
-@@ -131,12 +114,6 @@
- Tcl_StaticPackage(interp, "Tkblt", Tkblt_Init,
- (Tcl_PackageInitProc*)NULL);
-
+-
+- // Tkblt
+- if (Tkblt_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage(interp, "Tkblt", Tkblt_Init,
+- (Tcl_PackageInitProc*)NULL);
+-
- // Tktable
- if (Tktable_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
- (Tcl_PackageInitProc*)NULL);
--
+
// Tclcheckdns
if (Tclcheckdns_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-@@ -155,12 +132,6 @@
+@@ -155,12 +126,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
(Tcl_PackageInitProc*)NULL);
@@ -154,7 +153,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
// Tcliis
if (Tcliis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
-@@ -173,75 +144,5 @@
+@@ -173,75 +138,5 @@
Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
@@ -245,7 +244,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- saotkclean zvfsclean ds9clean srcclean \
- filesclean dirsclean
+distclean : filesclean \
-+ tkbltclean tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
++ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
@@ -253,7 +252,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/Makefile
+++ b/Makefile
-@@ -215,31 +215,8 @@
+@@ -215,32 +215,6 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -266,7 +265,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-tktableclean: FORCE
- $(MAKE) -C $(TKTABLEDIR) distclean
-
- tkbltclean: FORCE
+-tkbltclean: FORCE
- $(MAKE) -C $(TKBLTDIR) distclean
-
-zlibclean: FORCE
@@ -282,11 +281,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-
-libtiffclean: FORCE
- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
-+ $(MAKE) -C $(TKBLTDIR) distclean || true
-
+-
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -248,27 +225,12 @@
+
+@@ -248,27 +222,12 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
@@ -314,7 +313,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
$(MAKE) -C $(RICEDIR) distclean
-@@ -281,9 +243,6 @@
+@@ -281,9 +240,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -326,7 +325,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -202,32 +202,35 @@
+@@ -202,31 +202,34 @@
# so we can still find our files
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
@@ -351,6 +350,10 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- 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)/tkcon2.5/tkcon.tcl
+- source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
+- source $ds9(root)/tkblt3.0/graph.tcl
+ package require msgcat
+ package require http
+ package require xml
@@ -361,13 +364,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+ 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)/tkblt3.0/graph.tcl
-
++ package require BLT
++
+ package require Tktable
+ package require tclxpa
+ package require Signal
@@ -381,10 +382,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+ package require img::bmp
+ package require img::xbm
+ package require img::window
-+
+
source $ds9(root)/src/source.tcl
- set tkblt_library $ds9(root)/tkblt3.0
--- a/tcliis1.0/Makefile.in
+++ b/tcliis1.0/Makefile.in
@@ -80,7 +80,7 @@
diff --git a/debian/patches/tlt_fix_crash.patch b/debian/patches/saotk_fix_blt_crash.patch
similarity index 83%
rename from debian/patches/tlt_fix_crash.patch
rename to debian/patches/saotk_fix_blt_crash.patch
index 1950b74..e014969 100644
--- a/debian/patches/tlt_fix_crash.patch
+++ b/debian/patches/saotk_fix_blt_crash.patch
@@ -1,6 +1,5 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: BLT crashes when it reaches this code. This seems to be some
- remaining bug in the BLT-3.0 distributed with ds9. However; This fix is
+Author: Ole Streicher <olebole at debian.org>
+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.
@@ -83,14 +82,3 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
Matrix Marker::fwdMatrix()
---- a/tkblt3.0/configure.in
-+++ b/tkblt3.0/configure.in
-@@ -179,7 +179,7 @@
- # building as a shared library instead of a static library.
- #--------------------------------------------------------------------
-
--#TEA_ENABLE_SHARED
-+TEA_ENABLE_SHARED
-
- #--------------------------------------------------------------------
- # This macro figures out what flags to use with the compiler/linker
diff --git a/debian/patches/series b/debian/patches/series
index a759f60..b28e6b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,14 @@
checkdns.patch
htmlwidget.patch
iis.patch
-tlt_fix_crash.patch
+saotk_fix_blt_crash.patch
saotk_add_ksearch.patch
saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
saotk_fix_wcstools_includes.patch
saotk_fix_funtools_includes.patch
saotk_spellfix.patch
+ds9_support_blt.patch
ds9_use_external_libs.patch
ds9_make_linux.patch
ds9_use_filesystem.patch
diff --git a/debian/repack-dfsg.sh b/debian/repack.sh
similarity index 59%
rename from debian/repack-dfsg.sh
rename to debian/repack.sh
index 7bcb15a..091ddfc 100755
--- a/debian/repack-dfsg.sh
+++ b/debian/repack.sh
@@ -1,7 +1,6 @@
#!/bin/sh
# ./debian/repack
-# Repackage the DS9 source files as a DFSG tarball, with unnecessary
-# files removed.
+# Repackage the DS9 source files, with unnecessary files removed.
ver=$2
orig_tar=$3
@@ -13,7 +12,7 @@ tar xf $orig_tar -C $wd
srcdir=$wd/*
for subdir in funtools\* tcl8.\* tcllib-\* tk8.\* tkimg\* signal_ext\* \
- tktable\* tkcon-\* tclxml-\* wcssubs-\* xpa-\* blt\* \
+ tktable\* tkcon-\* tclxml-\* wcssubs-\* xpa-\* tkblt\* win \
zip-\* zlib-\* compilers ast-\* zvfs tkmacosx\* ; do
rm -rf $srcdir/$subdir
done
@@ -21,8 +20,8 @@ done
find $srcdir/ -name config.status |xargs rm -f
find $srcdir/ -name conf.h |xargs rm -f
-dfsg_tar=$tardir/saods9_$ver+dfsg.orig.tar.gz
-tar czf $dfsg_tar -C $wd .
+dfsg_tar=$tardir/saods9_$ver+repack.orig.tar.xz
+tar cJf $dfsg_tar -C $wd .
rm -rf $wd
-exec uupdate --no-symlink --upstream-version $ver+dfsg $dfsg_tar
+exec uupdate --no-symlink --upstream-version $ver+repack $dfsg_tar
diff --git a/debian/rules b/debian/rules
index 0230190..ce75eb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis rice hcompress plio xmlrpc tkblt saotk ds9
+BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis rice hcompress plio xmlrpc saotk ds9
get-orig-source:
- sh ./debian/repack-dfsg.sh
+ sh ./debian/repack.sh
%:
dh $@ --with autoreconf,autotools_dev
@@ -15,7 +15,6 @@ make.include:
override_dh_autoreconf:
(cd htmlwidget; autoreconf -i -f)
- (cd tkblt3.0; autoreconf -i -f)
(cd tkmpeg1.0; autoreconf -i -f)
(cd tcliis1.0; autoreconf -i -f)
(cd tclcheckdns1.1; autoreconf -i -f)
diff --git a/debian/saods9-blt.install b/debian/saods9-blt.install
deleted file mode 100644
index c93bf47..0000000
--- a/debian/saods9-blt.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libtkblt*.so /usr/lib/saods9/tkblt3.0
-tkblt3.0/library/*.tcl /usr/share/saods9/tkblt3.0
diff --git a/debian/saods9-data.install b/debian/saods9-data.install
index f1d67d8..8fc26cd 100644
--- a/debian/saods9-data.install
+++ b/debian/saods9-data.install
@@ -1,6 +1,6 @@
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/zipdir/zvfsmntpt/doc/sun.gif /usr/share/saods9
xmlrpc-0.3/xmlrpc.tcl /usr/share/saods9/src
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the debian-science-commits
mailing list