[SCM] General FITS file browser/editor/plotter with a gui branch, debian, updated. 81e26fc8bd407b9cd8692f68c661d7c04c66f41f
Ole Streicher
debian at liska.ath.cx
Wed Jul 25 09:54:03 UTC 2012
The following commit has been merged in the debian branch:
commit 81e26fc8bd407b9cd8692f68c661d7c04c66f41f
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jul 25 11:53:41 2012 +0200
Remove fitsTcl stuff: will be packaged separately
diff --git a/debian/dfsg.move b/debian/dfsg.move
deleted file mode 100644
index f40371b..0000000
--- a/debian/dfsg.move
+++ /dev/null
@@ -1,2 +0,0 @@
-heacore/cfitsio/eval_defs.h include
-heacore/cfitsio/eval_tab.h include
diff --git a/debian/dfsg.remove b/debian/dfsg.remove
index cd17d11..7483cf7 100644
--- a/debian/dfsg.remove
+++ b/debian/dfsg.remove
@@ -12,6 +12,12 @@ tcltk/iwidgets
# xpa, cfitsio, readline, wcslib are in Debian as well
tcltk/xpa
heacore
+
+#
+# fitsTcl will be distributed separately
+#
+ftools/guis/fitsTcl
+
#
# This has an unclear license and is not needed anyway
ftools/guis/fv/mac/tkMacAppInit.c
diff --git a/debian/patches/fitstcl_use_shared_cfitsio.patch b/debian/patches/fitstcl_use_shared_cfitsio.patch
deleted file mode 100644
index e5b99e3..0000000
--- a/debian/patches/fitstcl_use_shared_cfitsio.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Remove the need of a private cfitsio copy
- However, this patch still needs the files eval_defs.h and
- eval_tab.h copied from the cfitsion source. Then it compiles
- and resolves all symbols.
---- a/ftools/guis/fitsTcl/Makefile.in
-+++ b/ftools/guis/fitsTcl/Makefile.in
-@@ -12,12 +12,12 @@ SHARED_CFILE = tclShared.c
-
- OBJECTS = ${CFILES:.c=.o}
- LOCAL_OBJ = ${OBJECTS} ${SHARED_CFILE:.c=.o}
--SHARED_OBJ = ${LOCAL_OBJ} ${CFITSIO_DIR}/*.o
-+SHARED_OBJ = ${LOCAL_OBJ}
-
- STATIC_LIB = lib${LIBRARY}.a
- SHARED_LIB = lib${LIBRARY}${SHLIB_SUFFIX}
-
--IFLAGS = -I${CFITSIO_DIR} -I${TCL_INC_PATH}
-+IFLAGS = -I../../../include -I${TCL_INC_PATH}
-
- #----------------------------------------------------------------------------
- # Configurable macros:
-@@ -35,7 +35,6 @@ LD_FLAGS = @LD_FLAGS@
- TCL_INC_PATH = @TCL_INC_PATH@
- TCL_LIB_PATH = @TCL_PATH@
- TCL_LIB = @TCL_LIB@
--CFITSIO_DIR = @CFITSIODIR@
- SHLIB_LD_LIBS = @LIBS@ @SHLIB_LD_LIBS@
-
- #----------------------------------------------------------------------------
-@@ -52,34 +51,17 @@ ${STATIC_LIB}: ${OBJECTS}
- ar cr ${STATIC_LIB} ${OBJECTS}
- ${RANLIB} ${STATIC_LIB}
-
--${SHARED_LIB}: build-cfitsio ${LOCAL_OBJ}
-+${SHARED_LIB}: ${LOCAL_OBJ}
- @if [ "x${TCL_LIB_PATH}" = x -o "x${TCL_LIB}" = x ]; then \
- echo "${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}"; \
- ${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} \
-- -o ${SHARED_LIB}; \
-+ -ltcl -lwcs -lcfitsio -o ${SHARED_LIB}; \
- else \
- echo "${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -L${TCL_LIB_PATH} -l${TCL_LIB} -o ${SHARED_LIB}"; \
- ${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} \
- -L${TCL_LIB_PATH} -l${TCL_LIB} -o ${SHARED_LIB}; \
- fi
-
--build-cfitsio:
-- @if [ "x${CFITSIO_DIR}" != x ]; then \
-- if [ -d "${CFITSIO_DIR}" ]; then \
-- if [ ! -f ${CFITSIO_DIR}/f77_wrap4.o ]; then \
-- echo "Configuring and building in ${CFITSIO_DIR}"; \
-- cd ${CFITSIO_DIR}; ./configure; \
-- ${MAKE} stand_alone "CC=${CC}" "CFLAGS=${CFLAGS}" \
-- "FITSIO_OBJ=" "FITSIO_SRC="; \
-- fi; \
-- else \
-- echo "CFITSIO_DIR='${CFITSIO_DIR}' does not exist!"; \
-- exit 1; \
-- fi; \
-- else \
-- echo "CFITSIO_DIR was not set!"; \
-- exit 1; \
-- fi
-
- install: all
- @if [ "x${C_LIB_OPTION}" = xstatic ]; then \
---- a/ftools/guis/fitsTcl/configure.in
-+++ b/ftools/guis/fitsTcl/configure.in
-@@ -56,26 +56,8 @@ AC_ARG_WITH(
- [ --with-itcl Path to itcl source ],
- ITCL_PATH=$withval
- )
--AC_ARG_WITH(
-- cfitsio,
-- [ --with-cfitsio Path to cfitsio source ],
-- CFITSIO=$withval
--)
- # Make sure we have cfitsio before proceeding:
- #-------------------------------------------
--AC_MSG_CHECKING([for cfitsio source directory])
--CFITSIODIR=
--for dir in $CFITSIO ./cfitsio ; do
-- if test -r $dir/eval_defs.h; then
-- CFITSIODIR=$dir
-- AC_MSG_RESULT($dir)
-- break
-- fi
--done
--if test -z "$CFITSIODIR"; then
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR(Can't find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code.)
--fi
- #-------------------------------------------
- AC_ARG_ENABLE(
- shared,
-@@ -95,7 +77,6 @@ TK_LIB=`echo $TK_PATH | sed 's:.*tk8:tk8:' | sed 's:.[0-9]/unix$::'`
- changequote([,])
- AC_SUBST(TCL_LIB)
- AC_SUBST(TK_LIB)
--AC_SUBST(CFITSIODIR)
-
- if test $lhea_shared = yes; then
- C_LIB_OPTION=shared
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0887e52..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fitstcl_use_shared_cfitsio.patch
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
index 86c0712..925a91a 100755
--- a/debian/repack-dfsg.sh
+++ b/debian/repack-dfsg.sh
@@ -17,11 +17,12 @@ echo $pkgname $ver $orig_tar $tardir $wd
tar xf ${orig_tar} -C ${TMPDIR}
srcdir=$(ls -d ${TMPDIR}/*)
-echo $srcdir
-( while read source target ; do
- mkdir -p ${srcdir}/${target}
- mv ${srcdir}/${source} ${srcdir}/${target}
- done ) < ${debiandir}/dfsg.move
+if [ -f ${debiandir}/dfsg.move ] ; then
+ ( while read source target ; do
+ mkdir -p ${srcdir}/${target}
+ mv ${srcdir}/${source} ${srcdir}/${target}
+ done ) < ${debiandir}/dfsg.move
+fi
for fname in $(cat ${debiandir}/dfsg.remove | sed s/\#.\*//); do
rm -rf ${srcdir}/${fname}
--
General FITS file browser/editor/plotter with a gui
More information about the debian-science-commits
mailing list