[Pkg-jed-commit] r60 - in trunk/packages/jed/debian: . init.d patches

Jörg Sommer jo-guest at costa.debian.org
Sun Sep 18 21:04:46 UTC 2005 

Author: jo-guest
Date: 2005-09-18 21:04:41 +0000 (Sun, 18 Sep 2005)
New Revision: 60

Added:
   trunk/packages/jed/debian/TODO
   trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
   trunk/packages/jed/debian/patches/50_popups.sl.dpatch
Modified:
   trunk/packages/jed/debian/init.d/05jed-common.sl
   trunk/packages/jed/debian/patches/00list
   trunk/packages/jed/debian/rules
Log:
(all about jed)
* 05jed-common.sl
  + the corected name in the headline

  + really append the directory with register_libdir()

  + do not change the Jed_Highlight_Cache_Dir with register_libdir()

  + added support for /usr/local/jed (is this the right dir?)

* added a new patch 50_popups.sl to support compressed help files in
  Help->Browse Docs

* added 50_abbrev_fix to fix the error with an empty abbrev table

* rules
  + added a link from /e/jed.d/README to README.Debian-startup

  + enabled compression for all files but libfuns.txt and jed_funs.txt

* added a TODO file


Added: trunk/packages/jed/debian/TODO
===================================================================
--- trunk/packages/jed/debian/TODO	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/TODO	2005-09-18 21:04:41 UTC (rev 60)
@@ -0,0 +1,4 @@
+* fix the build warnings (-Wformat=2)
+* support add_doc_file, set_doc_files, get_doc_files, _slang_doc_dir from
+  slang
+* update README.Debian-startup

Modified: trunk/packages/jed/debian/init.d/05jed-common.sl
===================================================================
--- trunk/packages/jed/debian/init.d/05jed-common.sl	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/init.d/05jed-common.sl	2005-09-18 21:04:41 UTC (rev 60)
@@ -1,4 +1,4 @@
-% debian jed.conf              -*- slang -*-
+% debian 05jed-common.sl              -*- slang -*-
 
 % make delete key delete the character under the cursor
 % (section 10.8 of the Debian Policy)
@@ -26,7 +26,7 @@
      return;
 
    % jed library path
-   set_jed_library_path(lib + "," + get_jed_library_path());
+   set_jed_library_path(get_jed_library_path() + "," + lib);
 
    % colors
    variable path = path_concat(lib, "colors");
@@ -43,7 +43,6 @@
    path = path_concat(lib, "dfa");
    if (2 != file_status(path))
      path = lib;
-   Jed_Highlight_Cache_Dir = path;
    Jed_Highlight_Cache_Path += "," + path;
 #endif
 
@@ -54,6 +53,31 @@
      () = evalfile(path);
 }
 
+$1 = "/usr/local/jed/";
+if ( 2 == file_status($1) ) {
+   % jed library path
+   set_jed_library_path($1 + "," + get_jed_library_path());
+
+   % colors
+   $2 = path_concat($1, "colors");
+   if ( 2 == file_status($2) )
+     Color_Scheme_Path = $2 + "," + Color_Scheme_Path;
+
+   % documentation
+   $2 = path_concat($1, "libfuns.txt");
+   if ( 1 == file_status($2) )
+     Jed_Doc_Files = $2 + "," + Jed_Doc_Files;
+
+   % dfa cache
+#ifdef HAS_DFA_SYNTAX
+    $2 = path_concat($1, "dfa");
+    if ( 2 == file_status($2) )
+      Jed_Highlight_Cache_Path += "," + $2;
+    else
+      Jed_Highlight_Cache_Path += "," + $1;
+#endif
+}
+
 % Jed_Home_Directory is defined in site.sl, defaulting to $HOME
 % If Jed_Home_Directory/.jed/ exists, point Jed_Home_Directory there,
 $1 = path_concat(Jed_Home_Directory, ".jed");
@@ -67,24 +91,24 @@
    Jed_Home_Directory = $1;
 
    % jed library path
-   set_jed_library_path(Jed_Home_Directory + "," + get_jed_library_path());
+   set_jed_library_path($1 + "," + get_jed_library_path());
 
    % colors
-   $1 = path_concat(Jed_Home_Directory, "colors");
-   if ( 2 == file_status($1) )
-     Color_Scheme_Path = $1 + "," + Color_Scheme_Path;
+   $2 = path_concat($1, "colors");
+   if ( 2 == file_status($2) )
+     Color_Scheme_Path = $2 + "," + Color_Scheme_Path;
 
    % documentation
-   $1 = path_concat(Jed_Home_Directory, "libfuns.txt");
-   if ( 1 == file_status($1) )
-     Jed_Doc_Files = $1 + "," + Jed_Doc_Files;
+   $2 = path_concat($1, "libfuns.txt");
+   if ( 1 == file_status($2) )
+     Jed_Doc_Files = $2 + "," + Jed_Doc_Files;
 
    % dfa cache
 #ifdef HAS_DFA_SYNTAX
