[Pkg-ocaml-maint-commits] [SCM] lablgl packaging branch, master, updated. debian/1.04-3-5-gb900102

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b90010258bbefb445a6b38b267f92406a5fa98fc
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Dec 14 11:54:18 2009 +0100

    Use Tcl/Tk 8.5

diff --git a/debian/Makefile.config b/debian/Makefile.config
index 2c808a5..9e873f4 100644
--- a/debian/Makefile.config
+++ b/debian/Makefile.config
@@ -20,9 +20,9 @@ XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lX11
 
 # Where to find Tcl/Tk headers
 # This must the same version as for LablTk
-TKINCLUDES = -I/usr/include/tcl8.4
+TKINCLUDES = -I/usr/include/tcl8.5
 # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
-TKLIBS = -ltk8.4 -ltcl8.4
+TKLIBS = -ltk8.5 -ltcl8.5
 
 # Where to find OpenGL/Mesa/Glut headers and libraries
 GLINCLUDES =
diff --git a/debian/changelog b/debian/changelog
index 816cde3..18ce83e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lablgl (1.04-5) UNRELEASED; urgency=low
+
+  * Use Tcl/Tk 8.5
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 14 Dec 2009 11:54:00 +0100
+
 lablgl (1.04-4) unstable; urgency=low
 
   * Converted to source format 3.0 (quilt)
diff --git a/debian/control b/debian/control
index 93b08a1..669b14f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 7.0.50~),
  ocaml (>= 3.11.1-3~),
- tcl8.4-dev,
- tk8.4-dev,
+ tcl8.5-dev,
+ tk8.5-dev,
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
  freeglut3-dev,
@@ -34,8 +34,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lablgl.git
 #
 # debhelper (>= 4.0): used in debian/rules, debian/compat
 # ocaml: the ocaml compiler and stdlib, with labltk
-# tcl8.4-dev: #include <tcl.h>
-# tk8.4-dev: #include <tk.h>
+# tcl8.5-dev: #include <tcl.h>
+# tk8.5-dev: #include <tk.h>
 # libgl-dev: #include <GL/gl.h>
 #            #include <GL/glx.h>
 # libglu-dev: #include <GL/glu.h>
@@ -69,7 +69,7 @@ Architecture: any
 Depends:
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev,
- tk8.4-dev,
+ tk8.5-dev,
  libxmu-dev,
  freeglut3-dev,
  ${ocaml:Depends},

-- 
lablgl packaging