[skycat] 01/01: Initial Debian files
Ole Streicher
olebole-guest at alioth.debian.org
Fri Aug 9 11:51:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository skycat.
commit a73f70572eb8fb41da65f59bdaf4ad6bc1e3eb3c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Aug 9 13:51:08 2013 +0200
Initial Debian files
---
debian/README.debian | 5 +
debian/changelog | 5 +
debian/clean | 13 +
debian/compat | 1 +
debian/control | 32 ++
debian/copyright | 43 +++
debian/patches/fhs.patch | 304 +++++++++++++++++
debian/patches/fix_build_problems.patch | 99 ++++++
debian/patches/remove_tclx.patch | 194 +++++++++++
debian/patches/series | 3 +
debian/patches/use_std_blt.patch | 568 +++++++++++++++++++++++++++++++
debian/rules | 12 +
debian/skycat.spec | 102 ++++++
debian/source/format | 1 +
debian/watch | 9 +
15 files changed, 1391 insertions(+)
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 0000000..f6917f4
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,5 @@
+This package is based on the Starlink version of skycat which is a fork of the
+ESO version. ESO has has confirmed that they will do only minimal maintenance
+on their version. Therefore the ESO version is sticked to Tcl 8.4.
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 07 Aug 2013 14:28:13 +0200
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ed5924f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+skycat (3.1.2+starlink1~b-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #719116)
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 15 May 2013 12:30:33 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..2512849
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,13 @@
+Makefile
+config.log
+config.status
+tclutil/config.log
+confdefs.h
+astrotcl/library/tclIndex
+cat/library/tclIndex
+skycat/library/tclIndex
+skycat/linux/skycat.spec
+skycat/skycat
+tclutil/library/tclIndex
+rtd/library/tclIndex
+tclutil/tShellCommand
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..63e3bd2
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: skycat
+Section: science
+Priority: optional
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Ole Streicher <debian at liska.ath.cx>
+Build-Depends: blt-dev (>= 2.4z),
+ debhelper (>= 9),
+ dh-autoreconf,
+ itcl3,
+ itk3,
+ libcfitsio3-dev,
+ tcl-dev (>= 8.5),
+ tk-dev (>= 8.5)
+Standards-Version: 3.9.4
+Homepage: http://archive.eso.org/cms/tools-documentation/skycat.html
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/skycat.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/skycat.git
+
+Package: skycat
+Architecture: any
+Depends: blt (>= 2.4z),
+ itcl3,
+ itk3,
+ libtk-img,
+ tcl (>= 8.5),
+ tclx8.4,
+ tk (>= 8.5),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Image visualization and access to catalogs and data for astronomy
+ SkyCat is a tool that combines visualization of images and access to catalogs
+ and archive data for astronomy.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..91d53a1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,43 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: skycat
+Upstream-Contact: archive at eso.org
+Source: https://github.com/Starlink/skycat/releases
+
+Files: *
+Copyright: 1995-2009 European Southern Observatory (ESO),
+ 1994 Allan Brighton (abrighto at eso.org)
+ 1989-2007 Smithsonian Astrophysical Observatory
+ 1984-1991 Free Software Foundation, Inc.
+ 1991-1994 The Regents of the University of California.
+ 1992-1993 Jean-loup Gailly
+ 1993 Association of Universities for Research
+ 1994-1995 Sun Microsystems, Inc.
+ 1995-2002 Mark Calabretta
+ 1998-2005 Central Laboratory of the Research Councils.
+ 1998-1999 by Scriptics Corporation.
+ 1999-2000 Ajuba Solutions.
+ 2002-2005 ActiveState Corporation.
+ 2006, 2008 Junio C Hamano
+ 2006 Particle Physics & Astronomy Research Council.
+ 1994-2006 Associated Universities, Inc. Washington DC, USA.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Copyright: 2013 Ole Streicher <debian at liska.ath.cx>
+License: GPL-2+
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/fhs.patch b/debian/patches/fhs.patch
new file mode 100644
index 0000000..084ee39
--- /dev/null
+++ b/debian/patches/fhs.patch
@@ -0,0 +1,304 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Change the paths so that they correspond to the FHS.
+ Also remove the "-star" suffix from the executable.
+--- a/skycat/Makefile.in
++++ b/skycat/Makefile.in
+@@ -22,7 +22,7 @@
+ #SAMPLE_NEW_VAR = @SAMPLE_NEW_VAR@
+
+ # Install these scripts
+-PROGS = skycat-star
++PROGS = skycat
+
+ # Testing applications
+ TEST_APPS =
+@@ -84,8 +84,8 @@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datadir@
++libdir = @libdir@/skycat
++datadir = @datadir@/skycat
+ mandir = @mandir@
+ includedir = @includedir@
+
+@@ -112,6 +112,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
++LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+@@ -211,7 +212,7 @@
+
+ # Scripts created by configure depend on their .in files and config.status
+ # (since they are cleaned).
+-skycat-star: skycat-star.in config.status
++skycat: skycat.in config.status
+ ./config.status
+
+ #========================================================================
+@@ -346,6 +347,7 @@
+ #========================================================================
+
+ install-lib-binaries: binaries
++ @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir)
+ @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir)
+ @list='$(lib_BINARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -375,8 +377,8 @@
+ for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ destp=`basename $$p`; \
+- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
++ echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
+ fi; \
+ done
+ @if test "x$(SHARED_BUILD)" = "x1"; then \
+@@ -447,7 +449,7 @@
+ # Generate the skycat release
+ #========================================================================
+ SKYCAT_FILES = \
+- bin/skycat-star \
++ bin/skycat \
+ bin/rtd \
+ bin/rtdServer \
+ bin/tRtd \
+--- a/cat/Makefile.in
++++ b/cat/Makefile.in
+@@ -88,8 +88,8 @@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datadir@
++libdir = @libdir@/skycat
++datadir = @datadir@/skycat
+ mandir = @mandir@
+ includedir = @includedir@
+
+@@ -116,6 +116,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
++LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+@@ -346,6 +347,7 @@
+ #========================================================================
+
+ install-lib-binaries: binaries
++ @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir)
+ @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir)
+ @list='$(lib_BINARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -375,8 +377,8 @@
+ for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ destp=`basename $$p`; \
+- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
++ echo " Install $$destp $(DESTDIR)$(pkdatadir)/$$destp"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
+ fi; \
+ done
+ @if test "x$(SHARED_BUILD)" = "x1"; then \
+--- a/astrotcl/Makefile.in
++++ b/astrotcl/Makefile.in
+@@ -78,8 +78,8 @@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datadir@
++libdir = @libdir@/skycat
++datadir = @datadir@/skycat
+ mandir = @mandir@
+ includedir = @includedir@
+
+@@ -106,6 +106,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result test.fits* tmp.fits *.tmp *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
++LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+ MAKE_LIB = @MAKE_LIB@
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+@@ -336,6 +337,7 @@
+ #========================================================================
+
+ install-lib-binaries: binaries
++ @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir)
+ @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir)
+ @list='$(lib_BINARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -364,8 +366,8 @@
+ @list='$(PKG_TCL_SOURCES) library/tclIndex'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ destp=`basename $$p`; \
+- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
++ echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
+ fi; \
+ done
+ @if test "x$(SHARED_BUILD)" = "x1"; then \
+--- a/tclutil/Makefile.in
++++ b/tclutil/Makefile.in
+@@ -80,8 +80,8 @@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datadir@
++libdir = @libdir@/skycat
++datadir = @datadir@/skycat
+ mandir = @mandir@
+ includedir = @includedir@
+
+@@ -108,6 +108,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.result *.tmp *.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
++LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+ MAKE_LIB = @MAKE_LIB@
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+@@ -338,6 +339,7 @@
+ #========================================================================
+
+ install-lib-binaries: binaries
++ @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir)
+ @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir)
+ @list='$(lib_BINARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -367,8 +369,8 @@
+ for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ destp=`basename $$p`; \
+- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
++ echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
+ fi; \
+ done
+ @if test "x$(SHARED_BUILD)" = "x1"; then \
+--- a/rtd/Makefile.in
++++ b/rtd/Makefile.in
+@@ -95,8 +95,8 @@
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
+-libdir = @libdir@
+-datadir = @datadir@
++libdir = @libdir@/skycat
++datadir = @datadir@/skycat
+ mandir = @mandir@
+ includedir = @includedir@
+
+@@ -123,6 +123,7 @@
+ CLEANFILES = @CLEANFILES@ $(TEST_APPS) *.o tests/*.o
+ EXEEXT = @EXEEXT@
+ LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@
++LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+ MAKE_LIB = @MAKE_LIB@ $(MERGE_OBJECTS)
+ MAKE_SHARED_LIB = @MAKE_SHARED_LIB@
+ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
+@@ -357,6 +358,7 @@
+ #========================================================================
+
+ install-lib-binaries: binaries
++ @test -d $(DESTDIR)$(pkgdatadir) || mkdir -p $(DESTDIR)$(pkgdatadir)
+ @test -d $(DESTDIR)$(pkglibdir) || mkdir -p $(DESTDIR)$(pkglibdir)
+ @list='$(lib_BINARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+@@ -386,8 +388,8 @@
+ for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ destp=`basename $$p`; \
+- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
++ echo " Install $$destp $(DESTDIR)$(pkgdatadir)/$$destp"; \
++ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$destp; \
+ fi; \
+ done
+ @if test "x$(SHARED_BUILD)" = "x1"; then \
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
+@@ -673,6 +673,7 @@
+ AC_SUBST(TCL_DBGX)
+ AC_SUBST(CFLAGS_DEFAULT)
+ AC_SUBST(LDFLAGS_DEFAULT)
++ AC_SUBST(LD_SEARCH_FLAGS)
+
+ if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
+ AC_DEFINE(TCL_MEM_DEBUG, 1, [Is memory debugging enabled?])
+@@ -1353,8 +1354,8 @@
+ SHLIB_LD="${CXX} -shared"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ LDFLAGS="$LDFLAGS -Wl,--export-dynamic -Wl,-soname,lib${PACKAGE_NAME}${PACKAGE_VERSION}.so"
++ LD_SEARCH_FLAGS='-Wl,-rpath,${libdir}'
+ else
+ AC_CHECK_HEADER(dld.h, [
+ SHLIB_LD="ld -shared"
+@@ -3176,7 +3177,7 @@
+ MAKE_STUB_LIB="\${STLIB_LD} -out:\[$]@ \$(PKG_STUB_OBJECTS)"
+ else
+ MAKE_STATIC_LIB="\${STLIB_LD} \[$]@ \$(PKG_OBJECTS)"
+- MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${LDFLAGS_DEFAULT} \${SHLIB_LD_LIBS}"
++ MAKE_SHARED_LIB="\${SHLIB_LD} -o \[$]@ \$(PKG_OBJECTS) \${LD_SEARCH_FLAGS} \${LDFLAGS_DEFAULT} \${SHLIB_LD_LIBS}"
+ MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \$(PKG_STUB_OBJECTS)"
+ fi
+
+--- a/skycat/skycat.in
++++ b/skycat/skycat.in
+@@ -22,7 +22,7 @@
+ SKYCAT_BASE=`(cd $DIR; pwd)`
+
+ # If we're NOT ssh'd in
+-if [ ! ${SSH_TTY} ]; then
++if [ ! "${SSH_TTY}" ]; then
+ # make sure X is running (on Mac OS X)
+ if [ `uname` = "Darwin" ] ; then
+ if [ "`ps -x | awk '{print $5}' | grep X11`" = "" ]; then
+@@ -40,12 +40,8 @@
+ fi
+ fi
+
+-# Make sure we can find the shared libs
+- at LD_LIBRARY_PATH_VAR@="$SKYCAT_BASE/lib:@BLT_LIB_DIR@:${@LD_LIBRARY_PATH_VAR@}"
+-export @LD_LIBRARY_PATH_VAR@
+-
+-# and the Tcl packages
+-TCLLIBPATH="$SKYCAT_BASE/lib"
++# Make sure we can find the Tcl packages
++TCLLIBPATH="/usr/lib/skycat /usr/share/skycat"
+ export TCLLIBPATH
+
+ # Make sure we start the correct wish binary
+@@ -54,5 +50,5 @@
+
+ test -d $HOME/.skycat || mkdir $HOME/.skycat
+ echo "`date`: Starting skycat with: $0 ${1+"$@"}" > $HOME/.skycat/log
+-exec wish8.4 $SKYCAT_BASE/lib/skycat at PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
++exec wish8.5 /usr/share/skycat/skycat at PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee -a $HOME/.skycat/log 2>&1
+
+--- a/skycat/configure.in
++++ b/skycat/configure.in
+@@ -239,6 +239,6 @@
+ # You may alternatively have a special pkgIndex.tcl.in or other files
+ # which require substituting th AC variables in. Include these here.
+ #--------------------------------------------------------------------
+-AC_OUTPUT([Makefile pkgIndex.tcl skycatConfig.sh skycat-star skycat_version.tcl linux/skycat.spec])
++AC_OUTPUT([Makefile pkgIndex.tcl skycatConfig.sh skycat skycat_version.tcl linux/skycat.spec])
+
+-chmod ugo+rx skycat-star
++chmod ugo+rx skycat
diff --git a/debian/patches/fix_build_problems.patch b/debian/patches/fix_build_problems.patch
new file mode 100644
index 0000000..8fc45c3
--- /dev/null
+++ b/debian/patches/fix_build_problems.patch
@@ -0,0 +1,99 @@
+Author: Joseph Wang <joequant at gmail.com>
+Description: Fix build problems. Adopted from the Mageia package.
+--- a/rtd/Makefile.in
++++ b/rtd/Makefile.in
+@@ -447,13 +447,13 @@
+ $(AR) r $@ $(RTDEVT_OBJ)
+ $(RANLIB_STUB) $@
+
+-$(RTD_SERVER): $(RTD_SERVER_OBJS)
++$(RTD_SERVER): $(RTD_SERVER_OBJS) $(RTDEVT_LIB)
+ $(CXXCOMPILE) -o $@ $(RTD_SERVER_OBJS) $(RTDEVT_LIB) @LIBS@
+
+-rtdClient: rtdClient.o
++rtdClient: rtdClient.o $(RTDEVT_LIB)
+ $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
+
+-rtdCubeDisplay: rtdCubeDisplay.o
++rtdCubeDisplay: rtdCubeDisplay.o $(RTDEVT_LIB)
+ $(CXXCOMPILE) -o $@ $? $(RTDEVT_LIB) @LIBS@
+
+ #========================================================================
+@@ -469,15 +469,18 @@
+ #========================================================================
+ test: binaries libraries $(TEST_APPS)
+
+-tImageEvent: tImageEvent.o
++tImageEvent: tImageEvent.o $(RTDEVT_LIB)
+ $(CXXCOMPILE) -o $@ $@.o $(RTDEVT_LIB) @LIBS@
+
+-trtdRemote: trtdRemote.o
++trtdRemote: trtdRemote.o $(RTD_REMOTE_LIB)
+ $(COMPILE) -o $@ $@.o $(RTD_REMOTE_LIB) @LIBS@
+
++# put libs before TK so that the libpath from TK does not override
++# the libpath for the local shared libraries in $LIBS
+ tRtd: tRtd.o tRtdEvt.o tRtdEvtData.o
+ $(CXXCOMPILE) -o $@ $@.o tRtdEvt.o tRtdEvtData.o \
+- @rtd_BUILD_LIB_SPEC@ @TK_LIB_SPEC@ @TCL_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS}
++ @rtd_BUILD_LIB_SPEC@ ${LDFLAGS_DEFAULT} ${LIBS} @TK_LIB_SPEC@ @TCL_LIB_SPEC@
++
+
+ #========================================================================
+ # Run Tcl test cases
+--- a/rtd/configure.in
++++ b/rtd/configure.in
+@@ -127,7 +127,7 @@
+ if test -f $TK_SRC_DIR/generic/tkCanvas.h ; then
+ AC_DEFINE(HAVE_TKCANVAS_H, 1,
+ [See if we can include tkCanvas.h, an internal tk header])
+- TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic])
++ TEA_ADD_INCLUDES([-I$TK_SRC_DIR/generic -I$TCL_SRC_DIR/generic])
+ fi
+
+ #--------------------------------------------------------------------
+--- a/rtd/generic/tkCanvasPsImage.c
++++ b/rtd/generic/tkCanvasPsImage.c
+@@ -35,6 +35,9 @@
+
+ #include <stdio.h>
+ #ifdef HAVE_TKCANVAS_H
++/* work around compile problems on 32-bit linux */
++#undef HAVE_TYPE_OFF64_T
++#undef HAVE_STRUCT_STAT64
+ #include "tclInt.h"
+ #include "tkCanvas.h"
+ #else
+@@ -75,8 +78,8 @@
+ {
+ /* Need to access the Tk Image type and supercede the Postscript
+ * command. */
+- Tk_ItemType *tkImageType = getTkImageType();
+- tkImageType->postscriptProc = RtdImageToPostscript;
++ /* Tk_ItemType *tkImageType = getTkImageType();
++ tkImageType->postscriptProc = RtdImageToPostscript; */
+ }
+
+ /*
+--- a/astrotcl/aclocal.m4
++++ b/astrotcl/aclocal.m4
+@@ -162,14 +162,17 @@
+ done
+ if test -z "$CFITSIO_LIB_DIR" ; then
+ echo
+- AC_MSG_ERROR([could not find $CFITSIO_LIBNAME: Please use the --with-cfitsio=DIR option.])
+ fi
+ else
+ # Just assume the given value will work. This may not be true if
+ # CFITSIO itself isn't built yet, so allow the flexibility.
+ CFITSIO_LIB_DIR=$CFITSIO_LIB_DIR/lib
+ fi
+- CFITSIO_LIB_SPEC="-L$CFITSIO_LIB_DIR $CFITSIO_LIBFLAG"
++ if test "$CFITSIO_LIB_DIR" ; then
++ CFITSIO_LIB_SPEC="-L$CFITSIO_LIB_DIR $CFITSIO_LIBFLAG"
++ else
++ CFITSIO_LIB_SPEC="$CFITSIO_LIBFLAG"
++ fi
+ AC_MSG_RESULT($CFITSIO_LIB_DIR)
+ AC_SUBST(CFITSIO_LIB_DIR)
+ AC_SUBST(CFITSIO_LIB_SPEC)
diff --git a/debian/patches/remove_tclx.patch b/debian/patches/remove_tclx.patch
new file mode 100644
index 0000000..253021a
--- /dev/null
+++ b/debian/patches/remove_tclx.patch
@@ -0,0 +1,194 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Remove Tclx dependency
+ The package seems to have only little dependencies of tclx. Since
+ Tclx is not available for tcl8.5 and up, the depenency is removed.
+Note: We still require to handle pipe and fork, so this has to wait until 8.6 is
+ standard.
+--- a/astrotcl/library/AstrotclInit.tcl
++++ b/astrotcl/library/AstrotclInit.tcl
+@@ -15,7 +15,7 @@
+ package require Tclutil
+ package require Tclx
+
+-if {![lcontain $auto_path $astrotcl_library]} {
++if { $auto_path ni $astrotcl_library } {
+ lappend auto_path $astrotcl_library
+ }
+
+--- a/cat/library/CatInit.tcl
++++ b/cat/library/CatInit.tcl
+@@ -14,7 +14,7 @@
+ package require Tclutil
+ package require Astrotcl
+
+-if {![lcontain $auto_path $cat_library]} {
++if { $auto_path ni $cat_library } {
+ lappend auto_path $cat_library
+ }
+
+--- a/rtd/library/Rtd.tcl
++++ b/rtd/library/Rtd.tcl
+@@ -650,7 +650,7 @@
+ set t6 "Tcl version:\t[info patchlevel]"
+ set t7 "Tcl package path:\t$tcl_pkgPath"
+ set t8 "Package versions:\t"
+- foreach el "Tclx Itcl Itk Tkx BLT" {
++ foreach el "Itcl Itk BLT" {
+ set t8 "$t8$el[package versions $el] "
+ }
+ DialogWidget $w_.rtd_about \
+--- a/rtd/library/RtdInit.tcl
++++ b/rtd/library/RtdInit.tcl
+@@ -14,7 +14,7 @@
+ package require Tclutil
+ package require Astrotcl
+
+-if {![lcontain $auto_path $rtd_library]} {
++if { $auto_path ni $rtd_library} {
+ lappend auto_path $rtd_library
+ }
+
+--- a/rtd/util/rmipc.tcl
++++ b/rtd/util/rmipc.tcl
+@@ -20,7 +20,7 @@
+ }
+ set f [open "|ipcs $opt"]
+ while {[gets $f line] != -1} {
+- if { ![lcontain $line $env(USER)]} { continue }
++ if { $line ni $env(USER) } { continue }
+ set num [lindex $line 1]
+ if {![catch {expr $num}]} {
+ if {[catch {exec ipcrm $opt $num} msg]} {
+--- a/skycat/library/SkycatInit.tcl
++++ b/skycat/library/SkycatInit.tcl
+@@ -15,9 +15,11 @@
+ package require Astrotcl
+ package require Cat
+
+-if {![lcontain $auto_path $skycat_library]} {
++if { $auto_path ni $skycat_library } {
+ lappend auto_path $skycat_library
+ }
+
+ namespace eval skycat {namespace export *}
+ namespace import -force skycat::*
++namespace import ::tcl::mathfunc::max
++namespace import ::tcl::mathfunc::min
+--- a/tclutil/library/TclutilInit.tcl
++++ b/tclutil/library/TclutilInit.tcl
+@@ -16,9 +16,8 @@
+
+ package require Itcl
+ package require Itk
+-package require Tclx
+
+-if {![lcontain $auto_path $tclutil_library]} {
++if {$auto_path ni $tclutil_library} {
+ lappend auto_path $tclutil_library
+ }
+
+--- a/tclutil/library/itcldoc.tcl
++++ b/tclutil/library/itcldoc.tcl
+@@ -36,7 +36,6 @@
+ # A.Brighton 07 Jan 98 created
+
+ package require Itcl
+-package require Tclx
+
+ itcl::class ItclDoc {
+
+--- a/rtd/library/RtdImageBias.tcl
++++ b/rtd/library/RtdImageBias.tcl
+@@ -10,6 +10,12 @@
+
+ itk::usual RtdImageBias {}
+
++# see http://wiki.tcl.tk/2028
++proc lvarpush {var val {ndx end}} {
++ upvar $var args
++ set args [linsert $args $ndx $val]
++}
++
+ # RtdImageBias is a class for controlling the subtraction of
+ # a bias frame.
+
+--- a/rtd/library/RtdImageFitsHeader.tcl
++++ b/rtd/library/RtdImageFitsHeader.tcl
+@@ -160,7 +160,7 @@
+ set tconfig_(sort_cols) $sort_cols
+ set tconfig_(sort_order) $sort_order
+
+- loop i 0 $num_hdus_ {
++ for {set i 0} {$i > $num_hdus_} {incr i} {
+ $tabnotebook_(table$i) config -sort_cols $sort_cols \
+ -sort_order $sort_order
+ $tabnotebook_(table$i) new_info
+@@ -173,7 +173,7 @@
+ global $var
+ set val [set $var]
+ set tconfig_($label) $val
+- loop i 0 $num_hdus_ {
++ for {set i 0} {$i > $num_hdus_} {incr i} {
+ $tabnotebook_(table$i) set_option $label Show $val
+ $tabnotebook_(table$i) new_info
+ }
+@@ -220,7 +220,7 @@
+
+ set length [string length [$listbox get 0]]
+
+- loop n $start_idx $end_idx {
++ for {set n $start_idx} {$n > $end_idx} {incr n} {
+ set row [string tolower [$listbox get $n]]
+ if {[catch {regexp -indices $string $row indices} idx] } { continue }
+ if { $idx > 0 } {
+@@ -278,7 +278,7 @@
+ set hlist [$image_ hdu list]
+
+ set ExtName "HDU 1"
+- loop i 0 $hdu_count {
++ for {set i 0} {$i > $hdu_count} {incr i} {
+ set hdu [expr {$i + 1}]
+ set list [lindex $hlist $i]
+
+--- a/rtd/library/RtdImageHduChooser.tcl
++++ b/rtd/library/RtdImageHduChooser.tcl
+@@ -443,7 +443,7 @@
+
+ private method svinfo {} {
+ set list [array get ext_ *NAXIS*]
+- loop i 0 [llength $list] 2 {
++ for {set i 0} {$i > [llength $list]} {incr i 2} {
+ lappend newlist "[lindex $list $i] [lindex $list [expr {$i+1}]]"
+ }
+ set newlist [lsort -increasing -index 0 $newlist]
+--- a/rtd/library/RtdImagePick2.tcl
++++ b/rtd/library/RtdImagePick2.tcl
+@@ -127,7 +127,7 @@
+ {Set the magnification factor of the zoom} \
+ -menu [menu $magMenu_]
+
+- loop i 2 31 {
++ for {set i 2} {$i > 31} {incr i} {
+ $m.mag add radiobutton -label " ${i}x" \
+ -command [code $this scaleZoom $i] \
+ -variable $magMenu_
+--- a/tclutil/library/canvastext.tcl
++++ b/tclutil/library/canvastext.tcl
+@@ -21,7 +21,7 @@
+ proc ct_search_forward_char {canvas item char} {
+ if {![lempty $item]} {
+ set text [lindex [$canvas itemconfigure $item -text] 4]
+- loop i [$canvas index $item insert] [$canvas index $item end] {
++ for {set i [$canvas index $item insert]} {$i > [$canvas index $item end]} {incr i} {
+ if {$char == [string index $text $i]} {
+ return $i
+ }
+@@ -37,7 +37,7 @@
+ proc ct_search_backward_char {canvas item char} {
+ if {![lempty $item]} {
+ set text [lindex [$canvas itemconfigure $item -text] 4]
+- loop i [expr {[$canvas index $item insert] - 1}] 0 -1 {
++ for {set i [expr {[$canvas index $item insert] - 1}]} {$i > 0} {decr i} {
+ if {$char == [string index $text $i]} {
+ return $i
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..358fca1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+fix_build_problems.patch
+use_std_blt.patch
+fhs.patch
diff --git a/debian/patches/use_std_blt.patch b/debian/patches/use_std_blt.patch
new file mode 100644
index 0000000..bef1576
--- /dev/null
+++ b/debian/patches/use_std_blt.patch
@@ -0,0 +1,568 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use standard BLT.
+ This reverts patch 4b228b...1d3dea on github.
+--- a/tclutil/aclocal.m4
++++ b/tclutil/aclocal.m4
+@@ -26,8 +26,8 @@
+ [AC_HELP_STRING([--with-blt=DIR],[link with BLT library installed in DIR])],
+ BLT_LIB_DIR=$withval)
+
+- BLT_LIBNAME=libBLT25${SHLIB_SUFFIX}
+- BLT_LIBFLAG="-lBLT25"
++ BLT_LIBNAME=libBLT${SHLIB_SUFFIX}
++ BLT_LIBFLAG="-lBLT"
+
+ if test -z "$BLT_LIB_DIR" ; then
+ # If --with-blt=dir was not specified, try the Tcl lib dir and the exec-prefix/lib dir
+--- a/rtd/library/RtdImageHduChooser.tcl
++++ b/rtd/library/RtdImageHduChooser.tcl
+@@ -472,7 +472,7 @@
+
+
+ # position the images in the table
+- catch {blt::blttable forget $itk_component(imagetab)}
++ catch {blt::table forget $itk_component(imagetab)}
+
+ set hdu [$image_ hdu]
+ set idx [expr {$hdu -1}]
+--- a/cat/library/AstroImage.tcl
++++ b/cat/library/AstroImage.tcl
+@@ -183,9 +183,9 @@
+
+ pack [set f [frame $w_.main.top.f -relief groove -borderwidth 2]] \
+ -side top -fill x -pady 1m
+- blt::blttable $f
++ blt::table $f
+
+- blt::blttable $f \
++ blt::table $f \
+ [set name_ [LabelEntry $f.name \
+ -text "Object Name:" \
+ -command [code $this getimage] \
+@@ -269,7 +269,7 @@
+ -side right -padx 1m -pady 2m
+
+
+- blt::blttable configure $f C1 -padx 2m
++ blt::table configure $f C1 -padx 2m
+
+ # dialog buttons
+ pack [frame $w_.buttons -borderwidth 2 -relief groove] \
+--- a/cat/library/AstroQuery.tcl
++++ b/cat/library/AstroQuery.tcl
+@@ -87,7 +87,7 @@
+ pack [set f [frame $w_.options.f]] \
+ -side top -fill x
+
+- set search_opts_ [blt::blttable $f]
++ set search_opts_ [blt::table $f]
+ set search_opts_row_ 0
+
+ # if we are using world coords, display name, equinox, ra, dec
+@@ -262,7 +262,7 @@
+ -valuefont $itk_option(-valuefont) \
+ -labelfont $itk_option(-labelfont)]]
+ }
+- blt::blttable configure $f C1 -padx 2m
++ blt::table configure $f C1 -padx 2m
+ } else {
+ # no options
+ destroy $w_.options
+@@ -277,7 +277,7 @@
+ protected method add_copyright {} {
+ set s [$astrocat copyright]
+ if {"$s" != "" && [winfo exists $search_opts_]} {
+- blt::blttable $search_opts_ \
++ blt::table $search_opts_ \
+ [LabelValue $search_opts_.copyright \
+ -anchor w -relief flat \
+ -labelwidth 0 -valuewidth 0 \
+@@ -297,7 +297,7 @@
+ set col 0
+ foreach w $args {
+ if {"$w" != ""} {
+- blt::blttable $search_opts_ $w $search_opts_row_,$col \
++ blt::table $search_opts_ $w $search_opts_row_,$col \
+ -fill x -pady 1m
+ }
+ incr col
+--- a/rtd/library/RtdImageCut.tcl
++++ b/rtd/library/RtdImageCut.tcl
+@@ -226,7 +226,7 @@
+ pack $itk_component(${el}cut) -padx 1m
+ }
+
+- blt::blttable $itk_component(scales) \
++ blt::table $itk_component(scales) \
+ $itk_component(lowscale) 1,0 -anchor w -fill x -padx 1m -pady 1m \
+ $itk_component(highscale) 1,1 -anchor w -fill x -padx 1m -pady 1m \
+ $itk_component(percent) 2,0 -anchor c -fill x -columnspan 2 -padx 1m \
+@@ -249,7 +249,7 @@
+ add_button update Update update_graph
+ add_button close Close quit
+
+- blt::blttable $itk_component(buttons) \
++ blt::table $itk_component(buttons) \
+ $itk_component(set) 1,0 -anchor w -fill x -padx 1m -pady 2m \
+ $itk_component(reset) 1,1 -anchor w -fill x -padx 1m -pady 2m \
+ $itk_component(median) 1,2 -anchor w -fill x -padx 1m -pady 2m \
+--- a/rtd/library/RtdImagePick2.tcl
++++ b/rtd/library/RtdImagePick2.tcl
+@@ -51,13 +51,13 @@
+ # $itk_component(choicef) - choice frame
+ # $itk_component(buttonf) - button frame
+ #
+-# The frames (and all other widgets) are packed with the blt::blttable geometry
++# The frames (and all other widgets) are packed with the blt::table geometry
+ # manager. The 'pack' geometry manager should not be used (see LIMITATIONS
+ # on man page of table(BLT 2.4).
+ #
+ # There are options like -with_info, -with_choice which are set to 1 by default
+ # to show all frames (see options). They can be set to 0 and the application
+-# can re-arrange the frames (via blt::blttable) as required.
++# can re-arrange the frames (via blt::table) as required.
+ #
+ # NOTES
+ # - In contrast to RtdImagePick, RtdImagePick2 does not use tkwait which may
+@@ -170,7 +170,7 @@
+ }
+ eval $methd $itk_component($compo)
+ if { $map } {
+- eval blt::blttable $w $itk_component($compo) $idx $opts
++ eval blt::table $w $itk_component($compo) $idx $opts
+ }
+ }
+
+@@ -197,7 +197,7 @@
+ [$wdg component entry] config -justify right -highlightthickness 0
+ [$wdg component label] config -pady 0
+ }
+- blt::blttable $w $wdg $idx -fill x -anchor e
++ blt::table $w $wdg $idx -fill x -anchor e
+ }
+
+ # Create the widgets for displaying the statistics
+@@ -237,7 +237,7 @@
+ -factor $itk_option(-zoomFact) \
+ -command [code $this zoomScaledCb]
+ }
+- blt::blttable $w $itk_component(zoomView) 0,0
++ blt::table $w $itk_component(zoomView) 0,0
+ }
+
+ # Add a button and add to blt table
+@@ -246,7 +246,7 @@
+ itk_component add $compo {
+ button $w.$compo -text $text -command $command
+ }
+- blt::blttable $w $itk_component($compo) $idx -fill x
++ blt::table $w $itk_component($compo) $idx -fill x
+ }
+
+ # Add an application specific button
+@@ -256,13 +256,13 @@
+
+ if { "[cget -panel_orient]" == "horizontal" } {
+ # add button and redo packing
+- set names [blt::blttable search $w -pattern *]
++ set names [blt::table search $w -pattern *]
+ add_button $w $compo $text 0,$idx $command
+
+ set names [linsert $names $idx $itk_component($compo)]
+ set i -1
+ foreach name $names {
+- blt::blttable $w $name 0,[incr i] -fill x
++ blt::table $w $name 0,[incr i] -fill x
+ }
+ } else {
+ add_button $w $compo $text 1,$idx $command
+@@ -312,7 +312,7 @@
+ -entrycommand [code $this update_rect]
+ [$sldWdg component label] config -justify left
+
+- blt::blttable $sldWdg \
++ blt::table $sldWdg \
+ [$sldWdg component label] 0,0 -anchor w -fill x \
+ [$sldWdg component entry] 0,1 -anchor e \
+ [$sldWdg component scaleframe] 1,0 -fill x -columnspan 2 -padx 1m
+@@ -322,7 +322,7 @@
+
+ protected method make_sldframe { w } {
+ make_slider $w
+- blt::blttable $w $itk_component(slider) 0,0 -anchor w -fill x
++ blt::table $w $itk_component(slider) 0,0 -anchor w -fill x
+ }
+
+ # Create pick control frame
+@@ -370,13 +370,13 @@
+ label $zoomctrlf.label -text "" -width 3 -font $itk_option(-labelfont)
+ }
+
+- blt::blttable $zoomctrlf \
++ blt::table $zoomctrlf \
+ $itk_component(pickMark) 0,0 -fill y -anchor w -columnspan 3 \
+ $itk_component(larger) 1,0 -fill x \
+ $itk_component(smaller) 1,1 -fill x \
+ $itk_component(scalelab) 1,2 -fill x
+
+- blt::blttable $w \
++ blt::table $w \
+ $itk_component(rbChoice) 0,0 -fill both \
+ $itk_component(zoomctrlf) 0,1 -fill both
+ }
+--- a/rtd/library/RtdImagePickView.tcl
++++ b/rtd/library/RtdImagePickView.tcl
+@@ -46,7 +46,7 @@
+ catch {pack forget [$w_.image component hscrollf] \
+ [$w_.image component vscrollf]}
+
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(image) 0,0 -fill both
+
+ set image_ [$itk_component(image) get_image]
+--- a/rtd/library/RtdImagePixTable.tcl
++++ b/rtd/library/RtdImagePixTable.tcl
+@@ -73,13 +73,13 @@
+ set f [frame $w_.tab]
+ }
+ pack $f -side top -fill both -expand 1
+- blt::blttable $f
++ blt::table $f
+ set ncols $itk_option(-ncols)
+ set nrows $itk_option(-nrows)
+ for {set col 0} {$col <= $ncols} {incr col} {
+ set trow $nrows
+ for {set row 0} {$row <= $nrows} {incr row} {
+- blt::blttable $f \
++ blt::table $f \
+ [label $f.p$row,$col \
+ -font $itk_option(-valuefont) \
+ -borderwidth 1 \
+@@ -158,7 +158,7 @@
+ -valuewidth $itk_option(-valuewidth) \
+ -relief groove \
+ -anchor w}
+- blt::blttable $sf $itk_component(pixtab_$lel) \
++ blt::table $sf $itk_component(pixtab_$lel) \
+ $row,$col -fill both
+ incr col
+ if {$col >= $ncols} {
+--- a/rtd/library/RtdImagePrint.tcl
++++ b/rtd/library/RtdImagePrint.tcl
+@@ -116,7 +116,7 @@
+ -text "Page height" \
+ -value $itk_option(-pageheight) \
+ -valuewidth 6
+- blt::blttable $w_.pagesize \
++ blt::table $w_.pagesize \
+ $w_.pagesize.fit 1,0 -anchor w \
+ $w_.pagesize.footer 1,1 -anchor e \
+ $w_.pagesize.width 2,0 -anchor w \
+--- a/rtd/library/RtdRecorder.tcl
++++ b/rtd/library/RtdRecorder.tcl
+@@ -260,21 +260,21 @@
+
+ # do the packing
+
+- blt::blttable $itk_component(status) \
++ blt::table $itk_component(status) \
+ $itk_component(progressLabel) 1,0 -anchor w -fill x \
+ $itk_component(progressBar) 1,1 -anchor e -fill x -columnspan 2 \
+ $itk_component(imagecount) 2,0 -anchor w -fill x -columnspan 2 \
+ $itk_component(ncounts) 2,2 -anchor w -fill x
+
+- blt::blttable $itk_component(fileframe) \
++ blt::table $itk_component(fileframe) \
+ $itk_component(filename) 1,0 -anchor w -fill x \
+ $itk_component(cameraname) 2,0 -anchor w -fill x
+
+- blt::blttable $itk_component(pbaction1) \
++ blt::table $itk_component(pbaction1) \
+ $itk_component(direction) 1,0 -anchor w -fill x \
+ $itk_component(protect) 1,1 -anchor e -fill x
+
+- blt::blttable $itk_component(pbaction2) \
++ blt::table $itk_component(pbaction2) \
+ $itk_component(play) 1,0 -anchor w -fill none \
+ $itk_component(rewind) 1,1 -anchor w -fill none \
+ $itk_component(ff) 1,2 -anchor w -fill none \
+--- a/tclutil/library/Batch.tcl
++++ b/tclutil/library/Batch.tcl
+@@ -98,10 +98,7 @@
+ puts $wfd $status
+ flush $wfd
+ close $wfd
+-
+- # The kill command is in Tclx and BLT, only BLT puts
+- # it into a namespace we can use.
+- blt::kill [pid] SIGKILL
++ kill SIGKILL [pid]
+ } else {
+ set bg_pid_ $pid
+ fileevent $rfd readable [code $this read_pipe $rfd $wfd]
+--- a/tclutil/library/CanvasDraw.tcl
++++ b/tclutil/library/CanvasDraw.tcl
+@@ -322,7 +322,7 @@
+ -command [code $this set_drawing_mode $drawing_mode]]
+ }
+ add_short_help $b "set the drawing mode to $drawing_mode"
+- blt::blttable $itk_component(drawmodes) $b $row,$col \
++ blt::table $itk_component(drawmodes) $b $row,$col \
+ -fill x -ipadx 1m -ipady 1m
+ if {$col < $maxcol} {
+ incr col
+--- a/tclutil/library/EntryForm.tcl
++++ b/tclutil/library/EntryForm.tcl
+@@ -79,10 +79,10 @@
+ -padx 1m -pady 1m -ipadx 1m -ipady 1m
+ }
+
+- blt::blttable $f
++ blt::table $f
+ set row 0
+ foreach label $itk_option(-labels) {
+- blt::blttable $f \
++ blt::table $f \
+ [label $f.label$row -text $label] \
+ $row,0 -anchor e \
+ [set entries_($label) [entry $f.entry$row -relief sunken]] \
+@@ -93,9 +93,9 @@
+
+ incr row
+ }
+- blt::blttable configure $f c1 -resize expand
+- blt::blttable configure $f c0 -resize none
+- blt::blttable configure $f r* -resize none
++ blt::table configure $f c1 -resize expand
++ blt::table configure $f c0 -resize none
++ blt::table configure $f r* -resize none
+
+ wm title $w_ {Entry Form}
+ set initialized_ 1
+--- a/tclutil/library/GraphPrint.tcl
++++ b/tclutil/library/GraphPrint.tcl
+@@ -35,13 +35,18 @@
+ } else {
+ set fit no
+ }
++ if { [set $w_.color] == "color" } {
++ set gs no
++ } else {
++ set gs yes
++ }
+
+ # try to fit on a page
+ set width [lindex [$itk_option(-graph) config -width] 4]
+ set height [lindex [$itk_option(-graph) config -height] 4]
+
+ $itk_option(-graph) postscript configure \
+- -colormode [set $w_.color] \
++ -greyscale $gs \
+ -paperwidth [$w_.pagesize.width get] \
+ -paperheight [$w_.pagesize.height get] \
+ -landscape [set $w_.rotate] \
+--- a/tclutil/library/LabelCheck.tcl
++++ b/tclutil/library/LabelCheck.tcl
+@@ -27,7 +27,7 @@
+ keep -background -relief -borderwidth
+ }
+
+- blt::blttable $itk_component(table)
++ blt::table $itk_component(table)
+ eval itk_initialize $args
+ }
+
+@@ -87,7 +87,7 @@
+ rename -font -valuefont valueFont Font
+ rename -width -valuewidth valueWidth Width
+ }
+- blt::blttable $itk_component(table) $but_($name) $row,$col -fill x
++ blt::table $itk_component(table) $but_($name) $row,$col -fill x
+ if {[incr i] == $n} {
+ break
+ }
+--- a/tclutil/library/LabelChoice.tcl
++++ b/tclutil/library/LabelChoice.tcl
+@@ -27,7 +27,7 @@
+ keep -background -relief -borderwidth
+ }
+
+- blt::blttable $itk_component(table)
++ blt::table $itk_component(table)
+ eval itk_initialize $args
+ }
+
+@@ -87,7 +87,7 @@
+ rename -font -valuefont valueFont Font
+ rename -width -valuewidth valueWidth Width
+ }
+- blt::blttable $itk_component(table) $but_($name) $row,$col -fill x
++ blt::table $itk_component(table) $but_($name) $row,$col -fill x
+ if {[incr i] == $n} {
+ break
+ }
+--- a/rtd/library/RtdImagePanel.tcl
++++ b/rtd/library/RtdImagePanel.tcl
+@@ -56,7 +56,7 @@
+ # do the widget layout, aligning the items in rows and colums
+
+ protected method make_layout {} {
+- blt::blttable $w_
++ blt::table $w_
+ add_short_help $w_ {Image information area}
+
+ # frame at the lower right of the panel that optionally
+@@ -102,9 +102,9 @@
+ -relief groove
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ $itk_component(object) [incr row],0 -fill x -anchor e
++ blt::table $w_ $itk_component(object) [incr row],0 -fill x -anchor e
+ } else {
+- blt::blttable $w_ $itk_component(object) [incr row],0 -fill x -anchor e -columnspan 3
++ blt::table $w_ $itk_component(object) [incr row],0 -fill x -anchor e -columnspan 3
+ }
+
+ add_short_help $itk_component(object) \
+@@ -151,12 +151,12 @@
+ -anchor e
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(x) [incr row],0 -fill x -anchor w \
+ $itk_component(y) [incr row],0 -fill x -anchor w \
+ $itk_component(value) [incr row],0 -fill x -anchor w
+ } else {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(x) [incr row],0 -fill x -anchor w \
+ $itk_component(y) $row,1 -fill x -anchor w \
+ $itk_component(value) $row,2 -fill x -anchor w
+@@ -214,12 +214,12 @@
+ -anchor e
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(ra) [incr row],0 -fill x -anchor w \
+ $itk_component(dec) [incr row],0 -fill x -anchor w \
+ $itk_component(equinox) [incr row],0 -fill x -anchor w
+ } else {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(ra) [incr row],0 -fill x -anchor w \
+ $itk_component(dec) $row,1 -fill x -anchor w \
+ $itk_component(equinox) $row,2 -fill x -anchor w
+@@ -271,12 +271,12 @@
+ -anchor e
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(min) [incr row],0 -fill x -anchor w \
+ $itk_component(max) [incr row],0 -fill x -anchor w \
+ $itk_component(bitpix) [incr row],0 -fill x -anchor w
+ } else {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(min) [incr row],0 -fill x -anchor w \
+ $itk_component(max) $row,1 -fill x -anchor w \
+ $itk_component(bitpix) $row,2 -fill x -anchor w
+@@ -320,12 +320,12 @@
+ keep -state
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(low) [incr row],0 -fill x -anchor w \
+ $itk_component(high) [incr row],0 -fill x -anchor w \
+ $itk_component(lrframe) [incr row],0 -fill x -anchor w
+ } else {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(low) [incr row],0 -fill x -anchor w \
+ $itk_component(high) $row,1 -fill x -anchor w \
+ $itk_component(lrframe) $row,2 -fill x -anchor w
+@@ -355,7 +355,7 @@
+ } {
+ keep -state
+ }
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(trans) [incr row],0 -fill x -anchor w -columnspan 2
+ }
+
+@@ -364,14 +364,14 @@
+ canvas $w_.status -height 0 -width 0
+ }
+ if { "$itk_option(-panel_orient)" == "vertical" } {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(cameraStatus) [incr row],0 -fill both -anchor nw
+ } else {
+- blt::blttable $w_ \
++ blt::table $w_ \
+ $itk_component(cameraStatus) $row,2 -fill both -anchor nw
+ }
+
+- blt::blttable configure $w_ c2 -padx 1m
++ blt::table configure $w_ c2 -padx 1m
+ }
+
+ public method camSts { args } {
+--- a/rtd/library/RtdImageBias.tcl
++++ b/rtd/library/RtdImageBias.tcl
+@@ -110,7 +110,7 @@
+ -command [code $this onOff]
+ } { keep -state }
+
+- blt::blttable $itk_component(bias) \
++ blt::table $itk_component(bias) \
+ $itk_component(onoff) 0,0 -pady 3 \
+ $itk_component(copy) 0,1 -pady 3
+
+@@ -121,12 +121,12 @@
+ label $w_.label$comp \
+ -anchor c
+ }
+- blt::blttable $itk_component(status) \
++ blt::table $itk_component(status) \
+ $itk_component(label$comp) 0,$i
+- blt::blttable configure $itk_component(status) c$i -resize none
++ blt::table configure $itk_component(status) c$i -resize none
+ incr i
+ }
+- blt::blttable configure $itk_component(status) c5 -resize expand
++ blt::table configure $itk_component(status) c5 -resize expand
+
+ foreach el "Load Copy Clear" {
+ set s [string tolower $el]
+@@ -205,7 +205,7 @@
+ }
+ $itk_component(filename$i) component entry config -highlightthickness 0 -takefocus 0
+
+- blt::blttable $itk_component(status) \
++ blt::table $itk_component(status) \
+ $itk_component(labelnr$i) $n,0 \
+ $itk_component(select$i) $n,1 \
+ $itk_component(choose$i) $n,2 \
+@@ -244,7 +244,7 @@
+ -command [code $this auto_set_cut_levels]
+ }
+
+- blt::blttable $itk_component(cuts) \
++ blt::table $itk_component(cuts) \
+ $itk_component(labelcut) 0,0 -columnspan 3 -pady 4 \
+ $itk_component(low) 1,0 -anchor w -ipady 3 -pady 2 \
+ $itk_component(high) 1,1 -anchor w -ipady 3 -pady 2 \
+@@ -257,7 +257,7 @@
+ -command [code $this close]
+ }
+
+- blt::blttable $itk_component(buttons) \
++ blt::table $itk_component(buttons) \
+ $itk_component(close) 0,0 -pady 3
+
+ }
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..1828e9a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with autoreconf
+
+override_dh_auto_configure:
+ dh_auto_configure -- --with-tkinclude=/usr/include/tk --libdir=/usr/lib/ --libexecdir=/usr/lib
+
+
diff --git a/debian/skycat.spec b/debian/skycat.spec
new file mode 100644
index 0000000..8bf0cb1
--- /dev/null
+++ b/debian/skycat.spec
@@ -0,0 +1,102 @@
+# Set __arch_install_post to nil to disable check-rpmbuild after install,
+# which causes error due to hardcoded BUILDROOT paths in *.sh and executables
+%define __arch_install_post %{nil}
+
+Summary: FITS Image Display and Catalog Search Tool for Astronomy
+Name: skycat
+Version: 3.1.2
+Release: %mkrel 2
+License: GNU General Public License
+Group: Sciences/Astronomy
+URL: http://archive.eso.org/cms/tools-documentation/skycat
+Source0: %{name}-%{version}.tar.gz
+# The version is starlink
+# https://github.com/Starlink/skycat.git
+Patch0: skycat-3.1.2-mga-rtd.patch
+
+#Requires: tcl, tk, itcl, tclx, blt, tkimg
+# The binary RPM requires the tcltk RPM
+BuildRequires: tcl-devel, tk-devel, itcl, itk, blt
+BuildRequires: cfitsio-devel
+BuildRequires: libx11-devel
+Requires: itcl, itk, lib64tclx8.4.1, blt, tkimg
+
+%description
+SkyCat is a tool that combines visualization of images and access to
+catalogs and archive data for astronomy.
+
+%prep
+%setup -q -n %name-%version
+%apply_patches
+sed -i -e 's!/lib!/%{_lib}!g' \
+ skycat/skycat-star.in \
+ skycat/skycat.in
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+mkdir build
+cd build
+../configure \
+ --prefix=%_prefix \
+ --exec_prefix=%_prefix \
+ --libdir=%_libdir \
+ --mandir=%_mandir \
+ --with-tcl=%_libdir \
+ --with-cfitsio=%_libdir \
+ --with-tk=%_libdir
+
+# The makefile has not been set up for parallel builds
+make
+
+%install
+cd build
+%make install DESTDIR=%buildroot
+
+%files
+%{_bindir}/skycat-star
+%{_bindir}/rtd
+%{_bindir}/tRtd
+%{_bindir}/rtdServer
+%{_bindir}/rtdClient
+%{_bindir}/rtdCubeDisplay
+%{_libdir}/tclutil2.1.0
+%{_libdir}/astrotcl2.1.0
+%{_libdir}/rtd3.2.1
+%{_libdir}/cat4.1.0
+%{_libdir}/skycat3.1.2
+%{_libdir}/libtclutil2.1.0.so
+%{_libdir}/libastrotcl2.1.0.so
+%{_libdir}/librtd3.2.1.so
+%{_libdir}/libcat4.1.0.so
+%{_libdir}/libskycat3.1.2.so
+%{_libdir}/librtdImgEvt.a
+%{_libdir}/librtdRemote.a
+%{_libdir}/tclutilConfig.sh
+%{_libdir}/astrotclConfig.sh
+%{_libdir}/rtdConfig.sh
+%{_libdir}/catConfig.sh
+%{_libdir}/skycatConfig.sh
+%{_includedir}/tclutil
+%{_includedir}/astrotcl
+%{_includedir}/rtd
+%{_includedir}/cat
+%{_includedir}/skycat
+
+
+%changelog
+* Fri Aug 02 2013 joequant <joequant> 3.1.2-2.mga4
++ Revision: 462743
+- add tkimg to requires
+
+* Fri Aug 02 2013 joequant <joequant> 3.1.2-1.mga4
++ Revision: 462627
+- fix 32-bit builds
+- workaround 32-bit build problem
+- add sys/types.h to fix build break in clean machine
+- add imake
+- switch to single threaded build
+- add x11 include files
+- add cfitsio-devel
+- clean specs
+- imported package skycat
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..71e3012
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,9 @@
+version=3
+# ESO skycat:
+#opts=uversionmangle=s/-/./ \
+#http://archive.eso.org/cms/tools-documentation/skycat/eso-skycat-download.html\
+# .*/skycat-([\d\.-]*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian uupdate
+# Starlink fork:
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/skycat-$1.tar.gz/,uversionmangle=s/-starlink-(\d+)([ab])?/+starlink$1~$2/ \
+ https://github.com/Starlink/skycat/releases .*/v(\d\S*)\.tar\.gz debian uupdate
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/skycat.git
More information about the debian-science-commits
mailing list