[Pkg-jed-commit] r309 - in trunk/packages/jed-extra: debian
debian/patches utils
Guenter Milde
milde-guest at costa.debian.org
Thu Jun 1 13:29:46 UTC 2006
Author: milde-guest
Date: 2006-06-01 13:29:43 +0000 (Thu, 01 Jun 2006)
New Revision: 309
Removed:
trunk/packages/jed-extra/debian/patches/apsmode.dpatch
trunk/packages/jed-extra/debian/patches/ding.dpatch
Modified:
trunk/packages/jed-extra/debian/README.Debian
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/copyright
trunk/packages/jed-extra/debian/jed-extra-preparse.sl
trunk/packages/jed-extra/debian/patches/00list
trunk/packages/jed-extra/debian/rules
trunk/packages/jed-extra/utils/build-from-svn-copy.sh
Log:
utils/build-from-svn-copy.sh: get fresh orig source only if not present
(this way the get-orig-source rule can always
fetch a new source but build-from-svn-copy.sh
can also work offline)
jed-extra-preparse.sl: preparse the colors dir (TODO: generate dfa cache files)
changelog: update documentation
new upstream version: downgrade to 2.1.3
(The pre releases will get 3-part numbers while 2.2
will be the next FRS release. The last FRS release is 2.1.
Therefore, the upstream jedmodes-2.2.tgz tarball will be renamed
to 2.1.2.)
patches/*: patched upstream (see also the mail discussion with Paul regarding
evaluation of jed-extra/utils/ini.sl)
rules: bugfix
copyright, README.Debian: documentation update
Modified: trunk/packages/jed-extra/debian/README.Debian
===================================================================
--- trunk/packages/jed-extra/debian/README.Debian 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/README.Debian 2006-06-01 13:29:43 UTC (rev 309)
@@ -7,23 +7,26 @@
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
+The Jedmodes repository is a heterogeneous collection 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`_ has more detailled information.
+`Jedmodes`_ web site has more detailled information and also a
+`mail list`_.
.. _Jedmodes: http://jedmodes.sourceforge.net/
+.. _`mail list`: mailto:jedmodes-users at lists.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).
+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) or
+use one of the alternatives in the ``examples`` sub directory.
As the Jedmodes repository contains a mix of modes from different authors,
(sometimes providing similar functionality by different means or with
@@ -31,7 +34,7 @@
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
+add activation code to their ~/.jed/jed.rc. The ``examples`` subdir contains
some generic examples|templates for this task.
Versions
@@ -40,6 +43,7 @@
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.
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/changelog 2006-06-01 13:29:43 UTC (rev 309)
@@ -1,4 +1,4 @@
-jed-extra (2.2-1) experimental; urgency=low
+jed-extra (2.1.3-1) experimental; urgency=low
NOT YET RELEASED!
TODO:
@@ -7,9 +7,12 @@
- excluding offending modes from the auto-initialization,
- adding stuff to 50jed-extra.sl
- + make upstream release of jedmodes-2.2 by GM (once it is ready and holds
+ + make upstream release of jedmodes-2.2 [GM] (once it is ready and holds
all changes proposed during the preparation of the new package release)
-
+
+ In the preparation phase, the jedmodes.sf.net/cvs/jedmodes-2.1.n.tgz
+ pre-releases are used.
+
New upstream release
* all modes should now work with SLang-2
@@ -27,50 +30,53 @@
* the following modes were added:
console_keys, dictmode, dict-backend, filter-buffer, libdir,
- moby-thesaurus, tm
+ moby-thesaurus, tm, boxquote
See contents.txt for a listing of contained modes with abstracts.
* new upstream source URI and download rule [GM]
- * list of upstream modes (with categorization) in contents.txt
- modes marked as "Obsolete" are excluded [GM]
- * updated copyright (source URI, author list, contact info) [JS, GM]
+ * updated copyright file to comply more with
+ http://lists.debian.org/debian-devel-announce/2006/03/msg00023.html
+ (source URIs, author list, contact info) [JS, GM]
+
* updated README.Debian (give customization instructions) [GM]
+
* move all initialization/customization to jed.d/50jed-extra.sl
using libdir.sl for "registering" of library directories [GM]
+ * now /etc/jed.d/50jed-extra.sl takes care of the possible state,
+ that the package was removed but not purged [JS]
+
+ * list of upstream modes (with categorization) in contents.txt
+ modes marked as "Obsolete" are excluded [GM]
* changed location of jed-extra library dir to /usr/share/jed/jed-extra/
+ * create subdirectories utils/, drop-in/, and extra/ and sort modes
+ to facilitate configuration
* removed patches for bugs fixed upstream [GM]
- +++ Changes by Rafael Laboisssiere
-
* The *.slc files are now generated at install-time
- * debian/compile: Script that gets installed as
- /usr/share/jed/compile/jed-extra
- * debian/postinst, debian/prerm: Call /usr/share/jed/compile/jed-extra
- with the appropriate argument
- * debian/control:
- - Dropped the Build-Depends-Indep on jed
- - Upgraded Standards-Version to 3.6.2
- * debian/rules: Make files in /usr/share/jed/site-lib/apsconf
- non-executable
+ - debian/compile: Script that gets installed as
+ /usr/share/jed/compile/jed-extra [RL]
+ - debian/postinst, debian/prerm: Call /usr/share/jed/compile/jed-extra
+ with the appropriate argument [RL]
+ - reworked jed-extra-preparse.sl (compile-files.sl.in before) to be
+ fully SLang, which make eperl as build dependency unnecessary [JS]
+
+ * debian/control:
+ - Dropped the Build-Depends-Indep on jed [RL]
+ - Upgraded Standards-Version to 3.6.2 [RL]
+ - Description update [GM]
- +++ Changes by Jörg Sommer <joerg at alea.gnuu.de>
-
- * yodlfun.txt is now found in site-lib/ because it is searched there
- * now the file in /etc/jed.d/ takes care of the possible state,
- that the package was removed but not purged
- * restructured source package
+ * yodlfun.txt is now in the same directory as yodl.sl
+ because it is searched there [JS]
+
+ * restructured source package [JS]
+ 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 (this later file is renamed to
- README.tar.sl, in order to keep lintian happy)
- * the example file for apsmode/apsconf is in examples
- * updated copyright file to comply more with
- http://lists.debian.org/debian-devel-announce/2006/03/msg00023.html
+ in /usr/share/doc/jed-extra/mode-doc/ (with INSTALL renamed to
+ README.tar.sl, in order to keep lintian happy) [JS]
-- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org> Thu, 6 Apr 2006 16:22:40 +0200
Modified: trunk/packages/jed-extra/debian/copyright
===================================================================
--- trunk/packages/jed-extra/debian/copyright 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/copyright 2006-06-01 13:29:43 UTC (rev 309)
@@ -2,15 +2,16 @@
Fri, 11 Jul 2003 10:32:35 +0200.
It is currently maintained by the
- Debian Jed Group <pkg-jed-devel at lists.alioth.debian.org>
-The tarballs/files included in this release were downloaded from:
+ Debian Jed Group <pkg-jed-devel at lists.alioth.debian.org>
- http://jedmodes.sf.net/cvs/jedmodes.tgz
+Most files included in this release were downloaded from the Jed Modes
+Repositroy
- and other sources (TODO: specify!)
+ http://jedmodes.sf.net/cvs/
The file boxquote.sl was downloaded from
+
http://www.cis.fu-berlin.de/~phgrau/slang/boxquote.sl
Upstream Authors:
@@ -18,7 +19,7 @@
Boekholt, Paul
Davis, John
Gerell, Johann
- Grau, Phillip of boxquote.sl
+ Grau, Phillip boxquote.sl
Johansen, Morten
Koeckritz, Thomas
Mahnic, Marko
@@ -29,10 +30,18 @@
Sommer, Jörg
Wheeler, Kyle
-Jedmodes comes with its own mailing list:
+The authors email can be found either in the source files or at the Jedmodes
+project page
- jedmodes-users at lists.sourceforge.net
+ http://sourceforge.net/projects/jedmodes/
+
+under the Project Details.
+The Jedmodes site also has a mail list. For feedback mail to
+
+ jedmodes-users at lists.sourceforge.net
+
+
Copyright:
All files in this package are released under the GNU General Public
License.
Modified: trunk/packages/jed-extra/debian/jed-extra-preparse.sl
===================================================================
--- trunk/packages/jed-extra/debian/jed-extra-preparse.sl 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/jed-extra-preparse.sl 2006-06-01 13:29:43 UTC (rev 309)
@@ -5,6 +5,7 @@
private variable drop_in_dir = path_concat(lib_dir, "drop-in");
private variable utils_dir = path_concat(lib_dir, "utils");
private variable extra_dir = path_concat(lib_dir, "extra");
+private variable colors_dir = path_concat(lib_dir, "colors");
% add the jed-extra libraries to the jed library path
set_jed_library_path(strjoin([drop_in_dir,
@@ -16,6 +17,7 @@
require("make_ini");
+% Do not generate autoloads for the following files:
Make_ini_Exclusion_List = ["ini.sl",
"gdbmrecent.sl",
"ispell.sl",
@@ -27,27 +29,26 @@
"hyperman.sl",
"cal.sl"];
+% preparse modes and generate ini.sl files with autoloads and completions for
+% public functions
update_ini(lib_dir);
update_ini(drop_in_dir);
update_ini(extra_dir);
+% generate autoloads (but not completions) for all functions in Utils
Make_ini_Scope = 2;
Make_ini_Add_Completions = 0;
update_ini(utils_dir);
-# stop
-% the old code without use of make_ini.sl
define compile_slfiles_in_dir(dir)
{
- message ("Byte compiling SLang files in "+dir);
+ message ("Byte compiling SLang files in " + dir);
foreach ( listdir(dir) ) {
$1 = ();
- if ( $1[[-3:-1]] == ".sl" )
- byte_compile_file(dir+"/"+$1, 0);
+ if ( path_extname($1) == ".sl" )
+ byte_compile_file(path_concat(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");
Modified: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/patches/00list 2006-06-01 13:29:43 UTC (rev 309)
@@ -1,4 +1,4 @@
-missing_autoload
+#missing_autoload
-apsmode
-ding
+#apsmode
+#ding
Deleted: trunk/packages/jed-extra/debian/patches/apsmode.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/apsmode.dpatch 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/patches/apsmode.dpatch 2006-06-01 13:29:43 UTC (rev 309)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## apsmode.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad jed-extra-2.2~/apsmode/apsconf/apsconf.sl jed-extra-2.2/apsmode/apsconf/apsconf.sl
---- jed-extra-2.2~/apsmode/apsconf/apsconf.sl 2005-11-23 16:42:22.000000000 +0100
-+++ jed-extra-2.2/apsmode/apsconf/apsconf.sl 2006-05-24 19:16:27.615198334 +0200
-@@ -55,7 +55,7 @@
- aps_del_ps_file = 1;
-
- #ifdef UNIX
--aps_tmp_dir = path_concat(getenv("TMPDIR"), ""); % ensure trailing "/"
-+aps_tmp_dir = path_concat(getenv("TMP"), ""); % ensure trailing "/"
- if (aps_tmp_dir == "")
- aps_tmp_dir = "/tmp/";
- a2ps_cmd = "a2ps";
Deleted: trunk/packages/jed-extra/debian/patches/ding.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/ding.dpatch 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/patches/ding.dpatch 2006-06-01 13:29:43 UTC (rev 309)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ding.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad jed-extra-2.2~/ding/ding.sl jed-extra-2.2/ding/ding.sl
---- jed-extra-2.2~/ding/ding.sl 2006-05-24 19:29:11.328864334 +0200
-+++ jed-extra-2.2/ding/ding.sl 2006-05-24 19:30:55.893120334 +0200
-@@ -182,6 +182,9 @@
-
- define ding_mode(); % dummy definition
-
-+public define ding(); % predefinition, otherwise the reference on it do no
-+ % exist inside the ding() function
-+
- public define ding() % ([word], direction=Ding_Direction)
- {
- variable word, direction;
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/debian/rules 2006-06-01 13:29:43 UTC (rev 309)
@@ -54,7 +54,7 @@
# install package documentation
dh_install $$(find . -name \*.html -o -name \*.otl -name \*.example \
- -o -name README*) usr/share/doc/jed-extra/mode-doc/
+ -o -name README\*) usr/share/doc/jed-extra/mode-doc/
dh_installdocs debian/contents.txt
Modified: trunk/packages/jed-extra/utils/build-from-svn-copy.sh
===================================================================
--- trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-05-31 13:44:35 UTC (rev 308)
+++ trunk/packages/jed-extra/utils/build-from-svn-copy.sh 2006-06-01 13:29:43 UTC (rev 309)
@@ -31,9 +31,10 @@
# svn update
-# Get the upstream tarball
-# ------------------------
+# Remove old patches / old build-dir
+# ----------------------------------
+
# remove old dir (if left over)
# rm -Rf jedmodes-$VER
if [ -e jedmodes-$VER ]
@@ -42,25 +43,31 @@
fi
+# or just the patches
+
+# rm -rf jedmodes-$VER/patch-stamp jedmodes-$VER/patch-stampT \
+# jedmodes-$VER/debian/patched
+
+
+# Get the upstream tarball
+# ------------------------
+
# If there is no jed-extra_$VER.orig.tar.gz, copy or download
# 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; \
+# 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
# fi
-debian/rules get-orig-source
+if [ ! -e jed-extra_$VER.orig.tar.gz ]
+ then debian/rules get-orig-source
+fi
# Unpack
# ------
tar -xzf jed-extra_$VER.orig.tar.gz
-# Remove old patches
-# ------------------
-
-# is this necessary if we move the old dir out of the way?
-
# Copy the debian/ subdir to the source tree
# ------------------------------------------
install -d jedmodes-$VER/debian
More information about the Pkg-jed-commit
mailing list