Source: togl
Version: 1.7-12
Severity: important
Tags: patch

Dear Maintainer,

Tcl/Tk 8.5 has reached its end of life and is to be removed from Debian soon.
The togl package build depends on it, so there's this bugreport.

Please, switch to more recent Tcl/Tk (8.6) or (in your case it's feasible)
use the current default Tcl/Tk to build your package.

I'm attaching a proposed NMU diff which switches to the current default
(now 8.6, prospectively 8.7) Tcl/Tk version. It also moves the pkgIndex.tcl
from versioned .../tcltk/tcl8.5/ to /usr/lib/tcltk/ directory as the package
works with any installed Tcl/Tk version (8.5 or 8.6).

If you don't mind I can do this NMU. Or you can sugegst a better soltion.

-- 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)
diff -Nru togl-1.7/debian/changelog togl-1.7/debian/changelog
--- togl-1.7/debian/changelog   2010-04-13 05:01:46.000000000 +0400
+++ togl-1.7/debian/changelog   2018-01-21 09:26:04.000000000 +0300
@@ -1,3 +1,13 @@
+togl (1.7-12.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switch to the default Tcl/Tk (currently 8.6) from 8.5 which is to be
+    removed from Debian.
+  * Move the pkgIndex.tcl to /usr/lib/tcltk/togl-1.7 (it's no longer
+    version-specific).
+
+ -- Sergei Golovan <sgolo...@debian.org>  Sun, 21 Jan 2018 09:26:04 +0300
+
 togl (1.7-12) unstable; urgency=low
 
   * Add note on image.c in copyright
diff -Nru togl-1.7/debian/control togl-1.7/debian/control
--- togl-1.7/debian/control     2010-04-09 13:23:31.000000000 +0400
+++ togl-1.7/debian/control     2018-01-21 09:26:04.000000000 +0300
@@ -2,7 +2,7 @@
 Section: libs
 Priority: extra
 Maintainer: Christophe Trophime <christophe.troph...@grenoble.cnrs.fr>
-Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, autoconf (>= 
2.65), automake (>= 1.11.1), tcl8.5-dev, tk8.5-dev, 
libgl1-mesa-dev|nvidia-glx-dev, libglu1-mesa-dev, libxmu-dev
+Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, autoconf (>= 
2.65), automake (>= 1.11.1), tcl-dev, tk-dev, libgl1-mesa-dev|nvidia-glx-dev, 
libglu1-mesa-dev, libxmu-dev
 Standards-Version: 3.8.4
 Homepage: http://togl.sourceforge.net/
 
diff -Nru togl-1.7/debian/libtogl1.install togl-1.7/debian/libtogl1.install
--- togl-1.7/debian/libtogl1.install    2010-03-16 11:45:14.000000000 +0300
+++ togl-1.7/debian/libtogl1.install    2018-01-21 09:26:04.000000000 +0300
@@ -1,2 +1,2 @@
 usr/lib/libTogl*.so.*
-usr/share/tcltk/tcl8.5/togl-1.7/pkgIndex.tcl
+usr/lib/tcltk/togl-1.7/pkgIndex.tcl
diff -Nru togl-1.7/debian/rules togl-1.7/debian/rules
--- togl-1.7/debian/rules       2010-04-09 13:23:35.000000000 +0400
+++ togl-1.7/debian/rules       2018-01-21 09:26:04.000000000 +0300
@@ -11,20 +11,20 @@
 # DEB_MAKE_CHECK_TARGET := demos
 
 # Add here any variable or target overrides you need.
-DEB_CONFIGURE_EXTRA_FLAGS := --with-tcl=/usr/lib/tcl8.5 
--with-tk=/usr/lib/tk8.5
+DEB_CONFIGURE_EXTRA_FLAGS := --with-tcl=/usr/lib --with-tk=/usr/lib
 
 #makebuilddir/libtogl1::
 #      autoconf
 
 build/libtogl1::
        rm -f libTogl1.7.so
-       $(CC) -shared -Wl,-soname,libTogl.so.1  -lX11 -lGL -lXmu -ltclstub8.5 
-ltkstub8.5 -o libTogl.so.1.7 togl.o
+       $(CC) -shared -Wl,-soname,libTogl.so.1 -o libTogl.so.1.7 togl.o -lX11 
-lGL -lXmu -ltclstub -ltkstub
 
 install/libtogl1::
        sed -i -e 's/libTogl1.7.so/libTogl.so.1.7/'  
debian/tmp/usr/lib/pkgIndex.tcl
        sed -i -e 's/\$$dir/\/usr\/lib/'  debian/tmp/usr/lib/pkgIndex.tcl
-       mkdir -p debian/tmp/usr/share/tcltk/tcl8.5/togl-1.7
-       mv debian/tmp/usr/lib/pkgIndex.tcl 
debian/tmp/usr/share/tcltk/tcl8.5/togl-1.7/
+       mkdir -p debian/tmp/usr/lib/tcltk/togl-1.7
+       mv debian/tmp/usr/lib/pkgIndex.tcl debian/tmp/usr/lib/tcltk/togl-1.7/
        install -m644 libTogl.so.1.7  debian/tmp/usr/lib
        (cd debian/tmp/usr/lib && ln -s libTogl.so.1.7 ./libTogl.so.1)
 

Reply via email to