[Pkg-ocaml-maint-commits] [lablgl] 01/06: switch to default tk version

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository lablgl.

commit 8b24f76f5dffcc77b3e71165b90e037299d1669d
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Mar 16 09:17:06 2018 +0100

    switch to default tk version
---
 debian/Makefile.config |  4 ++--
 debian/changelog       |  7 +++++++
 debian/control         | 10 +++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/Makefile.config b/debian/Makefile.config
index 9e873f4..a388291 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.5
+TKINCLUDES = -I/usr/include/tcl
 # Tcl/Tk libs (for broken RTLD_GLOBAL: e.g. FreeBSD 4.0)
-TKLIBS = -ltk8.5 -ltcl8.5
+TKLIBS = -ltk -ltcl
 
 # Where to find OpenGL/Mesa/Glut headers and libraries
 GLINCLUDES =
diff --git a/debian/changelog b/debian/changelog
index f7e18ef..3840fd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lablgl (1:1.05-3) unstable; urgency=medium
+
+  * Switch to the default Tcl/Tk version from 8.5 since 8.5 is to be removed
+    from Debian. Thanks to Sergei Golovan for the patch! (closes: #892990)
+
+ -- Ralf Treinen <treinen at debian.org>  Fri, 16 Mar 2018 09:13:53 +0100
+
 lablgl (1:1.05-2) unstable; urgency=medium
 
   * Add liblabltk-ocaml-dev to Build-Depends
diff --git a/debian/control b/debian/control
index a0b9b5d..9c0128d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  ocaml (>= 4.00.1),
- tcl8.5-dev,
- tk8.5-dev,
+ tcl-dev,
+ tk-dev,
  liblabltk-ocaml-dev,
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
@@ -36,8 +36,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/lablgl
 #
 # debhelper (>= 4.0): used in debian/rules, debian/compat
 # ocaml: the ocaml compiler and stdlib, with labltk
-# tcl8.5-dev: #include <tcl.h>
-# tk8.5-dev: #include <tk.h>
+# tcl-dev: #include <tcl.h>
+# tk-dev: #include <tk.h>
 # libgl-dev: #include <GL/gl.h>
 #            #include <GL/glx.h>
 # libglu-dev: #include <GL/glu.h>
@@ -71,7 +71,7 @@ Architecture: any
 Depends:
  libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev,
- tk8.5-dev,
+ tk-dev,
  ocaml-findlib,
  libxmu-dev,
  freeglut3-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lablgl.git