[saods9] 01/01: Use tcl8.5-dev and tk8.5-dev build dependencies instead of tcl-dev and tk-dev because of FTBFS in case of upgrading tcl-dev and tk-dev to 8.6.

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian-unstable
in repository saods9.

commit f723be2934f336b98907f34bdcebacf716c0f6f7
Author: Sergei Golovan <sgolovan at debian.org>
Date:   Fri Oct 18 21:48:14 2013 +0400

    Use tcl8.5-dev and tk8.5-dev build dependencies instead of tcl-dev and tk-dev
    because of FTBFS in case of upgrading tcl-dev and tk-dev to 8.6.
---
 debian/changelog                           |    9 +++++++++
 debian/control                             |    4 ++--
 debian/patches/ds9_make_linux.patch        |   11 ++++++++++-
 debian/patches/ds9_use_external_libs.patch |    2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 169b482..a39435c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+saods9 (7.2+dfsg-4) unstable; urgency=low
+
+  [Sergei Golovan]
+  * Use tcl8.5-dev and tk8.5-dev build dependencies instead of tcl-dev and
+    tk-dev because of FTBFS in case of upgrading tcl-dev and tk-dev to 8.6.
+    Closes: #726758
+
+ -- Ole Streicher <debian at liska.ath.cx>  Fri, 18 Oct 2013 21:48:14 +0400
+
 saods9 (7.2+dfsg-3) unstable; urgency=low
 
   * Re-create htmlwidget/configure. Fixes FTBS on MIPS.
diff --git a/debian/control b/debian/control
index e6a7ff7..2f549ca 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: autotools-dev,
                libxrandr-dev,
                libxt-dev,
                perl,
-               tcl-dev,
-               tk-dev,
+               tcl8.5-dev,
+               tk8.5-dev,
                zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: http://hea-www.harvard.edu/RD/ds9/site/Home.html
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 88bdbdc..49cce6b 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -12,7 +12,7 @@ Description: Set the compile flags according to the Debian environment. We
  X11LIB	= /usr/X11R6/lib
  
 -XX	= -O2 
-+XX	=  $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk -I/usr/include/freetype2
++XX	=  $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl8.5 -I/usr/include/freetype2
  YY	= -gstabs+ -fno-inline 
  ZZ	=
  
@@ -42,6 +42,15 @@ Description: Set the compile flags according to the Debian environment. We
  
 --- a/Makefile
 +++ b/Makefile
+@@ -50,7 +50,7 @@
+ 
+   TCLFLAGS = $(XFLAGS) $(EXTTCLFLAGS)
+   TKTABLEFLAGS = $(XFLAGS)
+-  BLTFLAGS = $(XFLAGS) $(BLTWITHOUT)
++  BLTFLAGS = $(XFLAGS) --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 $(BLTWITHOUT)
+   TKIMGFLAGS = $(XFLAGS)
+   XPAFLAGS = $(XFLAGS)
+ 
 @@ -283,7 +283,7 @@
  
  blt	: FORCE
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index 039b1ec..bca8474 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -107,7 +107,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 +	-Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \
 +	-lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \
 +	-lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0 -lBLTX30 -lBLTCore30 \
-+	-lwcstools -lfuntools  -ltk -ltcl -lz \
++	-lwcstools -lfuntools  -ltk8.5 -ltcl8.5 -lz \
 +	-L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
  endif
  

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