[Pkg-jed-commit] r56 - in trunk/packages/jed-extra/debian: . patches
Jörg Sommer
jo-guest@costa.debian.org
Sun, 03 Jul 2005 23:35:23 +0000
Author: jo-guest
Date: 2005-07-03 23:35:22 +0000 (Sun, 03 Jul 2005)
New Revision: 56
Added:
trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
Removed:
trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch
trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch
trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch
trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch
trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch
trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch
trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch
trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch
trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch
Modified:
trunk/packages/jed-extra/debian/changelog
trunk/packages/jed-extra/debian/copyright
trunk/packages/jed-extra/debian/patches/00list
trunk/packages/jed-extra/debian/rules
Log:
jed-extra
* removed 47_jedscape-requires.dpatch, 49_miscfun-autoload-view-mode and
51_tree-dfa-fixes, because these modes aren't anymore in the package
* removed, because fixed upstream: 42_view-mode-require-keydefs,
43_ding-require-txtutils-csvutils, 45_gnuplot-shell-cmd-on-region,
46_ishell-autoload-view-mode, 50_home-lib_fix 53_mupad-fix
* disabled, because do not apply: 50_rfcview-require-bufutils,
44_gnuplot-use-jedmodes-info
* rules
+ outline/outline.txt is no longer in the package
* added 50_ispell-fix-requirements
* removed apsmode/apsconf/SLang.ssh, because a2ps/slang.ssh is the same
but newer and better
* updated copyright about the new upstream source
Modified: trunk/packages/jed-extra/debian/changelog
===================================================================
--- trunk/packages/jed-extra/debian/changelog 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/changelog 2005-07-03 23:35:22 UTC (rev 56)
@@ -17,17 +17,18 @@
+++ Changes by Jörg Sommer <joerg@alea.gnuu.de>
- * added 53_mupad-fix.patch: Fixes mupad.sl to build.
- * the new upstream tarball does not include gtkhelp.sl,
- jedgtk_image.sl, jedgtk_search.sl, jedgtk.sl, flipper.sl,
- gtk_usage.txt; these files depend on slgtk which isn't currently in
- Debian; because this, these files are removed from this package
- * the same with pcre.sl
- * walk.sl is no longer available at upstream
+ * the following modes were removed by upstream:
+
+ boekmark, bufed_srch, cal, gpg, help, history, hs, hyperman, jedgtk,
+ jedmodes, jedscape, miscfun, mousedrag, outline, resume, rimini,
+ server, sfrecent, tracker, tree, yankpop
+
+ * the following modes were added by upstream:
+
+ filter-buffer, tm
+
* updated debian/copyright about the sources
* yodlfun.txt is now found in site-lib/ because it is searched there
- * added a new patch 50_home-lib_fix to fix the missing variable
- declaration in home-lib.sl
* now the files in /etc/jed-init.d/ take care of the state the package
was removed but not purged
* restructured source package
Modified: trunk/packages/jed-extra/debian/copyright
===================================================================
--- trunk/packages/jed-extra/debian/copyright 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/copyright 2005-07-03 23:35:22 UTC (rev 56)
@@ -3,15 +3,9 @@
The tarballs/files included in this release were downloaded from:
- jedmodes.tar.gz:
- http://sourceforge.net/project/showfiles.php?group_id=14968
- subpar.sl: http://jedmodes.sourceforge.net/mode/subpar/
- window.sl: http://jedmodes.sourceforge.net/mode/window/
- complete.sl: http://jedmodes.sourceforge.net/mode/complete/
+ cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/jedmodes export \
+ -D2005-07-08 mode
- or
- look in debian/build-orig.tar_gz in the source package
-
Upstream Authors:
Paul Boekholt <p.boekholt@hetnet.nl>
Günter Milde <milde@ife.et.tu-dresden.de>
Modified: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/00list 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,14 +1,6 @@
41_apsconf-tmp-dir
-42_view-mode-require-keydefs
-43_ding-require-txtutils-csvutils
-44_gnuplot-use-jedmodes-info
-45_gnuplot-shell-cmd-on-region
-46_ishell-autoload-view-mode
-47_jedscape-requires
+# 44_gnuplot-use-jedmodes-info
48_make-dfa-fixes
-49_miscfun-autoload-view-mode
-50_rfcview-require-bufutils
-50_home-lib_fix
-51_tree-dfa-fixes
+50_ispell-fix-requirements
+# 50_rfcview-require-bufutils
52_yodl-require
-53_mupad-fix
Deleted: trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/42_view-mode-require-keydefs.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 42_view-mode-require-keydefs.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/view/view.sl mode/view/view.sl
---- mode-orig/view/view.sl 2004-11-15 13:36:08.000000000 +0100
-+++ mode/view/view.sl 2005-03-06 11:56:22.000000000 +0100
-@@ -12,6 +12,8 @@
-
- % requirements
-
-+require ("keydefs");
-+
- autoload("close_buffer", "bufutils");
- autoload("set_help_message", "bufutils");
- autoload("help_message", "bufutils");
Deleted: trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/43_ding-require-txtutils-csvutils.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 43_ding-require-txtutils-csvutils.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/ding/ding.sl mode/ding/ding.sl
---- mode-orig/ding/ding.sl 2004-11-15 13:36:00.000000000 +0100
-+++ mode/ding/ding.sl 2005-03-06 13:58:18.000000000 +0100
-@@ -28,7 +28,8 @@
- %
- % Optionally change custom variables
-
--
-+require ("txtutils");
-+require ("csvutils");
-
- % debug information, comment these out when ready
- _debug_info = 1;
Deleted: trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/45_gnuplot-shell-cmd-on-region.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_gnuplot-shell-cmd-on-region.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/gnuplot/gnuplot.sl mode/gnuplot/gnuplot.sl
---- mode-orig/gnuplot/gnuplot.sl 2005-03-06 15:07:05.000000000 +0100
-+++ mode/gnuplot/gnuplot.sl 2005-03-06 15:07:00.000000000 +0100
-@@ -49,7 +49,7 @@
- % requirements
- require("comments"); % from jed's standard library
- autoload ("find_dir", "info");
--autoload ("do_shell_cmd_on_region", "ishell.sl");
-+autoload ("shell_cmd_on_region", "ishell.sl");
- autoload ("ishell_mode", "ishell.sl");
-
- % --- user adjustable settings ------------------------------------
-@@ -269,7 +269,7 @@
- %!%-
- public define gnuplot_run ()
- {
-- do_shell_cmd_on_region (Gnuplot_Command);
-+ shell_cmd_on_region (Gnuplot_Command);
- set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
- % now we are in the "*shell-output*" buffer
- !if (bobp and eobp) % if there is any output
-@@ -354,7 +354,7 @@
- }
- % run gnuplot
- set_prefix_argument(2); % ignore output
-- do_shell_cmd_on_region(Gnuplot_Command);
-+ shell_cmd_on_region(Gnuplot_Command);
-
- % clean up
- set_buffer_modified_flag(0); % so delbuf doesnot ask whether to save first
-@@ -405,7 +405,7 @@
-
- % run gnuplot
- set_prefix_argument(2); % ignore output
-- do_shell_cmd_on_region (Gnuplot_Command);
-+ shell_cmd_on_region (Gnuplot_Command);
-
- % clean up
- set_buffer_modified_flag (0); % so delbuf doesnot ask whether to save first
Deleted: trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/46_ishell-autoload-view-mode.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 46_ishell-autoload-view-mode.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/ishell/ishell.sl mode/ishell/ishell.sl
---- mode-orig/ishell/ishell.sl 2004-12-03 11:58:12.000000000 +0100
-+++ mode/ishell/ishell.sl 2005-03-06 15:11:56.000000000 +0100
-@@ -108,6 +108,7 @@
- autoload("run_blocal_hook", "bufutils");
- autoload("bufsubfile", "bufutils");
- % autoload("strbreak", "strutils");
-+autoload("view_mode", "view");
-
- % ------------------ custom variables ---------------------------------
-
Deleted: trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/47_jedscape-requires.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 47_jedscape-requires.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/jedscape/jedscape.sl mode/jedscape/jedscape.sl
---- mode-orig/jedscape/jedscape.sl 2004-11-15 13:36:04.000000000 +0100
-+++ mode/jedscape/jedscape.sl 2005-03-06 22:18:14.000000000 +0100
-@@ -33,6 +33,9 @@
- % anything defined in this file.
- require("ishell");
- require("view");
-+autoload ("string_nth_match", "strutils");
-+autoload ("dired_read_dir", "dired");
-+autoload ("strread_file", "bufutils");
- if (_featurep("jedscape"))
- use_namespace("jedscape");
- else
Deleted: trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/49_miscfun-autoload-view-mode.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 49_miscfun-autoload-view-mode.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/miscfun/miscfun.sl mode/miscfun/miscfun.sl
---- mode-orig/miscfun/miscfun.sl 2004-11-15 13:36:06.000000000 +0100
-+++ mode/miscfun/miscfun.sl 2005-03-07 21:55:45.000000000 +0100
-@@ -9,6 +9,8 @@
- % look through the file, copy functions you find useful to your own
- % miscfun.sl and follow the installation instructions.
-
-+autoload ("view_mode", "view");
-+
- %{{{ complete_filename
- % This is basically the ashell_completion() function for completing
- % filenames from ashell.sl, minus the ashell-specific stuff.
Deleted: trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/50_home-lib_fix.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_home-lib_fix.dpatch by Jörg Sommer <joerg@alea.gnuu.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: home-lib.sl misses the declaration of Jed_Home_Library, this fixes it
-
-@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./home-lib/home-lib.sl /tmp/dpep-work.FpeOEi/jed-extra-1.2/home-lib/home-lib.sl
---- ./home-lib/home-lib.sl 2005-06-30 17:18:11.000000000 +0200
-+++ /tmp/dpep-work.FpeOEi/jed-extra-1.2/home-lib/home-lib.sl 2005-06-30 17:21:04.848428040 +0200
-@@ -20,6 +20,10 @@
- % Version 0.9 first public version
- % 0.9.1 Jed_Highlight_Cache_Path += Jed_Home_Library;
-
-+custom_variable("Jed_Home_Library", path_concat(Jed_Home_Directory, "lib"));
-+if (file_status(Jed_Home_Library) != 2) % no directory
-+ Jed_Home_Library = "";
-+
- % --- Site Library --------------------------------------------------------
-
- #ifdef UNIX
Added: trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_ispell-fix-requirements.dpatch by Jörg Sommer <joerg@alea.gnuu.de>
+##
+## DP: ispell_init misses some declarations of autoload functions
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./ispell/ispell_init.sl /tmp/dpep-work.wIsxzL/mode.cvs/ispell/ispell_init.sl
+--- ./ispell/ispell_init.sl 2005-06-16 10:54:35.000000000 +0200
++++ /tmp/dpep-work.wIsxzL/mode.cvs/ispell/ispell_init.sl 2005-07-04 00:56:49.007973624 +0200
+@@ -26,7 +26,9 @@
+ "flyspell_region", "flyspell",
+ "auto_ispell", "ispell",
+ "ispell_region", "ispell",
+- "vispell", "vispell", 10);
++ "vispell", "vispell",
++ "push_defaults", "sl_utils",
++ "menu_radio", "menu_utils", 12);
+ _add_completion("ispell_change_dictionary",
+ "ispell_change_local_dictionary",
+ "flyspell_mode", "ispell_region",
Property changes on: trunk/packages/jed-extra/debian/patches/50_ispell-fix-requirements.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/51_tree-dfa-fixes.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 51_tree-dfa-fixes.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
-diff -Naur mode-orig/tree/tree.sl mode/tree/tree.sl
---- mode-orig/tree/tree.sl 2004-11-15 13:36:08.000000000 +0100
-+++ mode/tree/tree.sl 2005-03-08 08:50:00.000000000 +0100
-@@ -349,12 +349,13 @@
- {
- $0 = "tree";
- create_syntax_table ($0);
-- define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
-- define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
-- define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
-- define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
-- define_highlight_rule("^[^ ].*$", "Qstring", $0);
-- build_highlight_table ($0);
-+ dfa_define_highlight_rule(" [^\\|`]* \\-\\> .*$", "Qcomment", $0);
-+ dfa_define_highlight_rule(" [^\\|`]* \\~\\> .*$", "Qerror", $0);
-+ dfa_define_highlight_rule(" [^\\|`]*/$", "Qkeyword", $0);
-+ dfa_define_highlight_rule(" [^\\|`]*\\*$", "Qkeyword1", $0);
-+ dfa_define_highlight_rule("^[^ ].*$", "Qstring", $0);
-+ dfa_build_highlight_table ($0);
-+ enable_dfa_syntax_for_mode ($0);
- use_syntax_table ("tree");
- }
- #endif
Deleted: trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/patches/53_mupad-fix.dpatch 2005-07-03 23:35:22 UTC (rev 56)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 53_mupad-fix.dpatch by Rafael Laboissiere <rafael@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
---- mode.orig/mupad/mupad.sl 2005-03-09 11:20:03.000000000 +0100
-+++ mode/mupad/mupad.sl 2005-04-22 22:45:19.994720840 +0200
-@@ -115,7 +115,8 @@
- bol_skip_white ();
- ch = char(what_char());
- bol_trim ();
-- insert_spaces (goal--, goal);
-+ goal--;
-+ insert_spaces (goal);
- pop_spot ();
- skip_white ();
-
Modified: trunk/packages/jed-extra/debian/rules
===================================================================
--- trunk/packages/jed-extra/debian/rules 2005-07-03 12:12:44 UTC (rev 55)
+++ trunk/packages/jed-extra/debian/rules 2005-07-03 23:35:22 UTC (rev 56)
@@ -32,7 +32,8 @@
$(jed_root)/site-lib
dh_install a2ps/*.ssh /usr/share/a2ps/sheets/
- dh_install -Xapsconf.example apsmode/apsconf colors $(jed_root)/site-lib
+ dh_install -Xapsconf.example -XSLang.ssh apsmode/apsconf colors \
+ $(jed_root)/site-lib
chmod -x $(debroot)$(jed_root)/site-lib/apsconf/*
# fill up /etc
@@ -47,7 +48,7 @@
dh_installchangelogs
dh_installdocs $$(find . -name \*.html -o -name \*.otl) \
- outline/outline.txt a2ps/README tar/INSTALL
+ a2ps/README tar/INSTALL
mv $(debroot)/usr/share/doc/jed-extra/README \
$(debroot)/usr/share/doc/jed-extra/README.a2ps