[Pkg-jed-commit] r51 - in trunk/packages/jed-extra: . debian debian/init debian/patches
Jörg Sommer
jo-guest@costa.debian.org
Thu, 30 Jun 2005 17:25:33 +0000
Author: jo-guest
Date: 2005-06-30 17:25:29 +0000 (Thu, 30 Jun 2005)
New Revision: 51
Added:
trunk/packages/jed-extra/debian/build-orig.tar_gz
trunk/packages/jed-extra/debian/init/
trunk/packages/jed-extra/debian/init/05home-lib.sl
trunk/packages/jed-extra/debian/jed-extra-init.sl
trunk/packages/jed-extra/debian/jed-extra-preparse.sl
trunk/packages/jed-extra/debian/patches/
trunk/packages/jed-extra/debian/patches/00list
trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch
trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch
trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch
trunk/packages/jed-extra/debian/patches/44_gnuplot-use-jedmodes-info.dpatch
trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch
trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch
trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch
trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch
trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch
trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch
trunk/packages/jed-extra/debian/patches/50_rfcview-require-bufutils.dpatch
trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch
trunk/packages/jed-extra/debian/patches/52_yodl-require.dpatch
trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch
Removed:
trunk/packages/jed-extra/compile-files.sl.in
trunk/packages/jed-extra/init/
trunk/packages/jed-extra/patches/
Modified:
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/compile
trunk/packages/jed-extra/debian/control
trunk/packages/jed-extra/debian/copyright
trunk/packages/jed-extra/debian/init/50jed-extra.sl
trunk/packages/jed-extra/debian/init/55ispell.sl
trunk/packages/jed-extra/debian/rules
Log:
All this applies to jed-extra!
* init/ moved to debian/, because it's debian stuff
* 55ispell.sl, 50jed-extra.sl extended to handle the case the package was
removed, but not purged
* added a new jed-init-file 05home-lib.sl which evaluates
/.../site-lib/home-lib.sl (if it exists)
* compile-files.sl.in removed and a new jed-extra-preparse.sl (similar to
jeds one) added. This needs not eperl and is fully SLang; debian/control
fixed
* debian/patches/ for dpatch created
* converted all patches in dpatches and created new 00list:
$ export DEBFULLNAME="Rafael Laboissiere" DEBEMAIL="rafael@debian.org"
$ j=40
$ for i in $(cat patches/00list); do
orig=patches/$i;
new=debian/patches/${j}_${i%patch}dpatch;
svn cp $orig $new;
chmod +x $new
dpatch patch-template -p "${j}_${i%.patch}" < $orig > $new;
svn rm $orig;
echo ${j}_${i%.patch} >> debian/patches/00list
j=$(($j+1))
done
* added new 00list to svn
* patches/ and patches/00list removed
* 40_rc-files.dpatch removed. All what was done there was creating files,
they become concatenated in rules to one big file -- now all this is
placed in jed-extra-init.sl
* debian/changelog updated
+ set the urgency for this update on high, because older versions
conflict with slang >= 2.0.3
* debian/copyright updated about the new sources of the package contents
* debian/compile
+ rewritten to match better the new terms of the new jed package
+ marked it as executable (svn ps svn:executable)
+ there need to be parenthesis in the find expression otherwise nothing
happens, because evaluation stops at -o
* added debian/build-orig.tar_gz to create the .tar.gz used as upstream
source
* debian/rules rewritten to
+ take advantage of debhelper scripts
+ use dpatch
+ handle the new version of orig.tar.gz
Deleted: trunk/packages/jed-extra/compile-files.sl.in
===================================================================
--- trunk/packages/jed-extra/compile-files.sl.in 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/compile-files.sl.in 2005-06-30 17:25:29 UTC (rev 51)
@@ -1,33 +0,0 @@
-% -*- slang -*-
-
-<: undef $/; :>
-
-variable files = [
-<:
- $in = <>;
- print join (",", map {
- '"'
- . (($_ =~ m{colors/}) ? "colors/" : "")
- . (reverse split ("/", $_))[0]
- . '"'
- } split (/\s+/, $in));
-:>
-];
-
-variable command = __argv [5];
-variable f;
-
-if (command == "install") {
- message ("Byte compiling jed-extra files");
- foreach (files) {
- f = ();
- byte_compile_file (expand_jedlib_file (f), 0);
- }
-} else if (command == "remove") {
- message ("Removing byte-compiled jed-extra files");
- foreach (files) {
- f = ();
- run_shell_cmd ("rm -f " + expand_jedlib_file (f + "c"));
- }
-} else
- message ("Unknown command " + command);
Added: trunk/packages/jed-extra/debian/build-orig.tar_gz
===================================================================
--- trunk/packages/jed-extra/debian/build-orig.tar_gz 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/build-orig.tar_gz 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+wget http://ovh.dl.sourceforge.net/sourceforge/jedmodes/jedmodes.tar.gz
+tar -xzf jedmodes.tar.gz
+mv mode jed-extra-1.2
+cd jed-extra-1.2
+wget -O window.sl 'http://cvs.sourceforge.net/viewcvs.py/jedmodes/mode/window/window.sl?view=checkout&rev=HEAD'
+wget -O subpar.sl 'http://jedmodes.sourceforge.net/cvs/mode/subpar/subpar.sl'
+wget -O complete.sl 'http://cvs.sourceforge.net/viewcvs.py/jedmodes/mode/complete/complete.sl?view=checkout&rev=HEAD'
+cd ..
+tar -czf jed-extra_1.2.orig.tar.gz jed-extra-1.2
Property changes on: trunk/packages/jed-extra/debian/build-orig.tar_gz
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/changelog 2005-06-30 17:25:29 UTC (rev 51)
@@ -1,4 +1,4 @@
-jed-extra (1.0-2) experimental; urgency=low
+jed-extra (1.2-1) experimental; urgency=high
NOT YET RELEASED!
@@ -9,14 +9,33 @@
/usr/share/jed/compile/jed-extra
* debian/postinst, debian/prerm: Call /usr/share/jed/compile/jed-extra
with the appropriate argument
- * compile-files.sl.in: Accepts either "install" or "remove" as arguments
- and,respectively, byte-compile the *.sl files or remove the *.slc files.
* debian/control: Dropped the -Build-Depends-Indep on jed
- +++ Changes by Jörg Sommer
+ +++ Changes by Jörg Sommer <joerg@alea.gnuu.de>
- * patches/mupad-fix.patch: Fixes mupad.sl to build.
-
+ * added 53_mupad-fix.patch: Fixes mupad.sl to build.
+ * the new upstream tarball does not include gtkhelp.sl,
+ jedgtk_image.sl, jedgtk_search.sl, jedgtk.sl, flipper.sl,
+ gtk_usage.txt; these files depend on slgtk which isn't currently in
+ Debian; because this, these files are removed from this package
+ * the same with pcre.sl
+ * walk.sl is no longer available at upstream
+ * updated debian/copyright about the sources
+ * yodlfun.txt is now found in site-lib/ because it is searched there
+ * added a new patch 50_home-lib_fix to fix the missing variable
+ declaration in home-lib.sl
+ * now the files in /etc/jed-init.d/ take care of the state the package
+ was removed but not purged
+ * restructured source package
+ + now all is in one directory debian
+ + patches are dpatches
+ + rules use debhelper
+ * reworked jed-extra-preparse.sl (compile-files.sl.in before) to be
+ fully SLang, which make eperl as build dependency unnecessary
+ * all *.html files, the README of a2ps and the INSTALL of tar are now
+ in /usr/share/doc/jed-extra
+ * the example file for apsmode/apsconf is in examples
+
--
jed-extra (1.0-1) experimental; urgency=low
Modified: trunk/packages/jed-extra/debian/compile
===================================================================
--- trunk/packages/jed-extra/debian/compile 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/compile 2005-06-30 17:25:29 UTC (rev 51)
@@ -1,14 +1,24 @@
#!/bin/sh -e
-JED=/usr/bin/jed
-COMPILE=jed-extra-compile-files.sl
+LIBDIR=/usr/share/jed/site-lib
+PREPARSE=jed-extra-preparse.sl
+# . /usr/share/debconf/confmodule
+
+# db_get jed-common/compile-sl
+# if [ "$RET" != true ]; then
+# exit 0
+# fi
+
case "$1" in
- install|remove)
- $JED -batch -n -l $COMPILE $1
+ install)
+ jed-script $LIBDIR/$PREPARSE
;;
+ remove)
+ find $LIBDIR \( -name \*.slc -o -name \*.dfa \) -delete
+ ;;
*)
echo "unknown argument --> \"$1"\" >&2
- exit 0
+ exit 1
;;
esac
Property changes on: trunk/packages/jed-extra/debian/compile
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/control 2005-06-30 17:25:29 UTC (rev 51)
@@ -2,7 +2,7 @@
Section: editors
Priority: optional
Maintainer: Debian JED Group <pkg-jed-devel@lists.alioth.debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), eperl
+Build-Depends-Indep: debhelper (>> 4.0.0)
Standards-Version: 3.6.1
Package: jed-extra
Modified: trunk/packages/jed-extra/debian/copyright
===================================================================
--- trunk/packages/jed-extra/debian/copyright 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/copyright 2005-06-30 17:25:29 UTC (rev 51)
@@ -3,10 +3,15 @@
The tarballs/files included in this release were downloaded from:
- http://jedmodes.sf.net/mode/ispell/last/download/ispell.tgz (v 1.12)
- http://jedmodes.sf.net/mode/sl_utils/1.1/download/sl_utils.tar.gz
- http://jedmodes.sf.net/mode/home-lib/last/download/home-lib.sl (v 0.9.2)
+ jedmodes.tar.gz:
+ http://sourceforge.net/project/showfiles.php?group_id=14968
+ subpar.sl: http://jedmodes.sourceforge.net/mode/subpar/
+ window.sl: http://jedmodes.sourceforge.net/mode/window/
+ complete.sl: http://jedmodes.sourceforge.net/mode/complete/
+ or
+ look in debian/build-orig.tar_gz in the source package
+
Upstream Authors:
Paul Boekholt <p.boekholt@hetnet.nl>
Günter Milde <milde@ife.et.tu-dresden.de>
Copied: trunk/packages/jed-extra/debian/init (from rev 49, trunk/packages/jed-extra/init)
Added: trunk/packages/jed-extra/debian/init/05home-lib.sl
===================================================================
--- trunk/packages/jed-extra/init/05home-lib.sl 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/init/05home-lib.sl 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,4 @@
+$1 = "/usr/share/jed/site-lib/home-lib.sl";
+
+if (file_status($1) == 1)
+ evalfile($1);
Modified: trunk/packages/jed-extra/debian/init/50jed-extra.sl
===================================================================
--- trunk/packages/jed-extra/init/50jed-extra.sl 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/init/50jed-extra.sl 2005-06-30 17:25:29 UTC (rev 51)
@@ -1 +1,10 @@
-() = evalfile ("jed-extra");
+$1 = "/usr/share/jed/site-lib";
+
+% if jed-extra is removed (not pruged), this file exists but nothing else
+% it expects
+
+if (file_status($1) == 2) {
+ set_jed_library_path(get_jed_library_path()+","+$1);
+
+ () = evalfile($1 + "/jed-extra-init.sl");
+}
Modified: trunk/packages/jed-extra/debian/init/55ispell.sl
===================================================================
--- trunk/packages/jed-extra/init/55ispell.sl 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/init/55ispell.sl 2005-06-30 17:25:29 UTC (rev 51)
@@ -1 +1,7 @@
-() = evalfile ("ispell_init");
+
+% make sure jed-extra is removed and not purged
+
+$1 = expand_jedlib_file("ispell_init.sl");
+
+if ( strlen($1) )
+ () = evalfile($1);
Added: trunk/packages/jed-extra/debian/jed-extra-init.sl
===================================================================
--- trunk/packages/jed-extra/debian/jed-extra-init.sl 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/jed-extra-init.sl 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,426 @@
+
+% a2ps
+
+autoload ("string_get_match", "strutils");
+autoload ("rebind", "bufutils");
+autoload ("a2ps_mode", "a2ps");
+add_mode_for_extension ("a2ps", "ssh");
+
+% apsmode
+
+foreach (["print_buffer",
+ "print_region",
+ "print_buffer_preview",
+ "print_region_preview",
+ "show_print_log",
+ "aps_help"]) {
+ variable f = ();
+ autoload (f, "apsmode");
+ add_completion (f);
+}
+
+% autotext
+
+autoload ("complete_autotext", "autotext");
+add_completion ("complete_autotext");
+
+% brief
+
+define brief_emulation ()
+{
+ custom_variable ("ALT_CHAR", 27);
+ () = evalfile ("brief");
+}
+add_completion ("brief_emulation");
+
+% browse_url
+
+foreach (["find_url",
+ "view_url",
+ "browse_url_x",
+ "browse_url"]) {
+ variable func = ();
+ autoload (func, "browse_url");
+ add_completion (func);
+}
+
+% bufed
+
+autoload ("bufed", "bufed");
+add_completion ("bufed");
+
+% bufutils
+
+foreach (["run_buffer",
+ "fit_window",
+ "close_buffer",
+ "reload_buffer"]) {
+ variable func = ();
+ autoload (func, "bufutils");
+ add_completion (func);
+}
+
+% calc
+
+foreach (["calc", "calc2"]) {
+ variable func = ();
+ autoload (func, "calc.sl");
+ add_completion (func);
+}
+
+% cdecl
+
+autoload ("cdecl", "cdecl");
+add_completion ("cdecl");
+
+% ch_table
+
+define ct_load_popup_hook (menubar)
+{
+ menu_insert_item ("&Rectangles", "Global.&Edit",
+ "&Special Chars", "special_chars");
+}
+append_to_hook ("load_popup_hooks", &ct_load_popup_hook);
+autoload ("ch_table", "ch_table.sl");
+autoload ("special_chars", "ch_table.sl");
+add_completion ("special_chars");
+
+% css1
+
+autoload ("css1_mode", "css1");
+add_mode_for_extension ("css1", "css");
+add_mode_for_extension ("css1", "css1");
+
+% cua
+
+define cua_emulation ()
+{
+ () = evalfile ("cua");
+}
+add_completion ("cua_emulation");
+
+% cuamark
+
+public define cuamark_style ()
+{
+ () = evalfile ("cuamark");
+}
+add_completion ("cuamark_style");
+
+% custmode
+
+autoload ("custom_mode", "custmode.sl");
+
+% dabbrev
+
+autoload ("dabbrev", "dabbrev");
+add_completion ("dabbrev");
+
+% ding
+
+autoload ("ding", "ding");
+add_completion ("ding");
+
+% email
+
+autoload ("mail_mode", "email");
+add_completion ("mail_mode");
+
+% ffap
+
+autoload ("ffap", "ffap");
+add_completion ("ffap");
+
+% filelist
+
+autoload ("filelist_list_dir", "filelist");
+add_completion ("filelist_list_dir");
+
+% gnuplot
+
+define gnuplot_mode_hook ()
+{
+ local_setkey ("gnuplot_help", "^Ch", $2); % Help
+ local_setkey ("gnuplot_run", "^Cr", $2); % Alt-Return: Run buffer/region
+ local_setkey ("gnuplot_print", "^Cp", $2); % Print plot
+ local_setkey ("gnuplot_plot", "^Cd", $2); % Display plot
+}
+autoload ("gnuplot_mode", "gnuplot.sl");
+add_mode_for_extension ("gnuplot", "gnuplot");
+add_mode_for_extension ("gnuplot", "gp");
+
+% gpg
+
+foreach (["gpg_encrypt",
+ "gpg_decrypt",
+ "gpg_sign",
+ "gpg_forget_password"]) {
+ variable func = ();
+ autoload (func, "gpg");
+ add_completion (func);
+}
+
+% grep
+
+autoload ("grep", "grep");
+add_completion ("grep");
+
+% history
+
+foreach (["history_load",
+ "history_save",
+ "history_local_save"]) {
+ variable func = ();
+ autoload (func, "history");
+ add_completion (func);
+}
+
+% howto
+
+autoload ("howto_mode", "howto");
+add_completion ("howto_mode");
+
+% hs
+
+autoload ("hs_mode", "hs");
+add_completion ("hs_mode");
+
+% help
+
+foreach (["help_for_help",
+ "grep_definition",
+ "set_variable"]) {
+ variable func = ();
+ autoload (func, "help");
+ add_completion (func);
+}
+
+% hyperman
+
+autoload ("unix_man", "hyperman");
+add_completion ("unix_man");
+
+% ishell
+
+foreach (["ishell",
+ "ishell_mode",
+ "shell_cmd_on_region"]) {
+ variable func = ();
+ autoload (func, "ishell");
+ add_completion (func);
+}
+
+% jedscape
+
+foreach (["jedscape",
+ "jedscape_get_url"]) {
+ variable func = ();
+ autoload (func, "jedscape");
+ add_completion (func);
+}
+
+% life
+
+autoload ("life", "life");
+add_completion ("life");
+
+% make
+
+autoload ("make_mode", "make");
+add_completion ("make_mode");
+
+% make_ini
+
+foreach (["make_ini",
+ "update_ini"]) {
+ variable func = ();
+ autoload (func, "make_ini");
+ add_completion (func);
+}
+
+% manedit
+
+autoload ("manedit_mode", "manedit");
+add_completion ("manedit_mode");
+foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
+ variable ext = ();
+ add_mode_for_extension ("manedit", ext);
+}
+
+% md5
+
+foreach (["md5",
+ "md5_region",
+ "md5_buffer"]) {
+ variable func = ();
+ autoload (func, "md5");
+ add_completion (func);
+}
+
+% minued
+
+autoload ("minued_mode", "minued");
+add_completion ("minued_mode");
+
+% miscfun
+
+foreach (["complete_filename",
+ "repeat",
+ "smart_format_par",
+ "wdiff"]) {
+ variable func = ();
+ autoload (func, "miscfun");
+ add_completion (func);
+}
+
+% outline
+
+autoload ("outline_mode", "outline");
+foreach (["outline2html",
+ "normalize_outline",
+ "rolo_grep"]) {
+ variable func = ();
+ autoload (func, "outlinemisc");
+ add_completion (func);
+}
+
+% print
+
+define print_popup_hook (menubar)
+{
+ menu_insert_separator (6, "Global.&File");
+ menu_insert_item (7, "Global.&File", "&Print Buffer", "print_buffer");
+}
+append_to_hook ("load_popup_hooks", &print_popup_hook);
+autoload ("print_buffer", "print");
+
+% recent
+
+
+% recent
+
+define recent ()
+{
+ () = evalfile ("recent");
+}
+add_completion ("recent");
+
+% rfcview
+
+custom_variable ("Rfc_Path", "/usr/share/doc/RFC/links/");
+custom_variable ("Rfc_Index", "/usr/share/doc/RFC/rfc-index.txt.gz");
+foreach (["rfcview", "rfc_mode"]) {
+ variable func = ();
+ autoload (func, "rfcview");
+ add_completion (func);
+}
+
+% rimini
+
+define mini_init_minibuffer ()
+{
+ variable mini = "Mini_Map";
+ !if (keymap_p (mini))
+ make_keymap (mini);
+ definekey ("next_mini_command", "\e[B", mini);
+ definekey ("prev_mini_command", "\e[A", mini);
+ definekey ("next_mini_command", "\eOB", mini);
+ definekey ("prev_mini_command", "\eOA", mini);
+ definekey ("mini_exit_minibuffer", "\r", mini);
+ definekey ("exit_mini", "\e\r", mini);
+ definekey ("mini_complete", "\t", mini);
+ definekey ("mini_complete", " ", mini);
+ definekey ("mini_isearch", "^r", "Mini_Map");
+ eval (".() rimini_init_minibuffer");
+}
+autoload ("mini_isearch", "rimini");
+require ("mini");
+
+% rst
+
+autoload ("rst_mode", "rst");
+add_completion ("rst_mode");
+
+% server
+
+foreach (["done", "start"]) {
+ variable f = ();
+ autoload ("server_" + f, "server");
+ add_completion ("server_" + f);
+}
+
+% snake
+
+autoload ("snake", "snake");
+add_completion ("snake");
+
+% sql
+
+foreach (["sql_mode",
+ "sql92_mode",
+ "sql99_mode",
+ "mssql_mode",
+ "mysql_mode",
+ "pgsql_mode",
+ "orsql_mode"]) {
+ variable func = ();
+ autoload (func, "sql");
+ add_completion (func);
+}
+add_mode_for_extension ("sql", "sql");
+
+% tar
+
+autoload ("tar", "tar");
+
+% temabbrv
+
+autoload ("temabbrev", "temabbrv");
+add_completion ("temabbrev");
+
+% tracker
+
+static define tracker_load_popup_hook (menubar)
+{
+ variable menu = "Global.S&ystem";
+ menu_append_popup(menu, "&Tracker");
+ menu = "Global.S&ystem.&Tracker";
+ menu_append_item(menu, "&Start", "tracker_start");
+ menu_append_item(menu, "s&Top", "tracker_stop");
+ menu_append_item(menu, "&View", "tracker_view");
+}
+append_to_hook ("load_popup_hooks", &tracker_load_popup_hook);
+foreach (["tracker_start", "tracker_view"]) {
+ variable func = ();
+ autoload (func, "tracker");
+ add_completion (func);
+}
+
+% tree
+
+autoload ("tree", "tree");
+add_completion ("tree");
+
+% turbo
+
+autoload ("turbo_mode", "turbo");
+add_completion ("turbo_mode");
+
+% uri
+
+foreach (["find_uri", "write_uri"]) {
+ variable func = ();
+ autoload (func, "uri");
+ add_completion (func);
+}
+
+% view
+
+autoload ("view_mode", "view");
+add_completion ("view_mode");
+
+% yodl
+
+autoload ("yodl_mode", "yodl");
+add_completion ("yodl_mode");
+add_mode_for_extension ("yo", "yodl");
Added: trunk/packages/jed-extra/debian/jed-extra-preparse.sl
===================================================================
--- trunk/packages/jed-extra/debian/jed-extra-preparse.sl 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/jed-extra-preparse.sl 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,15 @@
+% -*- slang -*-
+
+define compile_slfiles_in_dir(dir)
+{
+ message ("Byte compiling SLang files in "+dir);
+ foreach ( listdir(dir) ) {
+ $1 = ();
+ if ( $1[[-3:-1]] == ".sl" )
+ byte_compile_file(dir+"/"+$1, 0);
+ }
+}
+
+compile_slfiles_in_dir("/usr/share/jed/site-lib");
+compile_slfiles_in_dir("/usr/share/jed/site-lib/apsconf");
+compile_slfiles_in_dir("/usr/share/jed/site-lib/colors");
Added: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/patches/00list 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,14 @@
+41_apsconf-tmp-dir
+42_view-mode-require-keydefs
+43_ding-require-txtutils-csvutils
+44_gnuplot-use-jedmodes-info
+45_gnuplot-shell-cmd-on-region
+46_ishell-autoload-view-mode
+47_jedscape-requires
+48_make-dfa-fixes
+49_miscfun-autoload-view-mode
+50_rfcview-require-bufutils
+50_home-lib_fix
+51_tree-dfa-fixes
+52_yodl-require
+53_mupad-fix
Copied: trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch (from rev 49, trunk/packages/jed-extra/patches/apsconf-tmp-dir.patch)
===================================================================
--- trunk/packages/jed-extra/patches/apsconf-tmp-dir.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 41_apsconf-tmp-dir.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/apsmode/apsconf/apsconf.sl mode/apsmode/apsconf/apsconf.sl
+--- mode-orig/apsmode/apsconf/apsconf.sl 2004-11-15 13:35:56.000000000 +0100
++++ mode/apsmode/apsconf/apsconf.sl 2005-03-05 15:50:11.000000000 +0100
+@@ -53,7 +53,9 @@
+ aps_del_ps_file = 1;
+
+ #ifdef UNIX
+-aps_tmp_dir = "/home/xyz/tmp/";
++aps_tmp_dir = getenv ("TMPDIR") + "/";
++if (aps_tmp_dir == "/")
++ aps_tmp_dir = "/tmp/";
+ a2ps_cmd = "a2ps";
+ default_printer = 5;
+ #endif
Copied: trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch (from rev 49, trunk/packages/jed-extra/patches/view-mode-require-keydefs.patch)
===================================================================
--- trunk/packages/jed-extra/patches/view-mode-require-keydefs.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 42_view-mode-require-keydefs.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/view/view.sl mode/view/view.sl
+--- mode-orig/view/view.sl 2004-11-15 13:36:08.000000000 +0100
++++ mode/view/view.sl 2005-03-06 11:56:22.000000000 +0100
+@@ -12,6 +12,8 @@
+
+ % requirements
+
++require ("keydefs");
++
+ autoload("close_buffer", "bufutils");
+ autoload("set_help_message", "bufutils");
+ autoload("help_message", "bufutils");
Copied: trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch (from rev 49, trunk/packages/jed-extra/patches/ding-require-txtutils-csvutils.patch)
===================================================================
--- trunk/packages/jed-extra/patches/ding-require-txtutils-csvutils.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 43_ding-require-txtutils-csvutils.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/ding/ding.sl mode/ding/ding.sl
+--- mode-orig/ding/ding.sl 2004-11-15 13:36:00.000000000 +0100
++++ mode/ding/ding.sl 2005-03-06 13:58:18.000000000 +0100
+@@ -28,7 +28,8 @@
+ %
+ % Optionally change custom variables
+
+-
++require ("txtutils");
++require ("csvutils");
+
+ % debug information, comment these out when ready
+ _debug_info = 1;
Copied: trunk/packages/jed-extra/debian/patches/44_gnuplot-use-jedmodes-info.dpatch (from rev 49, trunk/packages/jed-extra/patches/gnuplot-use-jedmodes-info.patch)
===================================================================
--- trunk/packages/jed-extra/patches/gnuplot-use-jedmodes-info.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/44_gnuplot-use-jedmodes-info.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 44_gnuplot-use-jedmodes-info.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/gnuplot/gnuplot.sl mode/gnuplot/gnuplot.sl
+--- mode-orig/gnuplot/gnuplot.sl 2004-11-15 13:36:02.000000000 +0100
++++ mode/gnuplot/gnuplot.sl 2005-03-06 14:52:24.000000000 +0100
+@@ -48,11 +48,9 @@
+
+ % requirements
+ require("comments"); % from jed's standard library
++autoload ("find_dir", "info");
+ autoload ("do_shell_cmd_on_region", "ishell.sl");
+ autoload ("ishell_mode", "ishell.sl");
+-!if (is_defined ("info_find_dir"))
+- () = evalfile("info.sl"); % has no provides command :-(
+-
+
+ % --- user adjustable settings ------------------------------------
+
+@@ -168,11 +166,11 @@
+ %\usage{Void gnuplot_info (); }
+ %\description
+ % open info and goto node (gnuplot), an optional argument is subnode
+-%\seealso{info_find_dir, info_find_node, gnuplot_mode}
++%\seealso{find_dir, info_find_node, gnuplot_mode}
+ %!%-
+ define gnuplot_info ()
+ {
+- info_find_dir();
++ find_dir();
+ info_find_node("(gnuplot)");
+ if (_NARGS) % optional argument present
+ {
Copied: trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch (from rev 49, trunk/packages/jed-extra/patches/gnuplot-shell-cmd-on-region.patch)
===================================================================
--- trunk/packages/jed-extra/patches/gnuplot-shell-cmd-on-region.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 45_gnuplot-shell-cmd-on-region.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/gnuplot/gnuplot.sl mode/gnuplot/gnuplot.sl
+--- mode-orig/gnuplot/gnuplot.sl 2005-03-06 15:07:05.000000000 +0100
++++ mode/gnuplot/gnuplot.sl 2005-03-06 15:07:00.000000000 +0100
+@@ -49,7 +49,7 @@
+ % requirements
+ require("comments"); % from jed's standard library
+ autoload ("find_dir", "info");
+-autoload ("do_shell_cmd_on_region", "ishell.sl");
++autoload ("shell_cmd_on_region", "ishell.sl");
+ autoload ("ishell_mode", "ishell.sl");
+
+ % --- user adjustable settings ------------------------------------
+@@ -269,7 +269,7 @@
+ %!%-
+ public define gnuplot_run ()
+ {
+- do_shell_cmd_on_region (Gnuplot_Command);
++ shell_cmd_on_region (Gnuplot_Command);
+ set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
+ % now we are in the "*shell-output*" buffer
+ !if (bobp and eobp) % if there is any output
+@@ -354,7 +354,7 @@
+ }
+ % run gnuplot
+ set_prefix_argument(2); % ignore output
+- do_shell_cmd_on_region(Gnuplot_Command);
++ shell_cmd_on_region(Gnuplot_Command);
+
+ % clean up
+ set_buffer_modified_flag(0); % so delbuf doesnot ask whether to save first
+@@ -405,7 +405,7 @@
+
+ % run gnuplot
+ set_prefix_argument(2); % ignore output
+- do_shell_cmd_on_region (Gnuplot_Command);
++ shell_cmd_on_region (Gnuplot_Command);
+
+ % clean up
+ set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
Copied: trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch (from rev 49, trunk/packages/jed-extra/patches/ishell-autoload-view-mode.patch)
===================================================================
--- trunk/packages/jed-extra/patches/ishell-autoload-view-mode.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 46_ishell-autoload-view-mode.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/ishell/ishell.sl mode/ishell/ishell.sl
+--- mode-orig/ishell/ishell.sl 2004-12-03 11:58:12.000000000 +0100
++++ mode/ishell/ishell.sl 2005-03-06 15:11:56.000000000 +0100
+@@ -108,6 +108,7 @@
+ autoload("run_blocal_hook", "bufutils");
+ autoload("bufsubfile", "bufutils");
+ % autoload("strbreak", "strutils");
++autoload("view_mode", "view");
+
+ % ------------------ custom variables ---------------------------------
+
Copied: trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch (from rev 49, trunk/packages/jed-extra/patches/jedscape-requires.patch)
===================================================================
--- trunk/packages/jed-extra/patches/jedscape-requires.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 47_jedscape-requires.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/jedscape/jedscape.sl mode/jedscape/jedscape.sl
+--- mode-orig/jedscape/jedscape.sl 2004-11-15 13:36:04.000000000 +0100
++++ mode/jedscape/jedscape.sl 2005-03-06 22:18:14.000000000 +0100
+@@ -33,6 +33,9 @@
+ % anything defined in this file.
+ require("ishell");
+ require("view");
++autoload ("string_nth_match", "strutils");
++autoload ("dired_read_dir", "dired");
++autoload ("strread_file", "bufutils");
+ if (_featurep("jedscape"))
+ use_namespace("jedscape");
+ else
Copied: trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch (from rev 49, trunk/packages/jed-extra/patches/make-dfa-fixes.patch)
===================================================================
--- trunk/packages/jed-extra/patches/make-dfa-fixes.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 48_make-dfa-fixes.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/make/make.sl mode/make/make.sl
+--- mode-orig/make/make.sl 2004-11-15 13:36:05.000000000 +0100
++++ mode/make/make.sl 2005-03-06 23:14:40.000000000 +0100
+@@ -211,23 +211,26 @@
+ % in JED is seriously damaged. Or, alternatively (and probably),
+ % I don't know how to write good rules :(
+ %
+-define_highlight_rule("\"[^\"]*\"", "string", $0);
+-define_highlight_rule("'[^']*'", "string", $0);
+-%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
+-%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
+-%define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
+-%define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
+-define_highlight_rule ("^[ \t]*@", "string", $0);
+-define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
+-define_highlight_rule ("[ \t]*#.*$", "comment", $0);
+-define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-%define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-%define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
+-define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
+-define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
+-%define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
+-define_highlight_rule ("/include", "normal", $0);
+-build_highlight_table ($0);
++dfa_define_highlight_rule("\"[^\"]*\"", "string", $0);
++dfa_define_highlight_rule("'[^']*'", "string", $0);
++%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
++%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
++%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
++%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
++%dfa_define_highlight_rule ("^[ \t]*@", "string", $0);
++%dfa_define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
++dfa_define_highlight_rule ("[ \t]*#.*$", "comment", $0);
++%dfa_define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++%dfa_define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++%dfa_define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
++dfa_define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
++dfa_define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
++dfa_define_highlight_rule ("^[^\t][^=]*=[ \t]+", "preprocess", $0);
++dfa_define_highlight_rule ("\\$\\([^\\)]+\\)", "string", $0);
++%dfa_define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
++dfa_define_highlight_rule ("/include", "normal", $0);
++dfa_build_highlight_table ($0);
++enable_dfa_syntax_for_mode ($0);
+ #endif
+
+ () = define_keywords_n ($0, "ARASCCCOCPFCPCRMfiif", 2, 0);
Copied: trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch (from rev 49, trunk/packages/jed-extra/patches/miscfun-autoload-view-mode.patch)
===================================================================
--- trunk/packages/jed-extra/patches/miscfun-autoload-view-mode.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 49_miscfun-autoload-view-mode.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/miscfun/miscfun.sl mode/miscfun/miscfun.sl
+--- mode-orig/miscfun/miscfun.sl 2004-11-15 13:36:06.000000000 +0100
++++ mode/miscfun/miscfun.sl 2005-03-07 21:55:45.000000000 +0100
+@@ -9,6 +9,8 @@
+ % look through the file, copy functions you find useful to your own
+ % miscfun.sl and follow the installation instructions.
+
++autoload ("view_mode", "view");
++
+ %{{{ complete_filename
+ % This is basically the ashell_completion() function for completing
+ % filenames from ashell.sl, minus the ashell-specific stuff.
Added: trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_home-lib_fix.dpatch by Jörg Sommer <joerg@alea.gnuu.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: home-lib.sl misses the declaration of Jed_Home_Library, this fixes it
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./home-lib/home-lib.sl /tmp/dpep-work.FpeOEi/jed-extra-1.2/home-lib/home-lib.sl
+--- ./home-lib/home-lib.sl 2005-06-30 17:18:11.000000000 +0200
++++ /tmp/dpep-work.FpeOEi/jed-extra-1.2/home-lib/home-lib.sl 2005-06-30 17:21:04.848428040 +0200
+@@ -20,6 +20,10 @@
+ % Version 0.9 first public version
+ % 0.9.1 Jed_Highlight_Cache_Path += Jed_Home_Library;
+
++custom_variable("Jed_Home_Library", path_concat(Jed_Home_Directory, "lib"));
++if (file_status(Jed_Home_Library) != 2) % no directory
++ Jed_Home_Library = "";
++
+ % --- Site Library --------------------------------------------------------
+
+ #ifdef UNIX
Property changes on: trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Copied: trunk/packages/jed-extra/debian/patches/50_rfcview-require-bufutils.dpatch (from rev 49, trunk/packages/jed-extra/patches/rfcview-require-bufutils.patch)
===================================================================
--- trunk/packages/jed-extra/patches/rfcview-require-bufutils.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/50_rfcview-require-bufutils.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_rfcview-require-bufutils.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/rfcview/rfcview.sl mode/rfcview/rfcview.sl
+--- mode-orig/rfcview/rfcview.sl 2004-11-15 13:36:07.000000000 +0100
++++ mode/rfcview/rfcview.sl 2005-03-07 23:19:46.000000000 +0100
+@@ -24,6 +24,7 @@
+ implements("rfcview");
+
+ require("view");
++require("bufutils");
+ _autoload
+ ("set_buffer_hidden", "filter-view",
+ "set_matching_hidden", "filter_view",
Copied: trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch (from rev 49, trunk/packages/jed-extra/patches/tree-dfa-fixes.patch)
===================================================================
--- trunk/packages/jed-extra/patches/tree-dfa-fixes.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_tree-dfa-fixes.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/tree/tree.sl mode/tree/tree.sl
+--- mode-orig/tree/tree.sl 2004-11-15 13:36:08.000000000 +0100
++++ mode/tree/tree.sl 2005-03-08 08:50:00.000000000 +0100
+@@ -349,12 +349,13 @@
+ {
+ $0 = "tree";
+ create_syntax_table ($0);
+- define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
+- define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
+- define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
+- define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
+- define_highlight_rule("^[^ ].*$", "Qstring", $0);
+- build_highlight_table ($0);
++ dfa_define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
++ dfa_define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
++ dfa_define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
++ dfa_define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
++ dfa_define_highlight_rule("^[^ ].*$", "Qstring", $0);
++ dfa_build_highlight_table ($0);
++ enable_dfa_syntax_for_mode ($0);
+ use_syntax_table ("tree");
+ }
+ #endif
Copied: trunk/packages/jed-extra/debian/patches/52_yodl-require.dpatch (from rev 49, trunk/packages/jed-extra/patches/yodl-require.patch)
===================================================================
--- trunk/packages/jed-extra/patches/yodl-require.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/52_yodl-require.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_yodl-require.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+diff -Naur mode-orig/yodl/yodl.sl mode/yodl/yodl.sl
+--- mode-orig/yodl/yodl.sl 2004-11-15 13:36:09.000000000 +0100
++++ mode/yodl/yodl.sl 2005-03-08 12:58:16.000000000 +0100
+@@ -7,6 +7,10 @@
+ % Copyright (c) 2004 Paul Boekholt.
+ % Released under the terms of the GNU GPL (version 2 or later).
+
++require ("txtutils");
++require ("bufutils");
++require ("help");
++
+ if (_featurep("yodl"))
+ use_namespace("yodl");
+ else
Copied: trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch (from rev 49, trunk/packages/jed-extra/patches/mupad-fix.patch)
===================================================================
--- trunk/packages/jed-extra/patches/mupad-fix.patch 2005-06-10 11:09:07 UTC (rev 49)
+++ trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch 2005-06-30 17:25:29 UTC (rev 51)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_mupad-fix.dpatch by Rafael Laboissiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+
+--- mode.orig/mupad/mupad.sl 2005-03-09 11:20:03.000000000 +0100
++++ mode/mupad/mupad.sl 2005-04-22 22:45:19.994720840 +0200
+@@ -115,7 +115,8 @@
+ bol_skip_white ();
+ ch = char(what_char());
+ bol_trim ();
+- insert_spaces (goal--, goal);
++ goal--;
++ insert_spaces (goal);
+ pop_spot ();
+ skip_white ();
+
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-06-30 17:24:33 UTC (rev 50)
+++ trunk/packages/jed-extra/debian/rules 2005-06-30 17:25:29 UTC (rev 51)
@@ -7,116 +7,66 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
jed_root = /usr/share/jed
-debroot = $(shell pwd)/debian/jed-extra
-site_lib_dir = $(jed_root)/site-lib
-compile_dir = $(jed_root)/compile
-jed_init_dir = /etc/jed-init.d
-a2ps_ssh_dir = /usr/share/a2ps/sheets/
+debroot = $(PWD)/debian/jed-extra
-tarballs = jedmodes.tgz misc.tar.gz
-srcdirs = lib mode misc
-
-generate-patch:
- mv $(DIR) $(DIR)-new
- fakeroot ./debian/rules clean
- ./debian/rules patch-stamp
- rm -rf $(DIR)-orig
- mv $(DIR) $(DIR)-orig
- mv $(DIR)-new $(DIR)
- -diff -Naur $(DIR)-orig $(DIR) > $(PATCH)
- rm -rf $(DIR)-orig
-
-untar-stamp: $(tarballs)
+clean: unpatch
dh_testdir
- for t in $(tarballs) ; do \
- tar xfz $$t ; \
- done
- rm -rf mode/help
- touch untar-stamp
+ dh_clean
-patch-stamp: untar-stamp
- dh_testdir
- @for i in `cat patches/00list` ; do \
- echo Applying patch $$i ; \
- patch -p0 --no-backup-if-mismatch < patches/$$i ; \
- done
- touch patch-stamp
+build:
+ # nothing to do, but we need it to be policy conform
-lib/jed-extra.sl: patch-stamp
- mkdir -p lib
- cat `find $(srcdirs) -name \*.rc ` > $@
-
-compile-files.sl: lib/jed-extra.sl compile-files.sl.in
- find $(srcdirs) -name \*.sl | grep -v apsconf \
- | eperl compile-files.sl.in -o $@
-
-build: build-stamp
-build-stamp: compile-files.sl
+binary binary-indep: patch-stamp
dh_testdir
- for ext in html txt ; do \
- mkdir $$ext ; \
- cp `find $(srcdirs) -name \*.$$ext` $$ext ; \
- done
- touch build-stamp
-
-clean:
- dh_testdir
dh_testroot
+ # keep dh_install informations (debian/files)
+ dh_clean --keep
- rm -rf $(srcdirs) compile compile-files.sl *-stamp html \
- txt README.tar-mode
+ dh_install $$(find . \( -wholename ./debian -o -wholename ./colors -o \
+ -wholename ./apsmode/apsconf \) -prune -o \
+ \( -name \*.sl -o -name \*.hlp \) -print ) yodl/yodlfun.txt \
+ debian/jed-extra-preparse.sl debian/jed-extra-init.sl \
+ $(jed_root)/site-lib
- dh_clean
+ dh_install a2ps/*.ssh /usr/share/a2ps/sheets/
+ dh_install -Xapsconf.example apsmode/apsconf colors $(jed_root)/site-lib
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs $(site_lib_dir) $(jed_init_dir) $(a2ps_ssh_dir) \
- $(compile_dir)
+ # fill up /etc
+ dh_install debian/init/*.sl etc/jed-init.d/
- install --mode=644 \
- `find $(srcdirs) -name \*.sl -o -name \*.slc \
- -o -name \*.hlp | grep -v colors/ \
- | grep -v apsconf/ ` \
- $(debroot)$(site_lib_dir)
- install --mode=644 compile-files.sl \
- $(debroot)$(site_lib_dir)/jed-extra-compile-files.sl
+ # install compile script to build *.slc files after installation
+ dh_install debian/compile usr/share/jed/compile
+ mv $(debroot)/usr/share/jed/compile/compile \
+ $(debroot)/usr/share/jed/compile/jed-extra
- install --mode=644 mode/a2ps/*.ssh $(debroot)$(a2ps_ssh_dir)
- cp -a mode/apsmode/apsconf $(debroot)$(site_lib_dir)
- cp -a mode/colors $(debroot)$(site_lib_dir)/colors
- cp -a txt $(debroot)$(site_lib_dir)/txt
- cp mode/tar/INSTALL README.tar-mode
- chmod -x $(debroot)$(site_lib_dir)/apsconf/*
- install --mode=644 init/*.sl $(debroot)$(jed_init_dir)
- install --mode=644 mode/home-lib/home-lib.sl \
- $(debroot)$(jed_init_dir)/05home-lib.sl
+ # fill up /usr/share/doc/jed-extra
+ dh_installchangelogs
- install --mode=755 debian/compile $(compile_dir)/jed-extra
+ dh_installdocs $$(find . -name \*.html -o -name \*.otl) \
+ outline/outline.txt a2ps/README tar/INSTALL
- touch install-stamp
+ mv $(debroot)/usr/share/doc/jed-extra/README \
+ $(debroot)/usr/share/doc/jed-extra/README.a2ps
+ mv $(debroot)/usr/share/doc/jed-extra/INSTALL \
+ $(debroot)/usr/share/doc/jed-extra/INSTALL.tar.sl
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs html README.tar-mode
-# dh_installdebconf
+ # install some extra docs from the source
+ dh_installexamples apsmode/apsconf/apsconf.example
+
+ #dh_installdebconf
+
dh_compress
+
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
-# Build architecture-dependent files here.
binary-arch:
-# We have nothing to do by default.
+ # nothing to do, but we need it to be policy conform
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install untar byte-compile
-
+.PHONY: build clean binary binary-arch binary-indep