[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-5-g077e2f9
Guenter Milde
milde at users.berlios.de
Mon Nov 10 15:03:07 UTC 2008
The following commit has been merged in the master branch:
commit 077e2f9333e6ef7d5bbe2f8d38dbc0560b658591
Author: Guenter Milde <milde at users.berlios.de>
Date: Mon Nov 10 15:31:41 2008 +0100
Upstream compatible startup system
Some users reported problems with the Debian startup system not using
~/.jedrc when both, ~.jed/ and ~/.jedrc exist. Although we do not recommend
such a setup, it is usual to have in other Unix setups (and old Debian
ones), as ~/.jedrc is the upstream default location of the jed.rc file.
The set of changes adds a test for ~/.jedrc to the search for a user config
file and adapts the Debian documentation files.
Also included is a fix for the bug in site.sl that prevents tha addition of
the slsh library to the jed-library-path if there is no "local-packages"
subdirectory.
diff --git a/debian/README.Debian b/debian/README.Debian
index 3b532aa..0b145ab 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -69,10 +69,6 @@ for personal Jed-related files, e.g.
templates/ optional dir for templates (with jed-extra)
-ATTENTION: If "~/.jed/" exists, Jed will not find a "~/.jedrc" startup file.
-The user needs to move an eventually existing "~/.jedrc" to "~/.jed/jed.rc".
-
-
Some frequently asked questions
-------------------------------
diff --git a/debian/README.Debian-sarge-upgrade b/debian/README.Debian-sarge-upgrade
index 2c8edb3..837f986 100644
--- a/debian/README.Debian-sarge-upgrade
+++ b/debian/README.Debian-sarge-upgrade
@@ -61,13 +61,8 @@ UTF 8 support
Jed_Home_Directory
------------------
-* If the directory "~/.jed/" exists, it will become the `Jed_Home_Directory'
- and Jed will no longer search for "~/.jedrc" at startup.
-
- The user needs to move an eventually existing "~/.jedrc" to
- "~/.jed/jed.rc" ("~/.jed/.jedrc" is still found but deprecated).
-
-* However, Jed will not create such a directory. Users are encouraged to
+* If the directory "~/.jed/" exists, it will become the `Jed_Home_Directory'.
+ However, Jed will not create such a directory. Users are encouraged to
create the directory ".jed/" in their home directory and move an
eventually existing ~/.jedrc to ~/.jed/jed.rc (and ~/.jedrecent to
~.jed/.jedrecent).
@@ -76,7 +71,7 @@ Motivation
''''''''''
Debian Jed now supports a per-user "~/.jed/" application directory in
-accordance with the file hierarchy standard (FHS 2.3).
+accordance with the file hierarchy standard (FHS 2.3):
User specific configuration files for applications are stored in the
user's home directory in a file that starts with the '.' character (a
diff --git a/debian/README.Debian-startup b/debian/README.Debian-startup
index f215de1..a682deb 100644
--- a/debian/README.Debian-startup
+++ b/debian/README.Debian-startup
@@ -37,8 +37,9 @@ The order of evaluating the JED config settings is thus as follows:
% all further evaluations
2) /usr/share/jed/lib/defaults.sl % Debian provided code for evaluation of
- % the "jed.d" directory contents.
-
+ % the "jed.d" directory contents, defines
+ % and calls the function debian_startup().
+
% no call to /etc/jed.conf
3) /etc/jed.d/*.sl % package configuration files
@@ -47,11 +48,10 @@ The order of evaluating the JED config settings is thus as follows:
% skipped if it does not exist or with
% the -n command line option.
-5) _Jed_Default_Emulation % key-bindings file
+5) _Jed_Default_Emulation % fallback key-bindings file
% skipped if jed.rc loads an emulation, i.e.
% if (_Jed_Emulation != NULL)
- % default is "emacs", set in
- % /etc/jed.d/05jed-common.sl
+ % default is "emacs".
6) _Jed_Default_Color_Scheme % colour settings
% skipped jed.rc loads a colour scheme, i.e.
@@ -59,17 +59,17 @@ The order of evaluating the JED config settings is thus as follows:
7) command_line_options % -l FILE loads FILE as S-Lang code.
-Only now, files given on the command line are loaded into a buffer (each)
+After that, files given on the command line are loaded into a buffer (each)
which may trigger evaluation of more S-Lang files providing the editing mode.
All evaluated files might call other S-Lang files either directly
-(evalfile(), require(), set_color_scheme) or at a later stage (autoload()).
+(evalfile(), require(), set_color_scheme()) or at a later stage (autoload()).
-- Rafael Laboissiere <rafael at debian.org> Thu Oct 21 18:28:39 CEST 1999
-- Updated by Charl P. Botha <cpbotha at debian.org> Sun Jun 3 02:14:58 CEST 2001
-- and again by cpbotha with Rafael's new scheme Tue Nov 13 22:00:49 CET 2001
--- updated by G. Milde, 2006-05-16, 2008-02-21
+-- updated by G. Milde, 2006-05-16, 2008-02-21, 2008-11-10
-Last update 2008-02-21 Guenter Milde
+Last update 2008-11-10 Guenter Milde
diff --git a/debian/changelog b/debian/changelog
index 650f90b..84181a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jed (1:0.99.18+dfsg.1-11) UNPUBLISHED; urgency=medium (?)
+
+ * /etc/jed.d/05jed-common.sl:
+ + improved backwards compatibility of the startup scheme:
+ read ~/.jedrc if ~/.jed exists but neither ~/.jed/jed.rc
+ nor ~/.jed/.jedrc.
+ + Add slsh library dir (work around a bug in site.sl triggered by
+ the removal of slsh/local-packages/ in recent slsh versions).
+
+ -- Günter Milde <milde at users.sf.net> Mon, 10 Nov 2008 14:53:34 +0100
+
jed (1:0.99.18+dfsg.1-11) unstable; urgency=low
* debian/po/it.po: Add Italian translation of the debconf templates,
diff --git a/debian/init.d/05jed-common.sl b/debian/init.d/05jed-common.sl
index e011fef..51307d8 100644
--- a/debian/init.d/05jed-common.sl
+++ b/debian/init.d/05jed-common.sl
@@ -15,7 +15,7 @@ setkey ("delete_char_cmd", "\e[3~");
% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as
% fallback configuration file
-Default_Jedrc_Startup_File = NULL;
+Default_Jedrc_Startup_File = NULL; % eventually overwritten below
% Jed_Home_Directory (defined in site.sl, defaulting to $HOME)
%
@@ -23,13 +23,25 @@ Default_Jedrc_Startup_File = NULL;
% so .jedrc and .jedrecent are not spoiling the $HOME dir (FHS 2.3)
$1 = path_concat(Jed_Home_Directory, ".jed");
if ( 2 == file_status($1) ) {
- Jed_Home_Directory = $1;
- % set the default jedrc file path to ~/.jed/jed.rc
- $2 = path_concat(Jed_Home_Directory, "jed.rc");
+ % Adapt the user config file path:
+ % a) command_line_hook() in site.sl tries with ~/.jed/.jedrc
+ % b) recommended location: ~/.jed/jed.rc
+ % c) backwards compatible: ~/.jedrc
+ $2 = path_concat($1, "jed.rc");
+ if (file_status($2) == 1)
+ Default_Jedrc_Startup_File = $2;
+ $2 = path_concat(Jed_Home_Directory, ".jedrc");
if (file_status($2) == 1)
Default_Jedrc_Startup_File = $2;
+ % now set the variable:
+ Jed_Home_Directory = $1;
}
+% Add slsh library dir
+% (Bug in site.sl misses this if slsh/local-packages does not exist)
+$1 = path_concat (_slang_install_prefix, "share/slsh/");
+if (2 == file_status($1))
+ set_jed_library_path(strcat(get_jed_library_path(), ",", $1));
% Add slsh documentation (site.sl misses this)
%
--
Debian packaging of JED
More information about the Pkg-jed-commit
mailing list