[Pkg-tcltk-commits] r991 - in expect/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Nov 18 11:42:02 UTC 2009
Author: sgolovan
Date: 2009-11-18 11:42:01 +0000 (Wed, 18 Nov 2009)
New Revision: 991
Added:
expect/trunk/debian/patches/17-norc.patch
Removed:
expect/trunk/debian/patches/static-names.diff
Modified:
expect/trunk/debian/changelog
expect/trunk/debian/patches/06-pkgindex.patch
expect/trunk/debian/patches/19-tk-init.patch
expect/trunk/debian/patches/series
expect/trunk/debian/rules
Log:
[expect]
* Fixed sourcing rc flies by expectk (closes: #555746).
* Removed another unnecessary patch.
* Adapted expect test suite to the changes in pkgIndex.tcl which can't load
Expect package if it isn't installed into /usr/lib.
Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/changelog 2009-11-18 11:42:01 UTC (rev 991)
@@ -1,8 +1,11 @@
-expect (5.44.1.14-5) UNRELEASED; urgency=low
+expect (5.44.1.14-5) unstable; urgency=low
- * NOT RELEASED YET
+ * Fixed sourcing rc flies by expectk (closes: #555746).
+ * Removed another unnecessary patch.
+ * Adapted expect test suite to the changes in pkgIndex.tcl which can't load
+ Expect package if it isn't installed into /usr/lib.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 07 Nov 2009 16:00:50 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 18 Nov 2009 11:48:23 +0300
expect (5.44.1.14-4) unstable; urgency=low
Modified: expect/trunk/debian/patches/06-pkgindex.patch
===================================================================
--- expect/trunk/debian/patches/06-pkgindex.patch 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/patches/06-pkgindex.patch 2009-11-18 11:42:01 UTC (rev 991)
@@ -1,8 +1,10 @@
-Author: Michael A. Cleverly <michael at cleverly.com>
-Modified by Sergei Golovan <sgolovan at debian.org>
+Author: Michael A. Cleverly <michael at cleverly.com>, Sergei Golovan <sgolovan at debian.org>
Description:
Fixes stupid typo in pkgIndex.in (Closes: #186179).
Adjusted for new soname (Closes: #381052).
+ Replaced [package require Expect] by direct loading libexpect library in all tests
+ because package management can't load the library from its build location.
+Last-Modified: 2009-11-18
--- expect.orig/Makefile.in
+++ expect/Makefile.in
@@ -23,3 +25,80 @@
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join @prefix@ lib libexpect.so. at PACKAGE_VERSION@]]
+--- expect.orig/tests/cat.test
++++ expect/tests/cat.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ #exp_internal -f /dev/ttyp5 0
+
+--- expect.orig/tests/expect.test
++++ expect/tests/expect.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ catch {unset x}
+
+--- expect.orig/tests/logfile.test
++++ expect/tests/logfile.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ test logfile-1.1 {basic logfile} {
+ set filename /tmp/logfile.[pid]
+--- expect.orig/tests/pid.test
++++ expect/tests/pid.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ catch {unset x}
+
+--- expect.orig/tests/send.test
++++ expect/tests/send.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ log_user 0
+
+--- expect.orig/tests/spawn.test
++++ expect/tests/spawn.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ log_user 0
+
+--- expect.orig/tests/stty.test
++++ expect/tests/stty.test
+@@ -9,7 +9,7 @@
+ # do this in a way that is backward compatible for Tcl 8.3
+ namespace import ::tcltest::test ::tcltest::cleanupTests
+ }
+-package require Expect
++load [lindex [glob libexpect*.so] 0]
+
+ #exp_internal -f /dev/ttyp5 0
+
Added: expect/trunk/debian/patches/17-norc.patch
===================================================================
--- expect/trunk/debian/patches/17-norc.patch (rev 0)
+++ expect/trunk/debian/patches/17-norc.patch 2009-11-18 11:42:01 UTC (rev 991)
@@ -0,0 +1,36 @@
+Author: Sergei Golovan <sgolovan at debian.org>
+Description: Fixes processing of -norc and -NORC expectk command line options.
+Bug-Debian: http://bugs.debian.org/555746
+Bug: https://sourceforge.net/tracker/?func=detail&aid=2896150&group_id=13179&atid=113179
+Last-Update: 2009-11-12
+
+--- expect-5.44.1.14.orig/exp_main_tk.c
++++ expect-5.44.1.14/exp_main_tk.c
+@@ -101,6 +101,9 @@
+ *----------------------------------------------------------------------
+ */
+
++int my_rc = 1;
++int sys_rc = 1;
++
+ int
+ Tcl_AppInit(interp)
+ Tcl_Interp *interp; /* Interpreter for application. */
+@@ -137,6 +140,8 @@
+ * they weren't already created by the init procedures called above.
+ */
+
++ exp_interpret_rcfiles(interp,my_rc,sys_rc);
++
+ /*
+ * Specify a user-specific startup file to invoke if the application
+ * is run interactively. Typically the startup file is "~/.apprc"
+@@ -171,8 +176,6 @@
+ static int rest = 0;
+
+ /* for Expect */
+-int my_rc = 1;
+-int sys_rc = 1;
+ static int optcmd_eval();
+ static int optcmd_diagToStderr();
+ #ifdef TCL_DEBUGGER
Modified: expect/trunk/debian/patches/19-tk-init.patch
===================================================================
--- expect/trunk/debian/patches/19-tk-init.patch 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/patches/19-tk-init.patch 2009-11-18 11:42:01 UTC (rev 991)
@@ -1,6 +1,8 @@
Author: Sergei Golovan <sgolovan at debian.org>
-Description: Fixes Tk intialization by calling Tk_Init instead of
- using copy&pasted Tk_Init from older Tk.
+Description: Fixes Tk intialization by calling Tk_Init instead of using
+ copied&pasted Tk_Init from older Tk.
+Bug: https://sourceforge.net/tracker/?func=detail&aid=2585764&group_id=13179&atid=113179
+Last-Update: 2009-11-12
--- expect-5.44.1.14.orig/exp_main_tk.c
+++ expect-5.44.1.14/exp_main_tk.c
@@ -38,7 +40,7 @@
+static int rest;
/* for Expect */
- int my_rc = 1;
+ static int optcmd_eval();
@@ -181,21 +186,6 @@
int print_version = 0;
Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/patches/series 2009-11-18 11:42:01 UTC (rev 991)
@@ -11,5 +11,6 @@
13-implicit-defs.patch
15-comments.patch
16-logfile.patch
+17-norc.patch
18-non-linux.patch
19-tk-init.patch
Deleted: expect/trunk/debian/patches/static-names.diff
===================================================================
--- expect/trunk/debian/patches/static-names.diff 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/patches/static-names.diff 2009-11-18 11:42:01 UTC (rev 991)
@@ -1,16 +0,0 @@
-Author: Niko Tyni <ntyni at iki.fi>
-Description:
- Fixes name of the static library on alpha, mips and mipsel (Closes: #390366)
-
-diff -Naurp expect.orig/configure expect/configure
---- expect.orig/configure 2009-08-03 08:44:15.000000000 +0000
-+++ expect/configure 2009-08-03 08:44:29.000000000 +0000
-@@ -6362,7 +6362,7 @@ if test -n "$TMPDIR" && test -d "$TMPDIR
- else
- ac_tmpdirs='/tmp /var/tmp /usr/tmp'
- fi
--for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-+for ac_dir in . $ac_tmpdirs ; do
- test -d $ac_dir || continue
- test -w $ac_dir || continue # It is less confusing to not echo anything here.
- (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules 2009-11-17 21:03:23 UTC (rev 990)
+++ expect/trunk/debian/rules 2009-11-18 11:42:01 UTC (rev 991)
@@ -28,10 +28,7 @@
cp -fb /usr/share/misc/config.sub tclconfig/config.sub
cp -fb /usr/share/misc/config.guess config.guess
cp -fb /usr/share/misc/config.sub config.sub
-
autoconf
- #patch -Np1 -i debian/patches/static-names.diff
-
dh_auto_configure -- --includedir=/usr/include/tcl8.5 \
--with-tcl=/usr/lib/tcl8.5 \
--with-tk=/usr/lib/tk8.5 \
@@ -46,25 +43,21 @@
override_dh_auto_install:
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
# Renaming expect scripts
for SCRIPT in debian/tmp/usr/bin/*; do \
if [ "`basename $$SCRIPT`" != "expect" ] && [ "`basename $$SCRIPT`" != "expectk" ]; then \
mv $$SCRIPT `dirname $$SCRIPT`/expect_`basename $$SCRIPT`; \
fi; \
done
-
for MANPAGE in debian/tmp/usr/share/man/man1/*; do \
if [ "`basename $$MANPAGE`" != "expect.1" ] && [ "`basename $$MANPAGE`" != "expectk.1" ]; then \
mv $$MANPAGE `dirname $$MANPAGE`/expect_`basename $$MANPAGE`; \
fi; \
done
-
# Fixing library name
mv debian/tmp/usr/lib/expect$(VERSION)/libexpect$(VERSION).so debian/tmp/usr/lib/libexpect.so.$(VERSION)
mkdir -p -m 755 debian/tmp/usr/lib/tcltk
mv debian/tmp/usr/lib/expect$(VERSION) debian/tmp/usr/lib/tcltk
-
# Fixing permissions
chmod 0644 debian/tmp/usr/lib/tcltk/expect$(VERSION)/pkgIndex.tcl
More information about the Pkg-tcltk-commits
mailing list