[ftools-fv] 01/04: Call wish8.5 and depend of tk8.5 (required because we use itcl{3} which depends on tk8.5). Closes: #725689

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository ftools-fv.

commit dcb17fac5f88b811dbfb486d0afa264590b1cf95
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 9 11:10:09 2013 +0200

    Call wish8.5 and depend of tk8.5 (required because we use itcl{3} which depends on tk8.5). Closes: #725689
---
 debian/changelog                      |    7 +++++++
 debian/control                        |    4 ++--
 debian/patches/pow_fix_makefile.patch |    7 ++++---
 debian/patches/pow_fix_startup.patch  |    2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54a300c..50c984e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ftools-fv (5.3+dfsg-3) unstable; urgency=low
+
+  * Call wish8.5 and depend of tk8.5 (required because we use itcl{3}
+    which depends on tk8.5). Closes: #725689
+
+ -- Ole Streicher <debian at liska.ath.cx>  Wed, 09 Oct 2013 10:21:17 +0200
+
 ftools-fv (5.3+dfsg-2) unstable; urgency=low
 
   * Fix FTBS on hurd
diff --git a/debian/control b/debian/control
index d3c5ce4..89cc4da 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libcfitsio3-dev,
-               tcl-dev,
-               tk-dev,
+               tcl8.5-dev,
+               tk8.5-dev,
                wcslib-dev
 Standards-Version: 3.9.3
 Homepage: http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/ftools/fv/
diff --git a/debian/patches/pow_fix_makefile.patch b/debian/patches/pow_fix_makefile.patch
index 823ea10..5d514e4 100644
--- a/debian/patches/pow_fix_makefile.patch
+++ b/debian/patches/pow_fix_makefile.patch
@@ -31,10 +31,11 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
 +C_LIB_OPTION	= shared
  SHLIB_SUFFIX	= @SHLIB_SUFFIX@
  SHLIB_LD	= @SHLIB_LD@
- LD_FLAGS	= @LD_FLAGS@
+-LD_FLAGS	= @LD_FLAGS@
++LD_FLAGS	= @LD_FLAGS@ @LDFLAGS@
  
 -TCL_INC_PATH	= @TCL_INC_PATH@
-+TCL_INC_PATH	= /usr/include/tcl
++TCL_INC_PATH	= /usr/include/tcl8.5
  TCL_LIB_PATH	= @TCL_PATH@
  TCL_LIB		= @TCL_LIB@
 -TK_INC_PATH	= @TK_INC_PATH@
@@ -46,7 +47,7 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
 -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}
++SHLIB_LD_LIBS	= @LIBS@ @SHLIB_LD_LIBS@ -ltcl8.5 -ltk8.5 -lwcs -lcfitsio ${XLIBS}
  
  #----------------------------------------------------------------------------
  # Targets:
diff --git a/debian/patches/pow_fix_startup.patch b/debian/patches/pow_fix_startup.patch
index 686f08c..5a357a8 100644
--- a/debian/patches/pow_fix_startup.patch
+++ b/debian/patches/pow_fix_startup.patch
@@ -27,7 +27,7 @@ Description: Replace the startup script by something simpler, and set the
 +export XLIB_SKIP_ARGB_VISUALS=1
 +export POW_LIBRARY=/usr/share/ftools/POW
 +export POW_HELPDIR=/usr/share/doc/ftools-pow/
-+exec wish $POW_LIBRARY/POWplot.tcl -- $*
++exec wish8.5 $POW_LIBRARY/POWplot.tcl -- $*
 --- a/tcltk/pow/pow.tcl
 +++ b/tcltk/pow/pow.tcl
 @@ -5347,7 +5347,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ftools-fv.git