[SCM] Minimal buy-in FITS library and utility package branch, debian, updated. e5175fedd77c03f6fcd6df9089d84f8195689f74

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e5175fedd77c03f6fcd6df9089d84f8195689f74
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jun 10 09:34:28 2012 +0200

    Silence W-pointer-cast-size-mismatch warning

diff --git a/debian/patches/build_tclfun.patch b/debian/patches/build_tclfun.patch
index 7f770b7..a307e00 100644
--- a/debian/patches/build_tclfun.patch
+++ b/debian/patches/build_tclfun.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Build the Tcl extension as a shared library.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -38,6 +38,7 @@ INSTALL_ROOT =
+@@ -38,6 +38,7 @@
  
  # Directory in which to install the .a or .so binary for the FUNTOOLS library:
  LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
@@ -10,7 +10,7 @@ Description: Build the Tcl extension as a shared library.
  
  # Directory in which to install the program wish:
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-@@ -67,8 +68,12 @@ WCS_INC =		-I./wcs
+@@ -67,8 +68,12 @@
  FILTER_INC =        	-I./filter
  # FILTER_LIBS =		-L./filter -lfilter
  
@@ -24,7 +24,7 @@ Description: Build the Tcl extension as a shared library.
  
  # extra libs
  EXTRA_LIBS =		@EXTRA_LIBS@
-@@ -249,9 +254,9 @@ tclfun:		$(LIB) tclmainlib.o tclfun.o
+@@ -249,9 +254,9 @@
  
  shtclfun:	tclfun
  		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
@@ -36,7 +36,7 @@ Description: Build the Tcl extension as a shared library.
  		rm -rf $(PACKAGE)tmp; \
  		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
  		SHLIB=libtclfun.so; \
-@@ -393,6 +398,8 @@ install::	install-man
+@@ -393,6 +398,8 @@
  
  install::	install-share
  
@@ -45,7 +45,7 @@ Description: Build the Tcl extension as a shared library.
  install::	install-data
  
  FORCE:
-@@ -405,7 +412,7 @@ FORCE:
+@@ -405,7 +412,7 @@
  _install:
  
  shlib_install:
@@ -54,7 +54,7 @@ Description: Build the Tcl extension as a shared library.
  	   do \
  	   if [ -h $$i ] ; then \
  		echo "Installing link $$i" ; \
-@@ -417,6 +424,11 @@ shlib_install:
+@@ -417,6 +424,11 @@
  	   fi; \
  	   done;)
  
@@ -66,8 +66,8 @@ Description: Build the Tcl extension as a shared library.
  install-binaries: lib $(PROGS) $(SCRIPTS) $(DS9HELPERS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
---- a/configure.ac	2012-02-04 11:40:38.013399732 +0100
-+++ b/configure.ac	2012-02-04 11:41:16.957054763 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -194,6 +194,9 @@
  SC_PATH_TCLCONFIG
  if test x"${no_tcl}" = x ; then
@@ -78,3 +78,14 @@ Description: Build the Tcl extension as a shared library.
  fi
  
  AC_PROG_AWK
+--- a/util/tclmainlib.c
++++ b/util/tclmainlib.c
+@@ -280,7 +280,7 @@
+     else{
+       Tcl_Channel chan;
+       /* create a tcl channel corresponding to the pipe */
+-      if( !(chan = Tcl_MakeFileChannel((ClientData)got, TCL_READABLE)) ){
++      if( !(chan = Tcl_MakeFileChannel((ClientData)(intptr_t)got, TCL_READABLE)) ){
+ 	Tcl_SetResult(interp, "can't create Tcl chan for pipe", TCL_STATIC);
+ 	return TCL_ERROR;
+       }

-- 
Minimal buy-in FITS library and utility package