[SCM] Minimal buy-in FITS library and utility package branch, master, updated. 2429022014c73f39dc399255fccb7b4e85544b8d

Fri Jan 27 16:04:52 UTC 2012

The following commit has been merged in the master branch:
commit 313bf533f095a765f5f83408ddbe69779facea1c
Author: Ole Streicher <github at liska.ath.cx>
Date:   Fri Jan 27 16:55:48 2012 +0100

    Build Tcl interface

diff --git a/debian/control b/debian/control
index 9c60ace..84cbbb8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,27 @@ Homepage: https://www.cfa.harvard.edu/~john/funtools/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/funtools.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/funtools.git
 
+Package: funtools
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Minimal buy-in FITS utility package
+ Funtools, is a "minimal buy-in" FITS library and utility package developed at
+ the High Energy Astrophysics Division of SAO. The Funtools library
+ provides simplified access to a wide array of file types: standard
+ astronomical FITS images and binary tables, raw arrays and binary event
+ lists, and even tables of ASCII column data. A sophisticated region filtering
+ library (compatible with ds9) filters images and tables using boolean
+ operations between geometric shapes, support world coordinates, etc. Funtools
+ also supports advanced capabilities such as optimized data searching using
+ index files.
+ .
+ This package contains the tools.
+
 Package: libfuntools1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Minimal buy-in FITS library and utility package
+Description: Minimal buy-in FITS library
  Funtools, is a "minimal buy-in" FITS library and utility package developed at
  the High Energy Astrophysics Division of SAO. The Funtools library
  provides simplified access to a wide array of file types: standard
@@ -30,8 +46,8 @@ Description: Minimal buy-in FITS library and utility package
 Package: libfuntools-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Minimal buy-in FITS library and utility package
+Depends: libfuntools1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Minimal buy-in FITS library (development files)
  Funtools, is a "minimal buy-in" FITS library and utility package developed at
  the High Energy Astrophysics Division of SAO. The Funtools library
  provides simplified access to a wide array of file types: standard
@@ -44,10 +60,12 @@ Description: Minimal buy-in FITS library and utility package
  .
  This package contains the development files.
 
-Package: funtools
+Package: tcl-funtools
+Section: libs
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Minimal buy-in FITS library and utility package
+Depends: libfuntools1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+ ${tcl:Depends}
+Description: Minimal buy-in FITS library (Tcl interface)
  Funtools, is a "minimal buy-in" FITS library and utility package developed at
  the High Energy Astrophysics Division of SAO. The Funtools library
  provides simplified access to a wide array of file types: standard
@@ -58,4 +76,5 @@ Description: Minimal buy-in FITS library and utility package
  also supports advanced capabilities such as optimized data searching using
  index files.
  .
- This package contains the tools.
+ This package contains the Tcl interface.
+
diff --git a/debian/patches/build_tclfun.patch b/debian/patches/build_tclfun.patch
new file mode 100644
index 0000000..2e14ca1
--- /dev/null
+++ b/debian/patches/build_tclfun.patch
@@ -0,0 +1,53 @@
+--- funtools-1.4.4.orig/Makefile.in
++++ funtools-1.4.4/Makefile.in
+@@ -38,6 +38,7 @@ INSTALL_ROOT = $(DESTDIR)
+ 
+ # Directory in which to install the .a or .so binary for the FUNTOOLS library:
+ LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
++TCL_LIB_INSTALL_DIR =  $(LIB_INSTALL_DIR)/tcltk/funtools
+ 
+ # Directory in which to install the program wish:
+ BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
+@@ -67,8 +67,11 @@ WCS_LIBS =		-lwcstools
+ FILTER_INC =        	-I./filter
+ # FILTER_LIBS =		-L./filter -lfilter
+ 
++# tcl include files
++TCL_INC = 		-I/usr/include/tcl
++
+ # extra includes for compiling
+-INCLUDES =		$(UTIL_INC) $(FILTER_INC) $(WCS_INC) $(FITSY_INC)
++INCLUDES =		$(UTIL_INC) $(FILTER_INC) $(WCS_INC) $(FITSY_INC) $(TCL_INC)
+ 
+ # extra libs
+ EXTRA_LIBS =		@EXTRA_LIBS@
+@@ -396,6 +397,8 @@ install::	install-man
+ 
+ install::	install-share
+ 
++install::	tclfun_install
++
+ install::	install-data
+ 
+ FORCE:
+@@ -408,7 +411,7 @@ FORCE:
+ _install:
+ 
+ shlib_install:
+-	@-(for i in `ls *.so* *.dylib *.sl 2>/dev/null` ; \
++	@-(for i in `ls libfuntools.so* *.dylib *.sl 2>/dev/null` ; \
+ 	   do \
+ 	   if [ -h $$i ] ; then \
+ 		echo "Installing link $$i" ; \
+@@ -420,6 +423,11 @@ shlib_install:
+ 	   fi; \
+ 	   done;)
+ 
++tclfun_install: tclfun
++	mkdir -p $(TCL_LIB_INSTALL_DIR)
++	$(INSTALL_DATA) libtclfun.so $(TCL_LIB_INSTALL_DIR)
++	$(INSTALL_DATA) pkgIndex.tcl $(TCL_LIB_INSTALL_DIR)
++
+ install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
+ 	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
+ 	    do \
diff --git a/debian/patches/series b/debian/patches/series
index d351f22..6f32331 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_paths.patch
 fix_manpages.patch
 link_to_so.patch
 use_shared_libwcstools.patch
+build_tclfun.patch
diff --git a/debian/rules b/debian/rules
index 578900e..b3c8230 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,14 @@
 	dh $@ 
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-shared --with-zlib=-lz 
+	dh_auto_configure -- --enable-shared --with-zlib=-lz --with-wcslib=-lwcstools  --with-tcl=/usr/lib --enable-dl
+
+override_dh_auto_build:
+	dh_auto_build -- all shtclfun
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/changelog.html
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Xlibtclfun.so
+	tcltk-depends
diff --git a/debian/tcl-funtools.install b/debian/tcl-funtools.install
new file mode 100644
index 0000000..9c27083
--- /dev/null
+++ b/debian/tcl-funtools.install
@@ -0,0 +1,2 @@
+usr/lib/tcltk/funtools/libtclfun.so
+usr/lib/tcltk/funtools/pkgIndex.tcl

-- 
Minimal buy-in FITS library and utility package

