[Pkg-jed-commit] r774 - in jed/branches/0.99.19/debian: . patches

Jörg Sommer jo-guest at alioth.debian.org
Sat Jun 9 21:49:14 UTC 2007 

Author: jo-guest
Date: 2007-06-09 21:49:14 +0000 (Sat, 09 Jun 2007)
New Revision: 774

Added:
   jed/branches/0.99.19/debian/patches/fix-documentation.dpatch
   jed/branches/0.99.19/debian/patches/update-copyright.dpatch
Modified:
   jed/branches/0.99.19/debian/NEWS
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/control
   jed/branches/0.99.19/debian/defaults.sl
   jed/branches/0.99.19/debian/patches/00list
Log:
• debian/control
  · Added jed-extra to the conflict field, because it breaks with the new
    version. If an updated jed-extra version is in testing before we upload
    this package to unstable, we drop this conflict.

• debian/patches/fix-documentation.dpatch
  · New patch for documentation

• debian/patches/update-copyright.dpatch
  · John didn't updated the copyright since January.

• debian/NEWS
  · Added a warning about the changed require function.

  · Raised the urgency level for this entry.

• debian/defaults.sl
  · Beautifying.

• debian/changelog
  · Raise the urgency level to reflect the problems with jed-extra and the
    previous version.


Modified: jed/branches/0.99.19/debian/NEWS
===================================================================
--- jed/branches/0.99.19/debian/NEWS	2007-06-08 12:27:22 UTC (rev 773)
+++ jed/branches/0.99.19/debian/NEWS	2007-06-09 21:49:14 UTC (rev 774)
@@ -1,3 +1,12 @@
+jed-common (1:0.99.19~pre89-1) experimental; urgency=medium
+
+    The require function was dropped from site.sl and replaced by the require
+    function in the package slsh. This function has a different argument list.
+    The second (optional) argument accepted by the old jed version is the
+    namespace for the file not the file name.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Sat, 9 Jun 2007 23:34:41 +0200
+
 jed-common (0.99.18+dfsg.1-1) unstable; urgency=low
 
     The handling of "~" in path names changed between version 0.99.16 of

Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-06-08 12:27:22 UTC (rev 773)
+++ jed/branches/0.99.19/debian/changelog	2007-06-09 21:49:14 UTC (rev 774)
@@ -1,17 +1,35 @@
-jed (1:0.99.19~pre92-1) UNRELEASED; urgency=low
+jed (1:0.99.19~pre92-1) UNRELEASED; urgency=medium
 
   * New upstream release, taken from the upstream SVN repository at
     gna.org
 
-  * debian/control: Added slsh to the Depends field for slsh, because
-    since 0.99.19-82 jed uses the require from slsh.
+  * debian/patches/remove_jed_library_path.dpatch: In version 0.99.19-82 the
+    require function was removed from jed and superseded by the version in
+    slsh. This new function has a new argument structure and doesn't care
+    about the jed_library_path anymore. Due to this, all jed_library stuff was
+    removed and two transition functions get_jed_library_path and
+    set_jed_library_path where added to site.sl until all third party scripts
+    moved to [gs]et_slang_load_path.
 
+  * debian/control:
+    + Added slsh to the Depends field of jed-common, because since 0.99.19-82
+      jed uses the require from slsh.
+
+    + jed-extra breaks with the new require function from slsh and makes jed
+      unusable. Added a conflict for the current version.
+
   * debian/patches/empty_rectangle.dpatch: Added a new patch that makes
     string_rectangle (^X R T) does not fail with an empty rectangle and
     insert only the text.
 
- -- Jörg Sommer <joerg at alea.gnuu.de>  Fri, 8 Jun 2007 13:15:13 +0200
+  * debian/patches/update-copyright.dpatch: Added a patch to update the
+    copyright messages.
 
+  * debian/patches/fix-documentation.dpatch: A new patch to improve the
+    documentation.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Sat, 9 Jun 2007 23:40:48 +0200
+
 jed (1:0.99.19~pre89-1) experimental; urgency=low
 
   * New upstream release, taken from the upstream SVN repository at

Modified: jed/branches/0.99.19/debian/control
===================================================================
--- jed/branches/0.99.19/debian/control	2007-06-08 12:27:22 UTC (rev 773)
+++ jed/branches/0.99.19/debian/control	2007-06-09 21:49:14 UTC (rev 774)
@@ -76,7 +76,7 @@
 Package: jed-common
 Architecture: all
 Replaces: jed-sl
-Conflicts: jed-sl, jed (<< ${source:Version}), xjed (<< ${source:Version})
+Conflicts: jed-sl, jed (<< ${source:Version}), xjed (<< ${source:Version}), jed-extra (<= 2.3.2-3)
 Recommends: jed | xjed
 Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0, slsh
 Description: S-Lang runtime files for jed and xjed

Modified: jed/branches/0.99.19/debian/defaults.sl
===================================================================
--- jed/branches/0.99.19/debian/defaults.sl	2007-06-08 12:27:22 UTC (rev 773)
+++ jed/branches/0.99.19/debian/defaults.sl	2007-06-09 21:49:14 UTC (rev 774)
@@ -18,15 +18,14 @@
 define debian_startup()
 {
     variable file, dir = listdir("/etc/jed.d/");
-    foreach ( dir[array_sort(dir)] ) 
+    foreach file ( dir[array_sort(dir)] )
      {
-        file = ();
         if (path_extname(file) == ".sl")
           () = evalfile(strcat("/etc/jed.d/", file));
      }
 }
