From: Stephane Glondu <steph@glondu.net>
Date: Mon, 14 Dec 2009 10:44:44 +0000 (+0100)
Subject: Use Tcl/Tk 8.5
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~377
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a1347b76b5a207d056e4a66db381646c78b42b9;p=ocaml.git

Use Tcl/Tk 8.5
---

diff --git a/debian/changelog b/debian/changelog
index ed9da692..bc224d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ocaml (3.11.1-5) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Use Tcl/Tk 8.5
 
- -- Stéphane Glondu <glondu@debian.org>  Mon, 14 Dec 2009 11:43:39 +0100
+ -- Stéphane Glondu <glondu@debian.org>  Mon, 14 Dec 2009 11:53:44 +0100
 
 ocaml (3.11.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 338f6516..c4e1d7ac 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 7),
  autotools-dev,
- tcl8.4-dev,
- tk8.4-dev,
+ tcl8.5-dev,
+ tk8.5-dev,
  libncurses5-dev,
  libgdbm-dev,
  quilt,
@@ -134,8 +134,8 @@ Depends:
 Provides:
  ${ocaml:Provides}
 Suggests:
- tcl8.4-dev,
- tk8.4-dev
+ tcl8.5-dev,
+ tk8.5-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/control.in b/debian/control.in
index d7667d2a..c4cef1cd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,8 +12,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 7),
  autotools-dev,
- tcl8.4-dev,
- tk8.4-dev,
+ tcl8.5-dev,
+ tk8.5-dev,
  libncurses5-dev,
  libgdbm-dev,
  quilt,
@@ -134,8 +134,8 @@ Depends:
 Provides:
  ${ocaml:Provides}
 Suggests:
- tcl8.4-dev,
- tk8.4-dev
+ tcl8.5-dev,
+ tk8.5-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 2694a5c8..3ef35f4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,8 +52,8 @@ CONFIGURE_OPTS := \
   --with-pthread -prefix /usr \
   -libdir $(OCAML_STDLIB_DIR) \
   -mandir /usr/share/man \
-  -tkdefs "-I/usr/include/tcl8.4" \
-  -tklibs "-L/usr/lib -ltk8.4 -ltcl8.4"
+  -tkdefs "-I/usr/include/tcl8.5" \
+  -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5"
 
 CONFIGURE_SED := \
   -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \