[Pkg-jed-commit] r302 - in trunk/packages/jed-extra: debian
debian/patches utils
Guenter Milde
milde-guest at costa.debian.org
Wed May 24 15:38:27 UTC 2006
Author: milde-guest
Date: 2006-05-24 15:38:26 +0000 (Wed, 24 May 2006)
New Revision: 302
Modified:
trunk/packages/jed-extra/debian/README.Debian
trunk/packages/jed-extra/debian/README.Maintainer
trunk/packages/jed-extra/debian/contents.txt
trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
trunk/packages/jed-extra/debian/rules
trunk/packages/jed-extra/utils/build-from-svn-copy.sh
Log:
utils/build-from-svn-copy.sh: move the old build-dir out of the way before
download and re-pack of the orig source
README.Maintainer: documentation update
patches/50_ispell-fix-requirements.dpatch: bugfix: wrong number of arguments
rules: include changes by JS
- additional mode boxquote (TODO: the generated orig.tar.gz contains 2
copies of the jedmodes2.2 dir)
- dh_clean without --keep option
- moved the "fix apsconf permissions" hack to the upstream tar
generation skript
- use dh_install instead of mv to install the mode docs.
- exclusion options to dh_install: FIXME: the mode docs are still
installed in the libraries as well! Why does dh_install not honour
these options: -X.html -X.otl -X.example -XREADME
contents.txt: boxquote contains end-user functions, categorized as A instead of U
added tokenlist mode
uncommented latex-jlm, so it is reported as missing
README.Debian: Documentation update
Modified: trunk/packages/jed-extra/debian/README.Debian
===================================================================
--- trunk/packages/jed-extra/debian/README.Debian 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/debian/README.Debian 2006-05-24 15:38:26 UTC (rev 302)
@@ -1,30 +1,46 @@
-jed-extra: Jedmodes for Debian
-------------------------------
+jed-extra
+=========
-This package contains extensions ("modes") for the Jed programmer's editor.
-These are user provided S-Lang scripts from the "Jedmodes" repository at
-SourceForge.
+Contents
+--------
+This package contains extensions for the Jed programmer's editor , mainly
+from the `Jedmodes`_ repository at SourceForge.
+
+The Jedmodes repository contains a heterogeneous mixture of user provided
+S-Lang scripts (modes).
+
+Some of the modes are experimental while others work stable for their
+authors for ages, so USE AT YOUR OWN RISK.
+
See contents.txt for a listing of contained modes with abstracts. The
-Jedmodes homepage (http://jedmodes.sourceforge.net/) has more detailled
-information
+`Jedmodes homepage`_ has more detailled information.
-Basic activation/customization is done in /etc/jed.d/50jed-extra.sl,
-adapt this file to the needs of your site (the comments in this file
-provide further details).
+.. _Jedmodes: http://jedmodes.sourceforge.net/
+
+Setup
+-----
+
+Basic setup is done in /etc/jed.d/50jed-extra.sl, adapt this file to the
+needs of your site (the comments in this file provide further details).
+
As the Jedmodes repository contains a mix of modes from different authors,
(sometimes providing similar functionality by different means or with
-different look-and-feel) it is not possible to have a complete activation.
+different look-and-feel), a complete automatic setup is not possible.
In order to make full use of the modes, additional configuration is needed.
Users are advised to study the documentation at the source files and
add activation code to their ~/.jed/jed.rc. The "examples" subdir contains
some generic examples|templates for this task.
+Versions
+--------
+
The version numbering scheme for the jed-extra package follows the versions
on Jedmodes. All modes in versions 2.x should be SLang-2 compatible (while
most modes are still backwards compatible to SLang-1).
+Support for UTF8 is still experimental.
-- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
Modified: trunk/packages/jed-extra/debian/README.Maintainer
===================================================================
--- trunk/packages/jed-extra/debian/README.Maintainer 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/debian/README.Maintainer 2006-05-24 15:38:26 UTC (rev 302)
@@ -23,38 +23,36 @@
a) "just work" once it is installed,
b) not impose settings on the user that cannot be reverted.
-From the `Possible Levels of Support`_ support considered below, the
-
-* "minimal-invasive" activation in /etc/jed.d/50jed-extra.sl
-
-seems to be most suited.
+As this is somewhat contradictory, a "low level" activation in
+/etc/jed.d/50jed-extra.sl seems to be most suited.
+(See `Possible Levels of Support`_ support below for a more detailled
+discussion.)
-Contained modes
----------------
+Download URL
+------------
-See the list in "jedmodes-list.txt".
+In order to be included, a package|mode needs a "canonical site" from which
+it can be fetched non-interactively.
-Instead of a direct copy of Jedmodes-CVS, jed-extra should install an
-"intelligent" choice of packages: purge obsolete packages and add
-interesting new ones.
+Unfortunately, the standard URL for a Sourceforge release cannot serve as
+such a canonocal site, as it requires user interaction to select a mirror.
+Therefore alternatively a fixed mirror URL for a Jedmodes-CVS release or a
+URL for a pre-release source archive on the Jedmodes home site is used.
-However, in order to be included, a package|mode needs a "canonical site"
-from which it can be fetched non-interactively. Unfortunately, the standard
-URL for a Sourceforge release cannot serve as such a canonocal site, as it
-requires user interaction to select a mirror :-(
-(How do other packages with upstream sources on Sourceforge solve this
-problem?)
-:note: Should the choice be "inclusive" (as much as sensible) or "selective"
- (as few as sensible, excluding "exotic" modes)?
-
-
Categorization
--------------
-Considering the interference with JED, 4 types of modes can be distinguished:
+Instead of a direct copy of Jedmodes-CVS, jed-extra should install an
+"intelligent" choice of packages: purge obsolete packages and add
+interesting new ones. As Jedmodes is a heterogeneous collection of
+user-provided modes, some categorization/sorting seems in place.
+
+Considering the interference with JED, 4 types of modes can be distinguished
+cf. the list in "contents.txt":
+
A: Additions
~~~~~~~~~~~~
@@ -78,7 +76,7 @@
* example: help.sl (hyperhelp), man.sl (hyperman), recent.sl
--> install in a separate libdir added in the config file (a sysadmin can
+-> install in libdir/drop-in *added* in the config file (a sysadmin can
revert this default activation, a normal user can delete the libdir from
the jed-library-path)
@@ -115,7 +113,7 @@
* provide functions used by other modes
--> install in the libdir,
+-> install in libdir/utils
no need for activation (calling mode should have autoload() or require())
@@ -127,7 +125,7 @@
* other modes are of limited interest (exotic user cases)
--> do not install
+-> install in libdir/extra but do not activate
Where should the modes go?
Modified: trunk/packages/jed-extra/debian/contents.txt
===================================================================
--- trunk/packages/jed-extra/debian/contents.txt 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/debian/contents.txt 2006-05-24 15:38:26 UTC (rev 302)
@@ -15,7 +15,7 @@
A browse_url Functions for display of web pages from within JED.
X bufed buffer manager
U bufutils Tools for buffer and windows handling
-U boxquote Draw a border on the left around a region
+A boxquote Draw a border on the left around a region
D cal calendar and diary
A calc SLang calculator
X cdecl S-Lang version of K&R's dcl program
@@ -61,7 +61,7 @@
#X kcomplete keyword completion from the syntax table
A keywords Create keyword lists for syntax tables
O kp_keydefs keydefs for the numeric keypad (now included in x-keydefs)
-#D latex-jlm Yet another latex mode for Jed
+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
U listing Mode for listings of e.g. files or findings
@@ -98,6 +98,7 @@
A temabbrv On request replaces the word at cursor with a user-defined template
X templates Open templates and do some replacements
A tm TM documentation parser and TM creation tools
+A tokenlist Display a list of routines or matching lines in current buffer
#X tree Recursive directory listing utility
X turbo dynamic word completion (like in StarOffice)
U txtutils Tools for text processing (marking, string processing, formatting)
Modified: trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch 2006-05-24 15:38:26 UTC (rev 302)
@@ -13,7 +13,7 @@
- "vispell", "vispell", 9);
+ "vispell", "vispell",
+ "push_defaults", "sl_utils",
-+ "menu_radio", "menu_utils", 12);
++ "menu_radio", "menu_utils", 11);
_add_completion("ispell_change_dictionary",
"ispell_change_local_dictionary",
"flyspell_mode", "ispell_region",
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/debian/rules 2006-05-24 15:38:26 UTC (rev 302)
@@ -12,16 +12,16 @@
debroot = $(PWD)/debian/jed-extra
# upstream version
VER = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
- $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
+ $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
build:
# nothing to do, but required by debian policy
get-orig-source: jed-extra_$(VER).orig.tar.gz
- # The dependency on the archive file makes get-orig-source idempotent
+ @# nothing to do if jed-extra_$(VER).orig.tar.gz exists
-jed-extra_$(VER).orig.tar.gz:
+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
@@ -29,6 +29,14 @@
mv jedmodes-$(VER).tgz jed-extra_$(VER).orig.tar.gz
+ # additional modes from other sources
+ 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
@@ -36,29 +44,20 @@
binary binary-indep: patch-stamp
dh_testdir
dh_testroot
- # keep dh_install informations (debian/files)
- dh_clean --keep
+ dh_clean
# 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/
- 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
+ # 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 using the generated jed-extra.install
+ dh_install -X.html -X.otl -X.example -XREADME
- # install package documentation
+ # install package documentation
+ dh_install $$(find . -name \*.html -o -name \*.otl -name \*.example \
+ -o -name README*) usr/share/doc/jed-extra/mode-doc/
+
dh_installdocs debian/contents.txt
# Install examples
@@ -67,11 +66,11 @@
# 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
-
+
dh_installchangelogs
dh_compress
dh_fixperms
Modified: trunk/packages/jed-extra/utils/build-from-svn-copy.sh
===================================================================
--- trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-05-24 07:45:05 UTC (rev 301)
+++ trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-05-24 15:38:26 UTC (rev 302)
@@ -1,11 +1,12 @@
#!/bin/sh
+# Build the jed-extra package from existing working copy of SVN files
+#
# This is an experimental script that helps test-build jed-extra
# even on a computer not connected to the internet.
-# (c) 2005 Guenter Milde
+#
+# (c) 2005, 2006 Guenter Milde
-# Build the jed-extra package from existing working copy of SVN files
-#
-
+# go to the packages/jed-extra dir of the SVN copy
if [ `pwd | egrep '/utils$'` ]; then
cd ..
fi
@@ -33,12 +34,19 @@
# Get the upstream tarball
# ------------------------
+# 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
+
+fi
+
# If there is no jed-extra_$VER.orig.tar.gz, copy or download
-# (see also debian/rules)
-# TODO: move the file, if it is newer
-# if [ -e ~/.jed/jedmodes/src/jedmodes-$(VER).tgz ]; then \
-# cp ~/.jed/jedmodes/src/jedmodes-$(VER).tgz .; \
+# TODO: only move the file, if it is newer
+# if [ -e ~/.jed/jedmodes/src/jedmodes-$VER.tgz ]; then \
+# cp ~/.jed/jedmodes/src/jedmodes-$VER.tgz jed-extra_$VER.orig.tar.gz; \
# fi
debian/rules get-orig-source
@@ -46,14 +54,12 @@
# Unpack
# ------
-# remove old dir (if left over)
-rm -Rf jedmodes-$VER
tar -xzf jed-extra_$VER.orig.tar.gz
# Remove old patches
# ------------------
-# TODO
+# is this necessary if we move the old dir out of the way?
# Copy the debian/ subdir to the source tree
# ------------------------------------------
More information about the Pkg-jed-commit
mailing list