[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-0.99.19, updated. 1%3A0.99.18+dfsg.1-10-291-ga668a94
Jörg Sommer
joerg at alea.gnuu.de
Sat Nov 21 22:27:23 UTC 2009
The following commit has been merged in the jo-0.99.19 branch:
commit 0dc3f5d8bde1a6dc67e067fe3dd74d85dfbbfc7b
Merge: b5a3f9c00e7112678bbe0c8565a61d69322a8f2f 46f3153f38cc147bff197a63ff1c72cf95b28d63
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date: Sat Nov 21 20:41:32 2009 +0100
Merge remote branch 'origin/master' into 0.99.19
Keept the file debian/README.source form 0.99.19 and discarded the file
from the master branch, because I like my version more.
diff --combined debian/README.Debian
index 71a97d8,0b145ab..c63571a
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -30,7 -30,7 +30,7 @@@ Startup schem
Debian Jed's startup scheme provides for startup code from other packages.
Instead of a config file, we use a config directory: At startup, Jed will
evaluate all "*.sl" scripts in /etc/jed.d/. The sysadmin can modify or add
-files in /etc/jed.d/ for site-wide configuration.
+files in /etc/jed.d/ for site-wide configuration.
See README.Debian-startup for details.
@@@ -48,7 -48,7 +48,7 @@@ for personal Jed-related files, e.g
.jedrecent last opened files (autogenerated by recent.sl)
- lib/ library of personal extension scripts (home-made or
+ lib/ library of personal extension scripts (home-made or
downloaded) and customised versions of standard scripts
To use this library dir, you need to add it to the
@@@ -56,35 -56,122 +56,31 @@@
set_jed_library_path(path_concat(Jed_Home_Directory, "lib")
+ "," + get_jed_library_path()
-
+
or (with jed-extra installed)::
-
+
add_libdir(path_concat(Jed_Home_Directory, "lib"));
-
+
You can use it also for DFA highlight cache files setting::
-
+
Jed_Highlight_Cache_Dir = path_concat(Jed_Home_Directory, "lib");
-
+
templates/ optional dir for templates (with jed-extra)
- ATTENTION: If "~/.jed/" exists, Jed will not find a "~/.jedrc" startup file.
- The user needs to move an eventually existing "~/.jedrc" to "~/.jed/jed.rc".
-
-
Some frequently asked questions
-------------------------------
(see also txt/jed_faq.txt)
-Q: I define keybindings in jed.rc but they are not working. What is wrong?
-A: Jed will load a fallback keybinding-file if you do not specify an
- emulation in jed.rc overwriting your bindings (see also
- README.Debian-startup).
-
- Either select an emulation in jed.rc (as in the example files),
- or put your keybindings inside a keybindings_hook(), e.g.::
-
- define keybindings_hook(emulation)
- {
- setkey("menu_select_menu(\"Global.&Help\")", Key_F1);
- % ...
- }
-
- If you define all your keybindings without ressorting to an emulation
- mode, set the variable _Jed_Emulation (e.g. _Jed_Emulation = "cool") to
- prevent loading the _Jed_Default_Emulation fallback.
-
Q: My color settings are not working. What's wrong?
A: If you're using set_color() calls without loading a pre-defined scheme
- with set_color_scheme(), Jed falls back to the _Jed_Default_Color_Scheme.
+ with set_color_scheme(), Jed falls back to the _Jed_Default_Color_Scheme.
To fix your problem, you can set _Jed_Color_Scheme, like
_Jed_Color_Scheme = "cool".
-Q: When I paste indented text into Jed, it misaligns everything (i.e. every
- succeeding 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?
-A: There are several options:
-
- a) Use xjed.
- b) Use the `paste' function
- 1. M-x paste (or bind "paste" to a key)
- 2. Now paste your text...
- c) Install jed-extra and use newline_indent().
- See Help>Describe_Function newline_indent for details.
- d) Bind "newline_and_indent" to a different key.
- In jed.rc do e.g.:
-
- #ifndef XWINDOWS IBMPC_SYSTEM
- % Fix staircase effect with mouse-pasting in an x-terminal
- setkey("newline", "^M");
- setkey("newline_and_indent", "\eM"); % Alt_Return
- % Some modes overwrite the Key_Return binding. Restore it:
- define global_mode_hook (hook)
- {
- if (wherefirst(what_keymap() == ["C", "DCL", "IDL", "perl", "PHP"])
- != NULL)
- local_setkey("newline", "^M");
- }
- #endif
-
-Q: TAB does not generate a TAB! Why?
-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: When running Jed in an xterm, alt is not sending meta (and meta is not
- sending escape) so that alt-f and alt-b e.g. don't skip words forwards and
- backwards respectively.
-A: According to Thomas Dickey (do a google search to see that there is NO
- arguing here :) this is normal for xterm. To have alt "work", add
- 'xterm*metaSendsEscape: true' to your .Xresources (or equivalent) and
- make sure 'xmodmap -e "keysym Alt_L = Meta_L Alt_L"' is executed
- somewhere at X-startup (modify e.g. ~/.Xmodmap).
-
-Q: Jed makes a difference between a single '/' and multiple '/'
- in pathnames - e.g. '/usr//bin/' is *not* equal to '/usr/bin/' ! Why?
-A: According to John E. Davis, the author, this is like Emacs behaves, too.
-
-Q: My SLang scripts do no longer work.
-Q: After upgrading jed (or xjed), some jed-extra modes are broken.
-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.
-
-Q: How do I cancel a command that prompts me with "y/n" choices, without a
- "cancel" otpion?
-A: In Jed, (almost all) actions can be aborted by pressing a configurable
- "abort character" or calling the function kbd_quit(). The most used
- default abort character is `Ctrl-G'. Some emulations use a different
- default:
- CUA: `Ctrl-D' (and optional ESC, see cua_escape_cmd())
- Wordstar: `Ctrl-6'
-
-.. Copyright (c) 2006 the Debian JED Group
+.. Copyright © 2006 the Debian JED Group
Released under the terms of the GNU General Public License (ver. 2 or later)
Last update 2008-02-21 Guenter Milde
diff --combined debian/README.Debian-startup
index 7378a50,a682deb..fcd4e5e
--- a/debian/README.Debian-startup
+++ b/debian/README.Debian-startup
@@@ -11,21 -11,21 +11,21 @@@ Instead of a config file, we use a conf
evaluate all "*.sl" scripts in /etc/jed.d/:
* The files will be parsed in alphabetical order, i.e. files whose name
- starts with "00" will be loaded first and with "99" last.
+ starts with "00" will be loaded first and with "99" last.
* Evalutation of /etc/jed.d/ can be suppressed by the --skip-debian-startup
command line option.
* /etc/jed.d/ is not evaluated if Jed is started as `jed-script`.
-
+
If a script depends on the Debian configuration, it can call the function
debian_startup() defined in defaults.sl.
-
+
* Files in /etc/jed.d/ are configuration files. The system administrator can
modify them or add scripts for site-wide Jed configuration.
-* Every package has the right to place files into /etc/jed.d/.
- Use names like NN<name>.sl (where "NN" is a two-digit number).
+* Every package has the right to place files into /etc/jed.d/.
+ Use names like NN<name>.sl (where "NN" is a two-digit number).
(See Debian-Jed-Policy.txt for details).
Start-up Files
@@@ -36,22 -36,22 +36,22 @@@ The order of evaluating the JED config
1) /usr/share/jed/lib/site.sl % upstream basic setup that also triggers
% all further evaluations
-2) /usr/share/jed/lib/defaults.sl % Debian provided code for evaluation of
+2) /usr/share/jed/lib/defaults.sl % Debian provided code for evaluation of
- % the "jed.d" directory contents.
-
+ % the "jed.d" directory contents, defines
+ % and calls the function debian_startup().
+
% no call to /etc/jed.conf
-
+
3) /etc/jed.d/*.sl % package configuration files
4) ~/.jed/jed.rc or ~/.jedrc % user config file,
- % skipped if it does not exist or with
+ % skipped if it does not exist or with
% the -n command line option.
-
+
- 5) _Jed_Default_Emulation % key-bindings file
+ 5) _Jed_Default_Emulation % fallback key-bindings file
% skipped if jed.rc loads an emulation, i.e.
% if (_Jed_Emulation != NULL)
- % default is "emacs", set in
- % /etc/jed.d/05jed-common.sl
+ % default is "emacs".
6) _Jed_Default_Color_Scheme % colour settings
% skipped jed.rc loads a colour scheme, i.e.
@@@ -59,17 -59,17 +59,17 @@@
7) command_line_options % -l FILE loads FILE as S-Lang code.
- Only now, files given on the command line are loaded into a buffer (each)
+ After that, files given on the command line are loaded into a buffer (each)
which may trigger evaluation of more S-Lang files providing the editing mode.
All evaluated files might call other S-Lang files either directly
- (evalfile(), require(), set_color_scheme) or at a later stage (autoload()).
+ (evalfile(), require(), set_color_scheme()) or at a later stage (autoload()).
-- Rafael Laboissiere <rafael at debian.org> Thu Oct 21 18:28:39 CEST 1999
-- Updated by Charl P. Botha <cpbotha at debian.org> Sun Jun 3 02:14:58 CEST 2001
-- and again by cpbotha with Rafael's new scheme Tue Nov 13 22:00:49 CET 2001
- -- updated by G. Milde, 2006-05-16, 2008-02-21
+ -- updated by G. Milde, 2006-05-16, 2008-02-21, 2008-11-10
- Last update 2008-02-21 Guenter Milde
+ Last update 2008-11-10 Guenter Milde
diff --combined debian/changelog
index ad53357,725e824..5f3e015
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,283 -1,50 +1,334 @@@
+jed (1:0.99.19~pre210-1) UNRELEASED; urgency=low
+
+ * This packages is based on the svn snapshot from
+ https://svn.gna.org/svn/jed/trunk
+ + 0.99.19pre207 improved scrolling (Closes: #306223)
+
+ * Removed obsolate patches:
+ + fix-multi-key -- applied upstream 0.99.19pre205
+ + slang2 -- applied modified upstream 0.99.19pre206
+
+ * Reimported the info files from the upstream source. They were removed
+ in 0.99.18.dfsg.1-1, because the files in info/ contained a comment,
+ sayin they were generatend and hence not the preferred form for
+ modifications. This was a violation of the GPL. Now, upstream removed
+ this comment and made the files in info/ the preferred form for
+ modifications. For an upcoming upstream release we don't have to
+ modify the tarball and don't have to add dfsg to the version.
+
++ * Merged changes from 1:0.99.18+dfsg.1-12 and 1:0.99.18+dfsg.1-13.
++ Because development of the 0.99.18 branch ended, 1:0.99.18+dfsg.1-13
++ stays unreleased.
++
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+
+jed (1:0.99.19~pre175-1) experimental; urgency=low
+
+ * New upstream release
+
+ * Merged changes from 1:0.99.18+dfsg.1-11.
+
+ * Removed the dpatch for gpm and xft support and use the new configure
+ options.
+
+ * Removed the workaround for the broken rxvt keydefinition. A fix was
+ applied in 0.99.19pre118. See #446444.
+
+ * Added the file README.source to describe how to use dpatch (or better
+ said link to the default description in /usr/share/doc/dpatch). Added
+ the version 2.0.30 to the build dependency on dpatch to ensure the doc file
+ exists.
+
+ * Increased Standards-Version to 3.8.0. README.source is there, nothing
+ more needed.
+
+ * Added the field DM-Upload-Allowed: yes in the control file to allow
+ uploads by Jörg Sommer.
+
+ * Changed build dependency from libgpmg1-dev to libgpm-dev, because the
+ old package is obsolate.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 01 Jan 1970 00:00:00 +0000
+
+jed (1:0.99.19~pre143-2) experimental; urgency=low
+
+ * Added slsh as build-dependency to make the test suite work.
+ (closes: #488011)
+
+ * Added a workaround for the bug #446444 in the terminfo entry for
+ rxvt-unicode which caused the modes wmark and cuamark fail.
+
+ * Removed questions and answers from README.Debian they are in
+ jed_faq.txt, too. They are included in jed_faq since 0.99.19~pre136.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Fri, 27 Jun 2008 11:11:11 +0200
+
+jed (1:0.99.19~pre143-1) experimental; urgency=low
+
+ * New SVN snapshot taken from svn://svn.gna.org/svn/jed/trunk
+
+ + 141. lib/site.sl: Add the slsh library directory to the slang load
+ path even if it does not contain a local-packages sub-directory
+ (Joerg Sommer). (closes: #482487)
+
+ + 142. src/ledit.c: Changed the error message generated when unable
+ to open a .sl to something less confusing (Suggested by Guenter
+ Milde). (closes: #482490)
+
+ + 143. lib/dabbrev.sl: Byte semantics instead of character semantics
+ were used during expansion causing problems with words that contain
+ multibyte characters. (closes: #434383)
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Mon, 16 Jun 2008 17:22:48 +0200
+
+jed (1:0.99.19~pre138-1) experimental; urgency=low
+
+ * New upstream release
+ + 131. src/gpmmouse.c: Do not use GPM if running in xterm or rxvt
+ (Joerg Sommer). (closes: #473617)
+
+ * Merged the changes from the unstable release branch.
+ + Removed the following dpatches introduced by this merge. because
+ they are applied upstream:
+ - add-describe-bindings-to-C-h.dpatch 0.99.19~pre62
+ - extend-jed_faq.dpatch 0.99.19~pre136
+ - extend-help.sl.dpatch 0.99.19~pre134
+ - extend-manpage.dpatch 0.99.19~pre135
+ - fix-documentation.dpatch 0.99.19~pre132
+ - fix-help.sl.dpatch 0.99.19~pre134
+ - fix-jed-doc-file.dpatch 0.99.19~pre137
+ - fix-pymode-tab-space.dpatch 0.99.19~pre59
+ - fix-update-before-key-hook.dpatch 0.99.19~pre133
+ - highlight-isearch-results.dpatch 0.99.19~pre24
+ - pymode-repeat-shift.dpatch 0.99.19~pre59
+ - remove_jed_library_path.dpatch 0.99.19~pre138
+ - sane-color-object-return.dpatch 0.99.19~pre16
+
+ * Updated Vcs fields in the control file. Now, they point to the git
+ repository at git.debian.org.
+
+ * Use the package hardening-wrapper to enabled hardening as suggested in
+ http://lists.debian.org/debian-devel-announce/2008/01/msg00006.html
+
+ * Included the run of the testsuite from upstream source after the
+ build of the binaries. If DEB_BUILD_OPTIONS contains the string
+ ‘nocheck,’ the testsuite is skipped as suggested by the section
+ ‘Using DEB_BUILD_OPTIONS’ at
+ http://wiki.debian.org/Embedded_Debian_packaging_rules
+
+ * Removed README.Debian-sarge-upgrade, because the upgrade from sarge
+ to etch happend long time ago and we don't support upgrade from other
+ than the last stable release.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sat, 24 May 2008 13:51:17 +0200
+
+jed (1:0.99.19~pre117-1) experimental; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * debian/patches/empty_rectangle.dpatch .../fix-warnings.dpatch
+ .../fix-read_mini.dpatch .../update-copyright.dpatch
+ + Removed these patches. They are now applied upstream.
+
+ * copyright:
+ + Put the address of the SVN repository there to make it more obvious
+ where the code comes from.
+
+ * debian/patches/fix-jed-doc-file.dpatch
+ + New patch applied to make changes of Jed_Doc_Files made with
+ jed_(append|insert)_doc_file go to set_doc_files.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Sun, 7 Oct 2007 20:17:19 +0200
+
+jed (1:0.99.19~pre95-2) experimental; urgency=low
+
+ * debian/patches/fix-update-before-key-hook.dpatch: The LASTKEY
+ variable is not updated before the _jed_before_key_hook hooks are
+ called.
+
+ * /etc/jed.d/05jed-common.sl: Activated the keys Home and End by default.
+
+ * debian/patches/fix-help.sl.dpatch: A new patch to fix problems in
+ help.sl:
+ + describe_bindings() doesn't take care of CASE_SEARCH with leads to the
+ problem that "ESC [ A" and "ESC [ a" is replace by the same key
+ + describe_bindings() gets confused by newlines in the key definiton,
+ like in setkey(" \n", Key_KP_Enter)
+ + describe_bindings(): A key definition that starts with @, SPACE or . must
+ must be treated specialy
+
+ * debian/patches/extend-help.sl.dpatch: A new patch to improve help.sl
+ + Improves expand_keystring() to return Alt- instead of ESC, if ALT_CHAR
+ is non-zero, and print Space instead of the space character
+ + Improves describe_bindings() to convert the key sequences with
+ expand_keystring().
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Mon, 2 Jul 2007 12:35:05 +0200
+
+jed (1:0.99.19~pre95-1) experimental; urgency=medium
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * 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. (closes: #428308)
+
+ * 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.
+
+ * 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> Sun, 10 Jun 2007 20:58:14 +0200
+
+jed (1:0.99.19~pre89-1) experimental; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
+
+ * debian/patches/50_jed.tex.dpatch: Removed. It's includes upstream.
+
+ * debian/patches/manpage.dpatch: Described the operation modes of jed
+ in the manpage.
+
+ * debian/patches/slang2.dpatch: Replaced and removed old SLang code
+ that is deprecated since SLang2.
+
+ * debian/patches/fix-warnings.dpatch: Fixed some warnings that show up
+ when building with additional compiling checks.
+
+ * debian/control: Added Jörg Sommer to the list of uploaders.
+
+ -- Jörg Sommer <joerg at alea.gnuu.de> Tue, 29 May 2007 13:54:52 +0200
+
+jed (1:0.99.19~pre78-1) experimental; urgency=low
+
+ * Use an epoch in the package version number, since the unstable branch
+ has also an epoch now. Also start using "~pre" instead of ".+pre" in
+ the version number, which is more appropriate.
+ * debian/rules: Adjust the get-orig-source rule to the above
+
+ -- Rafael Laboissiere <rafael at debian.org> Tue, 22 May 2007 22:51:27 +0200
+
+jed (0.99.19.+pre78-2) experimental; urgency=low
+
+ * Uploading to experimental. The last release was accidentally uploaded
+ to unstable.
+ * debian/rules: Added code in the binary rule to check whether this version
+ is targeted to the experimental distribution and issue a warning if it
+ is not
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 17 May 2007 21:54:33 +0200
+
+jed (0.99.19.+pre78-1) unstable; urgency=low
+
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org [JS]
+ * Changed the upstream version numbering scheme, where the number after
+ "+pre" corresponds to the micro version of the unstable Jed
+ branch. [RL]
+ * debian/rules:
+ + Simplified the get-orig-source rule [JS]
+ + The upstream version is obtained by parsing debian/changelog [RL]
+ + Remove *.orig.tar.gz in the clean rule
+
+ * Dropped debian/patches/fix-pymode-block-end.dpatch, which is now
+ applied upstream. [JS]
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 17 May 2007 11:55:33 +0200
+
+jed (0.99.19.svn.60-1) experimental; urgency=low
+
+ * 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]
+ * Uploaded to experimental
+
+ * 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]
+
+ * debian/po/es.po: Added translation of debconf templates to Spanish.
+ (synched from 0.99.18-8.etch.1) [RL]
+
+ * Synched with 0.99.18+dfsg.1-2 [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 15 Apr 2007 11:37:36 +0200
+
+ jed (1:0.99.18+dfsg.1-13) UNRELEASED; urgency=low
+
+ * debian/rules:
+ + Add info-dir-section and menu entry to jed.info (closes: #528877)
+ + Replace the ancient config.{guess,sub} files by modern ones from the
+ autotools-dev package (fix Lintian warning)
+ * debian/info-dir: New file containing the information above
+ * debian/jed-common.{postinst, prerm}: Remove calls to install-info, as
+ per the dpkg -> GNU install-info transition
+ * Add dependency on install-info to jed and xjed. Thanks to Norbert
+ Preining (closes: #532590, #532595)
+ * debian/control:
+ + Suggests info-browser
+ + Bump Standards-Version to 3.8.2 (no changes needed)
+ + Build-depends on autotools-dev
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 16 May 2009 18:31:36 +0200
+
+ jed (1:0.99.18+dfsg.1-12) unstable; urgency=low
+
+ * /etc/jed.d/05jed-common.sl [GM]:
+ + improved backwards compatibility of the startup scheme:
+ read ~/.jedrc if ~/.jed exists but neither ~/.jed/jed.rc
+ nor ~/.jed/.jedrc.
+ + Add slsh library dir (work around a bug in site.sl triggered by
+ the removal of slsh/local-packages/ in recent slsh versions).
+ * debian/control: Bump Standards-Version to 3.8.1 (add needed file
+ debian/README.source explaining the patch system) [RL]
+ * debian/watch [RL]:
+ + Mangle the "+dfsg" part of the upstream version, which is a Debian
+ addition (fix Lintian warning)
+ + Add option pasv for accessing the upstream ftp server
+ * debian/control, debian/compat: Bump build-dependency on debhelper to
+ >= 7 and adjust the compatibility level accordingly (fix Lintian
+ warning) [RL]
+ * debian/control: Add Günter Milde to the list of Uploaders [RL]
+ * debian/jed.prerm, debian/xjed.prerm: Set the -e flag which ensures
+ that the script's execution is aborted when any executed command
+ fails (fix Lintian warning) [RL]
+ * debian/control: Fix Lintian warnings debhelper-but-no-misc-depends [RL]
+ * debian/jed-common.lintian-overrides: Add override for Lintian warning
+ about spelling error in README. The word "XWINDOWS" appears in a code
+ fragment and this is not a spelling error. [RL]
+ * debian/rules: Call dh_lintian for jed-common package [RL]
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 26 Apr 2009 10:46:58 +0200
+
jed (1:0.99.18+dfsg.1-11) unstable; urgency=low
* debian/po/it.po: Add Italian translation of the debconf templates,
diff --combined debian/control
index 51be1d9,af41b06..b0953ee
--- a/debian/control
+++ b/debian/control
@@@ -3,21 -3,21 +3,23 @@@ Section: editor
Priority: optional
Maintainer: Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>
Uploaders: Rafael Laboissiere <rafael at debian.org>,
- Jörg Sommer <joerg at alea.gnuu.de>
- Standards-Version: 3.8.0
+ Jörg Sommer <joerg at alea.gnuu.de>,
+ Günter Milde <milde at users.sf.net>
+ Standards-Version: 3.8.2
Build-Depends-Indep: hevea
- Build-Depends: debhelper (>= 4.1.16), dpatch (>= 2.0.30),
-Build-Depends: debhelper (>= 7), dpatch, libslang2-dev (>= 2.0.7-2),
- libxft-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libxt-dev, pkg-config, autotools-dev
++Build-Depends: debhelper (>= 7), dpatch (>= 2.0.30),
+ libxft-dev, libgpm-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libxt-dev, pkg-config, hardening-wrapper, autotools-dev, slsh,
+ libslang2-dev (>= 2.0.7-2)
Homepage: http://www.jedsoft.org/jed/
Vcs-Git: git://git.debian.org/git/pkg-jed/jed.git
Vcs-Browser: http://git.debian.org/?p=pkg-jed/jed.git
+DM-Upload-Allowed: yes
Package: jed
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, jed-common (>= ${source:Version})
+ Depends: ${misc:Depends}, ${shlibs:Depends}, jed-common (>= ${source:Version}),
+ install-info
Suggests: gpm [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Provides: info-browser, mail-reader, editor
Description: editor for programmers (textmode version)
@@@ -44,7 -44,8 +46,8 @@@
Package: xjed
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, jed-common (>= ${source:Version})
+ Depends: ${misc:Depends}, ${shlibs:Depends}, jed-common (>= ${source:Version}),
+ install-info
Provides: info-browser, mail-reader, editor
Description: editor for programmers (x11 version)
Jed is a small, fast (faster startup than xterm with bash),
@@@ -76,9 -77,10 +79,10 @@@
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
+ Suggests: info | info-browser
-Depends: ${misc:Depends}, findutils (>= 4.1.20-6), debconf | debconf-2.0
+Depends: ${misc:Depends}, findutils (>= 4.1.20-6), debconf | debconf-2.0, slsh
Description: S-Lang runtime files for jed and xjed
Jed is a small, fast and powerful text editor.
.
diff --combined debian/init.d/05jed-common.sl
index 86145b8,f91e799..9c92aa0
--- a/debian/init.d/05jed-common.sl
+++ b/debian/init.d/05jed-common.sl
@@@ -15,7 -15,7 +15,7 @@@ setkey ("delete_char_cmd", "\e[3~")
% Override (obsolete) code in site.sl that calls JED_ROOT/lib/jed.rc as
% fallback configuration file
- Default_Jedrc_Startup_File = NULL;
+ Default_Jedrc_Startup_File = NULL; % eventually overwritten below
% Jed_Home_Directory (defined in site.sl, defaulting to $HOME)
%
@@@ -23,16 -23,48 +23,30 @@@
% 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) ) {
+ % Adapt the user config file path:
+ % a) command_line_hook() in site.sl tries with ~/.jed/.jedrc
+ % b) recommended location: ~/.jed/jed.rc
+ % c) backwards compatible: ~/.jedrc
+ foreach $2 ([path_concat(Jed_Home_Directory, ".jed/jed.rc"),
+ path_concat(Jed_Home_Directory, ".jedrc")]) {
+ if (file_status($2) == 1) {
+ Default_Jedrc_Startup_File = $2;
+ break;
+ }
+ }
+ % now set the variable:
Jed_Home_Directory = $1;
- % set the default jedrc file path to ~/.jed/jed.rc
- $2 = path_concat(Jed_Home_Directory, "jed.rc");
- if (file_status($2) == 1)
- Default_Jedrc_Startup_File = $2;
}
+ % Add slsh library dir
+ % (Bug in site.sl misses this if slsh/local-packages does not exist)
+ $1 = path_concat (_slang_install_prefix, "share/slsh/");
+ if (2 == file_status($1))
+ set_jed_library_path(strcat(get_jed_library_path(), ",", $1));
+
% 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");
+
+setkey("beg_of_line", "\e[1~"); % Home
+setkey("eol_cmd", "\e[4~"); % End
diff --combined debian/rules
index 370d60c,60e651d..77f3cfa
--- a/debian/rules
+++ b/debian/rules
@@@ -2,16 -2,9 +2,16 @@@
#export DH_VERBOSE=1
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
# These additional compiler flags should bring up warnings about common
# sources of errors.
-CFLAGS += -Wall -Wformat=2 -Wunused -Wundef -Wextra -g
+export CFLAGS += -g -Wall -Wformat=2 -Wunused -Wundef -Wextra -Wswitch-enum \
+ -Wpointer-arith -Wnested-externs -Wbad-function-cast -Wcast-qual \
+ -Wcast-align -Wshadow
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@@ -19,40 -12,45 +19,40 @@@ els
CFLAGS += -O2
endif
+configure_flags = --prefix=/usr/share --exec-prefix=/usr --with-x \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+
+ifeq (, $(filter %-hurd-% %-kfreebsd-%, $(DEB_BUILD_GNU_TYPE)))
+ configure_flags += --enable-gpm
+else
+# libgpm is not supported by these architectures: #345268 #95843
+ configure_flags += --disable-gpm
+endif
+ifeq (, $(findstring -hurd-, $(DEB_BUILD_GNU_TYPE)))
+ configure_flags += --enable-xft
+else
+# The xrender extension is not supported on the hurd: #95843
+ configure_flags += --disable-xft
+endif
+
+export DEB_BUILD_HARDENING=1
+
include /usr/share/dpatch/dpatch.make
jed=$(CURDIR)/debian/jed
xjed=$(CURDIR)/debian/xjed
jed-common=$(CURDIR)/debian/jed-common
-temp=debian/tmp
-
-# get upstream version from changelog (FIXME)
-# UPSTREAM_VERSION = $(shell perl -ne '/([\d.]+)-/; print $$1; exit' < \
-# $(dir $(firstword $(MAKEFILE_LIST)))/changelog)
-UPSTREAM_VERSION=0.99-18
-DEBIAN_UPSTREAM_VERSION=$(subst -,.,$(UPSTREAM_VERSION)).dfsg.1
-
-AUTOTOOLS_FILES = config.guess config.sub
clean: unpatch
dh_testdir
dh_clean
[ ! -f Makefile ] || $(MAKE) distclean
- # Restore autotools files
- for f in $(AUTOTOOLS_FILES) ; do \
- if [ -f autoconf/$$f-orig ] ; then \
- mv autoconf/$$f-orig autoconf/$$f ; \
- fi ; \
- done
- rm -f build-stamp install-stamp
- # fixme-upstream
- rm -f src/config.h
+ rm -f build-stamp
config.status: patch-stamp
dh_testdir
- # Replace deprecated autotools files
- for f in $(AUTOTOOLS_FILES) ; do \
- if [ ! -f autoconf/$$f-orig ] ; then \
- mv autoconf/$$f autoconf/$$f-orig ; \
- fi ; \
- cp /usr/share/misc/$$f autoconf ; \
- done
- ./configure "CFLAGS=$(CFLAGS)" --prefix=/usr/share --exec-prefix=/usr --with-x
+ ./configure $(configure_flags) || \
+ { rc=$$?; cat config.log; exit $$rc; }
build: build-stamp
build-stamp: config.status
@@@ -69,12 -67,7 +69,12 @@@
# 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
+ $(MAKE) DL_LIB="" OTHERLIBS=-lutil XRENDERFONTLIBS=-lXft jed # getmail
+ $(MAKE) DL_LIB="" OTHERLIBS=-lutil XRENDERFONTLIBS=-lXft MOUSELIB= xjed
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) -C src runtests
+endif
touch build-stamp
@@@ -85,8 -78,10 +85,8 @@@ binary-indep: config.statu
dh_clean -i --keep
dh_installdirs -i
- $(MAKE) DESTDIR=$(jed-common) install
- rm -r $(jed-common)/usr/bin/ $(jed-common)/usr/share/man/
- # fixme-upstream
- rm -r $(jed-common)/usr/share/jed/bin/
+ $(MAKE) -C src DESTDIR=$(jed-common) JED_MAN_FILES= install_data
+ rm -r $(jed-common)/usr/share/share
#
# --- JED-COMMON ---
@@@ -102,7 -97,13 +102,7 @@@
debian/init.d/README.Debian-startup \
debian/Debian-Jed-Policy.txt
- # generate info files from jed.tex
- rmdir $(jed-common)/usr/share/jed/info
- mkdir -p $(jed-common)/usr/share/info
- cd $(jed-common)/usr/share/info/; hevea -fix -info -o jed.info \
- $(jed-common)/usr/share/doc/jed-common/manual/jed.tex ; \
- cat $(jed-common)/../info-dir jed.info > tmp ; \
- mv tmp jed.info
+ dh_installinfo -pjed-common info/jed.*
mv $(jed-common)/usr/share/doc/jed-common/manual \
$(jed-common)/usr/share/doc/jed-common/html
@@@ -118,6 -119,9 +118,9 @@@
dh_installexamples -pjed-common lib/jed.conf \
$(jed-common)/usr/share/jed/lib/jed.rc
+ # install Lintian override
+ dh_lintian -pjed-common
+
# install *.sl files
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
@@@ -180,34 -184,13 +183,34 @@@ binary-arch: build-stam
dh_md5sums -a
dh_builddeb -a
+DEB_VER = ${shell perl -ne '/\((.*);/; print $$1; last' < debian/changelog}
+JED_VER = $(shell echo "$(DEB_VER)" | sed "s/-.*//")
+DIST = ${shell echo "$(DEB_VER)" | sed 's/.*) *//'}
+
binary: binary-arch binary-indep
+ @if [ "$(DIST)" != experimental ] ; then \
+ echo "***********************************************************"; \
+ echo This version should be uploaded to experimental, not $(DIST)!; \
+ echo "***********************************************************"; \
+ fi
get-orig-source:
- wget ftp://space.mit.edu/pub/davis/jed/v0.99/jed-$(UPSTREAM_VERSION).tar.gz
- gunzip jed-$(UPSTREAM_VERSION).tar.gz
- tar f jed-$(UPSTREAM_VERSION).tar --delete jed-$(UPSTREAM_VERSION)/info
- gzip -9 jed-$(UPSTREAM_VERSION).tar
- mv jed-$(UPSTREAM_VERSION).tar.gz jed_$(DEBIAN_UPSTREAM_VERSION).orig.tar.gz
+ test -d trunk && rm -rf trunk || true
+ svn export http://svn.gna.org/svn/jed/trunk
+ REV=$$(perl -n -e 'last if /{{{ Previous Versions/; \
+ $$v{$$1} = 1 if /^(\d+)\./; \
+ END { print ((sort {$$b <=> $$a} keys %v) [0]) }' \
+ < trunk/changes.txt ) ; \
+ PKG_VER=0.99.19~pre$$REV ; \
+ SRC_DIR=jed-$$PKG_VER ; \
+ if [ -d $$SRC_DIR ] ; then \
+ echo Directory $$SRC_DIR exists, move it away! >&2 ; \
+ rm -rf trunk ; \
+ exit 1 ; \
+ else \
+ mv trunk jed-$$PKG_VER ; \
+ tar czf jed_$$PKG_VER.orig.tar.gz jed-$$PKG_VER ; \
+ rm -rf jed-$$PKG_VER ; \
+ fi
.PHONY: build clean binary binary-arch binary-indep get-orig-source
--
Debian packaging of JED
More information about the Pkg-jed-commit
mailing list