From: Stephane Glondu <steph@glondu.net>
Date: Fri, 8 Nov 2013 08:39:44 +0000 (+0100)
Subject: Use unversioned Tcl/Tk dependencies
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~196
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4afff9d3ed89036235c2dc15fa50291b10930be2;p=ocaml.git

Use unversioned Tcl/Tk dependencies
---

diff --git a/debian/control b/debian/control
index 840424a6..d5cea5f1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends:
  quilt,
  autotools-dev,
  binutils-dev,
- tcl8.5-dev,
- tk8.5-dev,
+ tcl-dev,
+ tk-dev,
  libncurses5-dev,
  bzip2,
  dh-ocaml (>= 1.0.0~)
@@ -131,8 +131,8 @@ Depends:
 Provides:
  ${ocaml:Provides}
 Suggests:
- tcl8.5-dev,
- tk8.5-dev
+ tcl-dev,
+ tk-dev
 Replaces: ocaml-nox (<< 3.11.0-2)
 Description: ML language implementation with a class-based object system
  Objective Caml (OCaml) is an implementation of the ML language, based on
diff --git a/debian/rules b/debian/rules
index 3940b254..513a2732 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,8 @@ CONFIGURE_OPTS := \
   -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \
   -x11lib "$(shell pkg-config --variable=libdir x11)" \
   -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
-  -tkdefs "-I/usr/include/tcl8.5" \
-  -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"
+  -tkdefs "-I/usr/include/tcl" \
+  -tklibs "-L/usr/lib -ltk -ltcl"
 
 CONFIGURE_SED := \
   -e "/LIBBFD_LINK/s%-lbfd%-Wl,-Bstatic -lbfd -Wl,-Bdynamic%" \