Package: tclspice
Version: 24-1
Severity: normal
Tags: patch
Dear Maintainer,
We are about to drop Tcl/Tk 8.4 from the Debian archive. Your package
tclspice still depends on tcl8.4 and tk8.4.
I'd like to propose the attached patch which switches to Tcl/Tk 8.5.
It also fixes the undefined symbol Blt_GetVector issue on loading
libspice.so into the wish shell (currently, tclspice is totally
unusable).
If you don't mind I'd like to do NMU with these changes.
-- System Information:
Debian Release: 7.3
APT prefers proposed-updates
APT policy: (500, 'proposed-updates'), (500, 'stable'), (100, 'unstable'),
(1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ngspice-24/debian/changelog ngspice-24/debian/changelog
--- ngspice-24/debian/changelog 2012-06-17 11:45:11.000000000 +0400
+++ ngspice-24/debian/changelog 2014-02-01 12:24:38.000000000 +0400
@@ -1,3 +1,12 @@
+ngspice (24-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Link to libBLT explicitly because otherwise libspice.so can't be loaded
+ into wish with undefined symbol Blt_GetVector.
+ * Replace obsolete dependencies on Tcl/Tk 8.4 by Tcl/Tk 8.5.
+
+ -- Sergei Golovan <sgolo...@debian.org> Sat, 01 Feb 2014 12:24:21 +0400
+
ngspice (24-1) unstable; urgency=low
* New upstream release
diff -Nru ngspice-24/debian/control ngspice-24/debian/control
--- ngspice-24/debian/control 2012-06-17 11:45:11.000000000 +0400
+++ ngspice-24/debian/control 2014-01-31 11:23:48.000000000 +0400
@@ -6,7 +6,7 @@
Andreas Tille <ti...@debian.org>
Build-Depends: debhelper (>= 8), automake, libtool, libxaw7-dev, flex,
bison, gfortran, libedit-dev, libncurses5-dev,
- texinfo, tcl8.4-dev, tcl8.4, tk8.4-dev, tk8.4, blt-dev
+ texinfo, tcl8.5-dev, tcl8.5, tk8.5-dev, tk8.5, blt-dev
Build-Depends-Indep: lyx, elyxer, texlive, texlive-latex-extra, texlive-lang-greek,
texlive-generic-recommended, imagemagick
Standards-Version: 3.9.3
@@ -29,7 +29,7 @@
Package: tclspice
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.4, tk8.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.5, tk8.5
Replaces: tclspice-dev
Breaks: tclspice-dev
Description: NGspice library for Tcl
diff -Nru ngspice-24/debian/patches/02_fix_tcl_examples.patch ngspice-24/debian/patches/02_fix_tcl_examples.patch
--- ngspice-24/debian/patches/02_fix_tcl_examples.patch 2012-05-18 12:20:45.000000000 +0400
+++ ngspice-24/debian/patches/02_fix_tcl_examples.patch 2014-01-31 11:29:19.000000000 +0400
@@ -1,14 +1,12 @@
Change wish to wish8.4, other wish shells don't work.
Change search path of libspice.so to /usr/lib/tcltk/
-Index: ngspice-24/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl 2012-05-17 08:25:23.484220306 +0200
+--- a/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl
++++ b/examples/tclspice/tcl-testbench1/tcl-testbench1.tcl
@@ -1,11 +1,11 @@
#!/bin/sh
# WishFix \
- exec wish -f "$0" ${1+"$@"}
-+ exec wish8.4 -f "$0" ${1+"$@"}
++ exec wish8.5 -f "$0" ${1+"$@"}
###
# old name: analyse-20070504-0.tcl
@@ -18,15 +16,13 @@
# Test of virtual capacitore circuit
# Vary the control voltage and log the resulting capacitance
-Index: ngspice-24/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl 2012-05-17 08:25:23.484220306 +0200
+--- a/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl
++++ b/examples/tclspice/tcl-testbench2/tcl-testbench2.tcl
@@ -1,10 +1,10 @@
#!/bin/sh
# WishFix \
- exec wish -f "$0" ${1+"$@"}
-+ exec wish8.4 -f "$0" ${1+"$@"}
++ exec wish8.5 -f "$0" ${1+"$@"}
###
package require BLT
@@ -35,15 +31,13 @@
namespace import blt::*
wm title . "Vector Test script"
-Index: ngspice-24/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl 2012-05-17 08:25:23.484220306 +0200
+--- a/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl
++++ b/examples/tclspice/tcl-testbench3/tcl-testbench3.tcl
@@ -1,10 +1,10 @@
#!/bin/sh
# WishFix \
- exec wish -f "$0" ${1+"$@"}
-+ exec wish8.4 -f "$0" ${1+"$@"}
++ exec wish8.5 -f "$0" ${1+"$@"}
###
package require BLT
@@ -52,20 +46,16 @@
source differentiate.tcl
spice::codemodel ../../../src/xspice/icm/spice2poly/spice2poly.cm
proc temperatures_calc {temp_inf temp_sup points} {
-Index: ngspice-24/examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl-testbench4/tcl-testbench4.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl-testbench4/tcl-testbench4.tcl 2012-05-17 08:25:23.484220306 +0200
+--- a/examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
++++ b/examples/tclspice/tcl-testbench4/tcl-testbench4.tcl
@@ -1,4 +1,4 @@
#!/bin/sh
# WishFix \
- exec wish vspicechart.tcl example.cir
-+ exec wish8.4 vspicechart.tcl example.cir
++ exec wish8.5 vspicechart.tcl example.cir
###
-Index: ngspice-24/examples/tclspice/tcl-testbench4/vspicechart.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl-testbench4/vspicechart.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl-testbench4/vspicechart.tcl 2012-05-17 08:27:46.853892007 +0200
+--- a/examples/tclspice/tcl-testbench4/vspicechart.tcl
++++ b/examples/tclspice/tcl-testbench4/vspicechart.tcl
@@ -7,7 +7,7 @@
@@ -84,15 +74,13 @@
Blt_Crosshairs .f2.chart
Blt_ClosestPoint .f2.chart
Blt_PrintKey .f2.chart
-Index: ngspice-24/examples/tclspice/tcl/test_vectoblt.tcl
-===================================================================
---- ngspice-24.orig/examples/tclspice/tcl/test_vectoblt.tcl 2012-05-17 08:25:17.629265705 +0200
-+++ ngspice-24/examples/tclspice/tcl/test_vectoblt.tcl 2012-05-17 08:25:23.488222327 +0200
+--- a/examples/tclspice/tcl/test_vectoblt.tcl
++++ b/examples/tclspice/tcl/test_vectoblt.tcl
@@ -1,10 +1,10 @@
#!/bin/sh
# WishFix \
- exec wish -f "$0" ${1+"$@"}
-+ exec wish8.4 -f "$0" ${1+"$@"}
++ exec wish8.5 -f "$0" ${1+"$@"}
###
package require BLT
diff -Nru ngspice-24/debian/patches/03_fix_blt_link.patch ngspice-24/debian/patches/03_fix_blt_link.patch
--- ngspice-24/debian/patches/03_fix_blt_link.patch 1970-01-01 03:00:00.000000000 +0300
+++ ngspice-24/debian/patches/03_fix_blt_link.patch 2014-02-01 11:15:07.000000000 +0400
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -83,7 +83,7 @@
+
+ @WINDOWS_TRUE@am__append_17 = -lpsapi
+ @TCL_MODULE_TRUE@am__append_18 = tclspinit
+-@TCLWIN_TRUE@@TCL_MODULE_TRUE@am__append_19 = -lpsapi -ltcl84 -lBLT24
++@TCL_MODULE_TRUE@am__append_19 = -lBLT
+ @TCL_MODULE_TRUE@@WINDOWS_TRUE@am__append_20 = \
+ @TCL_MODULE_TRUE@@WINDOWS_TRUE@ frontend/wdisp/libwindisp.la
+
diff -Nru ngspice-24/debian/patches/series ngspice-24/debian/patches/series
--- ngspice-24/debian/patches/series 2012-04-24 18:39:53.000000000 +0400
+++ ngspice-24/debian/patches/series 2014-02-01 12:22:14.000000000 +0400
@@ -1,2 +1,3 @@
01_fix_manpages.patch
02_fix_tcl_examples.patch
+03_fix_blt_link.patch
diff -Nru ngspice-24/debian/rules ngspice-24/debian/rules
--- ngspice-24/debian/rules 2012-06-17 11:45:11.000000000 +0400
+++ ngspice-24/debian/rules 2014-01-31 11:33:17.000000000 +0400
@@ -57,7 +57,7 @@
--enable-cider \
--disable-debug \
--disable-x \
- --with-tcl=/usr/lib/tcl8.4 \
+ --with-tcl=/usr/lib/tcl8.5 \
CFLAGS="$(CFLAGS)")
touch $@
