[ftools-fv] 01/02: Fixed FTBFS with new Tcl/Tk after dropping /usr/bin/tclsh alternative and removing patch for tclPort.h

[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 cb97390f1e77d19adb342144b7b649b663c2a079
Author: Sergei Golovan <sgolovan at nes.ru>
Date:   Thu Oct 10 09:22:36 2013 +0200

    Fixed FTBFS with new Tcl/Tk after dropping /usr/bin/tclsh alternative and removing patch for tclPort.h
---
 debian/changelog                        |    8 ++++++++
 debian/patches/pow_create_package.patch |    2 +-
 debian/patches/pow_fix_makefile.patch   |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de2eb97..9fa883d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ftools-fv (5.3+dfsg-4) unstable; urgency=low
+
+  [ Sergei Golovan ]
+  * Fixed FTBFS with new Tcl/Tk after dropping /usr/bin/tclsh alternative
+    and removing patch for tclPort.h.
+
+ -- Ole Streicher <debian at liska.ath.cx>  Thu, 10 Oct 2013 09:20:23 +0200
+
 ftools-fv (5.3+dfsg-3) unstable; urgency=low
 
   * Call wish8.5 and depend of tk8.5 (required because we use itcl{3}
diff --git a/debian/patches/pow_create_package.patch b/debian/patches/pow_create_package.patch
index 67cea9e..250ea9a 100644
--- a/debian/patches/pow_create_package.patch
+++ b/debian/patches/pow_create_package.patch
@@ -46,7 +46,7 @@ Description: Create and "package require" the POW package.
  
  shared: ${SHARED_OBJ}
  	${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}
-+	echo "pkg_mkIndex  . libpow.so" | tclsh
++	echo "pkg_mkIndex  . libpow.so" | tclsh8.5
  
  install:
  	@if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \
diff --git a/debian/patches/pow_fix_makefile.patch b/debian/patches/pow_fix_makefile.patch
index eb2cc3a..43d40ae 100644
--- a/debian/patches/pow_fix_makefile.patch
+++ b/debian/patches/pow_fix_makefile.patch
@@ -15,7 +15,7 @@ Description: Set variables in Makefile.in to get pow compiled (Q&D patch)
  
 -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}
++IFLAGS		= -I${TCL_INC_PATH} -I${TK_INC_PATH} -I${TK_INC_PATH}/../unix ${XINC}
  
  #----------------------------------------------------------------------------
  # Configurable macros:

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