[Pkg-jed-commit] r332 - trunk/packages/jed/debian

[Guenter Milde]

Author: milde-guest
Date: 2006-06-13 12:30:59 +0000 (Tue, 13 Jun 2006)
New Revision: 332

Modified:
   trunk/packages/jed/debian/NEWS
   trunk/packages/jed/debian/changelog
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/defaults.sl
Log:
debian/control:
    - Make sure jed|xjed and jed-common are of the same version. 
      jed|xjed depend on jed-common (same version),
      jed-common is not broken without jed|xjed, so it just recommends
      them and conflicts with earlier versions. 

Documentation update



Modified: trunk/packages/jed/debian/NEWS
===================================================================
--- trunk/packages/jed/debian/NEWS	2006-06-13 08:16:06 UTC (rev 331)
+++ trunk/packages/jed/debian/NEWS	2006-06-13 12:30:59 UTC (rev 332)
@@ -24,9 +24,9 @@
 S-Lang Version 2
 ----------------
 
-* Jed now uses S-Lang Version 2. There can be incompatibilities
-  breaking home-made or downloaded extensions made for Slang-1.
-  This affects also some scripts in the jed-extra (1.0-1) package!
+* Jed now uses S-Lang Version 2. There are incompatibilities that
+  break some home-made or downloaded extensions made for Slang-1.
+  This affects also several scripts in the jed-extra (1.0) package!
 
   New features and upgrade information for version 2 are described in
   appendix A. "S-Lang 2 Interpreter NEWS" of
@@ -93,24 +93,29 @@
 
   If there are files in "/etc/jed-init.d/" that are unknown to jed-common,
   the old directory will remain in place (but not used). The sysadmin should
-  check, manually move remaining files to "/etc/jed.d" and delete
-  "/etc/jed-init.d/".
+  check, manually delete remaining files or move them to "/etc/jed.d" and
+  delete "/etc/jed-init.d/".
+  
+  An example are the files 05home-lib.sl and 55ispell.sl installed by the
+  jed-extra (1.0) package. These will no longer be evaluated at startup
+  after the upgrade to jed (0.99.18). (The upcoming jed-extra (2.1) will
+  replace them with the new initialization file /etc/jed.d/50jed-extra.sl.)
 
 * The file "/etc/jed.conf" has been removed.
 
   "/usr/share/jed/lib/defaults.sl" contains the code to evaluate the files
   in "/etc/jed.d".
 
-  "/etc/jed.d/05jed-common.sl" contains the site-wide configuration of jed
-  (and xjed).
+  "/etc/jed.d/05jed-common.sl" contains the site-wide configuration for
+  jed|xjed.
 
 * Evalutation of "/etc/jed.d/" can be suppressed by the
   --skip-debian-startup command line option.
 
 * "/etc/jed.d/" is not evaluated if Jed is started as `jed-script`.
 
-  If a script depends on the Debian configuration, it can call the function
-  debian_startup() (defined in defaults.sl).
+  If a script depends on the Debian configuration, it can use the function
+  debian_startup() (defined in defaults.sl) or be called with jed -batch.
 
 For details see README.Debian-startup.
 

Modified: trunk/packages/jed/debian/changelog
===================================================================
--- trunk/packages/jed/debian/changelog	2006-06-13 08:16:06 UTC (rev 331)
+++ trunk/packages/jed/debian/changelog	2006-06-13 12:30:59 UTC (rev 332)
@@ -5,16 +5,22 @@
   * Documentation update (NEWS, README.Debian, README.Debian-startup) [GM]
     - document the (beta) UTF8 support with SLang2
     - warn of SLang2 eventually breaking old *.sl scripts
-    - explain the Debian-special startup scheme
-     
+    - explain Debian's /etc/jed.d/ startup dir
 
   * debian/po/cs.po: Added Czech translations for debconf templates,
     thanks to Miroslav Kure <kurem at upcase.inf.upol.cz> [RL]
     
-  * Removed the conflict with jed-extra (<= 1.0-1) as jed-extra will not break 
-    jed|xjed (but some modes of jed-extra will be broken with jed using 
-    SLang2). [GM]
-
+  * debian/control:
+    - Make sure jed|xjed and jed-common are of the same version. 
+      jed|xjed depend on jed-common (same version),
+      jed-common is not broken without jed|xjed, so it just recommends
+      them and conflicts with earlier versions. 
+    - Removed the conflict with jed-extra (<= 1.0-1) as jed-extra will not
+      break jed|xjed
+      (jed-common will not work by default, as jed|xjed now uses the startup
+      dir /etc/jed-init.d/ instead of /etc/jed.d/. Some modes of jed-extra
+      will fail with SLang2. See also NEWS) [GM]
+  
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 07 Jun 2006 13:48:13 +0200
 
 jed (0.99.18-1) experimental; urgency=low

Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2006-06-13 08:16:06 UTC (rev 331)
+++ trunk/packages/jed/debian/control	2006-06-13 12:30:59 UTC (rev 332)
@@ -71,7 +71,7 @@
 Package: jed-common
 Architecture: all
 Replaces: jedslc, jedsl, jed-sl, jedsl-src, jed (<< 0.99.10-2)
-Conflicts: jedslc, jedsl, jed-sl, jedsl-src, jed (<< 0.99.18), xjed (<< 0.99.18)
+Conflicts: jedslc, jedsl, jed-sl, jedsl-src, jed (<< ${Source-Version}), xjed (<< ${Source-Version})
 Recommends: jed | xjed
 Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
 Description: S-Lang runtime files for jed and xjed

Modified: trunk/packages/jed/debian/defaults.sl
===================================================================
--- trunk/packages/jed/debian/defaults.sl	2006-06-13 08:16:06 UTC (rev 331)
+++ trunk/packages/jed/debian/defaults.sl	2006-06-13 12:30:59 UTC (rev 332)
@@ -4,7 +4,7 @@
 %
 % At startup, site.sl looks for the existence of "defaults.sl" and loads
 % it.  This file IS NOT distributed with JED (upstream) but added by the
-% Debian jed package.
+% Debian jed-common package.
 %
 %  Copyright (c) 2005 The Debian Jed Maintainers Group
 %  Released under the terms of the GNU General Public License (ver. 2 or later)