[SCM] General FITS file browser/editor/plotter with a gui branch, debian, updated. 090f579850b6e608db91554b9f0ee04601b922f0

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e957e620dd13e5598d8f87ab0d6c22f1371ab763
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 27 11:12:16 2012 +0200

    Patch pow so that it may compile

diff --git a/debian/patches/pow_fix_makefile.patch b/debian/patches/pow_fix_makefile.patch
new file mode 100644
index 0000000..433a75f
--- /dev/null
+++ b/debian/patches/pow_fix_makefile.patch
@@ -0,0 +1,40 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
+--- a/tcltk/pow/Makefile.in
++++ b/tcltk/pow/Makefile.in
+@@ -31,7 +31,7 @@
+ 		  Probe.html Profile.html ROI.html Regions.html Ruler.html \
+ 		  Scripting.html Tools.html XRange.html
+ 
+-OBJECTS         = ${CFILES:.c=.o} ${WCSLIB_DIR}/*.o
++OBJECTS         = ${CFILES:.c=.o} 
+ SHARED_OBJ      = ${OBJECTS}
+ 
+ STATIC_LIB	= lib${LIBRARY}.a
+@@ -49,22 +49,21 @@
+ CFLAGS		= @CFLAGS@
+ #CFLAGS		= -g -DTCL_MEM_DEBUG
+ DEFS		= @DEFS@ -DVISU_LIBRARY=\"${INSTALLDIR}/lib/pow\" 
+-C_LIB_OPTION	= @C_LIB_OPTION@
++C_LIB_OPTION	= 
+ SHLIB_SUFFIX	= @SHLIB_SUFFIX@
+ SHLIB_LD	= @SHLIB_LD@
+ LD_FLAGS	= @LD_FLAGS@
+ 
+-TCL_INC_PATH	= @TCL_INC_PATH@
++TCL_INC_PATH	= /usr/include/tcl
+ TCL_LIB_PATH	= @TCL_PATH@
+ TCL_LIB		= @TCL_LIB@
+-TK_INC_PATH	= @TK_INC_PATH@
++TK_INC_PATH	= /usr/include/tcl8.5/tk-private/generic/
+ TK_LIB_PATH	= @TK_PATH@
+ TK_LIB		= @TK_LIB@
+ XINC		= @XINCLUDES@
+ XLIBS		= @XLIBS@
+ CFITSIO_DIR	= @CFITSIODIR@
+-WCSLIB_DIR	= @WCSLIB_DIR@
+-SHLIB_LD_LIBS	= @LIBS@ @SHLIB_LD_LIBS@ -L${TCL_LIB_PATH} -l${TCL_LIB} -L${TK_LIB_PATH} -l${TK_LIB} ${XLIBS}
++SHLIB_LD_LIBS	= @LIBS@ @SHLIB_LD_LIBS@ -ltcl -ltk -lwcs -lcfitsio ${XLIBS}
+ 
+ #----------------------------------------------------------------------------
+ # Targets:
diff --git a/debian/patches/pow_update_photo.patch b/debian/patches/pow_update_photo.patch
new file mode 100644
index 0000000..80ab21d
--- /dev/null
+++ b/debian/patches/pow_update_photo.patch
@@ -0,0 +1,72 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Insert "Tcl_Interp *interp" as first argument to Tk_PhotoXXX()
+ which is required by current versions of Tcl.
+--- a/tcltk/pow/PowColormap.c
++++ b/tcltk/pow/PowColormap.c
+@@ -829,7 +829,7 @@
+   photo_block.offset[2] = 2;
+   
+   
+-  Tk_PhotoPutBlock(photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET);
++  Tk_PhotoPutBlock(interp, photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET);
+   
+   ckfree(photo_block.pixelPtr);
+   return TCL_OK;
+--- a/tcltk/pow/PowCommands.c
++++ b/tcltk/pow/PowCommands.c
+@@ -3037,11 +3037,11 @@
+              || (x < 0) || (y < 0) )
+          return;
+      if( (zoomX == 1.0) && (zoomY == 1.0) ) {
+-         Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
++         Tk_PhotoPutBlock(interp,handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
+          return;
+      }
+ 
+-     Tk_PhotoExpand(handle, x+width, y+height);
++     Tk_PhotoExpand(interp,handle, x+width, y+height);
+      Tk_PhotoGetImage(handle, &destBlockPtr);
+ 
+      /*
+@@ -3110,5 +3110,5 @@
+          }
+      }
+ 
+-     Tk_PhotoPutBlock(handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
++     Tk_PhotoPutBlock(interp,handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
+ }
+--- a/tcltk/pow/PowCreateImage.c
++++ b/tcltk/pow/PowCreateImage.c
+@@ -209,10 +209,10 @@
+     photo_block.offset[1] = 1;
+     photo_block.offset[2] = 2;
+ 
+-    Tk_PhotoExpand(photo_image_handle,
++    Tk_PhotoExpand(interp,photo_image_handle,
+ 		   image_instance->width, image_instance->height);
+     
+-    Tk_PhotoPutBlock(photo_image_handle, &photo_block, 0, 0,
++    Tk_PhotoPutBlock(interp,photo_image_handle, &photo_block, 0, 0,
+ 		     image_instance->width, image_instance->height, TK_PHOTO_COMPOSITE_SET);
+     
+     ckfree(photo_block.pixelPtr);
+--- a/tcltk/pow/Visu_tkImgPict.c
++++ b/tcltk/pow/Visu_tkImgPict.c
+@@ -2489,7 +2489,7 @@
+   }
+ 	
+   /* set size */
+-  Tk_PhotoExpand(destHandle,masterPtr->width,masterPtr->height);
++  Tk_PhotoExpand(interp,destHandle,masterPtr->width,masterPtr->height);
+ 
+   /* copy data from pict image to photo image. If no instance
+      exists, no colors have been allocated, so we copy the
+@@ -2572,7 +2572,7 @@
+   }
+   
+   /* put block in photo image */
+-  Tk_PhotoPutBlock(destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET);
++  Tk_PhotoPutBlock(interp,destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET);
+   
+   /* free photo block */
+   ckfree((void*)photoblock.pixelPtr);
diff --git a/debian/patches/series b/debian/patches/series
index 5e3eb81..acb6073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+pow_update_photo.patch
+pow_fix_makefile.patch
 fv_require.patch

-- 
General FITS file browser/editor/plotter with a gui