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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 0fc5b20c81f97aa3c6796fd92b97755229623b44
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jul 29 18:25:59 2012 +0200

    Fix POW build

diff --git a/debian/control b/debian/control
index d935a69..7d14c73 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,19 @@ Uploaders: Ole Streicher <debian at liska.ath.cx>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               itcl-dev,
                itk3-dev,
                iwidgets4,
-               libcfitsio3-dev
+               libcfitsio3-dev,
+               libwcs-dev,
+               tcl-dev,
+               tk-dev
 Standards-Version: 3.9.3
 Homepage: http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/ftools/fv/
 Vcs-Git: git://git.debian.org/git/debian-science/packages/heasoft-fv.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/heasoft-fv.git
 
-Package: fv
+Package: heasoft-fv
 Architecture: any
 Depends: itcl3.1, itk3.1, iwidgets3.1, ${shlibs:Depends}
 Description: a tool for viewing and editing FITS format files
diff --git a/debian/patches/pow_fix_makefile.patch b/debian/patches/pow_fix_makefile.patch
index 433a75f..2a3d102 100644
--- a/debian/patches/pow_fix_makefile.patch
+++ b/debian/patches/pow_fix_makefile.patch
@@ -2,21 +2,33 @@ 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 @@
+@@ -31,40 +31,37 @@
  		  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} 
++OBJECTS         = ${CFILES:.c=.o}
  SHARED_OBJ      = ${OBJECTS}
  
  STATIC_LIB	= lib${LIBRARY}.a
-@@ -49,22 +49,21 @@
+ SHARED_LIB	= lib${LIBRARY}${SHLIB_SUFFIX}
+ 
+-IFLAGS		= -I${CFITSIO_DIR} -I${WCSLIB_DIR} \
+-		  -I${TCL_INC_PATH} -I${TK_INC_PATH} ${XINC}
++IFLAGS		= -I${TCL_INC_PATH} -I${TK_INC_PATH} ${XINC}
+ 
+ #----------------------------------------------------------------------------
+ # Configurable macros:
+ #----------------------------------------------------------------------------
+-INSTALLDIR	= @prefix@
++INSTALLDIR	= $(DESTDIR)@prefix@
+ CC		= @CC@
+ RANLIB		= @RANLIB@
  CFLAGS		= @CFLAGS@
  #CFLAGS		= -g -DTCL_MEM_DEBUG
  DEFS		= @DEFS@ -DVISU_LIBRARY=\"${INSTALLDIR}/lib/pow\" 
 -C_LIB_OPTION	= @C_LIB_OPTION@
-+C_LIB_OPTION	= 
++C_LIB_OPTION	= shared
  SHLIB_SUFFIX	= @SHLIB_SUFFIX@
  SHLIB_LD	= @SHLIB_LD@
  LD_FLAGS	= @LD_FLAGS@
@@ -31,10 +43,19 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
  TK_LIB		= @TK_LIB@
  XINC		= @XINCLUDES@
  XLIBS		= @XLIBS@
- CFITSIO_DIR	= @CFITSIODIR@
+-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:
+@@ -86,7 +83,7 @@
+ install:
+ 	@if [ ! -d ${INSTALLDIR}/lib/pow ]; then \
+ 		echo "mkdir ${INSTALLDIR}/lib/pow"; \
+-		mkdir ${INSTALLDIR}/lib/pow; \
++		mkdir -p ${INSTALLDIR}/lib/pow ${INSTALLDIR}/bin ${INSTALLDIR}/include; \
+ 	fi
+ 	@if [ "x${C_LIB_OPTION}" = xstatic ]; then \
+ 		echo "cp ${STATIC_LIB} ${INSTALLDIR}/lib/"; \
diff --git a/debian/rules b/debian/rules
index a07153e..5d7ac18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,22 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+DH_VERBOSE=1
 
 %:
-	dh $@ --with autoreconf -BBUILD_DIR
+	dh $@ --with autoreconf
 
 
 override_dh_autoreconf:
-	dh_autoreconf "(cd BUILD_DIR ; autoreconf)"
+	dh_autoreconf "(cd tcltk/pow ; autoreconf)"
 
 override_dh_auto_configure:
-	cd BUILD_DIR ; ./configure
+	dh_auto_configure -D tcltk/pow
+
+override_dh_auto_build:
+	dh_auto_build -D tcltk/pow
+
+override_dh_auto_install:
+	dh_auto_install -D tcltk/pow
 
 override_dh_auto_clean:
-	true
\ No newline at end of file
+	dh_auto_clean -D tcltk/pow

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