Bug#753795: The correct patch

[Sergei Golovan]

Hi!

Here is the correct patch (where the examples in the tclspice package
use wish8.6 instead of wish8.5).

Cheers!
-- 
Sergei Golovan
-------------- next part --------------
diff -Nru ngspice-24/debian/changelog ngspice-24/debian/changelog
--- ngspice-24/debian/changelog	2014-02-14 09:43:38.000000000 +0400
+++ ngspice-24/debian/changelog	2014-07-04 07:35:11.000000000 +0400
@@ -1,3 +1,12 @@
+ngspice (24-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replace dependencies on Tcl/Tk 8.5 by Tcl/Tk 8.6 to match the newer
+    blt package.
+  * Define USE_INTERP_RESULT to make tclspice buildable with Tcl 8.6.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 04 Jul 2014 07:35:05 +0400
+
 ngspice (24-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru ngspice-24/debian/control ngspice-24/debian/control
--- ngspice-24/debian/control	2014-01-31 11:23:48.000000000 +0400
+++ ngspice-24/debian/control	2014-07-05 10:26:27.000000000 +0400
@@ -6,7 +6,7 @@
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 8), automake, libtool, libxaw7-dev, flex,
  bison, gfortran, libedit-dev, libncurses5-dev,
- texinfo, tcl8.5-dev, tcl8.5, tk8.5-dev, tk8.5, blt-dev
+ texinfo, tcl8.6-dev, tcl8.6, tk8.6-dev, tk8.6, blt-dev (>= 2.5.3)
 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.5, tk8.5
+Depends: ${shlibs:Depends}, ${misc:Depends}, ngspice, blt, tcl8.6, tk8.6
 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	2014-01-31 11:29:19.000000000 +0400
+++ ngspice-24/debian/patches/02_fix_tcl_examples.patch	2014-07-05 10:46:45.000000000 +0400
@@ -6,7 +6,7 @@
  #!/bin/sh
  # WishFix \
 -        exec wish -f "$0" ${1+"$@"}
-+        exec wish8.5 -f "$0" ${1+"$@"}
++        exec wish8.6 -f "$0" ${1+"$@"}
  	###
  
  # old name:  analyse-20070504-0.tcl
@@ -22,7 +22,7 @@
  #!/bin/sh
  # WishFix \
 -	exec wish -f "$0" ${1+"$@"}
-+	exec wish8.5 -f "$0" ${1+"$@"}
++	exec wish8.6 -f "$0" ${1+"$@"}
  ###
  
  package require BLT
@@ -37,7 +37,7 @@
  #!/bin/sh
  # WishFix \
 -        exec wish -f "$0" ${1+"$@"}
-+        exec wish8.5 -f "$0" ${1+"$@"}
++        exec wish8.6 -f "$0" ${1+"$@"}
  	###
  
  package require BLT
@@ -52,7 +52,7 @@
  #!/bin/sh
  # WishFix \
 -	exec wish vspicechart.tcl example.cir
-+	exec wish8.5 vspicechart.tcl example.cir
++	exec wish8.6 vspicechart.tcl example.cir
  ###
 --- a/examples/tclspice/tcl-testbench4/vspicechart.tcl
 +++ b/examples/tclspice/tcl-testbench4/vspicechart.tcl
@@ -80,7 +80,7 @@
  #!/bin/sh
  # WishFix \
 -        exec wish -f "$0" ${1+"$@"}
-+        exec wish8.5 -f "$0" ${1+"$@"}
++        exec wish8.6 -f "$0" ${1+"$@"}
          ###
  
  package require BLT
diff -Nru ngspice-24/debian/rules ngspice-24/debian/rules
--- ngspice-24/debian/rules	2014-01-31 11:33:17.000000000 +0400
+++ ngspice-24/debian/rules	2014-07-04 07:36:02.000000000 +0400
@@ -14,7 +14,7 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-
+CFLAGS= -DUSE_INTERP_RESULT
 
 config.status: config.status-stamp configure
 config.status-stamp:
@@ -57,7 +57,7 @@
 		--enable-cider \
 		--disable-debug \
 		--disable-x \
-		--with-tcl=/usr/lib/tcl8.5 \
+		--with-tcl=/usr/lib/tcl8.6 \
 		CFLAGS="$(CFLAGS)")
 	touch $@