[Pkg-jed-commit] r197 - in trunk/packages/jed-extra: debian
debian/patches utils
Guenter Milde
milde-guest at costa.debian.org
Tue Nov 15 11:23:37 UTC 2005
Author: milde-guest
Date: 2005-11-15 11:23:36 +0000 (Tue, 15 Nov 2005)
New Revision: 197
Removed:
trunk/packages/jed-extra/debian/jed-extra.install
Modified:
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/compile
trunk/packages/jed-extra/debian/control
trunk/packages/jed-extra/debian/patches/00list
trunk/packages/jed-extra/debian/rules
trunk/packages/jed-extra/utils/sort-modes.sl
Log:
control added findutils(with find -delete) dependency
patches/00list added/updated comments
changelog log changes
sort-modes.sl install apsmode/apsconf in lib_dir
jed-extra.install removed: generate with sort-modes.sl
compile full path to jed-extra-preparse.sl
rules correct sorting and moving and renaming in binary-indep
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/changelog 2005-11-15 11:23:36 UTC (rev 197)
@@ -1,31 +1,32 @@
-jed-extra (1.2-1) experimental; urgency=high
+jed-extra (2.0-1) experimental; urgency=high
NOT YET RELEASED!
- new upstream release,
+ TODO:
+ + fine tune ini.sl (add missing autoloads and remove redundancy) by
+ - modifying upstream,
+ - excluding offending modes from the auto-initialization,
+ - adding stuff to 50jed-extra.sl
+
+ + create example alternative 50jed-extra.sl and example jed.rc
+
+ + use new upstream release jedmodes-2.1 once it is ready and holds
+ all changes proposed during the preparation of the new package release
+
+ new upstream release
all modes should now work with SLang-2
+++ Changes by Guenter Milde <milde at users.sf.net>
* new upstream source URI
+ * list of upstream modes (with categorization) in contents.txt
* updated copyright (source URI, author list, contact info)
* updated README.Debian (give customization instructions)
* move all initialization/customization to jed.d/50jed-extra.sl
using libdir.sl for "registering" of library directories
* changed location of jed-extra library dir to /usr/share/jed/jed-extra/
+ * removed patches for bugs fixed upstream
- TODO:
- + rules to sort the upstream files into .../jed-extra/ and
- .../jed-extra/drop-in/
- + creation of ini.sl files, *.slc files, *.dfa files, documentation
- files in the libdirs with make-ini in 'compile' script
- + fine tune by
- - modifying upstream,
- - excluding offending modes,
- - adding stuff ot 50jed-extra.sl
- + create example alternative 50jed-extra.sl and example jed.rc
-
-
+++ Changes by Rafael Laboisssiere
* The *.slc files are now generated at install-time
@@ -63,7 +64,8 @@
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)
+ README.tar.sl, in order to keep lintian happy) [now removed as tar is in
+ experimental state, GM]
* the example file for apsmode/apsconf is in examples
--
Modified: trunk/packages/jed-extra/debian/compile
===================================================================
--- trunk/packages/jed-extra/debian/compile 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/compile 2005-11-15 11:23:36 UTC (rev 197)
@@ -1,7 +1,7 @@
#!/bin/sh -e
LIBDIR=/usr/share/jed/jed-extra
-PREPARSE=jed-extra-preparse.sl
+PREPARSE=/usr/share/jed/compile/jed-extra-preparse.sl
case "$1" in
install)
Modified: trunk/packages/jed-extra/debian/control
===================================================================
--- trunk/packages/jed-extra/debian/control 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/control 2005-11-15 11:23:36 UTC (rev 197)
@@ -7,7 +7,7 @@
Package: jed-extra
Architecture: all
-Depends: jed-common (>= 0.99.17.111)
+Depends: jed-common (>= 0.99.17.111), findutils (>= 4.2.9)
Suggests: slsh, slang-gdbm, html2text
Conflicts: dictionaries-common (<< 0.14.0)
Description: collection of useful JED modes and utilities
Deleted: trunk/packages/jed-extra/debian/jed-extra.install
===================================================================
--- trunk/packages/jed-extra/debian/jed-extra.install 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/jed-extra.install 2005-11-15 11:23:36 UTC (rev 197)
@@ -1,59 +0,0 @@
-debian/init/*.sl etc/jed.d/
-debian/compile usr/share/jed/compile
-debian/jed-extra-preparse.sl usr/share/jed/compile
-
-life/* usr/share/jed/jed-extra
-view/* usr/share/jed/jed-extra
-tm/* usr/share/jed/jed-extra
-apsmode/* usr/share/jed/jed-extra
-brief/* usr/share/jed/jed-extra/drop-in
-browse_url/* usr/share/jed/jed-extra
-bufutils/* usr/share/jed/jed-extra
-ch_table/* usr/share/jed/jed-extra
-circle/* usr/share/jed/jed-extra
-css1/* usr/share/jed/jed-extra
-csvutils/* usr/share/jed/jed-extra
-cuamark/* usr/share/jed/jed-extra
-cuamouse/* usr/share/jed/jed-extra
-datutils/* usr/share/jed/jed-extra
-email/* usr/share/jed/jed-extra
-filelist/* usr/share/jed/jed-extra
-gnuplot/* usr/share/jed/jed-extra
-grep/* usr/share/jed/jed-extra
-libdir/* usr/share/jed/jed-extra
-hyperhelp/* usr/share/jed/jed-extra/drop-in
-mtools/* usr/share/jed/jed-extra
-ishell/* usr/share/jed/jed-extra
-ispell/* usr/share/jed/jed-extra/drop-in
-listing/* usr/share/jed/jed-extra
-make/* usr/share/jed/jed-extra
-make_ini/* usr/share/jed/jed-extra
-manedit/* usr/share/jed/jed-extra
-md5/* usr/share/jed/jed-extra
-menutils/* usr/share/jed/jed-extra
-minued/* usr/share/jed/jed-extra
-filter-buffer/* usr/share/jed/jed-extra
-mupad/* usr/share/jed/jed-extra
-navigate/* usr/share/jed/jed-extra
-numbuf/* usr/share/jed/jed-extra
-hyperman/* usr/share/jed/jed-extra/drop-in
-print/* usr/share/jed/jed-extra
-recent/* usr/share/jed/jed-extra/drop-in
-sl_utils/* usr/share/jed/jed-extra
-snake/* usr/share/jed/jed-extra
-strutils/* usr/share/jed/jed-extra
-txtutils/* usr/share/jed/jed-extra
-uri/* usr/share/jed/jed-extra
-vi/* usr/share/jed/jed-extra
-calc/* usr/share/jed/jed-extra
-colors/* usr/share/jed/jed-extra/colors
-custmode/* usr/share/jed/jed-extra
-jedasp/* usr/share/jed/jed-extra
-keywords/* usr/share/jed/jed-extra
-rst/* usr/share/jed/jed-extra
-sql/* usr/share/jed/jed-extra
-temabbrv/* usr/share/jed/jed-extra
-window/* usr/share/jed/jed-extra
-x-keydefs/* usr/share/jed/jed-extra
-complete/* usr/share/jed/jed-extra
-gdbmrecent/* usr/share/jed/jed-extra
Modified: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/patches/00list 2005-11-15 11:23:36 UTC (rev 197)
@@ -1,5 +1,4 @@
41_apsconf-tmp-dir
-48_make-dfa-fixes
50_ispell-fix-requirements
-# 50_rfcview-require-bufutils
-52_yodl-require
+# 50_rfcview-require-bufutils # no longer in jed-extra (eXotic)
+# 52_yodl-require # no longer in jed-extra (eXotic)
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/debian/rules 2005-11-15 11:23:36 UTC (rev 197)
@@ -5,7 +5,7 @@
# $Id$
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
@@ -20,11 +20,11 @@
# nothing to do, but required by debian policy
get-orig-source: jed-extra_$(VER).orig.tar.gz
- # Debian policy says:
+ # Debian policy says:
# This target fetches the most recent version of the original source
# package from a canonical archive site (via FTP or WWW, for example)
- # The dependency on the archive file makes it idempotent
-
+ # The dependency on the archive file makes it idempotent
+
jed-extra_$(VER).orig.tar.gz:
# Get the upstream archive
# uncomment your choice of source location # TODO: make this an option
@@ -68,18 +68,19 @@
# install modes according to jed-extra.install
# (generated by ../utils/sort-modes.sl)
- dh_install -X.html -X.otl -Xapsconf -XREADME
+ dh_install -X.html -X.otl -X.example -XREADME
# install documentation (under /usr/share/doc/jed-extra)
+ # TODO: this installs also html docs for eXcluded modes :-(
dh_installdocs $$(find . -name \*.html -o -name \*.otl) \
- README.txt
+ README.txt
+ # Install examples
+ dh_installexamples $$(find . -name \*.example)
+
+ #fix apsconf permissions
+ chmod -x $(debroot)/usr/share/jed/jed-extra/apsconf/*
- # install some extra docs from the source
- dh_installexamples apsmode/apsconf
- #fix permissions
- chmod -x $(debroot)/usr/share/doc/jed-extra/examples/apsconf/*
-
- # rename compile script to build *.slc files after installation
+ # fix some names (as dh_install* cannot change filenames)
mv $(debroot)/usr/share/jed/compile/compile \
$(debroot)/usr/share/jed/compile/jed-extra
Modified: trunk/packages/jed-extra/utils/sort-modes.sl
===================================================================
--- trunk/packages/jed-extra/utils/sort-modes.sl 2005-11-15 10:04:34 UTC (rev 196)
+++ trunk/packages/jed-extra/utils/sort-modes.sl 2005-11-15 11:23:36 UTC (rev 197)
@@ -25,7 +25,6 @@
private variable colors_dir = path_concat(lib_dir, "colors");
private variable drop_in_dir = path_concat(lib_dir, "drop-in");
-
% Types
% -----
%
@@ -40,6 +39,13 @@
destinations["U"] = lib_dir;
+% files that do not fit into the list
+private variable non_listed_files = "debian/init/*.sl etc/jed.d/\n"
+ + "apsmode/apsconf " + lib_dir + "\n"
+ + "debian/compile usr/share/jed/compile\n"
+ + "debian/jed-extra-preparse.sl usr/share/jed/compile\n\n";
+
+
% verbosity
private variable verbose = 1;
@@ -85,9 +91,7 @@
% debian specific installation tasks
-insert("debian/init/*.sl etc/jed.d/\n");
-insert("debian/compile usr/share/jed/compile\n");
-insert("debian/jed-extra-preparse.sl usr/share/jed/compile\n\n");
+insert(non_listed_files);
foreach (listdir(orig_dir))
{
More information about the Pkg-jed-commit
mailing list