[Pkg-jed-commit] r300 - in trunk/packages/jed-extra/debian: .
examples init
Guenter Milde
milde-guest at costa.debian.org
Tue May 23 15:35:16 UTC 2006
Author: milde-guest
Date: 2006-05-23 15:35:15 +0000 (Tue, 23 May 2006)
New Revision: 300
Added:
trunk/packages/jed-extra/debian/install.template
Modified:
trunk/packages/jed-extra/debian/compile
trunk/packages/jed-extra/debian/contents.txt
trunk/packages/jed-extra/debian/control
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/examples/jed-extra.rc
trunk/packages/jed-extra/debian/init/50jed-extra.sl
trunk/packages/jed-extra/debian/rules
Log:
rules: variable VER for current version
(Rafael, can you fix the extraction from the changelog?)
get_orig_source: do not download if the orig source is present
control: suggest slang-curl (used by dict-curl backend)
compile: remove also generated ini.sl and libfuns.txt files
init|examples: be sure not to run the config file without jed-extra/libdir.sl
manedit mode setting loop "the JED way"
Modified: trunk/packages/jed-extra/debian/compile
===================================================================
--- trunk/packages/jed-extra/debian/compile 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/compile 2006-05-23 15:35:15 UTC (rev 300)
@@ -10,7 +10,8 @@
# again at installation
;;
remove)
- find $LIBDIR \( -name \*.slc -o -name \*.dfa \) -delete
+ find $LIBDIR \( -name \*.slc -o -name \*.dfa \
+ -o -name ini.sl* -o -name libfuns.txt \) -delete
;;
*)
echo "unknown argument --> \"$1"\" >&2
Modified: trunk/packages/jed-extra/debian/contents.txt
===================================================================
--- trunk/packages/jed-extra/debian/contents.txt 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/contents.txt 2006-05-23 15:35:15 UTC (rev 300)
@@ -30,10 +30,10 @@
A cuamark CUA style of marking ("volatile regions")
O cuamisc Helper functions for the cua suite
A cuamouse CUA compatible mouse mode
-A custmode Custom syntax highlighting
+X custmode Custom syntax highlighting
O dabbrev Complete the current word looking for similar word-beginnings
U datutils Convenience functions for several Data_Types
-A diagnose Diagnostic functions for SLang programmers
+X diagnose Diagnostic functions for SLang programmers
#X dict A dict client.
X ding Ding dictionary lookup function and mode
A dictmode dict dictionary lookup (including thesaurus)
@@ -64,7 +64,7 @@
#D latex-jlm Yet another latex mode for Jed
A libdir Support for library directories with jed extensions
A life Conway's Game of Life
-A listing Mode for listings of e.g. files or findings
+U listing Mode for listings of e.g. files or findings
A make Mode for 'Makefile' files
A make_ini Initialize non-standard modes automatically
A manedit JED mode for editing Linux manpages.
Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/control 2006-05-23 15:35:15 UTC (rev 300)
@@ -9,7 +9,7 @@
Package: jed-extra
Architecture: all
Depends: jed-common (>= 0.99.17.111), findutils (>= 4.2.9)
-Suggests: slsh, slang-gdbm, html2text
+Suggests: slsh, slang-gdbm, slang-curl, html2text
Conflicts: dictionaries-common (<< 0.14.0)
Description: collection of useful JED modes and utilities
The JED text editor can be easily extended using the SLang scripting
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra-full.sl 2006-05-23 15:35:15 UTC (rev 300)
@@ -15,20 +15,20 @@
% (or your users), go for the "minimal" version of 50jed-extra.
-% The jed-extra library dir
+% Location of the jed-extra package's library dir
$1 = "/usr/share/jed/jed-extra/";
-% if jed-extra is removed (not purged), this file exists
-% but nothing else it expects --> abort
-#if (file_status($1) != 2)
+% if jed-extra is removed (not purged), this file (and possibly the
+% jed-extra library dir) exist, but nothing else it expects --> abort
+$2 = path_concat($1, "libdir.sl");
+#if (file_status($2) != 1)
#stop
#endif
-
% Add (and initialize) library directories
% ----------------------------------------
-require("libdir", path_concat($1, "libdir.sl"));
+require("libdir", $2);
% Utilities (required by the other modes)
% Initialization adds autoloads for utility functions:
@@ -68,8 +68,8 @@
add_mode_for_extension ("gnuplot", "gp");
add_mode_for_extension ("mupad", "mu"); % mode for mupad files
foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
- variable ext = ();
- add_mode_for_extension ("manedit", ext);
+ $2 = ();
+ add_mode_for_extension ("manedit", $2);
}
add_mode_for_extension ("sql", "sql");
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra-minimal.sl 2006-05-23 15:35:15 UTC (rev 300)
@@ -11,20 +11,20 @@
%
% All settings in this file can be reverted by normal users.
-% The jed-extra library dir
+% Location of the jed-extra package's library dir
$1 = "/usr/share/jed/jed-extra/";
-% if jed-extra is removed (not purged), this file exists
-% but nothing else it expects --> abort
-#if (file_status($1) != 2)
+% if jed-extra is removed (not purged), this file (and possibly the
+% jed-extra library dir) exist, but nothing else it expects --> abort
+$2 = path_concat($1, "libdir.sl");
+#if (file_status($2) != 1)
#stop
#endif
-
% Add (and initialize) library directories
% ----------------------------------------
-require("libdir", path_concat($1, "libdir.sl"));
+require("libdir", $2);
% Utilities (required by the other modes)
% Initialization adds autoloads for utility functions:
Modified: trunk/packages/jed-extra/debian/examples/50jed-extra.sl
===================================================================
--- trunk/packages/jed-extra/debian/examples/50jed-extra.sl 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/examples/50jed-extra.sl 2006-05-23 15:35:15 UTC (rev 300)
@@ -1,70 +1,40 @@
% 50jed-extra.sl: Initialization of jed-extra package
-%
+
% Copyright (c) 2005 Debian JED Group
% Released under the terms of the GNU General Public License (v. 2 or later)
-%
-% The default version of the initalization file does an "minimal invasive"
-% activation of the jed-extra modes.
-%
-% Copy to /etc/jed.d/50jed-extra.sl if you are sure all users of your site
-% want (or can tolerate) normal jed-extra support `out of the box'.
-%
-% Beware: evaluation of initialization files cannot be reverted by normal
-% users by other means than completely disabling the Debian startup scheme with
-% the command line option --skip-debian-startup. If this frightens you (or
-% your users), go for the "minimal" version of 50jed-extra.
-% jed-extra provides one more emulation mode (in addition to jed-common)
-% if (BATCH == 0)
-% {
-% require("vi"); % vi emulation
-% }
-
-% The jed-extra library dir
+% Location of the jed-extra package's library dir
$1 = "/usr/share/jed/jed-extra/";
-% if jed-extra is removed (not purged), this file exists
-% but nothing else it expects --> abort
-#if (file_status($1) != 2)
+% if jed-extra is removed (not purged), this file (and possibly the
+% jed-extra library dir) exist, but nothing else it expects --> abort
+$2 = path_concat($1, "libdir.sl");
+#if (file_status($2) != 1)
#stop
#endif
-
% Add (and initialize) library directories
% ----------------------------------------
-require("libdir", path_concat($1, "libdir.sl"));
+require("libdir", $2);
% Utilities (required by the other modes)
-% Initialization adds autoloads for utility functions:
-% - slows down startup
-% + lets private modes use the util functions without need for autoloads
-% + lets Help>Apropos find util functions right from the start
-% 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
-% Initialization is low key (autolaods, some Menu entries)
append_libdir($1, 1); % append and initialize
% append_libdir($1, 0); % append but do not initialize
% Drop-In Modes (recent, help, man, ...) need to be prepended
-% Comment if you want to keep the original behaviour
-% Initialization is low key (autolaods for additional functions)
-% add_libdir($1 + "drop-in/", 1); % append and initialize
-add_libdir($1 + "drop-in/", 0); % append but do not initialize
+% (comment out if you want to keep the original behaviour)
+add_libdir($1 + "drop-in/", 1); % append and initialize
+% add_libdir($1 + "drop-in/", 0); % append but do not initialize
% Experimental and exotic modes
-% 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).
-
-% Full activation of "extra" modes (Uncomment at your own risc)
+% (uncomment to initalize, maybe better on a per user basis in ~/jed.rc)
% append_libdir($1 + "extra/", 0); % append but do not initialize
-% append_libdir($1 + "extra/", 1); % append and initialize
-%
-% Alternatively, add documentation for "extra functions" to the online help
-Jed_Doc_Files += "," + $1+"extra/libfuns.txt";
+% append_libdir($1 + "extra/", 1); % append and initialize
% "Manual" initialization of stuff not handled by the ini.sl files
@@ -77,8 +47,8 @@
add_mode_for_extension ("gnuplot", "gp");
add_mode_for_extension ("mupad", "mu"); % mode for mupad files
foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
- variable ext = ();
- add_mode_for_extension ("manedit", ext);
+ $2 = ();
+ add_mode_for_extension ("manedit", $2);
}
add_mode_for_extension ("sql", "sql");
@@ -93,17 +63,17 @@
% require("numbuf"); % number buffers for fast switching
% require("navigate"); % history feature (recent buffers)
% require("ispell_init"); % ispell|aspell support
+
% require("cuamark"); % use CUA style kind of selecting regions
% Printing
% --------
% there are 2 alternative functions to send the current buffer to a printer
-% The user can easily override the choice in his|her jed.rc.
%
% autoload("print_buffer", "print"); % simple, sends pure ASCII
% autoload("print_buffer", "apsmode"); % uses a2ps, needs to be configured
-
+%
% define print_popup_hook (menubar)
% {
% menu_insert_separator (6, "Global.&File");
Modified: trunk/packages/jed-extra/debian/examples/jed-extra.rc
===================================================================
--- trunk/packages/jed-extra/debian/examples/jed-extra.rc 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/examples/jed-extra.rc 2006-05-23 15:35:15 UTC (rev 300)
@@ -93,8 +93,8 @@
% add_mode_for_extension ("mupad", "mu"); % mode for mupad files
% add_mode_for_extension ("sql", "sql");
% foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
-% variable ext = ();
-% add_mode_for_extension ("manedit", ext);
+% $2 = ();
+% add_mode_for_extension ("manedit", $2);
% }
% activate extension modes
Modified: trunk/packages/jed-extra/debian/init/50jed-extra.sl
===================================================================
--- trunk/packages/jed-extra/debian/init/50jed-extra.sl 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/init/50jed-extra.sl 2006-05-23 15:35:15 UTC (rev 300)
@@ -6,17 +6,17 @@
% Location of the jed-extra package's library dir
$1 = "/usr/share/jed/jed-extra/";
-% if jed-extra is removed (not purged), this file exists
-% but nothing else it expects --> abort
-#if (file_status($1) != 2)
+% if jed-extra is removed (not purged), this file (and possibly the
+% jed-extra library dir) exist, but nothing else it expects --> abort
+$2 = path_concat($1, "libdir.sl");
+#if (file_status($2) != 1)
#stop
#endif
-
% Add (and initialize) library directories
% ----------------------------------------
-require("libdir", path_concat($1, "libdir.sl"));
+require("libdir", $2);
% Utilities (required by the other modes)
append_libdir($1 + "utils/", 1); % append and initialize
@@ -37,7 +37,6 @@
% append_libdir($1 + "extra/", 1); % append and initialize
-
% "Manual" initialization of stuff not handled by the ini.sl files
% ----------------------------------------------------------------
@@ -48,8 +47,8 @@
add_mode_for_extension ("gnuplot", "gp");
add_mode_for_extension ("mupad", "mu"); % mode for mupad files
foreach (["man", "1", "2", "3", "4", "5", "6", "7", "8"]) {
- "manedit"; exch;
- add_mode_for_extension ((), ());
+ $2 = ();
+ add_mode_for_extension ("manedit", $2);
}
add_mode_for_extension ("sql", "sql");
Copied: trunk/packages/jed-extra/debian/install.template (from rev 291, trunk/packages/jed-extra/debian/jed-extra.install.template)
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2006-05-23 13:54:41 UTC (rev 299)
+++ trunk/packages/jed-extra/debian/rules 2006-05-23 15:35:15 UTC (rev 300)
@@ -9,41 +9,26 @@
include /usr/share/dpatch/dpatch.make
-CONTENTS_FILE = debian/contents.txt
-
-ADDITION = $(shell sed -n -e '/^A/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-COLOR = $(shell sed -n -e '/^C/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-DROP_IN = $(shell sed -n -e '/^D/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-ENHANCEMENT = $(shell sed -n -e '/^E/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-UTILS = $(shell sed -n -e '/^U/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-EXPERIMENTAL = $(shell sed -n -e '/^X/ {s/^.\s*//; s@\s.*@/*@; p;}' $(CONTENTS_FILE))
-
debroot = $(PWD)/debian/jed-extra
-libdir = /usr/share/jed/jed-extra
-
-dh_inst_excl = -X.html -X.otl -X.example -XREADME
-
# upstream version
VER = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
$(dir $(firstword $(MAKEFILE_LIST)))/changelog)
+
build:
# nothing to do, but required by debian policy
-get-orig-source:
+get-orig-source: jed-extra_$(VER).orig.tar.gz
+ # The dependency on the archive file makes get-orig-source idempotent
+
+jed-extra_$(VER).orig.tar.gz:
+ # latest non-released source tarball
+ wget http://jedmodes.sf.net/cvs/jedmodes-$(VER).tgz; \
# officially released CVS tarball directly from a download mirror
# wget http://kent.dl.sourceforge.net/sourceforge/jedmodes/jedmodes-$(VER).tgz
- # latest non-released source tarball
- wget http://jedmodes.sf.net/cvs/jedmodes-$(VER).tgz
+
mv jedmodes-$(VER).tgz jed-extra_$(VER).orig.tar.gz
-
- mkdir --parents jedmodes-$(VER)/boxquote
- cd jedmodes-$(VER)/boxquote; \
- wget http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
- gunzip jed-extra_$(VER).orig.tar.gz
- tar --append --file jed-extra_$(VER).orig.tar jedmodes-$(VER)
- gzip -9 jed-extra_$(VER).orig.tar
-
+
clean: unpatch
dh_testdir
dh_clean
@@ -52,45 +37,27 @@
dh_testdir
dh_testroot
# keep dh_install informations (debian/files)
- dh_clean
+ dh_clean --keep
# install modes
# -------------
+
+ # fix apsconf permissions
+ # (executable in the Jedmodes CVS repository due to upload from Windoof)
+ chmod -R a-x apsmode/*
+ chmod a+x apsmode/apsconf/
# move mode documentation to /usr/share/doc/jed-extra/mode-doc/
- dh_install $$(find . -name \*.html -o -name \*.otl -name \*.example \
- -o -name README) usr/share/doc/jed-extra/mode-doc/
-
- for i in $(ADDITION) $(ENHANCEMENT) $(COLOR) $(DROP_IN) \
- $(UTILS) $(EXPERIMENTAL); do \
- case "$$i" in *"/*") echo $${i%/*} not found >&2; exit 1;; esac; \
- done
-
-ifneq ($(ADDITION)$(ENHANCEMENT), )
- dh_install $(dh_inst_excl) $(ADDITION) $(ENHANCEMENT) $(libdir)
-endif
-ifneq ($(COLOR), )
- dh_install $(dh_inst_excl) $(COLOR) $(libdir)/colors
-endif
-ifneq ($(DROP_IN), )
- dh_install $(dh_inst_excl) $(DROP_IN) $(libdir)/drop-in
-endif
-ifneq ($(UTILS), )
- dh_install $(dh_inst_excl) $(UTILS) $(libdir)/utils
-endif
-ifneq ($(EXPERIMENTAL), )
- dh_install $(dh_inst_excl) $(EXPERIMENTAL) $(libdir)/extra
-endif
-
- @echo "following modes are not installed:"
- (sed -n -e '/^[ACDEOUX]/ {s/^.\s*//; s/\s.*//; p;}' $(CONTENTS_FILE); \
- ls; echo "COPYING\ndebian\nREADME\npatch-stamp") | sort | uniq -u
- @echo
-
- @echo "non .sl files in $(libdir):"
- find $(debroot)$(libdir) -type f -not -name \*.sl -printf '%P\n'
- @echo
-
+ install -d $(debroot)/usr/share/doc/jed-extra/mode-doc/
+ mv $$(find . -name \*.html -o -name \*.otl -name \*.example) \
+ $(debroot)/usr/share/doc/jed-extra/mode-doc/
+
+ # generate jed-extra.install from categorization in contents.txt
+ jed-script debian/sort-modes.sl
+ # now install using the generated jed-extra.install
+ dh_install
+ # dh_install -X.html -X.otl -X.example -XREADME
+
# install package documentation
dh_installdocs debian/contents.txt
@@ -100,7 +67,7 @@
# fix some names (as dh_install* cannot change filenames)
mv $(debroot)/usr/share/jed/compile/compile \
$(debroot)/usr/share/jed/compile/jed-extra
-
+
chmod +x $(debroot)/usr/share/jed/compile/jed-extra
#dh_installdebconf
More information about the Pkg-jed-commit
mailing list