-   
-if ( andelse {BATCH != 2} 
+
+if ( andelse {BATCH != 2}
      % skip startup scripts if jed is started as `jed-script`
      {wherefirst(__argv == "--skip-debian-startup") == NULL}
      % skip startup scripts if jed is started with --skip-debian-startup

Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list	2007-06-08 12:27:22 UTC (rev 773)
+++ jed/branches/0.99.19/debian/patches/00list	2007-06-09 21:49:14 UTC (rev 774)
@@ -18,3 +18,5 @@
 slang2
 fix-warnings
 empty_rectangle
+fix-documentation
+update-copyright

Added: jed/branches/0.99.19/debian/patches/fix-documentation.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-documentation.dpatch	                        (rev 0)
+++ jed/branches/0.99.19/debian/patches/fix-documentation.dpatch	2007-06-09 21:49:14 UTC (rev 774)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-documentation.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: Updates/improvements of the documentation.
+
+ at DPATCH@
+diff -urNad 0.99.19~/doc/hlp/jedfuns.hlp 0.99.19/doc/hlp/jedfuns.hlp
+--- 0.99.19~/doc/hlp/jedfuns.hlp	2007-05-29 04:40:18.000000000 +0200
++++ 0.99.19/doc/hlp/jedfuns.hlp	2007-06-09 23:07:19.837893086 +0200
+@@ -3775,9 +3775,11 @@
+ 
+   reads a string from the user and then searches forward for it and if
+   not found, it resumes the search from the beginning of the buffer.
+-  Note: If the user aborts the function `mini_read' by pressing the
++
++ NOTES
++  If the user aborts the function `read_mini' by pressing the
+   keyboard quit character (e.g., Ctrl-G), an error is signaled.  This
+-  error can be caught by an `ERROR_BLOCK' and the appropriate action
++  error can be caught by a `try-catch' statement and the appropriate action
+   taken. Also if the mini-buffer is already in use, this function should
+   not be called.  The variable `MINIBUFFER_ACTIVE' may be checked to
+   determine if this is the case or not.
+diff -urNad 0.99.19~/doc/tm/rtl/mini.tm 0.99.19/doc/tm/rtl/mini.tm
+--- 0.99.19~/doc/tm/rtl/mini.tm	2006-02-13 18:51:58.000000000 +0100
++++ 0.99.19/doc/tm/rtl/mini.tm	2007-06-09 23:07:39.141893086 +0200
+@@ -101,9 +101,11 @@
+ #v-
+   reads a string from the user and then searches forward for it and if
+   not found, it resumes the search from the beginning of the buffer.
+-  Note: If the user aborts the function \var{mini_read} by pressing the
++
++\notes
++  If the user aborts the function \var{read_mini} by pressing the
+   keyboard quit character (e.g., Ctrl-G), an error is signaled.  This
+-  error can be caught by an \var{ERROR_BLOCK} and the appropriate action
++  error can be caught by a \var{try-catch} statement and the appropriate action
+   taken. Also if the mini-buffer is already in use, this function should
+   not be called.  The variable \var{MINIBUFFER_ACTIVE} may be checked to
+   determine if this is the case or not.


Property changes on: jed/branches/0.99.19/debian/patches/fix-documentation.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: jed/branches/0.99.19/debian/patches/update-copyright.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/update-copyright.dpatch	                        (rev 0)
+++ jed/branches/0.99.19/debian/patches/update-copyright.dpatch	2007-06-09 21:49:14 UTC (rev 774)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## update-copyright.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: The year 2007 is missing in the copyright messages of Jed.
+
+ at DPATCH@
+diff -urNad 0.99.19~/lib/aboutjed.hlp 0.99.19/lib/aboutjed.hlp
+--- 0.99.19~/lib/aboutjed.hlp	2006-07-19 16:44:36.000000000 +0200
++++ 0.99.19/lib/aboutjed.hlp	2007-06-09 23:16:09.469893086 +0200
+@@ -1,4 +1,4 @@
+-Copyright (C) 1994, 1999, 2000-2006  John E. Davis
++Copyright (C) 1994, 1999, 2000-2007  John E. Davis
+ Email comments or suggestions to jed at jedsoft.org.
+ 
+ Jed Home Page:
+diff -urNad 0.99.19~/lib/cpright.hlp 0.99.19/lib/cpright.hlp
+--- 0.99.19~/lib/cpright.hlp	2006-02-13 18:51:58.000000000 +0100
++++ 0.99.19/lib/cpright.hlp	2007-06-09 23:16:09.469893086 +0200
+@@ -11,5 +11,5 @@
+      alt.lang.s-lang.  To subscribe to the jed-users mailing list, see
+      <http://www.jedsoft.org/jed/mailinglists.html>.
+ 
+-     Copyright (C) 1994, 2000-2006  John E. Davis
++     Copyright (C) 1994, 2000-2007  John E. Davis
+      Email comments or suggestions to <jed at jedsoft.org>.


Property changes on: jed/branches/0.99.19/debian/patches/update-copyright.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Pkg-jed-commit mailing list