[Debian-astro-commits] [saods9] 03/07: Adjust for new version
Ole Streicher
olebole at moszumanska.debian.org
Tue Jul 21 12:49:46 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 405dd1760a8ef42a25c4001cebc3c3a75e71804c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Jul 21 11:30:22 2015 +0200
Adjust for new version
---
debian/changelog | 5 +-
debian/control | 4 +-
debian/copyright | 12 +--
debian/patches/ds9_make_linux.patch | 37 --------
debian/patches/ds9_use_shared_libs.patch | 102 +++------------------
debian/patches/ds9_use_tcltk_packages.patch | 107 ++++++++++------------
debian/patches/htmlwidget.patch | 42 ---------
debian/patches/iis.patch | 2 +-
debian/patches/saotk_add_ksearch.patch | 4 +-
debian/patches/saotk_add_psscale.patch | 8 +-
debian/patches/saotk_avoid_compile_warnings.patch | 20 ++--
debian/patches/saotk_fix_blt_crash.patch | 8 +-
debian/patches/saotk_spellfix.patch | 4 +-
debian/patches/saotk_use_system_libs.patch | 63 ++-----------
debian/patches/series | 1 -
debian/rules | 6 +-
debian/tk-sao.install | 1 +
debian/tk-saotk.install | 1 -
18 files changed, 108 insertions(+), 319 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 982227f..9dc53c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-saods9 (7.4~b4+repack-4) UNRELEASED; urgency=low
+saods9 (7.4~b5+repack-1) UNRELEASED; urgency=low
- * New package saotk
+ * New upstream beta version
+ * New package tk-sao
-- Ole Streicher <olebole at debian.org> Tue, 07 Jul 2015 20:18:24 +0200
diff --git a/debian/control b/debian/control
index 6ca7113..987de1b 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends: blt (>= 2.5.3),
tcl-xpa,
tcllib,
tclxml,
- tk-saotk,
+ tk-sao,
tk-table (>= 2.9),
tkcon,
${misc:Depends},
@@ -69,7 +69,7 @@ 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: tk-saotk
+Package: tk-sao
Architecture: any
Depends: blt (>= 2.5.3), ${misc:Depends}, ${shlibs:Depends}
Recommends: saods9-doc
diff --git a/debian/copyright b/debian/copyright
index 2ca608c..a236c9e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,9 +14,7 @@ Copyright: Copyright (C) 1999-2012 Smithsonian Astrophysical Observatory,
Copyright (c) 1997-2000 D. Richard Hipp
Copyright (C) 1984-2003 Free Software Foundation, Inc.
Comment: Some original authors:
- plio/: Doug Tody and Mike Fitzpatrick, NOAO
- iis/: Doug Tody, NOAO
- rice/: Richard White
+ tcliis*/: Doug Tody, NOAO
xmlrpc-0.3/: Eric Yeh
License: GPL
This program is free software: you can redistribute it and/or modify
@@ -89,7 +87,7 @@ License: sun-BSD
software in accordance with the terms specified in this
license.
-Files: saotk/util/fdstream.hpp
+Files: tksao*/util/fdstream.hpp
Copyright: (C) Copyright Nicolai M. Josuttis 2001.
License: Expat
Permission to copy, use, modify, sell and distribute this
@@ -98,7 +96,7 @@ License: Expat
or implied warranty, and with no claim as to its suitability
for any purpose.
-Files: saotk/util/FlexLexer.h
+Files: tksao*/util/FlexLexer.h
Copyright: Kent Williams and Tom Epperly.
License: BSD-2-clause
This code is derived from software contributed to Berkeley by
@@ -128,7 +126,7 @@ License: BSD-2-clause
since relicensed without the advertizing clause. Here, I only restate
the license included upstream.)
-Files: htmlwidget/src/*
+Files: tkhtml*/src/*
Copyright: Copyright (c) 1997-2000 D. Richard Hipp
License: LGPL
This library is free software; you can redistribute it and/or
@@ -157,6 +155,6 @@ License: public-domain
into the public domain.
.
Based on Justin's diff, the debianization is completely rewritten for
- the updstream version 6.2 by Ole Streicher <debian at liska.ath.cx>.
+ the upstream version 6.2 by Ole Streicher <debian at liska.ath.cx>.
Contributions came from the Gentoo packaging by Sebastien Fabbro
<bicatali at gentoo.org>.
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 4a2c632..ad60d7a 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -31,23 +31,6 @@ Description: Set the compile flags according to the Debian environment. We
+CCOPT = ${CFLAGS} ${CPPFLAGS} ${OPTS} ${AA}
+CCNOPT = ${CFLAGS} ${CPPFLAGS} ${NOPTS} ${AA}
---- a/Makefile.unix
-+++ b/Makefile.unix
-@@ -40,11 +40,11 @@
-
- tkhtml : $(HTMLDIR)
- @echo "Installing $@..."
-- cd $(HTMLDIR); CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
-+ cd $(HTMLDIR); CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' \
-+ CPPFLAGS='$(CPPFLAGS)' \
-+ LDFLAGS='$(LDFLAGS)' \
- $(root)/htmlwidget/configure \
- --x-includes=$(X11INCLUDE) --x-libraries=$(X11LIB) \
-- --with-tcl=$(root)/$(TCLDIR) \
-- --with-tk=$(root)/$(TKDIR) \
- --prefix $(root) --exec-prefix $(root) \
- --enable-shared=no
- $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
--- a/ds9/Makefile
+++ b/ds9/Makefile
@@ -9,7 +9,7 @@
@@ -59,26 +42,6 @@ Description: Set the compile flags according to the Debian environment. We
-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $(MAIN).c -o $@
$(MAIN).c : $(MAINDIR)/$(MAIN).c
---- a/htmlwidget/makemake.tcl.in
-+++ b/htmlwidget/makemake.tcl.in
-@@ -91,7 +91,7 @@
- global BEXE
- set n "${name}$BEXE"
- puts "$n: $src"
-- puts " @BUILD_CC@ @BUILD_CFLAGS@ -o $n $src $libs"
-+ puts " @BUILD_CC@ @CPPFLAGS@ @BUILD_CFLAGS@ @LDFLAGS@ -o $n $src $libs"
- puts ""
- global cleanable; lappend cleanable $n
- }
-@@ -196,7 +196,7 @@
- #
- proc MakeObj {name src {dep {}}} {
- set n $name
-- set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
-+ set cc "@TARGET_CC@ @CPPFLAGS@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
- append cc " @TARGET_X_INC@"
- append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
- puts "$n: $src $dep"
--- a/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
@@ -1,6 +1,6 @@
diff --git a/debian/patches/ds9_use_shared_libs.patch b/debian/patches/ds9_use_shared_libs.patch
index 6ad5c69..20997c2 100644
--- a/debian/patches/ds9_use_shared_libs.patch
+++ b/debian/patches/ds9_use_shared_libs.patch
@@ -30,9 +30,9 @@ Description: Link against shared libraries.
$(ZDIR)/template
LIBS = \
-- ../lib/$(SAOTKVER)/libsaotk1.0.a \
- ../lib/libtkhtml.a \
-- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+- ../lib/$(TKSAODIR)/libtksao1.0.a \
+ ../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
+ ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
- ../lib/$(TCLXMLVER)/libTclxml3.2.a \
- ../lib/$(TKTABLEVER)/libTktable2.10.a \
- ../lib/$(TKIMGVER)/libtkimgpng1.4.a \
@@ -50,13 +50,12 @@ Description: Link against shared libraries.
- ../lib/libast.a \
- ../lib/libast_err.a \
- ../lib/libast_pal.a \
- ../lib/$(SAOTKVER)/libsaotk1.0.a \
-- ../lib/libzvfs.a \
+ ../lib/$(TKSAODIR)/libtksao1.0.a \
+- ../lib/$(TCLZVFSDIR)/libtclzvfs1.0.a \
- ../lib/libxpa.a \
-+ ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
../lib/$(TCLIISDIR)/libtcliis1.0.a \
- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
-- ../lib/libsignal_ext.a \
+- ../lib/$(TCLSIGNALDIR)/libtclsignal1.4.a \
- ../lib/$(TKBLTDIR)/libtkblt3.0.a \
- ../lib/libtk8.6.a \
- ../lib/libtkstub8.6.a \
@@ -76,23 +75,23 @@ Description: Link against shared libraries.
- -lxml2 \
- -lz -lpthread
+ $(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o \
-+ -Wl,-Bstatic -L../lib -ltkhtml -Wl,-Bdynamic -ltk -ltcl \
++ -Wl,-Bstatic -L../lib/$(TKHTMLDIR)/ -ltkhtml1.0 -Wl,-Bdynamic -ltk -ltcl \
+ -L/usr/X11R6/lib -lX11
endif
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -50,13 +50,9 @@
- $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
- cp $(HTMLDIR)/libtkhtml.a lib/.
+@@ -29,13 +29,9 @@
+ --enable-symbols
+ $(MAKE) -C $(TKDIRDIR) -j $(JOBS) install
-distclean : tclclean tkclean \
- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
+- xpaclean tcliisclean tclcheckdnsclean tclsignalclean funtoolsclean \
- astclean \
-- saotkclean zvfsclean ds9clean \
+- tksaoclean tclzvfsclean ds9clean \
- srcclean filesclean dirsclean
+distclean : filesclean \
+ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
@@ -100,77 +99,6 @@ Description: Link against shared libraries.
#--------------------------distribution
---- a/Makefile
-+++ b/Makefile
-@@ -282,68 +282,21 @@
- find . -name "*stackdump*" -exec rm {} \;
- endif
-
--tclclean : FORCE
-- $(MAKE) -C $(TCLDIRDIR) distclean
--
--tkclean : FORCE
-- $(MAKE) -C $(TKDIRDIR) distclean
--
--astclean: FORCE
-- $(MAKE) -C $(ASTDIR) distclean
--
--funtoolsclean: FORCE
-- $(MAKE) -C $(FUNTOOLSDIR) distclean
--
- saotkclean : FORCE
- $(MAKE) -C $(SAOTKDIR) distclean
-
--signalclean : FORCE
-- $(MAKE) -C $(SIGNALDIR) distclean
--
- tclcheckdnsclean : FORCE
- $(MAKE) -C $(TCLCHECKDNSDIR) distclean
-
- tcliisclean : FORCE
- $(MAKE) -C $(TCLIISDIR) distclean
-
--tclxmlclean: FORCE
-- $(MAKE) -C $(TCLXMLDIR) distclean
--
--tktableclean: FORCE
-- $(MAKE) -C $(TKTABLEDIR) distclean
--
--tkbltclean: FORCE
-- $(MAKE) -C $(TKBLTDIR) distclean
--
- tkhtmlclean: FORCE
- rm -rf $(HTMLDIR)
-
--tkimgclean: libtiffclean
-- rm -fr $(TKIMGDIR)/Img/*
-- rm -fr lib/Img1.*
-- $(MAKE) -C $(TKIMGDIR) distclean
--
--libtiffclean: FORCE
-- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
--
--tkmacosxclean : FORCE
-- $(MAKE) -C $(TKMACOSXDIR) distclean
--
- tkmpegclean: FORCE
- $(MAKE) -C $(TKMPEGDIR) distclean
-
--tkwinclean : FORCE
-- $(MAKE) -C $(TKWINDIR) distclean
--
--xpaclean : FORCE
-- $(MAKE) -C $(XPADIR) distclean
--
--zlibclean: FORCE
-- $(MAKE) -C $(ZLIBDIR) distclean
--
--zvfsclean: FORCE
-- $(MAKE) -C $(ZVFSDIR) distclean
--
- srcclean : FORCE
- $(MAKE) -C $(SRCDIR) distclean
-
--- a/ds9/ds9.unix
+++ b/ds9/ds9.unix
@@ -18,31 +18,11 @@
@@ -180,7 +108,7 @@ Description: Link against shared libraries.
- int Tkblt_Init(Tcl_Interp*);
- int Tktable_Init(Tcl_Interp*);
int Tclcheckdns_Init(Tcl_Interp*);
- int Saotk_Init(Tcl_Interp*);
+ int Tksao_Init(Tcl_Interp*);
int Tkhtml_Init(Tcl_Interp*);
int Tkmpeg_Init(Tcl_Interp*);
-
@@ -212,7 +140,7 @@ Description: Link against shared libraries.
- // Tkblt
- if (Tkblt_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-- Tcl_StaticPackage(interp, "Tkblt", Tkblt_Init,
+- Tcl_StaticPackage(interp, "tkblt", Tkblt_Init,
- (Tcl_PackageInitProc*)NULL);
-
- // Tktable
@@ -238,7 +166,7 @@ Description: Link against shared libraries.
if (Tcliis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
@@ -141,75 +103,6 @@
- Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
+ Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
- // Tclxml
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 184cd0e..ec1ac98 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -6,12 +6,12 @@ Description: Don't load TclTk extensions as shared libs, but as packages
$(ZDIR)/template
LIBS = \
-- ../lib/libtkhtml.a \
-- ../lib/$(SAOTKVER)/libsaotk1.0.a \
+- ../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+- ../lib/$(TKSAODIR)/libtksao1.0.a \
- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a
-+ ../lib/libtkhtml.a
++ ../lib/$(TKHTMLDIR)/libtkhtml1.0.a
#--------------------------main
@@ -23,7 +23,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages
void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
-
- int Tclcheckdns_Init(Tcl_Interp*);
-- int Saotk_Init(Tcl_Interp*);
+- int Tksao_Init(Tcl_Interp*);
int Tkhtml_Init(Tcl_Interp*);
- int Tkmpeg_Init(Tcl_Interp*);
- int Tcliis_Init(Tcl_Interp*);
@@ -47,13 +47,13 @@ Description: Don't load TclTk extensions as shared libs, but as packages
- // Tclcheckdns
- if (Tclcheckdns_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "Tclcheckdns", Tclcheckdns_Init,
+- Tcl_StaticPackage (interp, "tclcheckdns", Tclcheckdns_Init,
- (Tcl_PackageInitProc*)NULL);
-
-- // Saotk
-- if (Saotk_Init(interp) == TCL_ERROR)
+- // Tksao
+- if (Tksao_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "saotk", Saotk_Init,
+- Tcl_StaticPackage (interp, "tksao", Tksao_Init,
- (Tcl_PackageInitProc*)NULL);
-
// Tkhtml
@@ -71,7 +71,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages
- // Tkmpeg
- if (Tkmpeg_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
+- Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
- (Tcl_PackageInitProc*)NULL);
-
-
@@ -83,7 +83,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages
package require tkcon
source $ds9(root)/src/xmlrpc.tcl
package require BLT
-+ package require saotk
++ package require tksao
+ package require tcliis
+ package require tclcheckdns
+ package require tkmpeg
@@ -92,34 +92,34 @@ Description: Don't load TclTk extensions as shared libs, but as packages
package require Signal
--- a/Makefile
+++ b/Makefile
-@@ -128,7 +128,7 @@
+@@ -130,7 +130,7 @@
./configure \
- $(WITHTCL) $(WITHTK) \
+ $(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
- --disable-shared \
+ --enable-shared \
--enable-symbols
- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
+ $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
-@@ -142,7 +142,7 @@
+@@ -140,7 +140,7 @@
./configure \
$(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
- --disable-shared \
+ --enable-shared \
--enable-symbols
- $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
+ $(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
-@@ -152,7 +152,7 @@
+@@ -150,7 +150,7 @@
./configure \
$(WITHTCL) \
--prefix $(root) --exec-prefix $(root) \
- --disable-shared \
+ --enable-shared \
--enable-symbols
- $(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
+ $(MAKE) -C $(TCLSIGNALDIR) install
-@@ -209,7 +209,7 @@
+@@ -225,7 +225,7 @@
./configure \
$(WITHTCL) $(WITHTK) \
--prefix $(root) --exec-prefix $(root) \
@@ -128,6 +128,15 @@ Description: Don't load TclTk extensions as shared libs, but as packages
--enable-symbols
$(MAKE) -C $(TKMPEGDIR) -j $(JOBS) install
+@@ -235,7 +235,7 @@
+ ./configure \
+ $(WITHTCL) $(WITHTK) \
+ --prefix $(root) --exec-prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+ $(MAKE) -C $(TKSAODIR) -j $(JOBS) install
+
--- a/tclcheckdns1.1/configure.in
+++ b/tclcheckdns1.1/configure.in
@@ -155,7 +155,7 @@
@@ -163,8 +172,8 @@ Description: Don't load TclTk extensions as shared libs, but as packages
SHLIB_LD_LIBS='${LIBS} -lstdc++'
#--------------------------------------------------------------------
---- a/saotk/configure.in
-+++ b/saotk/configure.in
+--- a/tksao1.0/configure.in
++++ b/tksao1.0/configure.in
@@ -375,7 +375,7 @@
# link against the non-stubbed Tcl library. Add Tk too if necessary.
#--------------------------------------------------------------------
@@ -174,41 +183,8 @@ Description: Don't load TclTk extensions as shared libs, but as packages
#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
SHLIB_LD_LIBS='${LIBS} -lstdc++'
---- a/tclcheckdns1.1/checkdns.C
-+++ b/tclcheckdns1.1/checkdns.C
-@@ -163,7 +163,7 @@
-
- Tcl_CreateObjCommand(interp, "checkdns", TclcheckdnsCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-- Tcl_PkgProvide(interp, "Tclcheckdns", "1.1");
-+ Tcl_PkgProvide(interp, "tclcheckdns", "1.1");
-
- return TCL_OK;
- }
---- a/tcliis1.0/iistcl.C
-+++ b/tcliis1.0/iistcl.C
-@@ -49,7 +49,7 @@
-
- // Define Package Name
-
-- if (Tcl_PkgProvide(interp, "Tcliis", "1.0") == TCL_ERROR)
-+ if (Tcl_PkgProvide(interp, "tcliis", "1.0") == TCL_ERROR)
- return TCL_ERROR;
-
- // Commands
---- a/tkmpeg1.0/tkmpeg.C
-+++ b/tkmpeg1.0/tkmpeg.C
-@@ -22,7 +22,7 @@
- int Tkmpeg_Init(Tcl_Interp* interp) {
-
- // Define Package Name
-- if (Tcl_PkgProvide(interp, "Tkmpeg", "1.0") == TCL_ERROR)
-+ if (Tcl_PkgProvide(interp, "tkmpeg", "1.0") == TCL_ERROR)
- return TCL_ERROR;
-
- // Commands
---- a/saotk/util/saotk.C
-+++ b/saotk/util/saotk.C
+--- a/tksao1.0/saotk.C
++++ b/tksao1.0/saotk.C
@@ -27,6 +27,7 @@
extern int PannerTrueColor_Init(Tcl_Interp*);
@@ -216,9 +192,9 @@ Description: Don't load TclTk extensions as shared libs, but as packages
+static Tcl_Interp *global_interp;
extern "C" {
- int Saotk_Init(Tcl_Interp* interp);
-@@ -90,6 +91,8 @@
- if (Tcl_PkgProvide(interp, "saotk", "1.0") == TCL_ERROR)
+ int Tksao_Init(Tcl_Interp* interp);
+@@ -91,6 +92,8 @@
+ if (Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION) != TCL_OK)
return TCL_ERROR;
+ global_interp = interp;
@@ -226,7 +202,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages
return TCL_OK;
}
-@@ -97,3 +100,10 @@
+@@ -98,3 +101,10 @@
{
return TCL_OK;
}
@@ -237,3 +213,16 @@ Description: Don't load TclTk extensions as shared libs, but as packages
+ Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
+}
+
+--- a/tkhtml1.0/configure.in
++++ b/tkhtml1.0/configure.in
+@@ -170,8 +170,8 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+-AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+
+ #--------------------------------------------------------------------
+ # This macro generates a line to use when building a library. It
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
deleted file mode 100644
index 7c5b3fc..0000000
--- a/debian/patches/htmlwidget.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Ole Streicher <launchpad-cpl at ole.ath.cx>
-Description: The configure script of htmklwidget does not find tk.tcl and tk.h
- because buggy search. This patch fixes this q&d directly in "configure".
- Since ds9.7 will have an updated htmlwidget, I guess it makes no sense to
- provide a general patch here.
---- a/htmlwidget/configure.in
-+++ b/htmlwidget/configure.in
-@@ -332,9 +332,6 @@
- else
- AC_MSG_RESULT(unknown)
- fi
--if test "$CYGWIN" != "yes"; then
-- AC_CYGWIN
--fi
- if test "$CYGWIN" = "yes"; then
- BUILD_EXEEXT=.exe
- else
-@@ -540,7 +537,7 @@
- cat > conftest.tcl <<\EOF
- regsub {^([A-Za-z]):/} [info library] {//\1/} out
- regsub {/tcl7.6} $out {tk4.2} out
-- regsub {/tcl([^/]*)} $out {/tk\1} out
-+ regsub {/tcl8([^/]*)} $out {/tk8\1} out
- puts -nonewline $out
- exit
- EOF
-@@ -613,11 +610,11 @@
- AC_CHECK_HEADER(tcl.h, [found=yes])
- fi
- if test "$found" = "no"; then
-- for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do
-- n=$dir/include/tcl.h
-- AC_CHECK_FILE($dir/include/tcl.h, found=yes)
-+ for dir in /usr/include /usr/include/tcl /usr/include/tcl8.* ; do
-+ n=$dir/tcl.h
-+ AC_CHECK_FILE($dir/tcl.h, found=yes)
- if test "$found" = "yes"; then
-- TARGET_TCL_INC="-I$dir/include"
-+ TARGET_TCL_INC="-I$dir"
- break
- fi
- done
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index 8e8ae00..20c5f22 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -14,7 +14,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->datain = datain;
--- a/tcliis1.0/xim.C
+++ b/tcliis1.0/xim.C
-@@ -19,7 +19,7 @@
+@@ -23,7 +23,7 @@
void iisIO(ClientData data, int mask)
{
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 4c12f7f..0ba19db 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -1,8 +1,8 @@
Author: Sergio Pascual <sergiopr at fedoraproject.org>
Description: Insert the "ksearchh" routine that was originated by Doub Mink
in wcssubs so that fitsImage.c will compile.
---- a/saotk/frame/fitsimage.C
-+++ b/saotk/frame/fitsimage.C
+--- a/tksao1.0/frame/fitsimage.C
++++ b/tksao1.0/frame/fitsimage.C
@@ -29,7 +29,97 @@
extern "C" {
FitsHead* wcshead = NULL;
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index d685c86..6bcf7f8 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -3,8 +3,8 @@ Description: The original code from ds9 uses a patched postscript code to allow
scaling. Since we use standard Tk, we cannor support this (postscript scaling
is silently ignored), but we need to support the global variable "psScale"
which Doug Mink hacked into to get the scaling.
---- a/saotk/widget/widget.C
-+++ b/saotk/widget/widget.C
+--- a/tksao1.0/widget/widget.C
++++ b/tksao1.0/widget/widget.C
@@ -5,6 +5,8 @@
#include "widget.h"
#include "util.h"
@@ -23,8 +23,8 @@ Description: The original code from ds9 uses a patched postscript code to allow
else
cc = Tk_GetColor(interp, tkwin, str);
---- a/saotk/util/tkpostscript.h
-+++ b/saotk/util/tkpostscript.h
+--- a/tksao1.0/util/tkpostscript.h
++++ b/tksao1.0/util/tkpostscript.h
@@ -13,7 +13,7 @@
#endif
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index bed449a..438f776 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -1,7 +1,7 @@
Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compile time warnings in the saotk subsystem
---- a/saotk/colorbar/cbgrid.C
-+++ b/saotk/colorbar/cbgrid.C
+--- a/tksao1.0/colorbar/cbgrid.C
++++ b/tksao1.0/colorbar/cbgrid.C
@@ -122,19 +122,19 @@
if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"")))
goto error;
@@ -36,8 +36,8 @@ Description: Avoid compile time warnings in the saotk subsystem
// and now create astGrid
astGrid2dPtr = this;
---- a/saotk/frame/fitsimage.C
-+++ b/saotk/frame/fitsimage.C
+--- a/tksao1.0/frame/fitsimage.C
++++ b/tksao1.0/frame/fitsimage.C
@@ -1170,7 +1170,7 @@
if (ast[0] && ast[ii]) {
AstFrameSet* dep = (AstFrameSet*)astCopy(ast[ii]);
@@ -108,8 +108,8 @@ Description: Avoid compile time warnings in the saotk subsystem
if (!astOK || chan == AST__NULL)
return NULL;
---- a/saotk/frame/grid25d.C
-+++ b/saotk/frame/grid25d.C
+--- a/tksao1.0/frame/grid25d.C
++++ b/tksao1.0/frame/grid25d.C
@@ -114,7 +114,7 @@
// and now create astGrid
astGrid25dPtr = this;
@@ -139,8 +139,8 @@ Description: Avoid compile time warnings in the saotk subsystem
astAddFrame(frameSet,AST__CURRENT,cmap,out);
return frameSet;
---- a/saotk/frame/grid2d.C
-+++ b/saotk/frame/grid2d.C
+--- a/tksao1.0/frame/grid2d.C
++++ b/tksao1.0/frame/grid2d.C
@@ -46,7 +46,7 @@
AstFrameSet* frameSet = NULL;
AstPlot* plot = NULL;
@@ -191,8 +191,8 @@ Description: Avoid compile time warnings in the saotk subsystem
return 1;
}
---- a/saotk/frame/grid3d.C
-+++ b/saotk/frame/grid3d.C
+--- a/tksao1.0/frame/grid3d.C
++++ b/tksao1.0/frame/grid3d.C
@@ -118,16 +118,16 @@
astSetI(wcs, "Base", idata);
diff --git a/debian/patches/saotk_fix_blt_crash.patch b/debian/patches/saotk_fix_blt_crash.patch
index 650e0eb..6b4c05a 100644
--- a/debian/patches/saotk_fix_blt_crash.patch
+++ b/debian/patches/saotk_fix_blt_crash.patch
@@ -3,8 +3,8 @@ Description: BLT crashes when it reaches this code. This fix is
pragmatic -- I will not guarantee that this is not a memore hole.
I would very much appreciate if someone could review this and provide
a better fix.
---- a/saotk/frame/frblt.C
-+++ b/saotk/frame/frblt.C
+--- a/tksao1.0/frame/frblt.C
++++ b/tksao1.0/frame/frblt.C
@@ -947,7 +947,7 @@
if (Blt_GetVector(interp, xname, &xv) != TCL_OK)
goto error;
@@ -23,8 +23,8 @@ Description: BLT crashes when it reaches this code. This fix is
TCL_OK)
goto error;
---- a/saotk/frame/marker.C
-+++ b/saotk/frame/marker.C
+--- a/tksao1.0/frame/marker.C
++++ b/tksao1.0/frame/marker.C
@@ -1258,19 +1258,19 @@
{
Blt_Vector* xx;
diff --git a/debian/patches/saotk_spellfix.patch b/debian/patches/saotk_spellfix.patch
index e69a1b8..4b6ae34 100644
--- a/debian/patches/saotk_spellfix.patch
+++ b/debian/patches/saotk_spellfix.patch
@@ -1,7 +1,7 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Spellfix; however this is unused at the end.
---- a/saotk/frame/ds9parser.C
-+++ b/saotk/frame/ds9parser.C
+--- a/tksao1.0/frame/ds9parser.C
++++ b/tksao1.0/frame/ds9parser.C
@@ -1022,7 +1022,7 @@
"start", "commands", "command", "@1", "@2", "@3", "hash", "@4",
"comment", "@5", "shapeComment", "@6", "@7", "nonshapeComment", "@8",
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index b7eb151..40e260b 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -1,54 +1,7 @@
Author: Ole Streicher <olebole at debian.org>
Description: Compile against system library wcstools
---- a/saotk/Makefile.org
-+++ b/saotk/Makefile.org
-@@ -7,7 +7,7 @@
-
- CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
-
--DIRS = widget frame colorbar panner magnifier vector list fitsy++ util wcssubs
-+DIRS = widget frame colorbar panner magnifier vector list fitsy++ util
-
- OBJS = \
- widget/*.o \
-@@ -18,8 +18,7 @@
- vector/*.o \
- list/*.o \
- fitsy++/*.o \
-- util/*.o \
-- wcssubs/*.o
-+ util/*.o
-
- LIB = libsaotk.a
-
-@@ -62,9 +61,6 @@
- util : FORCE
- cd util; $(MAKE)
-
--wcssubs : FORCE
-- cd wcssubs; $(MAKE)
--
- clean : FORCE
- cd frame; $(MAKE) clean
- cd colorbar; $(MAKE) clean
-@@ -75,7 +71,6 @@
- cd list; $(MAKE) clean
- cd fitsy++; $(MAKE) clean
- cd util; $(MAKE) clean
-- cd wcssubs; $(MAKE) clean
-
- distclean : FORCE
- rm -f *.o *.a *.so
-@@ -88,7 +83,6 @@
- cd list; $(MAKE) distclean
- cd fitsy++; $(MAKE) distclean
- cd util; $(MAKE) distclean
-- cd wcssubs; $(MAKE) distclean
-
- parsers : FORCE
- cd frame; $(MAKE) parsers
---- a/saotk/configure.in
-+++ b/saotk/configure.in
+--- a/tksao1.0/configure.in
++++ b/tksao1.0/configure.in
@@ -266,25 +266,6 @@
util/util.C
vector/vector.C
@@ -84,8 +37,8 @@ Description: Compile against system library wcstools
#--------------------------------------------------------------------
# This macro generates a line to use when building a library. It
---- a/saotk/frame/fitsimage.h
-+++ b/saotk/frame/fitsimage.h
+--- a/tksao1.0/frame/fitsimage.h
++++ b/tksao1.0/frame/fitsimage.h
@@ -10,7 +10,7 @@
#include "fitsdata.h"
#include "coord.h"
@@ -95,8 +48,8 @@ Description: Compile against system library wcstools
#include "head.h"
#include "smooth.h"
---- a/saotk/fitsy++/hist.C
-+++ b/saotk/fitsy++/hist.C
+--- a/tksao1.0/fitsy++/hist.C
++++ b/tksao1.0/fitsy++/hist.C
@@ -13,8 +13,8 @@
#include "hist.h"
#include "util.h"
@@ -108,8 +61,8 @@ Description: Compile against system library wcstools
#ifdef __CYGWIN__
// limit size, cygwin pipe to 64K / (4 args x 4 bytes)
---- a/saotk/fitsy++/hpx.C
-+++ b/saotk/fitsy++/hpx.C
+--- a/tksao1.0/fitsy++/hpx.C
++++ b/tksao1.0/fitsy++/hpx.C
@@ -18,7 +18,7 @@
#include "hpx.h"
#include "util.h"
diff --git a/debian/patches/series b/debian/patches/series
index 184275c..21244bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,5 +12,4 @@ saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
saotk_use_system_libs.patch
saotk_spellfix.patch
-htmlwidget.patch
iis.patch
diff --git a/debian/rules b/debian/rules
index f63b317..fabff6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis saotk ds9
+BUILDPARTS:=dirs tclcheckdns tkmpeg tkhtml tcliis tksao ds9
get-orig-source:
sh ./debian/repack.sh
@@ -14,11 +14,11 @@ make.include:
ln -sf make.linux make.include
override_dh_autoreconf:
- (cd htmlwidget; 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 saotk; autoreconf -i -f)
+ (cd tksao1.0; autoreconf -i -f)
override_dh_auto_build: make.include
dh_auto_build -- $(BUILDPARTS)
diff --git a/debian/tk-sao.install b/debian/tk-sao.install
new file mode 100644
index 0000000..82f6cd9
--- /dev/null
+++ b/debian/tk-sao.install
@@ -0,0 +1 @@
+lib/tksao* /usr/lib/tcltk/
diff --git a/debian/tk-saotk.install b/debian/tk-saotk.install
deleted file mode 100644
index 2e314db..0000000
--- a/debian/tk-saotk.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/saotk* /usr/lib/tcltk/
--
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