[Pkg-octave-commit] r1206 - in octave/trunk/debian: . in

[Thomas Weber]

tags 466264 pending
tags 466723 pending
thanks

Author: thomas-guest
Date: 2008-02-21 13:41:21 +0000 (Thu, 21 Feb 2008)
New Revision: 1206

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.conf
Log:
Sync PACKAGE.conf with main-rcfile, bug fix for 466723, 466264


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-21 13:13:46 UTC (rev 1205)
+++ octave/trunk/debian/changelog	2008-02-21 13:41:21 UTC (rev 1206)
@@ -1,11 +1,15 @@
 octave3.0 (1:3.0.0-4) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * Uploaded to unstable
   * debian/control: Build-depend on g++-4.3 on arm.  This is a desperate
     attempt to see whether we can get rid of the segfault problem on arm
     (cf Bug#458852)
   * debian/rules: Use g++ and gcc 4.3 on arm architecture
 
+  [ Thomas Weber ]
+  * in/PACKAGE.conf: sync with upstream's main-rcfile (closes: 466723, 466264)
+
  -- Rafael Laboissiere <rafael at debian.org>  Thu, 21 Feb 2008 11:24:13 +0100
 
 octave3.0 (1:3.0.0-3) experimental; urgency=low

Modified: octave/trunk/debian/in/PACKAGE.conf
===================================================================
--- octave/trunk/debian/in/PACKAGE.conf	2008-02-21 13:13:46 UTC (rev 1205)
+++ octave/trunk/debian/in/PACKAGE.conf	2008-02-21 13:41:21 UTC (rev 1206)
@@ -12,6 +12,24 @@
 :]
 
 [V_3_0:
+## Configure readline using the file inputrc in the Octave startup
+## directory.
+
+read_readline_init_file (sprintf ("%s%s%s",
+				  octave_config_info ("startupfiledir"),
+				  filesep, "inputrc"));
+
+if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
+  PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');
+endif
+
+## This appears here instead of in the pkg/PKG_ADD file so that --norc
+## will also skip automatic loading of packages.
+
+pkg ("load", "auto");
+
+
+
 ### Use new style of path generation
 
 addpath (genpath ("/usr/local/share/octave/site-m"), "-begin");