[Pkg-jed-commit] r27 - in trunk/packages/jed/debian: . patches

[Jörg Sommer]

Author: jo-guest
Date: 2005-04-15 12:06:09 +0000 (Fri, 15 Apr 2005)
New Revision: 27

Added:
   trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch
Modified:
   trunk/packages/jed/debian/patches/00list
   trunk/packages/jed/debian/rules
Log:
When jed-extra is installed on the system building jed, it crashes the
build. During build the new jed version byte compiles the .sl files.
(debian/rules:binary-indep) At start it loads /etc/jed.conf (from
site.sl) which loads jed-extra, but this fails because it is not in the
path of the build version of jed.

This patch modifies site.sl, because this is the only place where we can
influence the behaviour for the build. /etc/jed.conf or /etc/jed-init.d/*
are out of scope!



Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list	2005-04-08 13:15:40 UTC (rev 26)
+++ trunk/packages/jed/debian/patches/00list	2005-04-15 12:06:09 UTC (rev 27)
@@ -1,5 +1,6 @@
 40_freetype-include
 50_slangfun-txt.dpatch
+50_jed-conf-build-fix
 50_jed-manpage-option-g
 50_enable-xrenderfont
 50_emacs-bindings

Added: trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch	2005-04-08 13:15:40 UTC (rev 26)
+++ trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch	2005-04-15 12:06:09 UTC (rev 27)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_jed_conf_build_fix.dpatch by  <joerg@alea.gnuu.de>
+##
+## DP: When building jed, it byte compiles the .sl-file. For this it run the
+## DP: new build jed, which loads /etc/jed.conf, which loads jed-extra, which
+## DP: fails, because it is build with a different jed version.
+
+@DPATCH@
+diff -urNad jed-B0.99-17.56/lib/site.sl /tmp/dpep.CK4Cus/jed-B0.99-17.56/lib/site.sl
+--- jed-B0.99-17.56/lib/site.sl	2004-11-28 22:44:05.000000000 +0100
++++ /tmp/dpep.CK4Cus/jed-B0.99-17.56/lib/site.sl	2005-04-15 13:17:57.330336624 +0200
+@@ -3163,14 +3163,15 @@
+ if (strlen(expand_jedlib_file("defaults.sl")))
+   () = evalfile("defaults");
+ #ifdef UNIX
+-else foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.conf"])
+-{
+-   $1 = ();
+-   if (1 == file_status ($1))
+-     {
+-	() = evalfile ($1);
+-	break;
+-     }
+-}
++else if (getenv("NO_JED_CONF") == NULL)
++  foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.conf"])
++    {
++       $1 = ();
++       if (1 == file_status ($1))
++	 {
++	    () = evalfile ($1);
++	    break;
++	 }
++    }
+ #endif
+ 


Property changes on: trunk/packages/jed/debian/patches/50_jed-conf-build-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2005-04-08 13:15:40 UTC (rev 26)
+++ trunk/packages/jed/debian/rules	2005-04-15 12:06:09 UTC (rev 27)
@@ -96,7 +96,7 @@
 	@echo --- JED-SL ---
 	@echo
 	# compile .sl; move compileable .sl to jed-sl.deb
-	JED_ROOT=`pwd` ./src/$(ARCH)objs/jed -batch -n -l preparse.sl
+	JED_ROOT=`pwd` NO_JED_CONF=1 ./src/$(ARCH)objs/jed -batch -n -l preparse.sl
 	cp -r lib $(jed-common)/usr/share/jed/
 	for i in $(jed-common)/usr/share/jed/lib/*.slc; do \
 	    sl=`basename $$i .slc`.sl; \