← Back to branch summary

~ubuntu-branches/ubuntu/trusty/expect/trusty

« back to all changes in this revision

Viewing changes to debian/patches/17-norc.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2011-08-17 21:50:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110817215029-0cfarscc630tfc5v
Tags: 5.45-1
* New upstream release.
* Removed unnecessary patches.
* Removed the expectk package because expectk was dropped from the upstream
  distribution. See NEWS.Debian for possible workarounds.
* Updated package to standards version 3.9.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/17-norc.patch
1
 
Author: Sergei Golovan <sgolovan@debian.org>
2
 
Description: Fixes processing of -norc and -NORC expectk command line options.
3
 
Bug-Debian: http://bugs.debian.org/555746
4
 
Bug: https://sourceforge.net/tracker/?func=detail&aid=2896150&group_id=13179&atid=113179
5
 
Last-Update: 2009-11-12
6
 
 
7
 
--- expect-5.44.1.15.orig/exp_main_tk.c
8
 
+++ expect-5.44.1.15/exp_main_tk.c
9
 
@@ -112,6 +112,9 @@
10
 
  *----------------------------------------------------------------------
11
 
  */
12
 
 
13
 
+int my_rc = 1;
14
 
+int sys_rc = 1;
15
 
+
16
 
 int
17
 
 Tcl_AppInit(interp)
18
 
     Tcl_Interp *interp;                /* Interpreter for application. */
19
 
@@ -148,6 +151,8 @@
20
 
      * they weren't already created by the init procedures called above.
21
 
      */
22
 
 
23
 
+    exp_interpret_rcfiles(interp,my_rc,sys_rc);
24
 
+
25
 
     /*
26
 
      * Specify a user-specific startup file to invoke if the application
27
 
      * is run interactively.  Typically the startup file is "~/.apprc"
28
 
@@ -182,8 +187,6 @@
29
 
 static int rest = 0;
30
 
 
31
 
 /* for Expect */
32
 
-int my_rc = 1;
33
 
-int sys_rc = 1;
34
 
 static int optcmd_eval();
35
 
 static int optcmd_diagToStderr();
36
 
 #ifdef TCL_DEBUGGER