[saods9] 01/03: Allow build against 8.5 as well as 8.6

[Ole Streicher]

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

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

commit a0ead34e34ef7146a2c0cbfe3895c042ac8a2698
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 27 17:28:53 2013 +0100

    Allow build against 8.5 as well as 8.6
---
 debian/control                             |    1 -
 debian/patches/ds9_use_external_libs.patch |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 64b46cb..e6a7ff7 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Build-Depends: autotools-dev,
                perl,
                tcl-dev,
                tk-dev,
-               tk8.6-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_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index a6621a9..c768ec4 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -8,7 +8,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
  CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
  
 -MAINDIR	= ../$(TKDIR)/unix
-+MAINDIR	= /usr/share/tcltk/tk8.6
++MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
  MAIN	= tkAppInit
  
  ZDIR = zipdir/zvfsmntpt

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