-   $1 = path_concat(Jed_Home_Directory, "dfa");
-   if ( 2 != file_status($1) )
-     $1 = Jed_Home_Directory;
-   Jed_Highlight_Cache_Dir = $1;
-   Jed_Highlight_Cache_Path += "," + $1;
+   $2 = path_concat($1, "dfa");
+   if ( 2 != file_status($2) )
+     $2 = $1;
+   Jed_Highlight_Cache_Dir = $2;
+   Jed_Highlight_Cache_Path += "," + $2;
 #endif
 }

Modified: trunk/packages/jed/debian/patches/00list
===================================================================
--- trunk/packages/jed/debian/patches/00list	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/patches/00list	2005-09-18 21:04:41 UTC (rev 60)
@@ -4,6 +4,8 @@
 50_jed-manpage
 50_enable-xrenderfont
 50_paste-mode-sl
+50_popups.sl
 50_pymode_indent
 50_README
+50_abbrev_fix
 60_gpm-mouse-support

Added: trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch	2005-09-18 21:04:41 UTC (rev 60)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_abbrev_fix.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: if an abbrevivation is added to the Global abbrev table, but it
+## DP: does not exist, jed raises an error; simply call
+## DP: define_abbreviation after startup; this patch fixes this issue
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./src/abbrev.c /tmp/dpep-work.pdCHmu/jed-B0.99-17.111/src/abbrev.c
+--- ./src/abbrev.c	2005-07-25 06:37:23.000000000 +0200
++++ /tmp/dpep-work.pdCHmu/jed-B0.99-17.111/src/abbrev.c	2005-09-11 23:52:44.622453448 +0200
+@@ -375,7 +375,7 @@
+    
+ 	if (tbl == NULL)
+ 	  {
+-	     (void) SLang_push_string ("Global");
++	     (void) SLang_push_string ("");
+ 	     (void) SLang_push_string ("");
+ 	     return;
+ 	  }


Property changes on: trunk/packages/jed/debian/patches/50_abbrev_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/jed/debian/patches/50_popups.sl.dpatch
===================================================================
--- trunk/packages/jed/debian/patches/50_popups.sl.dpatch	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/patches/50_popups.sl.dpatch	2005-09-18 21:04:41 UTC (rev 60)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_popups.sl.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The policy (12.3) recommends the compression of documentations. This
+## DP: patch adds support for compressed documentation files.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./lib/popups.sl /tmp/dpep-work.bTOADF/jed-B0.99-17.111/lib/popups.sl
+--- ./lib/popups.sl	2005-09-18 18:31:08.792582496 +0200
++++ /tmp/dpep-work.bTOADF/jed-B0.99-17.111/lib/popups.sl	2005-09-18 19:18:23.314669640 +0200
+@@ -23,6 +23,8 @@
+    foreach (files)
+      {
+ 	variable file = ();
++         if (file[[-3:-1]] == ".gz")
++           file = file[[:-4]];
+ 	file = path_sans_extname (file);
+ 	menu_append_item (popup, file, fun, file);
+      }
+@@ -31,7 +33,14 @@
+ private define browse_docs_callback (file)
+ {
+    file = dircat (JED_ROOT, "doc/txt/" + file + ".txt");
+-   () = read_file (file);
++    !if ( read_file (file) ) {
++        whatbuf();
++        dup();
++        delbuf( () );
++        sw2buf( () + ".gz" );
++        () = run_shell_cmd("gzip -dc " + file + ".gz");
++        bob();
++    }
+    pop2buf (whatbuf ());
+    most_mode ();
+ }
+@@ -251,7 +260,7 @@
+ #ifndef VMS
+ add_files_popup_with_callback ($1, "&Browse Docs",
+ 			       dircat (JED_ROOT, "doc/txt"),
+-			       "\\C^.*\\.txt$",
++			       "\\C^.*\\.txt",
+ 			       &browse_docs_callback);
+ #endif
+ menu_append_separator ($1);


Property changes on: trunk/packages/jed/debian/patches/50_popups.sl.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2005-09-11 20:30:34 UTC (rev 59)
+++ trunk/packages/jed/debian/rules	2005-09-18 21:04:41 UTC (rev 60)
@@ -101,13 +101,14 @@
 
 	# fill up /etc
 	dh_install -pjed-common debian/init.d/*.sl etc/jed.d/
+	dh_link usr/share/doc/jed-common/README.Debian-startup etc/jed.d/README
 
 	dh_installdebconf -i
 
 	@echo
 	@echo --- INSTALL-ARCH-INDEP ---
 	@echo
-	dh_compress -i --exclude=usr/share/doc/jed-common/txt/
+	dh_compress -i --exclude=libfuns.txt --exclude=jed_funs.txt
 
 	dh_fixperms -i
 	dh_installdeb -i

More information about the Pkg-jed-commit mailing list