[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 945dc6399e040e50ba7247eebf82e6d64ea70667
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jul 29 20:18:04 2012 +0200

    Build _pow package

diff --git a/debian/control b/debian/control
index ea91e61..5c064e5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libcfitsio3-dev,
-               wcslib-dev,
                tcl-dev,
-               tk-dev
+               tk-dev,
+               wcslib-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
@@ -17,7 +17,12 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/heasoft-fv.git
 
 Package: heasoft-fv
 Architecture: any
-Depends: itcl3.1, itk3.1, iwidgets4, ${shlibs:Depends}, ${misc:Depends}
+Depends: heasoft-pow,
+         itcl3,
+         itk3,
+         iwidgets4,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Tool for viewing and editing FITS format files
  Fv provides a graphical user interface to data stored in FITS
  (Flexible Image Transport System) files.  Local files can be created,
@@ -30,7 +35,7 @@ Description: Tool for viewing and editing FITS format files
 
 Package: heasoft-pow
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: tcl-fitstcl, itcl3, itk3, iwidgets4, ${misc:Depends}, ${shlibs:Depends}
 Description: Curve plotting and image display interface tool
  POW is a curve plotting and image display interface tool written and
  distributed by the HEASARC at NASA/GSFC.
diff --git a/debian/heasoft-pow.install b/debian/heasoft-pow.install
index 559395c..422e830 100644
--- a/debian/heasoft-pow.install
+++ b/debian/heasoft-pow.install
@@ -1,5 +1,5 @@
-usr/lib/tcltk/POW
 usr/bin/POWplot
-usr/include/tkpict.h
 usr/include/pow.h
+usr/include/tkpict.h
+usr/lib/tcltk/POW
 usr/share/heasoft/POW
diff --git a/debian/patches/create_package.patch b/debian/patches/pow_create_package.patch
similarity index 72%
rename from debian/patches/create_package.patch
rename to debian/patches/pow_create_package.patch
index 075a1f0..330bbf5 100644
--- a/debian/patches/create_package.patch
+++ b/debian/patches/pow_create_package.patch
@@ -13,25 +13,21 @@
  
 --- a/tcltk/pow/PowInit.c
 +++ b/tcltk/pow/PowInit.c
-@@ -103,7 +103,6 @@
- 
-   Tcl_DStringInit(&pow_env);
- 
--
-   interp = interp_instance;
- 
- 
-@@ -130,9 +129,7 @@
+@@ -130,12 +130,9 @@
  
    charptr = Tcl_GetVar2(interp,"env", "POW_LIBRARY", TCL_GLOBAL_ONLY);
    if( charptr == NULL ) {
 -      puts("Could not find defaults.");
 -      puts("  Set your POW_LIBRARY environment variable.");
 -      return TCL_ERROR;
-+    Tcl_DStringAppend(&pow_env,"/usr/share/heasoft/POW", -1);
-   } else {
-     Tcl_DStringAppend(&pow_env,charptr, -1);
+-  } else {
+-    Tcl_DStringAppend(&pow_env,charptr, -1);
++    charptr = "/usr/share/heasoft/POW";
    }
++  Tcl_DStringAppend(&pow_env,charptr, -1);
+ 
+   /*  Brackets needed around %s to prevent Windows-style paths  */
+   /*  ... eg, c:\fv... from getting converted to control chars  */
 @@ -219,6 +216,9 @@
    Pow_CreateCommands(interp); 
  
@@ -61,7 +57,14 @@
  	fi
  	mkdir -p ${INSTALLDIR}/bin
  	@for file in ${SCRIPTS}; do \
-@@ -109,7 +110,7 @@
+@@ -103,13 +104,13 @@
+ 		cp $$file ${INSTALLDIR}/include/; \
+ 	done
+ 	mkdir -p ${INSTALLDIR}/share/heasoft/POW
+-	@for file in ${TCLFILES}; do \
++	@for file in ${TCLFILES} tclIndex; do \
+ 		echo "cp $$file ${INSTALLDIR}/share/heasoft/POW/"; \
+ 		cp $$file ${INSTALLDIR}/share/heasoft/POW/; \
  	done
  
  clean:
diff --git a/debian/patches/pow_fix_startup.patch b/debian/patches/pow_fix_startup.patch
new file mode 100644
index 0000000..4c5d3d1
--- /dev/null
+++ b/debian/patches/pow_fix_startup.patch
@@ -0,0 +1,24 @@
+--- a/tcltk/pow/POWplot
++++ b/tcltk/pow/POWplot
+@@ -1,19 +1,3 @@
+ #!/bin/sh
+-#
+-#
+-(if [ "x$POW" = x ] ; then \
+-     POW=$FTOOLS; \
+-     export POW;	
+-fi; \
+-POW_LIBRARY=$POW/lib/pow ;\
+-export POW_LIBRARY ;\
+-unset TCL_LIBRARY; unset TK_LIBRARY; unset TCLLIBPATH ;\
+-unset ITCL_LIBRARY; unset ITK_LIBRARY; \
+-LD_LIBRARY_PATH=$POW/lib:$LD_LIBRARY_PATH ;\
+-export LD_LIBRARY_PATH ;\
+-if [ "$POW_DISPLAY" != "" ] ; then \
+-$POW/bin/tclsh $POW_LIBRARY/POWplotClient.tcl -- $1 $2 $3 $4 $5 $6 $7 $8 $9;  
+-else 
+-$POW/bin/wish $POW_LIBRARY/POWplot.tcl -- $1 $2 $3 $4 $5 $6 $7 $8 $9; 
+-fi; \
+-exit)
++export POW_LIBRARY=/usr/share/heasoft/POW
++exec wish $POW_LIBRARY/POWplot.tcl -- $*
diff --git a/debian/patches/series b/debian/patches/series
index cc6e2dc..974388d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 pow_update_photo.patch
 pow_fix_makefile.patch
-create_package.patch
+pow_create_package.patch
+pow_fix_startup.patch
 fv_require.patch

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