[skycat] 01/04: Revert tcl8.6 transition and depend on tcl8.5: we need blt, which is dependent on 8.5

[Ole Streicher]

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

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

commit 09a9e57f68fd54e86e03ea579b7520ed1a0f6b22
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 17 13:33:51 2014 +0100

    Revert tcl8.6 transition and depend on tcl8.5: we need blt, which is dependent on 8.5
---
 debian/changelog      | 3 +--
 debian/control        | 8 ++++----
 debian/patches/series | 1 -
 debian/rules          | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4f65cf..04cf877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 skycat (3.1.2+starlink1~b-4) unstable; urgency=low
 
-  * Add tcl-private/unix to includes. Closes: #741781.
-  * Remove Tclx dependency and depend on tcl8.6
+  * Explicitly depend on tcl8.5. Closes: #741781.
   * Bump standards version to 3.9.5. No changes needed.
 
  -- Ole Streicher <debian at liska.ath.cx>  Mon, 17 Mar 2014 11:21:59 +0100
diff --git a/debian/control b/debian/control
index 46dc073..d268cfa 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: blt-dev (>= 2.4z),
                itk3,
                libcfitsio3-dev,
                libwcstools-dev,
-               tcl-dev (>= 8.6),
-               tk-dev (>= 8.6)
+               tcl8.5-dev,
+               tk8.5-dev
 Standards-Version: 3.9.5
 Homepage: http://archive.eso.org/cms/tools-documentation/skycat.html
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/skycat.git
@@ -23,8 +23,8 @@ Depends: blt (>= 2.4z),
          itcl3,
          itk3,
          libtk-img,
-         tcl (>= 8.6),
-         tk (>= 8.6),
+         tcl8.5,
+         tk8.5,
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Image visualization and access to catalogs and data for astronomy
diff --git a/debian/patches/series b/debian/patches/series
index a0fe616..97f83f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ use_std_blt.patch
 fhs.patch
 use_wcstools.patch
 nonlinux.patch
-remove_tclx.patch
diff --git a/debian/rules b/debian/rules
index c6f2519..75c9748 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 	dh  $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-tkinclude=/usr/include/tk --libdir=/usr/lib/ --libexecdir=/usr/lib
+	dh_auto_configure -- --with-tkinclude=/usr/include/tcl8.5 --with-tcl=/usr/lib/tcl8.5 --with-tk=/usr/lib/tk8.5 --libdir=/usr/lib/ --libexecdir=/usr/lib
 
 
 override_dh_installchangelogs:

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