1
1
Author: Michael A. Cleverly <michael@cleverly.com>, Sergei Golovan <sgolovan@debian.org>
3
Fixes stupid typo in pkgIndex.in (Closes: #186179).
4
3
Adjusted for new soname (Closes: #381052).
5
4
Replaced [package require Expect] by direct loading libexpect library in all tests
6
5
because package management can't load the library from its build location.
7
6
Last-Modified: 2009-11-18
9
--- expect-5.44.1.15.orig/Makefile.in
10
+++ expect-5.44.1.15/Makefile.in
12
( echo pkg_mkIndex . $(PKG_LIB_FILE) \; exit; ) | $(TCLSH)
8
--- expect-5.45.orig/Makefile.in
9
+++ expect-5.45/Makefile.in
15
- (echo 'package ifneeded Expect $(PACKAGE_VERSION) \
12
(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
13
echo 'package ifneeded Expect $(PACKAGE_VERSION) \
16
14
- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
17
+ (echo 'if {[package vcompare [info tclversion] @TCL_VERSION@] < 0} return' ; \
19
+ echo 'package ifneeded Expect $(PACKAGE_VERSION) \
20
15
+ [list load [file join @prefix@ lib libexpect.so.@PACKAGE_VERSION@]]'\
23
18
#========================================================================
24
--- expect-5.44.1.15.orig/pkgIndex.in
25
+++ expect-5.44.1.15/pkgIndex.in
27
# script is sourced, the variable $dir must contain the
28
# full path name of this file's directory.
19
--- expect-5.45.orig/tests/all.tcl
20
+++ expect-5.45/tests/all.tcl
22
package require tcltest
23
# do this in a way that is backward compatible for Tcl 8.3
24
namespace import ::tcltest::test ::tcltest::cleanupTests
25
-package require Expect
26
+load [lindex [glob libexpect*.so] 0]
30
+if {[package vcompare [info tclversion] @TCL_VERSION@] < 0} return
32
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
33
+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join @prefix@ lib libexpect.so.@PACKAGE_VERSION@]]
34
--- expect-5.44.1.15.orig/tests/cat.test
35
+++ expect-5.44.1.15/tests/cat.test
28
set ::tcltest::testSingleFile false
29
set ::tcltest::testsDirectory [file dirname [info script]]
30
--- expect-5.45.orig/tests/cat.test
31
+++ expect-5.45/tests/cat.test
37
33
# do this in a way that is backward compatible for Tcl 8.3
38
34
namespace import ::tcltest::test ::tcltest::cleanupTests
43
39
#exp_internal -f /dev/ttyp5 0
45
--- expect-5.44.1.15.orig/tests/expect.test
46
+++ expect-5.44.1.15/tests/expect.test
41
--- expect-5.45.orig/tests/expect.test
42
+++ expect-5.45/tests/expect.test
48
44
# do this in a way that is backward compatible for Tcl 8.3
49
45
namespace import ::tcltest::test ::tcltest::cleanupTests
56
--- expect-5.44.1.15.orig/tests/logfile.test
57
+++ expect-5.44.1.15/tests/logfile.test
52
--- expect-5.45.orig/tests/logfile.test
53
+++ expect-5.45/tests/logfile.test
59
55
# do this in a way that is backward compatible for Tcl 8.3
60
56
namespace import ::tcltest::test ::tcltest::cleanupTests
65
61
test logfile-1.1 {basic logfile} {
66
62
set filename /tmp/logfile.[pid]
67
--- expect-5.44.1.15.orig/tests/pid.test
68
+++ expect-5.44.1.15/tests/pid.test
63
--- expect-5.45.orig/tests/pid.test
64
+++ expect-5.45/tests/pid.test
70
66
# do this in a way that is backward compatible for Tcl 8.3
71
67
namespace import ::tcltest::test ::tcltest::cleanupTests
78
--- expect-5.44.1.15.orig/tests/send.test
79
+++ expect-5.44.1.15/tests/send.test
81
# do this in a way that is backward compatible for Tcl 8.3
82
namespace import ::tcltest::test ::tcltest::cleanupTests
84
-package require Expect
85
+load [lindex [glob libexpect*.so] 0]
89
--- expect-5.44.1.15.orig/tests/spawn.test
90
+++ expect-5.44.1.15/tests/spawn.test
92
# do this in a way that is backward compatible for Tcl 8.3
93
namespace import ::tcltest::test ::tcltest::cleanupTests
95
-package require Expect
96
+load [lindex [glob libexpect*.so] 0]
100
--- expect-5.44.1.15.orig/tests/stty.test
101
+++ expect-5.44.1.15/tests/stty.test
74
--- expect-5.45.orig/tests/send.test
75
+++ expect-5.45/tests/send.test
77
# do this in a way that is backward compatible for Tcl 8.3
78
namespace import ::tcltest::test ::tcltest::cleanupTests
80
-package require Expect
81
+load [lindex [glob libexpect*.so] 0]
85
--- expect-5.45.orig/tests/spawn.test
86
+++ expect-5.45/tests/spawn.test
88
# do this in a way that is backward compatible for Tcl 8.3
89
namespace import ::tcltest::test ::tcltest::cleanupTests
91
-package require Expect
92
+load [lindex [glob libexpect*.so] 0]
96
--- expect-5.45.orig/tests/stty.test
97
+++ expect-5.45/tests/stty.test
103
99
# do this in a way that is backward compatible for Tcl 8.3
104
100
namespace import ::tcltest::test ::tcltest::cleanupTests