[Pkg-jed-commit] r236 - trunk/packages/jed-extra/debian/patches

[Guenter Milde]

Author: milde-guest
Date: 2005-12-08 16:28:07 +0000 (Thu, 08 Dec 2005)
New Revision: 236

Removed:
   trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch
   trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch
Modified:
   trunk/packages/jed-extra/debian/patches/00list
Log:
patches now included upstream


Modified: trunk/packages/jed-extra/debian/patches/00list
===================================================================
--- trunk/packages/jed-extra/debian/patches/00list	2005-12-05 13:46:14 UTC (rev 235)
+++ trunk/packages/jed-extra/debian/patches/00list	2005-12-08 16:28:07 UTC (rev 236)
@@ -1,4 +1,3 @@
-41_apsconf-tmp-dir
 50_ispell-fix-requirements
 # 50_rfcview-require-bufutils # no longer in jed-extra (eXotic)
 # 52_yodl-require             # no longer in jed-extra (eXotic)

Deleted: trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch	2005-12-05 13:46:14 UTC (rev 235)
+++ trunk/packages/jed-extra/debian/patches/41_apsconf-tmp-dir.dpatch	2005-12-08 16:28:07 UTC (rev 236)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 41_apsconf-tmp-dir.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 2005-11-21 GM: use path_concat() to make the addition of "/" idempotent
-
- at DPATCH@
-
-diff -Naur mode-orig/apsmode/apsconf/apsconf.sl mode/apsmode/apsconf/apsconf.sl
---- mode-orig/apsmode/apsconf/apsconf.sl	2004-11-15 13:35:56.000000000 +0100
-+++ jedmodes-extra-2.0/apsmode/apsconf/apsconf.sl	2005-03-05 15:50:11.000000000 +0100
-@@ -53,7 +53,9 @@
- aps_del_ps_file = 1;
- 
- #ifdef UNIX
--aps_tmp_dir = "/home/xyz/tmp/";
-+aps_tmp_dir = path_concat(getenv("TMPDIR"), ""); % ensure trailing "/"
-+if (aps_tmp_dir == "")
-+  aps_tmp_dir = "/tmp/";
- a2ps_cmd = "a2ps";
- default_printer = 5;
- #endif

Deleted: trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch
===================================================================
--- trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch	2005-12-05 13:46:14 UTC (rev 235)
+++ trunk/packages/jed-extra/debian/patches/48_make-dfa-fixes.dpatch	2005-12-08 16:28:07 UTC (rev 236)
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 48_make-dfa-fixes.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-
-diff -Naur mode-orig/make/make.sl mode/make/make.sl
---- mode-orig/make/make.sl	2004-11-15 13:36:05.000000000 +0100
-+++ mode/make/make.sl	2005-03-06 23:14:40.000000000 +0100
-@@ -211,23 +211,26 @@
- % in JED is seriously damaged. Or, alternatively (and probably),
- % I don't know how to write good rules   :(
- %
--define_highlight_rule("\"[^\"]*\"", "string", $0);
--define_highlight_rule("'[^']*'", "string", $0);
--%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
--%define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
--%define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
--%define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
--define_highlight_rule ("^[ \t]*@", "string", $0);
--define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
--define_highlight_rule ("[ \t]*#.*$", "comment", $0);
--define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
--%define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
--%define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
--define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
--define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
--%define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
--define_highlight_rule ("/include", "normal", $0);
--build_highlight_table ($0);
-+dfa_define_highlight_rule("\"[^\"]*\"", "string", $0);
-+dfa_define_highlight_rule("'[^']*'", "string", $0);
-+%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\"", "string", $0);
-+%dfa_define_highlight_rule("\"([^\"\\\\]|\\\\.)*\\\\?$", "string", $0);
-+%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*'", "Qstring", $0);
-+%dfa_define_highlight_rule("'([^'\\\\]|\\\\.)*\\\\?$", "string", $0);
-+%dfa_define_highlight_rule ("^[ \t]*@", "string", $0);
-+%dfa_define_highlight_rule ("[ \t]*\\\\[ \t]*$", "string", $0);
-+dfa_define_highlight_rule ("[ \t]*#.*$", "comment", $0);
-+%dfa_define_highlight_rule ("[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
-+%dfa_define_highlight_rule ("[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
-+%dfa_define_highlight_rule ("^[ \t]*[A-Za-z_][A-Za-z_0-9]*", "Knormal", $0);
-+dfa_define_highlight_rule ("^[^\"']*\\:$", "keyword1", $0);
-+dfa_define_highlight_rule ("^[^\"']*\\:[ \t]+", "keyword1", $0);
-+dfa_define_highlight_rule ("^[^\t][^=]*=[ \t]+", "preprocess", $0);
-+dfa_define_highlight_rule ("\\$\\([^\\)]+\\)", "string", $0);
-+%dfa_define_highlight_rule ("[ \t]*\.PHONY.*", "keyword1", $0);
-+dfa_define_highlight_rule ("/include", "normal", $0);
-+dfa_build_highlight_table ($0);
-+enable_dfa_syntax_for_mode ($0);
- #endif
- 
- () = define_keywords_n ($0, "ARASCCCOCPFCPCRMfiif", 2, 0);