[Pkg-jed-commit] r511 - in jed/branches/0.99.19: . init.d patches po
Rafael Laboissiere
rafael at alioth.debian.org
Sat Jan 20 00:14:55 CET 2007
Author: rafael
Date: 2007-01-20 00:14:54 +0100 (Sat, 20 Jan 2007)
New Revision: 511
Added:
jed/branches/0.99.19/po/de.po
jed/branches/0.99.19/po/nl.po
jed/branches/0.99.19/po/pt.po
jed/branches/0.99.19/po/ru.po
jed/branches/0.99.19/po/sv.po
jed/branches/0.99.19/watch
Removed:
jed/branches/0.99.19/jed-common.preinst
jed/branches/0.99.19/patches/50_popups.sl.dpatch
jed/branches/0.99.19/patches/doc.dpatch
jed/branches/0.99.19/patches/fix-menu-utf8.dpatch
jed/branches/0.99.19/patches/help.dpatch
jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch
jed/branches/0.99.19/patches/slmode-function-popup.dpatch
Modified:
jed/branches/0.99.19/NEWS
jed/branches/0.99.19/README.Debian
jed/branches/0.99.19/changelog
jed/branches/0.99.19/control
jed/branches/0.99.19/init.d/05jed-common.sl
jed/branches/0.99.19/jed-common.config
jed/branches/0.99.19/jed-common.templates
jed/branches/0.99.19/patches/00list
jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch
jed/branches/0.99.19/po/cs.po
jed/branches/0.99.19/po/fr.po
jed/branches/0.99.19/po/pt_BR.po
jed/branches/0.99.19/po/templates.pot
jed/branches/0.99.19/rules
Log:
* Merged changes from HEAD.
* Deleted a bunch of patches (applied upstream)
* debian/rules:
- Dropped installation of info files
- Build orig tarball from SVN and use youngest revision number for
composing the package version number
Modified: jed/branches/0.99.19/NEWS
===================================================================
--- jed/branches/0.99.19/NEWS 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/NEWS 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,3 +1,25 @@
+jed-common (0.99.18-8) unstable; urgency=low
+
+ Since release 0.99.17.135-1 of the package, the JED run-time
+ configuration files are put in /etc/jed.d/ instead of
+ /etc/jed-init.d/. Due to a bug in dpkg (#108587) the config files
+ 00site.sl, 00debian.sl and 99defaults.sl as well as /etc/jed.conf are
+ not removed after an upgrade to 0.99.15-1 or higher.
+
+ A debconf question has been added to the jed-common package to inform
+ the user if modified files are kept in /etc/jed-init.d/. However, the
+ script that was responsible for deleting the files was defective and
+ there may be cases where the files are still in the system but shouldn't
+ be. (The debconf question can be revisited by running "dpkg-reconfigure
+ jed-common".)
+
+ The directory /etc/jed-init.d/ is no longer needed and should be removed
+ after transferring eventual customizations to /etc/jed.d/.
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 12 Jan 2007 14:11:18 +0100
+
+jed-common (0.99.18-7) unstable; urgency=low
+
=========================================
Recent changes to the Debian jed packages
=========================================
Modified: jed/branches/0.99.19/README.Debian
===================================================================
--- jed/branches/0.99.19/README.Debian 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/README.Debian 2007-01-19 23:14:54 UTC (rev 511)
@@ -2,20 +2,20 @@
Readme for the Debian Jed packages
============================================================================
-Jed (http://www.jedsoft.org/jed/) is a highly customizable editor for
-programmers by John E. Davis. Small, fast and mighty. Extensible in the
-C-like S-Lang language.
+Jed is a highly customizable editor for programmers by John E. Davis. It's
+small, fast and mighty and extensible in the C-like "S-Lang" language.
+Find out more about Jed on its homepage http://www.jedsoft.org/jed/ .
-Jed for debian comes in four packages
+Jed for Debian comes in four packages
jed console version of Jed
- xjed stand-alone X application
+ xjed stand-alone X application
(failsave: falls back to console app if DISPLAY is not set)
jed-common Files used by both jed and xjed
jed-extra User provided extensions, mainly from http://jedmodes.sf.net/
-Jed was debianized by Charl P. Botha and is now maintained by
-the Debian JED Group.
+Jed was debianized by Charl P. Botha and is now maintained by
+the Debian JED Group:
http://pkg-jed.alioth.debian.org/
email: <pkg-jed-devel at lists.alioth.debian.org>
@@ -41,18 +41,23 @@
Debian Jed supports a per-user "~/.jed/" application directory in accordance
with the file hierarchy standard (FHS 2.3). However, Jed will not create
such a directory. Users are encouraged to create the directory ".jed/" in
-their home directory. It will become the `Jed_Home_Directory'
-where personal jed-related files are assumed to be found, e.g.
+their home directory. It will become the `Jed_Home_Directory'
+for personal jed-related files, e.g.
jed.rc user startup configuration (move the jed.rc from the
examples/ here and modify to your needs)
+
.jedrecent last opened files (autogenerated by recent.sl)
+
lib/ personal extension scripts (home-made or downloaded)
- Add to the jed library path in jed.rc with
+ also for "personalized versions" of standard scripts
- set_jed_library_path(path_concat(Jed_Home_Directory, "lib")
+ To use this library dir, you need to add it to the
+ jed library path in jed.rc with e.g.::
+
+ set_jed_library_path(path_concat(Jed_Home_Directory, "lib")
+ "," + get_jed_library_path()
-
+
templates/ optional dir for templates (with jed-extra)
@@ -75,27 +80,27 @@
somewhere at X-startup (modify e.g. ~/.Xmodmap).
Q: When I paste text into Jed, it misaligns everything (i.e. every succeeding
- line is indented more than the previous, yielding horizontally cascading
+ line is indented more than the previous, yielding horizontally cascading
text).
A: In Jed, carriage return is bound to `newline_and_indent'. While this
auto-indention is a great help in normal editing, it stands in the way
when text is pasted via the mouse. Unfortunately, Jed cannot tell whether
its input comes from a keyboard, another program, or the mouse (XJed can).
-
+
Q: How can I prevent this?
-A0: Use xjed.
+A0: Use xjed.
A1: Use the `paste' function
1. M-x paste (or bind "paste" to a key)
- 2. Now paste your text...
+ 2. Now paste your text...
A2: Temporarily change the keybinding by doing:
1. M-X local_setkey("newline","^M") (Alt-Shift-X: the S-Lang prompt)
- 3. Now paste your text...
+ 3. Now paste your text...
4. M-X local setkey("newline_and_indent","^M")
A3: Bind "newline_and_indent" to a different key. In jed.rc do e.g.:
setkey("newline_and_indent", "\e^M"); % Key_Alt_Return
setkey("newline", "^M");
A4: Use the fact that Jed can tell whether there is input pending after the
- carriage return. Define in your jed.rc (or any other file evaluated at
+ carriage return. Define in your jed.rc (or any other file evaluated at
startup):
public define newline_indent ()
{
@@ -108,10 +113,10 @@
On a slow terminal (remote login or heavy load) this might fail by
non-indenting after fast typing of CR and the first character of the new
line.
-
+
Q: TAB does not generate a TAB! Why?
-A: It does something more usefull: indenting the line according to the
- mode's rules. Use `quoted_insert' for a hard TAB. For the full story,
+A: It does something more useful: indenting the line according to the
+ mode's rules. Use `quoted_insert' for a hard TAB. For the full story,
see /usr/share/doc/jed-common/jed_faq.txt.gz, question #13.
Q: Jed makes a difference between a single '/' and multiple '/'
@@ -124,7 +129,7 @@
A: If you're only using set_color() calls but never call set_color_scheme(),
Jed uses the _Jed_Default_Color_Scheme. So, to fix your problem, put
"_Jed_Default_Color_Scheme = NULL;" in your ~/.jedrc.
-
+
Q: Why is jed linked against libncurses when it uses slang?
A: Because it has GPM mouse support and these libraries need ncurses.
@@ -133,8 +138,15 @@
A: Since version 0.99.18, jed uses S-Lang 2. See "S-Lang 2 Interpreter NEWS"
of /usr/share/doc/libslang2/slang.txt for further explanation.
-
+Q: Why is copy/paste not working on the console?
+A: First, be sure that the gpm package is installed and correctly
+ configured. Copying and pasting in a JED window on the console should
+ then work like in X-Window (with a three button mouse, for instance,
+ select with left button and paste with middle button). However, for
+ inserting text selected outside the JED window, you should press down
+ the Alt key when pasting with the mouse.
+
.. Copyright (c) 2006 the Debian JED Group
Released under the terms of the GNU General Public License (ver. 2 or later)
-
- Last update 2006-06-12 Guenter Milde
+
+ Last update 2007-01-18 Guenter Milde
Modified: jed/branches/0.99.19/changelog
===================================================================
--- jed/branches/0.99.19/changelog 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/changelog 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,22 +1,145 @@
-jed (0.99.19-1) experimental; urgency=low
+jed (0.99.19.svn.57-1) experimental; urgency=low
- * New upstream release
- + The get_color() returns "default" in batch mode. (closes: #378396)
+ NOT YET RELEASED!
- * Added syntax highlighting for new Python 2 keywords. [JS]
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+ * The package version number contain the SVN revision number on which
+ the package is built [RL]
- * In SLang, if, for and while statements are allowed outside of functions.
- The function parser in cmode.sl (used by slang.sl) does not resprect this
- fact and show them in the menu Mode→Functions.
+ * In xjed, pasting with middle mouse button into an open mark works now
+ (closes: #330825) [RL]
+ * debian/patches/50_popups.sl.dpatch, debian/patches/doc.dpatch,
+ debian/patches/highlight-isearch-results.dpatch,
+ debian/patches/sane-color-object-return.dpatch,
+ debian/patches/pymode-repeat-shift.dpatch,
+ debian/patches/fix-menu-utf8.dpatch,
+ debian/patches/add-describe-bindings-to-C-h.dpatch:
+ Dropped these patches, which are now applied upstream
+ * debian/patches/fix-pymode-block-end.dpatch:
+ Adapted for the 0.99.19 branch [RL]
+
--
+jed (0.99.18-9) experimental; urgency=low
+
+ * debian/patches/00list: Reintroduced dpatches fix-pymode-tab-space
+ and pymode-repeat-shift, which were temporarily dropped in the last
+ release (again, closes: #305668) [RL]
+
+ * debian/init.d/05jed-common.sl: Do not call info_mode() for *.info
+ files, since info_mode is no editing mode but an info reader mode
+ (closes: #180577). [GM]
+
+ * debian/README.Debian: Added a Q&A entry to the FAQ section explaining
+ that the Alt key should be pressed down when pasting text selected
+ outside the console (closes: #174370) [RL]
+ * debian/control: related to the above, suggest the gpm package [RL]
+
+ * debian/patches/add-describe-bindings-to-C-h.dpatch: Bind "Ch b" to
+ describe bindings in Emacs emulation (closes: #292421) [RL]
+
+ * debian/patches/highlight-isearch-results.dpatch: When using
+ incremental search, highlight the text found after each find.
+ This is included upstream for jed >= 0.99.19-24 (closes: #387061) [RL]
+
+ * debian/patches/sane-color-object-return.dpatch: If no colors have been
+ associated with a color-object, return "default" for the
+ foreground/background colors instead of NULL. (This patch was taken
+ from the JED SVN repository at gna.org, revision 34, corresponding to
+ JED release 0.99.19-16; closes: #378396) [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 19 Jan 2007 10:38:20 +0100
+
+jed (0.99.18-8) unstable; urgency=low
+
+ * debian/po/sv.po: Adjusted msgid strings to correspond to those in
+ po/templates.pot, otherwise po2debconf will not include the sv
+ translations [RL]
+
+ * debian/po/pt_BR.po: Updated file [RL]
+ * debian/po/pt.po: Added the last question which was lacking in the
+ translation (really closes: #400510) [RL]
+
+ * debian/jed-common.config: Made this debconf script works as expected
+ [RL & JS]
+ * debian/jed-common.preinst: Removed file [RL]
+ * debian/control: Since the preinst script is gone, moved debconf from
+ Pre-Depends to Depends for jed-common [RL]
+
+ * debian/rules: Reverted the change in last release regarding the
+ naming of the upstream info files. We have been informed that
+ Lintian will not complain about this in the future and,
+ apparently, it is not really a Policy violation [RL]
+
+ * debian/patches/fix-pymode-tab-space.dpatch: Dropped this patch for now,
+ until a consensus is reached on how it should be implemented [RL]
+ * debian/patches/pymode-repeat-shift.dpatch: Dropped this patch also,
+ since it depends on fix-pymode-tab-space [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 14 Jan 2007 11:43:30 +0100
+
+jed (0.99.18-7) unstable; urgency=low
+
+ * po/nl.po: Added the translation into Dutch of the deconf messages.
+ Thanks to Vincent Zweije (closes: #395251) [JS]
+
+ * control: Moved debhelper dependency to the Pre-Depends field, because
+ we need debhelper in the preinst script. [JS]
+
+ * po/pt.po: Added the translation into Portuguese of the deconf messages.
+ Thanks to Miguel Figueiredo (closes: #400510) [JS]
+
+ * po/ru.po: Added the translation into Russian of the deconf messages.
+ Thanks to Yuri Kozlov (closes: #405744) [JS]
+
+ * patches/fix-pymode-tab-space.dpatch: Improved the patch to cover the
+ cases Günther Milde has reported. Thanks Günther (closes: #305668) [JS]
+
+ * rules: Rename the upstream info files from jed.*in into jed.info-*, as
+ required by section 12.2 of the Debian Policy [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Tue, 9 Jan 2007 17:00:10 +0100
+
+jed (0.99.18-6) unstable; urgency=low
+
+ * debian/patches/pymode-repeat-shift.dpatch: Added a patch to make the
+ shift line commands respect the repeat count (the prefix argument) in
+ Python mode. [JS]
+
+ * Fixed some linker options to reduce unnecessary dependencies on
+ librararies (see http://rerun.lefant.net/checklib/) Now, xjed doesn't
+ depend on libfontconfig1 anymore. [JS]
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 29 Sep 2006 22:38:31 +0200
+
+jed (0.99.18-5) unstable; urgency=low
+
+ * jed-common.templates: fixed a typo in the debconf question; thanks
+ to Sven Joachim (closes: #384726) [JS]
+
+ * po/fr.po: Updated the French debconf translation; thanks to
+ Thomas Huriaux (closes: #384683) [JS]
+ * po/cs.po: Updated the Czech debconf translation; thanks to
+ Miroslav Kure (closes: #384751) [JS]
+ * po/de.po: Added a German debconf translation [JS]
+ * debian/po/sv.po: Swedish translation for debconf templates, thanks to
+ Daniel Nylander [RL]
+
+ * patches/fix-pymode-tab-space.dpatch: Added a patch to make python mode
+ use the right indention character for a file (tab vs. space)
+ (closes: #305668) [JS]
+
+ * install README.Debian (to /usr/share/doc/jed-common) [GM]
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 15 Sep 2006 19:11:46 +0200
+
jed (0.99.18-4) unstable; urgency=low
* debian/watch: Added file [RL]
* debian/po/fr.po: Reviewed version, thanks to Thomas Huriaux
- <thomas.huriaux AT gmail DOT com> and Christian Perrier
- <bubulle AT debian DOT org> [RL]
+ and Christian Perrier [RL]
* piuparts complained about the left config files after the upgrade from
sarge. Now they are handled like 00site.sl and 99defauls.sl before. [JS]
@@ -32,7 +155,7 @@
bugs tagged fixed-in-experimental will be automatically closed with
the appropriate explanation from the changelog.
- -- Rafael Laboissiere <rafael at debian.org> Mon, 14 Aug 2006 16:00:05 +0200
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 8 Jul 2006 13:17:20 +0200
jed (0.99.18-2) unstable; urgency=low
@@ -42,7 +165,7 @@
- explain Debian's /etc/jed.d/ startup dir
* debian/po/cs.po: Added Czech translations for debconf templates,
- thanks to Miroslav Kure <kurem at upcase.inf.upol.cz> [RL]
+ thanks to Miroslav Kure [RL]
* debian/control:
- Make sure jed|xjed and jed-common are of the same version.
Modified: jed/branches/0.99.19/control
===================================================================
--- jed/branches/0.99.19/control 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/control 2007-01-19 23:14:54 UTC (rev 511)
@@ -5,11 +5,14 @@
Uploaders: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.7.2
Build-Depends-Indep: hevea
-Build-Depends: debhelper (>= 4.1.16), dpatch, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libslang2-dev, libxft-dev, libxt-dev, pkg-config
+Build-Depends: debhelper (>= 4.1.16), dpatch, libslang2-dev, libxft-dev,
+ libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxt-dev,
+ pkg-config
Package: jed
Architecture: any
Depends: ${shlibs:Depends}, jed-common (>= ${Source-Version})
+Suggests: gpm
Provides: info-browser, mail-reader, editor
Description: editor for programmers (textmode version)
Jed is a small, fast (faster startup than bash) and powerful text editor.
@@ -29,7 +32,7 @@
Basic, C, C++, DCL, FORTRAN, IDL, Java, NROFF, Pascal,
Perl, PHP, PostScript, Python, SH.
Modes for markup languages include HTML and (La)TeX (with AUC-TeX style
- editing and BiBTeX)
+ editing and BibTeX)
.
Additional tools and modes can be found in the jed-extra package.
.
@@ -55,7 +58,7 @@
Basic, C, C++, DCL, FORTRAN, IDL, Java, NROFF, Pascal,
Perl, PHP, PostScript, Python, SH.
Modes for markup languages include HTML and (La)TeX (with AUC-TeX style
- editing and BiBTeX)
+ editing and BibTeX)
.
Tools: directory editor (dired); info (browse GNU info files); mail;
rmail; ispell; shell mode; ...
@@ -63,7 +66,7 @@
The native X11 version provides improved mouse support, key configuration
and X selection interaction. If no display is available, xjed falls back to
text mode, thus there is no need to install both jed and xjed packages.
- .
+ .
Additional tools and modes can be found in the jed-extra package.
.
Homepage: http://www.jedsoft.org/jed/
@@ -73,9 +76,11 @@
Replaces: jed-sl
Conflicts: jed-sl, jed (<< ${Source-Version}), xjed (<< ${Source-Version})
Recommends: jed | xjed
-Depends: debconf | debconf-2.0, findutils (>= 4.1.20-6)
+Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0
Description: S-Lang runtime files for jed and xjed
- Jed (http://www.jedsoft.org/jed/) is a small, fast and powerful text editor.
+ Jed is a small, fast and powerful text editor.
.
This package provides the S-Lang runtime files that are needed by both
jed and xjed.
+ .
+ Homepage: http://www.jedsoft.org/jed/
Modified: jed/branches/0.99.19/init.d/05jed-common.sl
===================================================================
--- jed/branches/0.99.19/init.d/05jed-common.sl 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/init.d/05jed-common.sl 2007-01-19 23:14:54 UTC (rev 511)
@@ -8,18 +8,18 @@
setkey ("delete_char_cmd", "\e[3~");
% Fallback emulation (if the user has no ~/.jedrc config file)
-%
-% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed",
+%
+% Possible values are "brief", "cua", "emacs", "edt", "ide", "jed",
% "wordstar", and (with jed-extra) "vi".
%_Jed_Default_Emulation = "emacs"; % already set in site.sl
-% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as
+% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as
% fallback configuration file
Default_Jedrc_Startup_File = NULL;
% Jed_Home_Directory (defined in site.sl, defaulting to $HOME)
-%
-% If a subdir ~/.jed/ exists, point Jed_Home_Directory there,
+%
+% If a subdir ~/.jed/ exists, point Jed_Home_Directory there,
% so .jedrc and .jedrecent are not spoiling the $HOME dir (FHS 2.3)
$1 = path_concat(Jed_Home_Directory, ".jed");
if ( 2 == file_status($1) ) {
@@ -32,22 +32,26 @@
% Add slsh documentation (site.sl misses this)
-%
+%
% You might add directories containing site-wide local help files to the array
-foreach (["/usr/share/slsh/help",
+foreach (["/usr/share/slsh/help",
"/usr/share/slsh/local-packages/help"])
{
$1 = ();
if (file_status($1) != 2)
continue;
-
+
foreach (listdir($1))
{
$2 = ();
if (path_extname($2) == ".hlp")
- % the doc path set with add_doc_file() is currently not
+ % the doc path set with add_doc_file() is currently not
% recognized by the standard help.sl
% add_doc_file( path_concat($1, $2) );
Jed_Doc_Files += "," + path_concat($1, $2);
- }
+ }
}
+
+% do not call info_mode() for *.info files
+% (as info_mode is no editing mode but an info reader mode!)
+add_mode_for_extension("no", "info");
Modified: jed/branches/0.99.19/jed-common.config
===================================================================
--- jed/branches/0.99.19/jed-common.config 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/jed-common.config 2007-01-19 23:14:54 UTC (rev 511)
@@ -2,24 +2,60 @@
set -e
-. /usr/share/debconf/confmodule
+# md5sums from jed-0.99.9 (potato)
+file_1=38af7aa6498bfd7be927aa52c6c46585:/etc/jed-init.d/00site.sl
+file_2=91a5aee61e23906dcfffd24904d7ef62:/etc/jed-init.d/99default.sl
-if [ -e /etc/jed-init.d/00site.sl ] ||
- [ -e /etc/jed-init.d/99defaults.sl ]; then
+# md5sums from jed-0.99.15-5 (woody)
+file_3=ce466753801194229b9b78f0b3b7e28c:/etc/jed-init.d/00site.sl
+file_4=5f0954b045b6b81f1ef0ba545d42c000:/etc/jed.conf
- # the md5sums posted by Rafael on pkg-jed-devel at l.a.d.o
- if ( [ -e /etc/jed-init.d/00site.sl ] &&
- echo '2e00fef46fcee03fe504cea3b58510b6 /etc/jed-init.d/00site.sl' |
- md5sum -c 2>/dev/null ) ||
- ( [ -e /etc/jed-init.d/99defaults.sl ] &&
- echo '1514586554dfe5aefcee84aa967fb01b /etc/jed-init.d/99default.sl' |
- md5sum -c 2>/dev/null )
- then
- db_input medium jed-common/rm-site-defaults || true
- else
- # they aren't modified
- db_set jed-common/rm-site-defaults true
+# md5sums from SVN revisions 2 to 35
+file_5=5bf498a3703c5330e3acea00d0fa7a87:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 36 to 41
+file_6=28962c5ff0ff7cfcc58a22394599967e:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 42 to 55
+file_7=472a1d8dbdc16496ba51334f62366466:/etc/jed-init.d/00debian.sl
+
+# md5sums from SVN revisions 50 to 56
+file_8=da918de66b912df0205c5b38401b09b6:/etc/jed.conf
+
+# md5sums from SVN revisions 57
+file_9=fc2b1e847dd08da8b338a50ab04d1eb0:/etc/jed.conf
+
+# md5sums from SVN revisions 58
+file_10=3b919dbba6a2656a926f818344a60552:/etc/jed.conf
+
+# (starting at SVN revision 59, the /etc/jed-init.d/ was not used anymore)
+
+changed=false
+
+for n in `seq 1 10` ; do
+ eval "tmp=\$file_$n"
+ md5sum=${tmp%%:*}
+ file=${tmp##*:}
+ if [ -e $file ] ; then
+ if echo "$md5sum $file" | md5sum -c >/dev/null 2>&1 ; then
+ # The configuration file was not changed by the user: remove it
+ # silently
+ rm -f $file
+ else
+ changed=true
+ fi
fi
+done
+
+if $changed; then
+ . /usr/share/debconf/confmodule
+
+ db_input medium jed-common/rm-site-defaults || true
+ db_go
+ db_get jed-common/rm-site-defaults
+ if [ "$RET" = true ] ; then
+ for n in `seq 1 10` ; do
+ eval "rm -f \${file_$n##*:}"
+ done
+ fi
fi
-
-db_go || true
Deleted: jed/branches/0.99.19/jed-common.preinst
===================================================================
--- jed/branches/0.99.19/jed-common.preinst 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/jed-common.preinst 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,54 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
- install|upgrade)
- . /usr/share/debconf/confmodule
-
- file_0=/etc/jed-init.d/00site.sl
- file_1=/etc/jed-init.d/99default.sl
- file_2=/etc/jed-init.d/00debian.sl
- file_3=/etc/jed.conf
-
- # the md5sums posted by Rafael on pkg-jed-devel at l.a.d.o
- md5sum_0=2e00fef46fcee03fe504cea3b58510b6
- md5sum_1=1514586554dfe5aefcee84aa967fb01b
- # md5sum from jed-common 0.99.16â€5 aka Sarge
- md5sum_2=5bf498a3703c5330e3acea00d0fa7a87
- md5sum_3=5f0954b045b6b81f1ef0ba545d42c000
-
- prompt=false
- for i in 0 1 2 3; do
- eval "file=\$file_$i; md5sum=\$md5sum_$i"
- if [ -e $file ]; then
- if echo "$md5sum $file" | md5sum â€c >/dev/null 2>&1; then
- prompt=true
- else
- rm $file
- fi
- fi
- done
-
- if $prompt; then
- db_input medium jed-common/rm-site-defaults || true
- db_go || true
- db_get jed-common/rm-site-defaults
- if [ "$RET" = true ]; then
- rm -f /etc/jed-init.d/00site.sl /etc/jed-init.d/defaults.sl
- fi
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: jed/branches/0.99.19/jed-common.templates
===================================================================
--- jed/branches/0.99.19/jed-common.templates 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/jed-common.templates 2007-01-19 23:14:54 UTC (rev 511)
@@ -6,5 +6,5 @@
99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after
an upgrade to 0.99.15-1 or higher.
.
- It seems you have modified one of this files, because their md5 sums
+ It seems you have modified one of these files, because their md5 sums
differ from the originals.
Modified: jed/branches/0.99.19/patches/00list
===================================================================
--- jed/branches/0.99.19/patches/00list 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/00list 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,7 +1,6 @@
50_README
50_jed-manpage
50_jed.tex
-50_popups.sl
#if ! defined (DEB_BUILD_ARCH_hurd)
/* The xrender extension is not supported on the hurd: #95843 */
@@ -13,10 +12,6 @@
60_gpm-mouse-support
#endif
-slmode-function-popup
fix-pymode-block-end
-doc
-pymode-python2-keywords
-help
fix-multi-key
-fix-menu-utf8
+
Deleted: jed/branches/0.99.19/patches/50_popups.sl.dpatch
===================================================================
--- jed/branches/0.99.19/patches/50_popups.sl.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/50_popups.sl.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,46 +0,0 @@
-#! /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.VFDaWo/jed-B0.99-17.111/lib/popups.sl
---- ./lib/popups.sl 2005-07-25 06:37:23.000000000 +0200
-+++ /tmp/dpep-work.VFDaWo/jed-B0.99-17.111/lib/popups.sl 2005-09-29 23:11:09.885287728 +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,15 @@
- 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");
-+ set_buffer_modified_flag(0);
-+ bob();
-+ }
- pop2buf (whatbuf ());
- most_mode ();
- }
-@@ -251,7 +261,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);
Deleted: jed/branches/0.99.19/patches/doc.dpatch
===================================================================
--- jed/branches/0.99.19/patches/doc.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/doc.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,98 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## doc.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: Fixes some mistakes in the documentation and extends it a little bit.
-##
-## Please, change the according rtl files, too!
-
- at DPATCH@
---- jed~/doc/txt/hooks.txt (Revision 35)
-+++ jed/doc/txt/hooks.txt (Arbeitskopie)
-@@ -88,7 +88,7 @@
- "wrapok_hook"
- This hook may be used to enable automatic wrapping on a
- line-by-line basis. Jed will call this hook prior to wrapping a
-- line, and if it returns a non-zero value, the line wll be
-+ line, and if it returns a non-zero value, the line will be
- wrapped. See lib/slmode.sl for an example of its use.
-
- "newline_indent_hook"
---- jed~/doc/tm/rtl/misc.tm (Revision 35)
-+++ jed/doc/tm/rtl/misc.tm (Arbeitskopie)
-@@ -1,13 +1,12 @@
- \variable{BATCH}
- \synopsis{Non-Zero if in Batch Mode}
--\usage{Int_Type BATCH}
-+\usage{Int_Type BATCH (read-only)}
- \description
-- \var{BATCH} is a read-only variable will be zero if the editor is run
-+ \var{BATCH} will be zero if the editor is run
- in interactive or full-screen mode. It will be \1 if the editor is
- in batch mode (via the \exmp{-batch} comment line argument). If the
- editor is in script mode (via \exmp{-script}), then the value of
- \var{BATCH} will be \2.
--\seealso{}
- \done
-
- \variable{JED_ROOT}
-@@ -31,7 +30,7 @@
-
- \variable{_jed_secure_mode}
- \synopsis{Indicates if the editor is in secure mode}
--\usage{Int_Type _jed_secure_mode}
-+\usage{Int_Type _jed_secure_mode (read-only)}
- \description
- The value of \var{_jed_secure_mode} will be non-zero if the editor
- is running in secure mode. This mode does not allow any access to
-@@ -176,7 +175,7 @@
- \done
-
- \function{is_internal}
--\synopsis{Tst if function "f" is defined as an internal function}
-+\synopsis{Test if function "f" is defined as an internal function}
- \usage{Integer is_internal(String f)}
- \description
- \var{is_internal} returns non-zero is function \var{f} is defined as an
---- jed~/doc/hlp/jedfuns.hlp (Revision 35)
-+++ jed/doc/hlp/jedfuns.hlp (Arbeitskopie)
-@@ -3869,17 +3869,14 @@
- Non-Zero if in Batch Mode
-
- USAGE
-- Int_Type BATCH
-+ Int_Type BATCH (read-only)
-
- DESCRIPTION
-- `BATCH' is a read-only variable will be zero if the editor is run
-- in interactive or full-screen mode. It will be 1 if the editor is
-- in batch mode (via the `-batch' comment line argument). If the
-- editor is in script mode (via `-script'), then the value of
-- `BATCH' will be 2.
-+ `BATCH' will be zero if the editor is run in interactive or
-+ full-screen mode. It will be 1 if the editor is in batch mode
-+ (via the `-batch' command line argument). If the editor is in
-+ script mode (via `-script'), then the value of `BATCH' will be 2.
-
-- SEE ALSO
--
- --------------------------------------------------------------
-
- JED_ROOT
-@@ -3923,7 +3920,7 @@
- Indicates if the editor is in secure mode
-
- USAGE
-- Int_Type _jed_secure_mode
-+ Int_Type _jed_secure_mode (read-only)
-
- DESCRIPTION
- The value of `_jed_secure_mode' will be non-zero if the editor
-@@ -4148,7 +4145,7 @@
- is_internal
-
- SYNOPSIS
-- Tst if function "f" is defined as an internal function
-+ Test if function "f" is defined as an internal function
-
- USAGE
- Integer is_internal(String f)
Deleted: jed/branches/0.99.19/patches/fix-menu-utf8.dpatch
===================================================================
--- jed/branches/0.99.19/patches/fix-menu-utf8.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/fix-menu-utf8.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,79 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-menu-utf8.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: The handling of UTFâ€8 strings for menu entries is not correct. This
-## DP: causes problems if the hotkey is an UTFâ€8 character.
-
- at DPATCH@
-diff -urNad trunk~/lib/xterm.sl trunk/lib/xterm.sl
---- trunk~/src/menu.c (Revision 35)
-+++ trunk/src/menu.c (Arbeitskopie)
-@@ -968,41 +968,39 @@
-
- static void draw_name (char *name, int color0, int color1, unsigned int field_width)
- {
-- char *s;
-- unsigned int n;
-+ const size_t name_len = strlen(name);
-+ SLuchar_Type *s = name, *next_s;
-+ SLuchar_Type * const name_end = name + name_len;
-
-- s = name;
-+ while (s != name_end && (*s != '&'))
-+ s = SLutf8_skip_char(s, name_end);
-
-- while (*s && (*s != '&'))
-- s++;
-+ SLsmg_set_color (color0);
-+ if (s == name_end)
-+ {
-+ if (field_width < name_len)
-+ SLsmg_write_string(name);
-+ else
-+ SLsmg_write_nstring(name, field_width);
-
-- n = (unsigned int) (s - name);
-- if (n)
-- {
-- SLsmg_set_color (color0);
-- SLsmg_write_nchars (name, n);
-- }
-+ return;
-+ }
-
-- if (*s != 0)
-- {
-- unsigned int dn;
-+ SLsmg_write_chars (name, s);
-+ SLsmg_set_color (color1);
-
-- s++;
-- SLsmg_set_color (color1);
-- SLsmg_write_nchars (s, 1);
-- n++;
-- SLsmg_set_color (color0);
-- if (*s != 0)
-- {
-- s++;
-- dn = strlen (s);
-- SLsmg_write_nchars (s, dn);
-- n += dn;
-- }
-- }
-+ ++s; /* skip the ampersand */
-+ next_s = SLutf8_skip_char(s, name_end);
-+ SLsmg_write_chars (s, next_s);
-+ SLsmg_set_color (color0);
-
-- if (n < field_width)
-- SLsmg_write_nstring ("", field_width - n);
-+ if (field_width < name_len)
-+ SLsmg_write_string(next_s);
-+ else
-+ {
-+ field_width -= (SLutf8_strlen(name, 0)-1) - SLutf8_strlen(next_s, 0);
-+ SLsmg_write_nstring(next_s, field_width);
-+ }
- }
-
-
Modified: jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch
===================================================================
--- jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/fix-pymode-block-end.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -10,7 +10,7 @@
diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
--- trunk~/lib/pymode.sl 2006-02-13 18:51:58.000000000 +0100
+++ trunk/lib/pymode.sl 2006-08-12 18:13:15.761345577 +0200
-@@ -87,13 +87,10 @@
+@@ -95,13 +95,10 @@
private define py_endblock_cmd()
{
bol_skip_white();
Deleted: jed/branches/0.99.19/patches/help.dpatch
===================================================================
--- jed/branches/0.99.19/patches/help.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/help.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,117 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lib.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: This patch improves the describe_bindings() function.
-## DP: * It makes all key descriptions are aligned among each other,
-## DP: * it splits the listing into two sections: one with the keys defined in
-## DP: the global mode and one with the key special to this mode
-## DP: * it prints the description of the function bound to the key behind the
-## DP: function
-
- at DPATCH@
-diff -urNad trunk~/lib/help.sl trunk/lib/help.sl
---- trunk~/lib/help.sl (Revision 35)
-+++ trunk/lib/help.sl (Arbeitskopie)
-@@ -347,12 +347,97 @@
- pop2buf("*KeyBindings*");
- erase_buffer ();
- dump_bindings (map);
-- bob(); replace ("ESC [ A", "UP");
-- bob(); replace ("ESC [ B", "DOWN");
-- bob(); replace ("ESC [ C", "RIGHT");
-- bob(); replace ("ESC [ D", "LEFT");
-- bob(); replace ("ESC O P", "GOLD");
-+
-+ if (map != "global")
-+ {
-+ insert("\nInherited from the global keymap:\n");
-+ push_spot();
-+ dump_bindings("global");
-+ pop_spot();
-+
-+ variable global_map = Assoc_Type[String_Type];
-+ while ( not eobp() )
-+ {
-+ push_mark();
-+ () = ffind("\t\t\t");
-+ variable key = bufsubstr();
-+ () = right(3);
-+ push_mark();
-+ eol();
-+ global_map[key] = bufsubstr();
-+ delete_line();
-+ }
-+
-+ bob();
-+ forever
-+ {
-+ push_mark();
-+ () = ffind("\t\t\t");
-+ key = bufsubstr();
-+ if (key == "")
-+ break;
-+
-+ if ( assoc_key_exists(global_map, key) )
-+ {
-+ () = right(3);
-+ push_mark();
-+ eol();
-+ if (bufsubstr() == global_map[key])
-+ {
-+ delete_line();
-+ push_spot();
-+ eob();
-+ insert(key + "\t\t\t" + global_map[key] + "\n");
-+ pop_spot();
-+ }
-+ else
-+ () = down(1);
-+ }
-+ else
-+ () = down(1);
-+ }
-+ }
- bob();
-+
-+ replace ("ESC [ A", "UP");
-+ replace ("ESC [ B", "DOWN");
-+ replace ("ESC [ C", "RIGHT");
-+ replace ("ESC [ D", "LEFT");
-+ replace ("ESC O P", "GOLD");
-+
-+ do
-+ if (ffind("\t\t\t") and what_column() > TAB)
-+ {
-+ if ( what_column() <= TAB*3 )
-+ deln( (what_column()-1)/TAB );
-+ else
-+ deln(3);
-+ }
-+ while ( down(1) );
-+ bob();
-+
-+ do
-+ if ( ffind("\t\t\t") )
-+ {
-+ () = right(3);
-+ push_mark();
-+ !if ( ffind_char('(') )
-+ eol();
-+ variable fun = bufsubstr();
-+ variable dsc = help_get_doc_string(fun);
-+ pop;
-+ if (dsc != NULL)
-+ {
-+ eol();
-+ dsc = substr(dsc, is_substr(dsc, "\n SYNOPSIS\n ")+12,
-+ strlen(dsc) );
-+ whitespace( 48 - what_column() );
-+ insert(substr(dsc, 1, is_substr(dsc, "\n")-1) );
-+ }
-+ }
-+ while ( down(1) );
-+ bob();
-+
- CASE_SEARCH = cse;
- set_buffer_modified_flag(0);
- pop2buf (buf);
Deleted: jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch
===================================================================
--- jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/pymode-python2-keywords.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pymode-python2-keywords.dpatch by Peter Bengtsson <peter at fry-it.com>
-##
-## DP: Support (mainly syntax highlighting) for new Python 2 keywords.
-
- at DPATCH@
-diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
---- trunk~/lib/pymode.sl 2006-02-13 18:51:58.000000000 +0100
-+++ trunk/lib/pymode.sl 2006-08-12 17:47:01.833345577 +0200
-@@ -492,26 +492,33 @@
- () = define_keywords ($1, "ifinisor", 2); % all keywords of length 2
- () = define_keywords ($1, "anddefdelfornottry", 3); % of length 3 ....
- () = define_keywords ($1, "elifelseexecfrompass", 4);
--() = define_keywords ($1, "breakclassprintraisewhile", 5);
-+() = define_keywords ($1, "breakclassprintraisewhileyield", 5);
- () = define_keywords ($1, "assertexceptglobalimportlambdareturn", 6);
- () = define_keywords ($1, "finally", 7);
- () = define_keywords ($1, "continue", 8);
-
- % Type 1 keywords (actually these are what's in __builtins__)
- () = define_keywords_n ($1, "id", 2, 1);
--() = define_keywords_n ($1, "abschrcmpdirhexintlenmapmaxminoctordpowstr", 3, 1);
--() = define_keywords_n ($1, "Noneevalhashlongopenreprtypevars", 4, 1);
--() = define_keywords_n ($1, "applyfloatinputrangeroundtuple", 5, 1);
--() = define_keywords_n ($1, "coercedivmodfilterlocalsreducereloadxrange", 6, 1);
--() = define_keywords_n ($1, "IOError__doc__compiledelattrgetattrglobalshasattrsetattr", 7, 1);
--() = define_keywords_n ($1, "EOFErrorKeyError__name__callableexecfile", 8, 1);
--() = define_keywords_n ($1, "NameErrorTypeErrorraw_input", 9, 1);
--() = define_keywords_n ($1, "IndexErrorSystemExitValueError__import__", 10, 1);
--() = define_keywords_n ($1, "AccessErrorImportErrorMemoryErrorSyntaxErrorSystemError", 11, 1);
--() = define_keywords_n ($1, "RuntimeError", 12, 1);
--() = define_keywords_n ($1, "ConflictErrorOverflowError", 13, 1);
--() = define_keywords_n ($1, "AttributeError", 14, 1);
--() = define_keywords_n ($1, "KeyboardInterruptZeroDivisionError", 17, 1);
-+() = define_keywords_n ($1, "setsumzipabschrcmpdirhexintlenmapmaxminoctordpowstr", 3, 1);
-+() = define_keywords_n ($1, "TruebooldictexitfilehelpiterlistquitNoneevalhashlongopenreprtypevars", 4, 1);
-+() = define_keywords_n ($1, "Falseslicesuperapplyfloatinputrangeroundtuple", 5, 1);
-+() = define_keywords_n ($1, "bufferinternobjectsortedunichrcoercedivmodfilterlocalsreducereloadxrange", 6, 1);
-+() = define_keywords_n ($1, "OSErrorWarningcomplexcreditslicenseunicodeIOError__doc__compiledelattrgetattrglobalshasattrsetattr", 7, 1);
-+() = define_keywords_n ($1, "EllipsisTabErrorpropertyreversedEOFErrorKeyError__name__callableexecfile__call__", 8, 1);
-+() = define_keywords_n ($1, "Exception__debug__copyrightenumeratefrozensetNameErrorTypeErrorraw_input", 9, 1);
-+() = define_keywords_n ($1, "basestringisinstanceissubclassIndexErrorSystemExitValueError__import__", 10, 1);
-+() = define_keywords_n ($1, "LookupErrorUserWarningclassmethodAccessErrorImportErrorMemoryErrorSyntaxErrorSystemError", 11, 1);
-+() = define_keywords_n ($1, "UnicodeErrorstaticmethodRuntimeError", 12, 1);
-+() = define_keywords_n ($1, "FutureWarningStandardErrorStopIterationSyntaxWarningConflictErrorOverflowError", 13, 1);
-+() = define_keywords_n ($1, "AssertionErrorNotImplementedReferenceErrorRuntimeWarningAttributeErrorAssertionError", 14, 1);
-+() = define_keywords_n ($1, "ArithmeticErrorOverflowWarning", 15, 1);
-+() = define_keywords_n ($1, "EnvironmentErrorIndentationError", 16, 1);
-+() = define_keywords_n ($1, "UnboundLocalErrorKeyboardInterruptZeroDivisionError", 17, 1);
-+() = define_keywords_n ($1, "DeprecationWarningFloatingPointErrorUnicodeDecodeErrorUnicodeEncodeError", 18, 1);
-+() = define_keywords_n ($1, "NotImplementedError", 19, 1);
-+() = define_keywords_n ($1, "UnicodeTranslateError", 21, 1);
-+() = define_keywords_n ($1, "PendingDeprecationWarning", 25, 1);
-+
-
- #ifdef HAS_DFA_SYNTAX
- %%% DFA_CACHE_BEGIN %%%
Deleted: jed/branches/0.99.19/patches/slmode-function-popup.dpatch
===================================================================
--- jed/branches/0.99.19/patches/slmode-function-popup.dpatch 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/patches/slmode-function-popup.dpatch 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## slmode-function-popup.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: In SLang mode the menu Mode->Functions includes if, while or for if they
-## DP: occur outside of a function (which is valid).
-
- at DPATCH@
-diff -urNad branches~/lib/cmode.sl branches/lib/cmode.sl
---- branches~/lib/cmode.sl 2006-02-13 18:51:58.000000000 +0100
-+++ branches/lib/cmode.sl 2006-07-28 15:11:14.298231102 +0200
-@@ -1057,7 +1057,13 @@
- continue;
-
- c_bskip_over_comment (1);
-- names[bextract_identifier ()] = what_line ();
-+
-+ % In SLang you can write statements at the same level like
-+ % functions they look like functions but aren't it.
-+ variable id = bextract_identifier ();
-+ switch (id)
-+ { case "if" or case "while" or case "for": }
-+ { names[id] = what_line (); }
- }
- }
- }
Modified: jed/branches/0.99.19/po/cs.po
===================================================================
--- jed/branches/0.99.19/po/cs.po 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/po/cs.po 2007-01-19 23:14:54 UTC (rev 511)
@@ -16,7 +16,7 @@
"Project-Id-Version: jed\n"
"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-08-11 00:49+0200\n"
-"PO-Revision-Date: 2006-06-04 11:27+0200\n"
+"PO-Revision-Date: 2006-08-26 11:46+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -26,28 +26,26 @@
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid "Remove old files in /etc/?"
-msgstr "Odstranit staré soubory 00site.sl a 99defaults.sl?"
+msgstr "Odstranit staré soubory v /etc/?"
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid ""
"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
"upgrade to 0.99.15-1 or higher."
msgstr ""
"Kvůli chybě v dpkg (#108587) nejsou po aktualizaci na verzi 0.99.15-1 a "
-"vyÅ¡Å¡Ã odstranÄ›ny z /etc/jed-init.d/ konfiguraÄnà soubory 00site.sl a "
-"99defaults.sl."
+"vyÅ¡Å¡Ã odstranÄ›ny z /etc/jed-init.d/ konfiguraÄnà soubory 00site.sl, "
+"00debian.sl a 99defaults.sl a ani konfiguraÄnà soubor /etc/jed.conf."
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
msgid ""
-"It seems you have modified one of this files, because their md5 sums differ "
+"It seems you have modified one of these files, because their md5 sums differ "
"from the originals."
msgstr ""
"Jelikož se md5 souÄty tÄ›chto souborů liÅ¡Ã od originálů, zdá se, že jste je "
Copied: jed/branches/0.99.19/po/de.po (from rev 510, jed/trunk/debian/po/de.po)
Modified: jed/branches/0.99.19/po/fr.po
===================================================================
--- jed/branches/0.99.19/po/fr.po 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/po/fr.po 2007-01-19 23:14:54 UTC (rev 511)
@@ -16,38 +16,37 @@
"Project-Id-Version: jed 0.99.18\n"
"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-08-11 00:49+0200\n"
-"PO-Revision-Date: 2006-05-14 18:20+0200\n"
-"Last-Translator: Rafael Laboissiere <rafael at debian.org>\n"
+"PO-Revision-Date: 2006-08-21 19:36+0200\n"
+"Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid "Remove old files in /etc/?"
-msgstr "Faut-il effacer les anciens fichiers 00site.sl et 99defaults.sl ?"
+msgstr "Faut-il effacer les anciens fichiers dans le répertoire /etc/ ?"
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid ""
"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
"upgrade to 0.99.15-1 or higher."
msgstr ""
"En raison d'un bogue de dpkg (n° 108587), les fichiers de configuration "
-"00site.sl et 99defaults.sl dans /etc/jed-init.d/ ne sont pas effacés après "
-"la mise à niveau vers les versions 0.99.15-1 et supérieures."
+"00site.sl, 00debian.sl et 99defaults.sl dans /etc/jed-init.d/ et /etc/jed."
+"conf ne sont pas effacés après la mise à niveau vers les versions 0.99.15-1 "
+"et supérieures."
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
msgid ""
-"It seems you have modified one of this files, because their md5 sums differ "
+"It seems you have modified one of these files, because their md5 sums differ "
"from the originals."
msgstr ""
"Un de ces fichiers semble avoir été modifié, car leurs sommes MD5 sont "
Copied: jed/branches/0.99.19/po/nl.po (from rev 510, jed/trunk/debian/po/nl.po)
Copied: jed/branches/0.99.19/po/pt.po (from rev 510, jed/trunk/debian/po/pt.po)
Modified: jed/branches/0.99.19/po/pt_BR.po
===================================================================
--- jed/branches/0.99.19/po/pt_BR.po 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/po/pt_BR.po 2007-01-19 23:14:54 UTC (rev 511)
@@ -1,23 +1,14 @@
+# Brazilian Portuguese translation for jed debconf messages.
+# Copyright (C) Rafael Laboissiere <rafael at debian.org>, 2006
+# This file is distributed under the same license as the Jed package.
#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: jed 0.99.18\n"
+"Project-Id-Version: jed 0.99.18-7\n"
"Report-Msgid-Bugs-To: pkg-jed-devel at lists.alioth.debian.org\n"
"POT-Creation-Date: 2006-08-11 00:49+0200\n"
-"PO-Revision-Date: 2006-05-14 18:21+0200\n"
+"PO-Revision-Date: 2007-01-12 09:22+0100\n"
"Last-Translator: Rafael Laboissiere <rafael at debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -27,29 +18,28 @@
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid "Remove old files in /etc/?"
-msgstr "Remover antigos arquivos 00site.sl e 99defaults.sl?"
+msgstr "Remover os arquivos antigos de /etc/?"
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
-#, fuzzy
msgid ""
"Due to a bug in dpkg (#108587) the config files 00site.sl, 00debian.sl and "
"99defaults.sl in /etc/jed-init.d/ and /etc/jed.conf aren't removed after an "
"upgrade to 0.99.15-1 or higher."
msgstr ""
-"Devido a um bug do dpkg (#108587) os arquivos de configuração\n"
-"00site.sl e 99defaults.sl em /etc/jed-init.d/ não são removidos após a\n"
-"atualização à versão 0.99.15-1 ou a uma outra mais recente."
+"Devido a um bug no dpkg (#108587) os arquivos de configuração "
+"00site.sl, 00debian.sl e 99defaults.sl em /etc/jed-init.d/ e "
+"/etc/jed.conf não são removidos na atualização para a versão 0.99.15-1 "
+"ou superior."
#. Type: boolean
#. Description
#: ../jed-common.templates:1001
msgid ""
-"It seems you have modified one of this files, because their md5 sums differ "
+"It seems you have modified one of these files, because their md5 sums differ "
"from the originals."
msgstr ""
-"Aparentemente, um destes arquivos for modificado por você, por que o\n"
-"valor de sua soma md5 é diferente do original."
+"Aparentemente, um destes arquivos foi modificado por você, porque o "
+"valor de sua soma md5 é diferente do original."
\ No newline at end of file
Copied: jed/branches/0.99.19/po/ru.po (from rev 510, jed/trunk/debian/po/ru.po)
Copied: jed/branches/0.99.19/po/sv.po (from rev 510, jed/trunk/debian/po/sv.po)
Modified: jed/branches/0.99.19/po/templates.pot
===================================================================
--- jed/branches/0.99.19/po/templates.pot 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/po/templates.pot 2007-01-19 23:14:54 UTC (rev 511)
@@ -35,6 +35,6 @@
#. Description
#: ../jed-common.templates:1001
msgid ""
-"It seems you have modified one of this files, because their md5 sums differ "
+"It seems you have modified one of these files, because their md5 sums differ "
"from the originals."
msgstr ""
Modified: jed/branches/0.99.19/rules
===================================================================
--- jed/branches/0.99.19/rules 2007-01-19 11:52:01 UTC (rev 510)
+++ jed/branches/0.99.19/rules 2007-01-19 23:14:54 UTC (rev 511)
@@ -43,7 +43,15 @@
#
# --- MAKE ---
#
- make jed xjed # getmail
+ # These settings of DL_LIB, OTHERLIBS and XRENDERFONTLIBS are to get
+ # right of unnecessary dependencies on libraries.
+ # http://rerun.lefant.net/checklib/
+ #
+ # DL_LIB introduces a dependency on libdl that is already solved by
+ # libc. OTHERLIBS introduces a dependency on libm that is also solved
+ # by libc. XRENDERFONTLIBS fixes a problem with libxft-dev that defines
+ # libfontconfig.
+ make DL_LIB="" OTHERLIBS=-lutil XRENDERFONTLIBS=-lXft jed xjed # getmail
touch build-stamp
@@ -71,7 +79,8 @@
$(jed-common)/usr/share/doc/jed-common
rmdir $(jed-common)/usr/share/jed/doc
dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
- dh_installdocs -pjed-common debian/init.d/README.Debian-startup \
+ dh_installdocs -pjed-common debian/README.Debian \
+ debian/init.d/README.Debian-startup \
debian/Debian-Jed-Policy.txt
mv $(jed-common)/usr/share/doc/jed-common/manual \
@@ -90,11 +99,6 @@
dh_install -pjed-common debian/defaults.sl usr/share/jed/lib/
rm $(jed-common)/usr/share/jed/lib/jed.rc # it's moved to examples above
- # install info files
- mv $(jed-common)/usr/share/jed/info $(jed-common)/usr/share
- rm $(jed-common)/usr/share/info/dir.info \
- $(jed-common)/usr/share/info/info.info
-
# install compile script to build *.slc files after installation
dh_install -pjed-common debian/compile usr/share/jed/compile
mv $(jed-common)/usr/share/jed/compile/compile \
@@ -157,11 +161,14 @@
binary: binary-arch binary-indep
-get-orig-source:
-# wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
-# mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(UPSTREAM_VERSION).orig.tar.gz
- svn export svn://svn.gna.org/svn/jed/trunk jed-0.99.19
- tar -czf jed_0.99.19.orig.tar.gz jed-0.99.19
- rm -r jed-0.99.19
+get-orig-source:
+ ( url="svn://svn.gna.org/svn/jed/trunk" ; \
+ rev=$$(svn info $$url | grep ^Rev | sed "s/.*: //") ; \
+ ver=0.99.19.svn.$$rev ; \
+ dir=jed-$$ver ; \
+ svn export $$url $$dir ; \
+ rm -rf $$dir/info ; \
+ tar czf jed_$$ver.orig.tar.gz $$dir ; \
+ rm -rf $$dir )
.PHONY: build clean binary binary-arch binary-indep get-orig-source
Copied: jed/branches/0.99.19/watch (from rev 510, jed/trunk/debian/watch)
More information about the Pkg-jed-commit
mailing list