[Pkg-jed-commit] r323 - in trunk/packages/jed-extra: debian
debian/examples utils
Guenter Milde
milde-guest at costa.debian.org
Fri Jun 9 13:29:40 UTC 2006
Author: milde-guest
Date: 2006-06-09 13:29:39 +0000 (Fri, 09 Jun 2006)
New Revision: 323
Removed:
trunk/packages/jed-extra/debian/init/
Modified:
trunk/packages/jed-extra/debian/contents.txt
trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl
trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl
trunk/packages/jed-extra/debian/examples/50jed-extra.sl
trunk/packages/jed-extra/debian/rules
trunk/packages/jed-extra/utils/build-from-svn-copy.sh
Log:
utils/build-from-svn-copy.sh: renamed VER to UPSTREAM_VERSION
debian/init/: install already used the config file from the examples
so the init/ dir is no longer needed
contents.txt: move modes to X
comlete: special configuration, missing autoload
occur: both, tokenlist and occur re-define occur(), missing autoload
debian/examples/50*: add missing autoloads and comments
Now, check_installation fails only for extra modes in the default config:
extra/a2ps.sl...failed: string_get_match is undefined
extra/info_look.sl...failed: get_word is undefined
extra/rfcview.sl...failed: string_get_match is undefined
extra/turbo.sl...failed: get_blocal is undefined
extra/yodl.sl...failed: get_word is undefined
extra/complete.sl...failed: bget_word is undefined
extra/occur.sl...failed: get_word is undefined
(which is IMO ok) and only for one mode with utils/ini.sl loaded:
extra/rfcview.sl...failed: Help_Message is undefined
which is fixed in the new upstream pre-release jedmodes-2.1.4.tgz.
Modified: trunk/packages/jed-extra/debian/contents.txt
===================================================================
--- trunk/packages/jed-extra/debian/contents.txt 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/debian/contents.txt 2006-06-09 13:29:39 UTC (rev 323)
@@ -31,7 +31,7 @@
E ch_table A "popup_buffer" with a table of characters
U circle Circular array with relational indexing
C colors collection of color schemes
-A complete keyword completion function
+X complete keyword completion function
A console_keys make shift-arrow etc. work under linux-console
A css1 Mode for Cascading Style Sheets (CSS)
A csvutils Utilities to work with csv data
@@ -86,7 +86,7 @@
A mupad Mode for Mupad (computer algebra system) files.
E navigate "History feature" known from many browsers
E numbuf Number the buffers and bind Alt-[n] to go to buffer n
-D occur occur with context
+X occur occur with context
#X outline outline mode
X pcre Perl-compatible searching functions
A po_mode Mode for editing PO-files
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl 2006-06-09 13:29:39 UTC (rev 323)
@@ -35,6 +35,7 @@
% - slows down startup
% + lets private modes use the util functions without need for autoloads
% + lets Help>Apropos find util functions right from the start
+% + some modes from jed-extra/extra depend on this autoloads
append_libdir($1 + "utils/", 1); % append and initialize
% append_libdir($1 + "utils/", 0); % append but do not initialize
@@ -61,6 +62,12 @@
% "Manual" initialization of stuff not handled by the ini.sl files
% ----------------------------------------------------------------
+% add some autoloads (not needed if utils/ini.sl is evaluated, e.g. with
+% append_libdir($1 + "utils/", 1);)
+% autoload("push_defaults", "sl_utils"); % needed by ispell_init.sl, complete, occur, ...
+% autoload("string_nth_match", "strutils"); % needed by hyperman.sl
+% autoload("get_keystring", "strutils"); % needed by snake.sl
+
% call extension-dependend modes
add_mode_for_extension ("css1", "css");
add_mode_for_extension ("css1", "css1");
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl 2006-06-09 13:29:39 UTC (rev 323)
@@ -49,3 +49,11 @@
% The recommended use is to, copy or link interesting modes
% to /usr/local/share/jed/lib/ or ~/.jed/lib and user make_ini() and
% add_libdir() for activation (in ~/jed.rc).
+
+% add some autoloads
+autoload("push_defaults", "sl_utils"); % needed by ispell_init.sl, complete, occur, ...
+autoload("string_nth_match", "strutils"); % needed by hyperman.sl
+autoload("get_keystring", "strutils"); % needed by snake.sl
+% alternatively evaluate the utils/ini.sl file
+% () = evalfile("utils/ini.sl"); % autoloads for all utilit functions
+
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra.sl 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra.sl 2006-06-09 13:29:39 UTC (rev 323)
@@ -19,8 +19,8 @@
require("libdir", $2);
% Utilities (required by the other modes)
-append_libdir($1 + "utils/", 1); % append and initialize
-% append_libdir($1 + "utils/", 0); % append but do not initialize
+% append_libdir($1 + "utils/", 1); % append and initialize
+append_libdir($1 + "utils/", 0); % append but do not initialize
% "Normal" modes
append_libdir($1, 1); % append and initialize
@@ -40,6 +40,14 @@
% "Manual" initialization of stuff not handled by the ini.sl files
% ----------------------------------------------------------------
+% add some autoloads
+autoload("push_defaults", "sl_utils"); % needed by ispell_init.sl, complete, occur, ...
+autoload("string_nth_match", "strutils"); % needed by hyperman.sl
+autoload("get_keystring", "strutils"); % needed by snake.sl
+% alternatively evaluate the utils/ini.sl file (or set the "initialize"
+% argument to 1 in append_libdir($1 + "utils/", 1) above)
+% () = evalfile("utils/ini.sl"); % autoloads for all utilit functions
+
% call extension-dependend modes
add_mode_for_extension ("css1", "css");
add_mode_for_extension ("css1", "css1");
@@ -55,7 +63,7 @@
% Globally activate extensions
% ----------------------------
-% If there are more JED users on the machine, better do this activation in
+% If there are several JED users on the machine, better do this activation in
% the user's jed.rc files, as there is no way a "normal" user can revert
% the choices short of disabling all of the Debian configuration with
% `jed --skip-debian-startup`.
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/debian/rules 2006-06-09 13:29:39 UTC (rev 323)
@@ -38,9 +38,10 @@
mkdir --parents jedmodes-$(UPSTREAM_VERSION)/boxquote
cd jedmodes-$(UPSTREAM_VERSION)/boxquote; \
wget http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
+
gunzip jed-extra_$(UPSTREAM_VERSION).orig.tar.gz
tar --append --file jed-extra_$(UPSTREAM_VERSION).orig.tar \
- jedmodes-$(UPSTREAM_VERSION)/*
+ jedmodes-$(UPSTREAM_VERSION)/boxquote/*
gzip -9 jed-extra_$(UPSTREAM_VERSION).orig.tar
clean: unpatch
Modified: trunk/packages/jed-extra/utils/build-from-svn-copy.sh
===================================================================
--- trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-06-09 08:24:13 UTC (rev 322)
+++ trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-06-09 13:29:39 UTC (rev 323)
@@ -24,8 +24,9 @@
fi
# upstream version
-VER=`perl -ne '/\(([\d.]+)-/; print $1; exit' < debian/changelog`
+UPSTREAM_VERSION=`perl -ne '/\(([\d.]+)-/; print $1; exit' < debian/changelog`
+echo "building jed-extra $UPSTREAM_VERSION"
# Update the jed-extra files from SVN
# --------------------------------
@@ -36,44 +37,44 @@
# remove old dir (if left over)
-# rm -Rf jedmodes-$VER
-if [ -e jedmodes-$VER ]
- then rm -Rf jedmodes-$VER.bak
- mv -f jedmodes-$VER jedmodes-$VER.bak
+# rm -Rf jedmodes-$UPSTREAM_VERSION
+if [ -e jedmodes-$UPSTREAM_VERSION ]
+ then rm -Rf jedmodes-$UPSTREAM_VERSION.bak
+ mv -f jedmodes-$UPSTREAM_VERSION jedmodes-$UPSTREAM_VERSION.bak
fi
# or just the patches
-# rm -rf jedmodes-$VER/patch-stamp jedmodes-$VER/patch-stampT \
-# jedmodes-$VER/debian/patched
+# rm -rf jedmodes-$UPSTREAM_VERSION/patch-stamp jedmodes-$UPSTREAM_VERSION/patch-stampT \
+# jedmodes-$UPSTREAM_VERSION/debian/patched
# Get the upstream tarball
# ------------------------
-# If there is no jed-extra_$VER.orig.tar.gz, copy or download
+# If there is no jed-extra_$UPSTREAM_VERSION.orig.tar.gz, copy or download
# TODO: only move the file, if it is newer
-# if [ ~/.jed/jedmodes/src/jedmodes-$VER.tgz -nt jed-extra_$VER.orig.tar.gz ]
-# then cp ~/.jed/jedmodes/src/jedmodes-$VER.tgz jed-extra_$VER.orig.tar.gz
+# if [ ~/.jed/jedmodes/src/jedmodes-$UPSTREAM_VERSION.tgz -nt jed-extra_$UPSTREAM_VERSION.orig.tar.gz ]
+# then cp ~/.jed/jedmodes/src/jedmodes-$UPSTREAM_VERSION.tgz jed-extra_$UPSTREAM_VERSION.orig.tar.gz
# fi
-if [ ! -e jed-extra_$VER.orig.tar.gz ]
+if [ ! -e jed-extra_$UPSTREAM_VERSION.orig.tar.gz ]
then debian/rules get-orig-source
fi
# Unpack
# ------
-tar -xzf jed-extra_$VER.orig.tar.gz
+tar -xzf jed-extra_$UPSTREAM_VERSION.orig.tar.gz
# Copy the debian/ subdir to the source tree
# ------------------------------------------
-install -d jedmodes-$VER/debian
-cp -uRf debian/* jedmodes-$VER/debian
+install -d jedmodes-$UPSTREAM_VERSION/debian
+cp -uRf debian/* jedmodes-$UPSTREAM_VERSION/debian
-cd jedmodes-$VER
+cd jedmodes-$UPSTREAM_VERSION
# Fix the trailer line in changelog automatically
perl -ni -e 'if (not $done and /^ --/) {'\
More information about the Pkg-jed-commit
mailing list