Bug#893104: code-aster-gui: depends on deprecated Tcl/Tk 8.5

[Sergei Golovan]

Package: code-aster-gui
Version: 1.13.1-2
Severity: important
Tags: patch

Dear Maintainer,

Your package depends on Tcl/Tk 8.5 which has reached its end-of-life and is to
be removed from Debian. So please, switch to more modern Tcl/Tk version.
I'd like to suggest the attached patch (possibly with NMU) which switches
code-aster-gui to the default Tcl/Tk version. It replaces tk8.5 and tcl8.5
by tk and tcl in dependencies, and removes a patch which replaced calls
to wish by calls to wish8.5.

-- System Information:
Debian Release: 9.4
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental'), (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)

Versions of packages code-aster-gui depends on:
ii  debconf  1.5.61
ii  tcl8.5   8.5.19-2+b1
ii  tk8.5    8.5.19-1+b1
pn  tkpng    <none>

Versions of packages code-aster-gui recommends:
pn  code-aster-run  <none>

Versions of packages code-aster-gui suggests:
pn  ddd     <none>
pn  eficas  <none>
pn  gmsh    <none>
pn  grace   <none>
pn  nedit   <none>
-------------- next part --------------
diff -Nru astk-1.13.1/debian/changelog astk-1.13.1/debian/changelog
--- astk-1.13.1/debian/changelog	2014-05-13 12:09:45.000000000 +0400
+++ astk-1.13.1/debian/changelog	2018-03-16 13:56:20.000000000 +0300
@@ -1,3 +1,11 @@
+astk (1.13.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switch to the default Tcl/Tk version from Tcl/Tk 8.5 which is to be
+    removed from Debian.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 16 Mar 2018 13:56:20 +0300
+
 astk (1.13.1-2) unstable; urgency=low
 
   [ Denis Laxalde ]
diff -Nru astk-1.13.1/debian/control astk-1.13.1/debian/control
--- astk-1.13.1/debian/control	2014-05-13 12:08:00.000000000 +0400
+++ astk-1.13.1/debian/control	2018-03-16 13:53:45.000000000 +0300
@@ -13,7 +13,7 @@
 
 Package: code-aster-gui
 Architecture: all
-Depends: tk8.5, tcl8.5, tkpng, debconf (>= 1.5.30), ${misc:Depends}
+Depends: tk, tcl, tkpng, debconf (>= 1.5.30), ${misc:Depends}
 Recommends: code-aster-run
 Replaces: astk, astk-server
 Conflicts: astk, astk-server
diff -Nru astk-1.13.1/debian/patches/0006-Call-wish8.5-not-wish-Closes-725685.patch astk-1.13.1/debian/patches/0006-Call-wish8.5-not-wish-Closes-725685.patch
--- astk-1.13.1/debian/patches/0006-Call-wish8.5-not-wish-Closes-725685.patch	2014-05-13 12:08:00.000000000 +0400
+++ astk-1.13.1/debian/patches/0006-Call-wish8.5-not-wish-Closes-725685.patch	1970-01-01 03:00:00.000000000 +0300
@@ -1,37 +0,0 @@
-From: Denis Laxalde <denis.laxalde at logilab.fr>
-Date: Mon, 7 Apr 2014 10:05:45 +0200
-Subject: Call wish8.5, not wish (Closes #725685)
-
----
- ASTK_CLIENT/bin/astk |    2 +-
- ASTK_CLIENT/bin/bsf  |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ASTK_CLIENT/bin/astk b/ASTK_CLIENT/bin/astk
-index 1de34da..84e4baf 100755
---- a/ASTK_CLIENT/bin/astk
-+++ b/ASTK_CLIENT/bin/astk
-@@ -29,7 +29,7 @@ fi
- 
- # start tcl/tk interpreter
- if [ -z "$WISHEXECUTABLE" ]; then
--   WISHEXECUTABLE=wish
-+   WISHEXECUTABLE=wish8.5
- fi
- 
- $WISHEXECUTABLE /usr/share/astk/astk.tcl -- $* &
-diff --git a/ASTK_CLIENT/bin/bsf b/ASTK_CLIENT/bin/bsf
-index 64b50a2..81350f9 100755
---- a/ASTK_CLIENT/bin/bsf
-+++ b/ASTK_CLIENT/bin/bsf
-@@ -28,8 +28,8 @@ if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
- fi
- 
- # start tcl/tk interpreter
--if [ -z "$WISHEXECUTABLE" ]; then
--   WISHEXECUTABLE=wish
-+if [ -z "$WISHEXECUTABE" ]; then
-+   WISHEXECUTABLE=wish8.5
- fi
- 
- $WISHEXECUTABLE /usr/share/astk/bsf.tcl -- $* &
diff -Nru astk-1.13.1/debian/patches/series astk-1.13.1/debian/patches/series
--- astk-1.13.1/debian/patches/series	2014-05-13 12:08:00.000000000 +0400
+++ astk-1.13.1/debian/patches/series	2018-03-16 13:56:20.000000000 +0300
@@ -3,4 +3,3 @@
 0003-debian-install.patch
 0004-parallel_cp.patch
 0005-Disable-check-and-removal-of-previous-installation-d.patch
-0006-Call-wish8.5-not-wish-Closes-725685.patch