Bug#887928: din uses deprecated Tcl 8.5

Sun Jan 21 18:49:49 UTC 2018

Source: din
Version: 5.2.1-5
Severity: important
Tags: patch

Dear Maintainer,

Tcl/Tk 8.5 has reached its end-of-life and is to be removed from Debian before
the buster's release. So please, switch to a more modern version in your din
package.

I've attached a proposed NMU patch which replaces checking for Tcl 8.5 and
linking to it by Tcl 8.6 in din's build scripts (and in build-dependencies as
well). The package builds just fine, though I haven't tested it thoroughly.
If you don't mind I could do the actual upload with these changes.

-- System Information:
Debian Release: 9.3
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500, 'stable'), (1, 'unstable'), (1, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.14.0-0.bpo.3-amd64 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-------------- next part --------------
diff -Nru din-5.2.1/debian/changelog din-5.2.1/debian/changelog

--- din-5.2.1/debian/changelog	2016-12-06 18:27:58.000000000 +0300
+++ din-5.2.1/debian/changelog	2018-01-19 12:56:20.000000000 +0300
@@ -1,3 +1,9 @@
+din (5.2.1-5.1) unstable; urgency=medium
+
+  * Switch to Tcl/Tk 8.6 as 8.5 is planned to be removed from Debian.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 19 Jan 2018 12:56:20 +0300
+
 din (5.2.1-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru din-5.2.1/debian/control din-5.2.1/debian/control
--- din-5.2.1/debian/control	2016-12-06 18:26:21.000000000 +0300
+++ din-5.2.1/debian/control	2018-01-19 12:52:52.000000000 +0300
@@ -13,7 +13,7 @@
  libircclient-dev,
  libjack-dev,
  liblo-dev,
- tcl8.5-dev
+ tcl8.6-dev
 Standards-Version: 3.9.8
 Homepage: http://dinisnoise.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/din.git
diff -Nru din-5.2.1/debian/patches/port-to-tcl8.6.patch din-5.2.1/debian/patches/port-to-tcl8.6.patch
--- din-5.2.1/debian/patches/port-to-tcl8.6.patch	1970-01-01 03:00:00.000000000 +0300
+++ din-5.2.1/debian/patches/port-to-tcl8.6.patch	2018-01-19 12:55:42.000000000 +0300
@@ -0,0 +1,70 @@
+--- a/configure
++++ b/configure
+@@ -4348,7 +4348,7 @@
+ 
+ done
+ 
+-for ac_header in tcl.h tcl8.5/tcl.h
++for ac_header in tcl.h tcl8.6/tcl.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -4356,11 +4356,11 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- { $as_echo "$as_me:${as_lineno-$LINENO}: +++ Found Tcl 8.5 +++" >&5
+-$as_echo "$as_me: +++ Found Tcl 8.5 +++" >&6;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: +++ Found Tcl 8.6 +++" >&5
++$as_echo "$as_me: +++ Found Tcl 8.6 +++" >&6;}
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: !!! Is Tcl 8.5 installed? !!!" >&5
+-$as_echo "$as_me: WARNING: !!! Is Tcl 8.5 installed? !!!" >&2;}
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: !!! Is Tcl 8.6 installed? !!!" >&5
++$as_echo "$as_me: WARNING: !!! Is Tcl 8.6 installed? !!!" >&2;}
+ fi
+ 
+ done
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_PROG_CXX
+ AC_CHECK_HEADERS([GL/gl.h],AC_MSG_NOTICE([+++ Found OpenGL +++]),[AC_MSG_ERROR([!!! Please install OpenGL !!!])])
+-AC_CHECK_HEADERS([tcl.h] [tcl8.5/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.5 +++]),[AC_MSG_WARN([!!! Is Tcl 8.5 installed? !!!])])
++AC_CHECK_HEADERS([tcl.h] [tcl8.6/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.6 +++]),[AC_MSG_WARN([!!! Is Tcl 8.6 installed? !!!])])
+ AC_CHECK_HEADERS([libircclient.h],,[AC_MSG_ERROR([!!! Please install libircclient !!!])])
+ PKG_CHECK_MODULES([liblo], [liblo])
+ PKG_CHECK_MODULES([jack], [jack])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.5 -I/usr/local/include/tcl8.5 -I /opt/include/tcl8.5 -I ../include  -Wall -O3
+-LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -L/usr/lib/tcl8.5 -L/usr/local/lib/tcl8.5 -L /opt/lib/tcl8.5 -L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.5 -lGL -lircclient -lrt -lX11
++AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.6 -I/usr/local/include/tcl8.6 -I /opt/include/tcl8.6 -I ../include  -Wall -O3
++LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -L/usr/lib/tcl8.6 -L/usr/local/lib/tcl8.6 -L /opt/lib/tcl8.6 -L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.6 -lGL -lircclient -lrt -lX11
+ 
+ bin_PROGRAMS = din
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -110,8 +110,8 @@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@ $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) \
+-	-L/usr/lib/tcl8.5 -L/usr/local/lib/tcl8.5 -L /opt/lib/tcl8.5 \
+-	-L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.5 -lGL \
++	-L/usr/lib/tcl8.6 -L/usr/local/lib/tcl8.6 -L /opt/lib/tcl8.6 \
++	-L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.6 -lGL \
+ 	-lircclient -lrt -lX11
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -181,7 +181,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.5 -I/usr/local/include/tcl8.5 -I /opt/include/tcl8.5 -I ../include  -Wall -O3
++AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.6 -I/usr/local/include/tcl8.6 -I /opt/include/tcl8.6 -I ../include  -Wall -O3
+ din_SOURCES = \
+ main.cc\
+ din.cc\
diff -Nru din-5.2.1/debian/patches/series din-5.2.1/debian/patches/series
--- din-5.2.1/debian/patches/series	2016-12-06 18:23:58.000000000 +0300
+++ din-5.2.1/debian/patches/series	2018-01-19 12:50:47.000000000 +0300
@@ -3,3 +3,4 @@
 fix-libircclient-headers.patch
 fix-bashism.patch
 fix-random-constants.patch
+port-to-tcl8.6.patch
