--- elvis-2.2.0.orig/debian/changelog +++ elvis-2.2.0/debian/changelog @@ -0,0 +1,459 @@ +elvis (2.2.0-12) unstable; urgency=low + + * debian/control: Set maintainer to Debian QA Group + and orphan the package (see #688077). + * debian/patches/: Move descriptions of patches from the "APPLY" file + to the individual patches and drop that file. + * debian/changelog: Note that previous upload complying to new + source format closes a bug. (Closes: #485244) + * debian/patches/white_on_black_term_clr: Fix color scheme for + white on black (x)terminals. (Closes: #474202) + * debian/patches/getline: Include patch from Christoph Egger in + non-maintainer upload. Thanks. (Closes: #552866) + + -- Kapil Hari Paranjape Wed, 04 Mar 2009 14:27:24 +0530 + +elvis (2.2.0-11.1) unstable; urgency=low + + * Non-maintainer upload. + * Rename custon getline to build against eglibc 2.10 (Closes: #552866) + + -- Christoph Egger Sun, 03 Jan 2010 15:44:44 +0100 + +elvis (2.2.0-11) unstable; urgency=low + + * debian/watch: Modify to use PASV ftp, to ignore non-unix sources + and mangle the version to match chosen numbering. + * debian/elvis-common.doc-base: Remove "Apps/" from section name as + per "doc-base" manual section 2.3.3. + * debian/patches/: Convert all patches to strip-level 1 to comply + with Debian source format "3.0 (quilt)". + * debian/control: + - "elvis-console" priority reduced to extra since it conflicts with + binary package "elvis" which is optional. + - Standards Version 3.8.0. No other changes required. + + -- Kapil Hari Paranjape Tue, 03 Mar 2009 21:23:06 +0530 + +elvis (2.2.0-10) unstable; urgency=low + + * debian/changelog: + - Fixed typo in previous entry closing + #398745. + - Folded long lines. + * debian/control: + - Added Vcs-Svn tag. + - Moved Homepage from description to its own field. + - Standards-Version 3.7.3. + * debian/lintian/*: + - Added a comment explaining the reason for the overrides. + - Put full path of binaries to match the current error + message from lintian. + * debian/elvis-common.menu: Use "Applications" instead of + "Apps". + + -- Kapil Hari Paranjape Fri, 28 Dec 2007 16:50:40 +0530 + +elvis (2.2.0-9) unstable; urgency=low + + * debian/control: + - Added "Provides: editor". Closes: #398745. + - Changed email address of maintainer to debian.org + address. + * debian/watch: Added URL of upstream source. + + -- Kapil Hari Paranjape Mon, 6 Aug 2007 07:09:42 +0530 + +elvis (2.2.0-8) unstable; urgency=low + + * debian/control: Replaced Source-Version with source:Version + to make the package binNMU-safe. + * debian/patches: Incorporate patch from Martin Dietze. Elvis + no longer exits with error status if there is a subdirectory + called "tags". + + -- Kapil Hari Paranjape Mon, 9 Oct 2006 18:14:59 +0530 + +elvis (2.2.0-7) unstable; urgency=low + + * Incorporate patches/ft2-nameclash-fix from Thomas Girard with + gratitude. + * rules: Clean up quilt metadata. + * Standards Version: 3.7.2. No changes required. + + -- Kapil Hari Paranjape Mon, 19 Jun 2006 16:07:13 +0530 + +elvis (2.2.0-6.1) unstable; urgency=low + + * Non-maintainer upload. + * patches/ft2-nameclash-fix: prevent a name clash with freetype2 by renaming + an enum member. Closes: 370687. + + -- Thomas Girard Sat, 10 Jun 2006 13:49:38 +0200 + +elvis (2.2.0-6) unstable; urgency=low + + * debian/patches: switched to "quilt". + + -- Kapil Hari Paranjape Fri, 31 Mar 2006 10:18:41 +0530 + +elvis (2.2.0-5) unstable; urgency=low + + * New Maintainer. Closes: #341821. + * Indicate the 'tweaksection' variable in the + explanation of the '{' movement. Closes: #304700. + * Fixed hyphen-used-as-minus-sign. + * Fixed changelog to disable lintian warnings regarding + missing dates in Bill Mitchell's original entries. The + date is an estimate! + * Incorporated patch by QA group into elvis' patch + infrastructure. + + -- Kapil Hari Paranjape Tue, 10 Jan 2006 14:27:56 +0530 + +elvis (2.2.0-4) unstable; urgency=low + + * QA upload + * Maintainer field set to the QA group + * Fix build issues on kFreeBSD (closes: #340424) + * Standards-Version bumped + + -- Emanuele Rocca Thu, 05 Jan 2006 00:22:54 +0100 + +elvis (2.2.0-3) unstable; urgency=low + + * Moved elvis.clr to /etc/elvis. + * Fixed file/syntax detection for scripts that use env in their + shebang line. + * Calling elvisnox does no longer start Elvis in ex mode. + * Mentioned elvis-tools in elvis-common's short description. + + -- Georg Neis Wed, 28 Jan 2005 19:52:55 +0100 + + +elvis (2.2.0-2) unstable; urgency=low + + * Split the elvis package into elvis-common, elvis-console, elvis and + elvis-tools - see NEWS.Debian for further information (closes: #206517). + * Added return to elvis.syn as a keyword for shellscripts (closes: #254279). + * Used full path names in printdoc.bat and renamed the script to + printdoc.sh (closes: #270260). + * Fixed some typos in the manual. + * Included a fix for a bug in the ) vi command that could cause a + segmentation fault. + * elvtags and elvfmt now provide the correct manpages. + * Decreased the ctags priority to 40. + * Backported various small fixes from elvis-almost-2.2.1. + * Added previous maintainers to debian/copyright. + * README.Debian: + + Added a reference to the :customize alias. + + Addressed the problem with colors in dark xterms. + + -- Georg Neis Tue, 26 Aug 2004 21:00:55 +0200 + + +elvis (2.2.0-1) unstable; urgency=low + + * Newest upstream release: 2.2_0 + * Maintainer upload (Closes: #92305, #189630, #127012, #63433, #97168, + #100644, #112947, #137173, #147288, #22508, #124597, #131081, #23825, + #65908) + * debian/control: + * corrected short description + * added libncurses5-dev to Build-Depends (Closes: #228395) + + -- Georg Neis Mon, 19 Jan 2004 10:24:48 +0100 + + +elvis (2.2j-1) unstable; urgency=low + + * New maintainer (Closes: #192673) + * Newest upstream release: 2.2j + * debian/copyright: License changed from 'The Artistic License' to + 'The Clarified Artistic License' + * debian/elvisnox: Use the new environment variable ELVISGUI + * debian/elvis_*.xpm: Icons for the menu + * The package now includes a sample configuration file + * elvistrs.msg, elvis.lat and elvis.pc8 are no longer conffiles; they are + moved to /usr/share/elvis + * Renamed ref-elvis to elvref + * Changed priority of alternative "editor" to 90 (Closes: #121303) + + -- Georg Neis Tue, 07 Oct 2003 15:42:00 +0200 + + +elvis (2.1.4-4.2) unstable; urgency=low + + * NMU + * ctags.c: Fixed ctags on *all* platforms: problem just manifested on unsigned + char platforms. getc() returns an *int*, not a char. C sucks, deal. + (Closes: #127012) + * debian/postinst: reinstate ctags alternative + * debian/postrm: remove ctags alternative + * These two together make elvtags an alternative of ctags + (Closes: #63433) (Closes: #97168) + * debian/elvisnox: use bash's -a to solve problem that demolished + elvis's argv[0] recognition (Closes: #100644) + * debian/rules: Don't provide manual for "ref", it's supposed to be handled + via update alternatives (Closes: #112947) + * debian/control: Upper case some stuff in description (Closes: #124597) + * debian/copyright: Fixed copyright file location (Closes: #131081) + * lib/elvis.ini: not colouring when we're called vi/view (Closes: #137173) + * lib/elvisex.html: add note about "|" seperating commands. (Closes: #22508) + * lib/howto.html: add a howto on recovery (Closes: #23825) + * lib/elvis.syn: add "wish" as an alias for tcl (Closes: #65908) + + -- Moshe Zadka Mon, 6 May 2002 18:51:37 +0300 + + +elvis (2.1.4-4.1) unstable; urgency=low + + * Non-maintainer upload + * Modified instman.sh to use FHS manpaths (Closes: #92305) + * Added debhelper to Build-Depends (Closes: #70287) + * Bumped Standards-Version to 3.5.6 + * Convert to DH_COMPAT=2 + * Removed calls to dh_testversion and dh_suidgregister from debian/rules + + -- Gergely Nagy Sat, 25 Aug 2001 16:48:49 +0200 + + +elvis (2.1.4-4) unstable; urgency=low + + * Correct delete key binding in configuration file. (closes: #36185) + + -- Martin Mitchell Sun, 7 May 2000 03:26:16 +1000 + + +elvis (2.1.4-3) unstable; urgency=low + + * Add typename to C++ syntax highlighting. (closes: #60904) + + -- Martin Mitchell Mon, 17 Apr 2000 10:48:09 +1000 + + +elvis (2.1.4-2) unstable; urgency=low + + * Update to standard version 3.1.1. + * Fix return code by correcting elvis.ini. + (closes: #31312, #32850, #32851, #35242, #36730, #40525, #43309, #45137) + (closes: #58351, #46123) + * Correct paths of alternatives symlinks. + (closes: #50324, #50694, #51080, #51468, #54338) + * Fix permissions of elvisnox. (closes: #60735) + * Correct keymappings for keypad. (closes: #50615, #58357) + * Confirm correct suspension when running as root. (closes: #44104) + * Correct tag in html syntax highlighting. (closes: #35772) + * Confirm d]] command now has correct behavior. (closes: #15525) + + -- Martin Mitchell Mon, 17 Apr 2000 04:25:15 +1000 + + +elvis (2.1.4-1) unstable; urgency=low + + * New upstream release. + * Update to standards version 3.0.1. + + -- Martin Mitchell Sun, 31 Oct 1999 17:46:24 +1100 + + +elvis (2.1release-1) unstable; urgency=low + + * New upstream release. + * Final release of 2.1 series code. + * Update to standards version 2.5.0. + + -- Martin Mitchell Fri, 11 Dec 1998 03:29:31 +1100 + + +elvis (2.1j-2) unstable; urgency=low + + * Add bool, true and false for C++ syntax highlighting. (#25296) + * Include patch to fix keypad bindings. (#17823) + (thanks to Tom Lear ) + -- Martin Mitchell Tue, 20 Oct 1998 03:52:07 +1000 + + +elvis (2.1j-1) unstable; urgency=low + + * New upstream release. + * License changed to Artistic - move to main. + * Restore former alternatives priority now elvis is back in main. + + -- Martin Mitchell Fri, 16 Oct 1998 01:04:07 +1000 + + +elvis (2.1i-5) unstable; urgency=low + + * Fix bug causing -o option to segfault. (#26410) + + -- Martin Mitchell Sat, 5 Sep 1998 14:14:00 +1000 + + +elvis (2.1i-4) unstable; urgency=low + + * Place quotes around arguments in elvisnox script. (#17801) + * Fix syntax highlighting for 'dh_clean' in makefiles. (#15959) + + -- Martin Mitchell Fri, 1 May 1998 02:41:03 +1000 + + +elvis (2.1i-3) frozen unstable; urgency=medium + + * Correct path to global config files. + * Correct typo in package description. (#18901) + * Close bug already fixed regarding libc6 build issue. (#17259) + * Remove obsolete debhelper entries in rules file. + * Close bug already fixed regarding xterm-color and X11 mode. (#7698) + + -- Martin Mitchell Mon, 27 Apr 1998 14:37:21 +1000 + + +elvis (2.1i-2) frozen unstable; urgency=high + + * Fix critical bug that elvis would not remove its alternatives + properly. (#21667) + * Downgrade alternatives priority to -5, since elvis is now in + non-free. (#21668) + + -- Martin Mitchell Sun, 26 Apr 1998 01:34:21 +1000 + + +elvis (2.1i-1) frozen unstable; urgency=low + + * Return to distribution from project/orphaned. + * New upstream release. + * Update to Standard Version 2.4.1. + * Move to non-free. + * New maintainer. + * Fix X11 menu entry. (#15610) + + -- Martin Mitchell Sun, 19 Apr 1998 00:23:39 +1000 + + +elvis (2.1f-1) unstable; urgency=low + + * New upstream source + * Dropped elvisctags since there are other ctags programs available. + * In addition to syntax highlighting, elvis can now be used as a + text mode web browser (it does ftp and http) + * libc6 release + * converted to using debhelper + + -- Erik Andersen Sat, 22 Nov 1997 03:14:13 -0700 + + +elvis (2.0-9) stable unstable; urgency=low + + * Adjusted the elvis.ini file to fix bug #5768. + * Elvis is now built using deb-make. + * Adjusted the way I bypassed a dpkg problem to make things simpler + * Added support for the menu package + + -- Erik B. Andersen Tue, 31 Dec 1996 13:59:11 -0700 + + +elvis (2.0-8) frozen unstable; urgency=low + + * Added "elv-vi" to Replaces file for elvis + * Changed elvisctags so that it Suggests elvis, instead of Recommends + + -- Erik B. Andersen Fri, 29 Nov 1996 23:09:14 -0700 + + +elvis (2.0-7) frozen unstable; urgency=low + + * Here is the latest version of the much-discussed elvis package... I + think I have now gotten everything fixed and cleaned up for + Debian 1.2 Please check things out though... + * Changed elvis from "Recommends: elvisctags" to "Suggests: elvisctags" + This fixes bug #5416 and should make dselect users happy. + * Changed the behavior of "vi -G x11" to drop to the default gui + (i.e. termcap) when the x11 gui is unavailable. This allows users + of elm to specify "vi -G x11" as their primary editor, and have + elvis use the X interface when in X, and the text interface when in + console mode. This will make the one person who asked happy. + * Fixed bug #5393 by splitting up the config directory and moving the + non-config files to several locations. + * Added a script to ensure that old versions of elvis get completely + removed from the system regardless of a little dpkg problem, by + installing 0 byte files on top of the old files, and then deleting + the 0 byte files in the postinst script. Credit goes to Guy Maor + for the idea (which works). + * Rewrote the printdoc.bat file, and moved it to /usr/bin/elvis-printdoc + * elvisctags now utilizes update-alternatives for ctags, ref, and their + associated man pages. I recommend that the all other packages + which also provide these programs do likewise. + * Please note that in order to comply with the Debian standard, I + installed all man pages compressed in /usr/man/man1; however, since + elvis cannot read compressed files, I have installed a second, + uncompressed copy of the man pages in /usr/doc/elvis/online-docs. + I have also installed the online help files uncompressed in this + directory to allow elvis to access them. + + -- Erik B. Andersen Fri, 15 Nov 1996 09:32:30 -0700 + + +elvis (2.0-6) unstable; urgency=low + + * Fixed it so that it now replaces previous verions of elvis, + instead of just conflicting... + * Fixed Bug #4973, so configuration files now go in /etc/elvis + + -- Erik B. Andersen Sat, 26 Oct 1996 14:33:02 -0600 + + +elvis (2.0-5) unstable; urgency=low + + * New maintainer + * Upgraded to release version 2.0 from upstream source (no longer beta) + * Changed to new packaging scheme, and standards version. + * Completly rewrote all debian files, installation scripts, etc. + * Removed elviscmn, elvisnox, and elvisx11 - replaced by just "elvis" + * Compile all gui interfaces into one binary. I hacked the sources to + make termcap the default. To select the x11 gui interface, you + simply need to type "vi -G x11" + * Added some some nice defaults and color syntax highlighting to elvis.ini. + * I probably did some other stuff too, but I don't remember what. :-) + + -- Erik B. Andersen Wed, 23 Oct 1996 12:19:36 -0600 + + +elvis (2.0-4) unstable; urgency=low + * upgraded from elvis-2.0o to elvis-2.0p sources + + -- Bill Mitchell Mon, 15 Aug 1995 19:33:26 +0000 + + +elvis (2.0-3) unstable; urgency=low + * upgraded from elvis-2.0n to elvis-2.0o sources + + -- Bill Mitchell Mon, 15 Aug 1995 19:33:26 +0000 + + +elvis (2.0-2) unstable; urgency=low + * recommend elvisx11 | elvisnox in elviscmn control file + instead of elvisx11, elvisnox + + -- Bill Mitchell Mon, 15 Aug 1995 19:33:26 +0000 + + +elvis (2.0-1) unstable; urgency=low + * This package replaces the elvis1.8pl4 and/or e2-2.0.beta packages + * This version uses the elvis-2.0n sources, with one additional patch + from the author in dmsyntax.c. + * This is still beta-test code, but is believed to be close to the + release version. + + -- Bill Mitchell Mon, 15 Aug 1995 19:33:26 +0000 + + +elvis (2.0-0) unstable; urgency=low + * elf package + * This package replaces the elvis1.8pl4 and/or e2-2.0.beta packages + * This version uses the elvis-2.0n sources, with one additional patch + from the author in dmsyntax.c. + * This is still beta-test code, but is believed to be close to the + release version. + + -- Bill Mitchell Mon, 15 Aug 1995 19:33:26 +0000 --- elvis-2.2.0.orig/debian/elvis-common.links +++ elvis-2.2.0/debian/elvis-common.links @@ -0,0 +1,2 @@ +usr/share/elvis/manual usr/share/doc/elvis-common/manual +usr/share/man/man1/elvis.1.gz usr/share/man/man1/elvisnox.1.gz --- elvis-2.2.0.orig/debian/elvisnox +++ elvis-2.2.0/debian/elvisnox @@ -0,0 +1,15 @@ +#!/bin/sh + +# This is a little wrapper shell script which runs elvis with +# the GUI set to "termcap" (i.e. for using in a console). + +mode="" + +case "$0" in + *elvisnox) ;; # start in normal mode + *x) mode="-e";; # start in ex mode + *input) mode="-i";; # start in input mode + *view) mode="-R";; # set the defaultreadonly option +esac + +ELVISGUI="termcap" exec /usr/bin/elvis $mode "$@" --- elvis-2.2.0.orig/debian/elvis-common.docs +++ elvis-2.2.0/debian/elvis-common.docs @@ -0,0 +1,3 @@ +doc/bugs.txt +Announce-2.2_0 +README.html --- elvis-2.2.0.orig/debian/elvis-common.menu +++ elvis-2.2.0/debian/elvis-common.menu @@ -0,0 +1,23 @@ +?package(elvis-common,elvis-console): \ + needs="text" \ + hints="Small,Expert" \ + section="Applications/Editors" \ + title="Elvis (console)" \ + command="/usr/bin/elvis -Gtermcap" \ + icon="/usr/share/pixmaps/elvis_32x32.xpm" + +?package(elvis-common,elvis): \ + needs="text" \ + hints="Small,Expert" \ + section="Applications/Editors" \ + title="Elvis (console)" \ + command="/usr/bin/elvis -Gtermcap" \ + icon="/usr/share/pixmaps/elvis_32x32.xpm" + +?package(elvis-common,elvis): \ + needs="X11" \ + hints="Small,Expert" \ + section="Applications/Editors" \ + title="Elvis (X11)" \ + command="/usr/bin/elvis -Gx11" \ + icon="/usr/share/pixmaps/elvis_32x32.xpm" --- elvis-2.2.0.orig/debian/elvis.dirs +++ elvis-2.2.0/debian/elvis.dirs @@ -0,0 +1,3 @@ +etc/elvis +usr/bin +usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/elvis-common.doc-base +++ elvis-2.2.0/debian/elvis-common.doc-base @@ -0,0 +1,12 @@ +Document: elvis +Title: Elvis-2.2_0 Documentation +Author: Steve Kirkendall +Abstract: This manual describes Elvis' functionality as well as its + configuration and differences between the ports to different operating + systems. It even provides a brief overview about the basic concepts of + the vi/ex family of text editors. +Section: Editors + +Format: HTML +Index: /usr/share/doc/elvis-common/manual/elvis.html +Files: /usr/share/doc/elvis-common/manual/*.html --- elvis-2.2.0.orig/debian/elvis-common.install +++ elvis-2.2.0/debian/elvis-common.install @@ -0,0 +1 @@ +debian/elvis_32x32.xpm usr/share/pixmaps --- elvis-2.2.0.orig/debian/elvis-common.examples +++ elvis-2.2.0/debian/elvis-common.examples @@ -0,0 +1 @@ +data/elvis.rc --- elvis-2.2.0.orig/debian/elvis-tools.install +++ elvis-2.2.0/debian/elvis-tools.install @@ -0,0 +1 @@ +debian/lintian/elvis-tools usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/compat +++ elvis-2.2.0/debian/compat @@ -0,0 +1 @@ +5 --- elvis-2.2.0.orig/debian/elvis-console.dirs +++ elvis-2.2.0/debian/elvis-console.dirs @@ -0,0 +1,3 @@ +etc/elvis +usr/bin +usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/control +++ elvis-2.2.0/debian/control @@ -0,0 +1,79 @@ +Source: elvis +Section: editors +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>> 5), quilt, libncurses5-dev, libxft-dev, libxpm-dev, libxt-dev +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/elvis/ +Homepage: http://elvis.vi-editor.org +Standards-Version: 3.8.0 + +Package: elvis +Architecture: any +Conflicts: elvis-console +Depends: elvis-common (= ${source:Version}), ${shlibs:Depends} +Provides: man-browser, www-browser, editor +Suggests: elvis-tools +Description: powerful clone of the vi/ex text editor (with X11 support) + This package contains Elvis compiled with support for X11, Xft and + background images. If you don't need the X11 interface, install + elvis-console instead. See also: elvis-tools + . + Elvis is a clone of vi/ex, the standard UNIX editor. It supports + nearly all of the vi/ex commands, in both visual mode and ex mode. + Elvis adds support for multiple files, multiple windows, a variety of + display modes (including syntax highlighting, man, tex, html and + hex), an optional X11 user interface, on-line help, folding, spell + checking, new options, auto commands, regions, enhanced tags, + printing, aliases and an improved :map command. + . + Like vi/ex, Elvis stores most of the text in a temporary file, + instead of RAM. This allows it to edit files that are too large to + fit in a single process' data space. + Also, the edit buffer can survive a power failure or crash. + + +Package: elvis-common +Architecture: all +Conflicts: elvis (<< 2.2.0-2) +Description: common files for elvis, elvis-console and elvis-tools + This package provides the common files (manual, ex scripts, digraph + files, etc.) that are needed by the packages elvis, elvis-console and + elvis-tools. + +Package: elvis-console +Architecture: any +Priority: extra +Conflicts: elvis +Depends: elvis-common (= ${source:Version}), ${shlibs:Depends} +Provides: man-browser, www-browser, editor +Suggests: elvis-tools +Description: powerful clone of the vi/ex text editor (without X11 support) + This package contains Elvis compiled without X11 support. If you want + to use Elvis' X11 interface then install the package elvis instead. + See also: elvis-tools + . + Elvis is a clone of vi/ex, the standard UNIX editor. It supports + nearly all of the vi/ex commands, in both visual mode and ex mode. + Elvis adds support for multiple files, multiple windows, a variety of + display modes (including syntax highlighting, man, tex, html and + hex), an optional X11 user interface (see elvis-x11), on-line help, + folding, spell checking, new options, auto commands, regions, enhanced + tags, printing, aliases and an improved :map command. + . + Like vi/ex, Elvis stores most of the text in a temporary file, + instead of RAM. This allows it to edit files that are too large to + fit in a single process' data space. + Also, the edit buffer can survive a power failure or crash. + +Package: elvis-tools +Architecture: any +Conflicts: elvis (<< 2.2.0-2) +Depends: elvis-common (= ${source:Version}), ${shlibs:Depends} +Enhances: elvis, elvis-console +Description: text editing tools for programmers (elvfmt, elvtags, ref) + This package contains elvtags (for generating tags and refs + files), ref (for quickly locating/displaying the header of a + function) and elvfmt (for adjusting paragraphs of text). + . + These tools actually belong to the Elvis editor but can be used + without it. --- elvis-2.2.0.orig/debian/elvis.install +++ elvis-2.2.0/debian/elvis.install @@ -0,0 +1,2 @@ +debian/elvisnox usr/bin +debian/lintian/elvis usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/watch +++ elvis-2.2.0/debian/watch @@ -0,0 +1,7 @@ +# format version number, currently 3; this line is compulsory! +version=3 + +# This the format for an FTP site: +# Full-site-with-pattern [Version [Action]] +opts="pasv,uversionmangle=s/_/./" \ +ftp://ftp.cs.pdx.edu/pub/elvis/elvis-([\d\._]+)\.tar\.gz debian uupdate --- elvis-2.2.0.orig/debian/elvis-console.postinst +++ elvis-2.2.0/debian/elvis-console.postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet \ + --install /usr/bin/editor editor /usr/bin/elvis 90 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/elvis.1.gz + for app in editor ex input vi view; do + update-alternatives --quiet \ + --install /usr/bin/"$app" "$app" /usr/bin/elvis 120 \ + --slave /usr/share/man/man1/"$app".1.gz "$app".1.gz \ + /usr/share/man/man1/elvis.1.gz + done + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis-common.README.Debian +++ elvis-2.2.0/debian/elvis-common.README.Debian @@ -0,0 +1,31 @@ +Elvis for Debian +---------------- + +This package contains Elvis 2.2_0. + + +Elvis' manual is located in /usr/share/elvis/manual (elvis.html) and you +can read it as well with your browser as with Elvis itself (start Elvis, +type :h and hit Return). + + +If you want to bypass Elvis' global configuration then put your own +setup files into ~/.elvis - see chapter 10 in the manual for further +information. The elvis.ali file includes an alias for this purpose, see +:h customize. +If you just want to change some default settings then creating .elvisrc +in your home directory should suffice (:mkexrc can do this for you). + + +If you use Elvis (the termcap interface) within a dark xterm, you'll +probably get "wrong" colors (e.g. normal text will appear black, so +you can't read it). +You can solve this problem either by setting the background +option to "dark" in your configuration file or by setting the +environment variable ELVISBG to "dark". +Further information: http://georg.f-451.net/elvis/index.html#color + + +This package brings along some icons: + /usr/share/pixmaps/elvis_32x32.xpm (used by the menu system) + /usr/share/elvis/icons/* --- elvis-2.2.0.orig/debian/elvis-tools.postinst +++ elvis-2.2.0/debian/elvis-tools.postinst @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet \ + --install /usr/bin/ctags ctags /usr/bin/elvtags 40 \ + --slave /usr/share/man/man1/ctags.1.gz ctags.1.gz \ + /usr/share/man/man1/elvtags.1.gz + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/rules +++ elvis-2.2.0/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CC = gcc -Wall -g -I/usr/include/freetype2 -I/usr/X11R6/include +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CC += -O0 +else + CC += -O2 +endif + +CFGEXTS = ali arf awf brf bwf clr ini msg ps spe syn +CONFBOTH = --bindir=/usr/bin --datadir=/usr/share/elvis \ + --docdir=/usr/share/elvis/manual --libs=-lncurses +CONFCONSOLE = $(CONFBOTH) --without-x +CONFX11 = $(CONFBOTH) --with-x --with-xft --without-gnome +EDIR = $(CURDIR)/debian/elvis +MDIR = $(CURDIR)/debian/elvis-common +NDIR = $(CURDIR)/debian/elvis-console +TDIR = $(CURDIR)/debian/elvis-tools +MTRASH = *.txt ctags.man fmt.man +MPAGES = elvis elvfmt elvtags ref + +patch: + dh_testdir + + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + + touch patch + +unpatch: + dh_testdir + + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + + rm -rf .pc + rm -f patch + +build: patch + dh_testdir + ./configure $(CONFCONSOLE) + $(MAKE) CC="$(CC)" + mv elvis elvis-console + $(MAKE) clean + ./configure $(CONFX11) + $(MAKE) CC="$(CC)" + touch build + +install: build + dh_testdir + dh_installdirs -a + dh_installdirs -i + $(MAKE) BINDIR="$(TDIR)"/usr/bin \ + DATADIR="$(MDIR)"/usr/share/elvis \ + DOCDIR="$(MDIR)"/usr/share/elvis/manual \ + install + touch install + +binary-arch: install + dh_testdir + dh_testroot + dh_link -a + cd "$(MDIR)"/usr/share/elvis; \ + for i in $(CFGEXTS); do \ + cp elvis."$$i" "$(EDIR)"/etc/elvis; \ + mv elvis."$$i" "$(NDIR)"/etc/elvis; \ + done; \ + mv elvis.x11 "$(EDIR)"/etc/elvis; \ + rm elvis.rc + mv "$(TDIR)"/usr/bin/elvis "$(EDIR)"/usr/bin + mv elvis-console "$(NDIR)"/usr/bin/elvis + dh_install -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_shlibdeps -a + dh_gencontrol -a + dh_installdeb -a + dh_md5sums -a + dh_builddeb -a + +binary-indep: install + dh_testdir + dh_testroot + dh_link -i + cd "$(MDIR)"/usr/share/elvis/manual; \ + rm $(MTRASH); \ + mv printdoc.bat printdoc.sh; \ + chmod +x printdoc.sh; \ + for i in $(MPAGES); do \ + cp "$$i".man ../../man/man1/"$$i".1; \ + done + dh_install -i + dh_installdocs -i + dh_installchangelogs -i + dh_installexamples -i + dh_installmenu -i + dh_compress -i + dh_fixperms -i + dh_gencontrol -i + dh_installdeb -i + dh_md5sums -i + dh_builddeb -i + +binary: binary-arch binary-indep + +clean: unpatch + dh_testdir + dh_testroot + rm -f build install elvis-console + -[ -f Makefile ] && $(MAKE) clobber + dh_clean Makefile config.h config.stat ctags fmt + +.PHONY: binary binary-arch binary-indep clean unpatch --- elvis-2.2.0.orig/debian/elvis.prerm +++ elvis-2.2.0/debian/elvis.prerm @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade|remove|deconfigure) + for app in editor ex input vi view; do + update-alternatives --quiet --remove "$app" /usr/bin/elvisnox + done + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis-console.links +++ elvis-2.2.0/debian/elvis-console.links @@ -0,0 +1 @@ +usr/share/doc/elvis-common usr/share/doc/elvis-console --- elvis-2.2.0.orig/debian/elvis.postinst +++ elvis-2.2.0/debian/elvis.postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet \ + --install /usr/bin/editor editor /usr/bin/elvisnox 90 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/elvisnox.1.gz + for app in editor ex input vi view; do + update-alternatives --quiet \ + --install /usr/bin/"$app" "$app" /usr/bin/elvisnox 120 \ + --slave /usr/share/man/man1/"$app".1.gz "$app".1.gz \ + /usr/share/man/man1/elvisnox.1.gz + done + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis-tools.links +++ elvis-2.2.0/debian/elvis-tools.links @@ -0,0 +1 @@ +usr/share/doc/elvis-common usr/share/doc/elvis-tools --- elvis-2.2.0.orig/debian/elvis-console.install +++ elvis-2.2.0/debian/elvis-console.install @@ -0,0 +1 @@ +debian/lintian/elvis-console usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/elvis-tools.prerm +++ elvis-2.2.0/debian/elvis-tools.prerm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade|remove|deconfigure) + update-alternatives --quiet --remove ctags /usr/bin/elvtags + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis.links +++ elvis-2.2.0/debian/elvis.links @@ -0,0 +1 @@ +usr/share/doc/elvis-common usr/share/doc/elvis --- elvis-2.2.0.orig/debian/elvis_32x32.xpm +++ elvis-2.2.0/debian/elvis_32x32.xpm @@ -0,0 +1,242 @@ +/* XPM */ +static char * elvis_32x32_xpm[] = { +"32 32 207 2", +" c None", +". c #000000", +"+ c #AF00AF", +"@ c #AA00AA", +"# c #380038", +"$ c #AD00AD", +"% c #A700A7", +"& c #DF00DF", +"* c #750075", +"= c #BF00BF", +"- c #FF00FF", +"; c #550055", +"> c #200020", +", c #CA00CA", +"' c #E700E7", +") c #DC00DC", +"! c #600060", +"~ c #780078", +"{ c #280028", +"] c #C700C7", +"^ c #320032", +"/ c #232300", +"( c #686800", +"_ c #686823", +": c #686868", +"< c #454545", +"[ c #454500", +"} c #970097", +"| c #9A009A", +"1 c #EF00EF", +"2 c #101010", +"3 c #101000", +"4 c #D4D400", +"5 c #FFFF7F", +"6 c #FFFF9D", +"7 c #FFFFC7", +"8 c #EAEAEA", +"9 c #404040", +"0 c #EAEA00", +"a c #404000", +"b c #400040", +"c c #EA00EA", +"d c #B200B2", +"e c #420042", +"f c #870087", +"g c #CF00CF", +"h c #700070", +"i c #9F009F", +"j c #AAAA60", +"k c #AAAA4A", +"l c #FFFF70", +"m c #FFFF85", +"n c #FFFFFF", +"o c #DADADA", +"p c #7A7A7A", +"q c #FFFF4A", +"r c #9F9F00", +"s c #552530", +"t c #FF25DA", +"u c #DA00DA", +"v c #8F008F", +"w c #AAAA70", +"x c #AAAA3A", +"y c #FFFFEA", +"z c #8F8F6A", +"A c #ECECEC", +"B c #D7D7D7", +"C c #FFFFEC", +"D c #7A7A42", +"E c #DADA0B", +"F c #FFDA30", +"G c #FF15EA", +"H c #E200E2", +"I c #5A5A00", +"J c #505000", +"K c #AAAAAA", +"L c #FFFF7D", +"M c #FFFFD7", +"N c #A5A5A5", +"O c #AFAFAF", +"P c #555555", +"Q c #D7D787", +"R c #7D2D7D", +"S c #FFFF2D", +"T c #FF5AA5", +"U c #D200D2", +"V c #582830", +"W c #3D0D30", +"X c #2D0D20", +"Y c #0D0D00", +"Z c #484828", +"` c #B7B79D", +" . c #FFFF3A", +".. c #C5C555", +"+. c #757575", +"@. c #DFDFDF", +"#. c #FF827D", +"$. c #FF6897", +"%. c #FF1BE4", +"&. c #AAAA00", +"*. c #D5D500", +"=. c #808000", +"-. c #7F7F00", +";. c #555500", +">. c #FFFFAA", +",. c #FFFF80", +"'. c #FFFFD4", +"). c #80552A", +"!. c #D45580", +"~. c #FFD42B", +"{. c #FF2AD5", +"]. c #FFAA55", +"^. c #C5C500", +"/. c #8F8F00", +"(. c #E2E200", +"_. c #303000", +":. c #BABA00", +"<. c #757500", +"[. c #DFDF60", +"}. c #FFFFEF", +"|. c #FFFFAD", +"1. c #484848", +"2. c #282828", +"3. c #8F8F70", +"4. c #FFFF55", +"5. c #55381D", +"6. c #FFE21D", +"7. c #FFC53A", +"8. c #FF10EF", +"9. c #FF9F60", +"0. c #FFF22D", +"a. c #AFAF00", +"b. c #A5A500", +"c. c #D7D700", +"d. c #D2D200", +"e. c #787800", +"f. c #FFFF00", +"g. c #FFFF50", +"h. c #878787", +"i. c #FFFF82", +"j. c #A5A528", +"k. c #FF50AF", +"l. c #FFD22D", +"m. c #FF28D7", +"n. c #FFA55A", +"o. c #C7C700", +"p. c #4A4A00", +"q. c #858500", +"r. c #383800", +"s. c #B2B200", +"t. c #0B0B00", +"u. c #C7C720", +"v. c #A2A28F", +"w. c #DADAC7", +"x. c #FFFF58", +"y. c #A2A215", +"z. c #1D1D00", +"A. c #6A006A", +"B. c #20150B", +"C. c #EC15D7", +"D. c #FFB54A", +"E. c #FF0BF4", +"F. c #B5B500", +"G. c #CFCF00", +"H. c #DADA00", +"I. c #8F8F8F", +"J. c #707000", +"K. c #250025", +"L. c #FF4AB5", +"M. c #1D1D15", +"N. c #585840", +"O. c #252515", +"P. c #32322A", +"Q. c #2D2D15", +"R. c #585858", +"S. c #2D2D2D", +"T. c #858585", +"U. c #3A3A2A", +"V. c #B7B700", +"W. c #858515", +"X. c #151515", +"Y. c #2A2A2A", +"Z. c #100010", +"`. c #9A9A9A", +" + c #CDCDCD", +".+ c #232323", +"++ c #656500", +"@+ c #CDCD00", +"#+ c #C5C5C5", +"$+ c #929292", +"%+ c #CACACA", +"&+ c #505050", +"*+ c #CFCFCF", +"=+ c #8A8A00", +"-+ c #424200", +";+ c #727272", +">+ c #707070", +",+ c #BFBFBF", +"'+ c #BFBF00", +")+ c #959500", +"!+ c #6A6A6A", +"~+ c #030303", +"{+ c #080808", +"]+ c #3A3A3A", +"^+ c #ADAD00", +"/+ c #3D3D05", +"(+ c #3D3805", +" ", +" ", +" ", +" ", +" ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . + @ + + + @ + + + @ . . . . . . . . . . # $ + + + @ % $ . . ", +". . & * = - & * = - - ; . . . . . . . . . . . @ - - & * > , . . ", +". . ' ) ! - ' ) ! - - ; . . . . . . . . . . . @ - - ' ~ { ] . . ", +". . ) ~ - - ) ~ - - ) ^ . . / ( _ : < . [ . . @ - - ) ) } ) . . ", +". . @ | 1 1 @ | 1 - @ 2 . 3 4 5 6 7 8 9 0 a b c - - d e f d . . ", +". . g h i i g h i - @ j . k l m n n o p q r s t - - u v v u . . ", +". . - - - - - - - - @ w . x y z p n A B C D E F G - H % h @ . . ", +". . - - - - - - - - @ I J K L M N O n P Q R S S T - U ~ ~ U . . ", +". . V W V V W V V W X Y Z ` . .n ..+.@.w @ #.$.- - %.- - - . . ", +". . &.&.*.*.&.&.=.-.;.;.n >.,.'.n K K >.).!.~.{.- - ].- - - . . ", +". . ^./.(.(.=.[ _.:.;.<.[.}.|.7 1.2.3.4.5.6.l 7.8.9.0.$.- - . . ", +". . a.b.c.c.J I d.e.;.f.;.g.n n B h.i.j.+ k.l.m.m.l.g.n.- - . . ", +". . /.^.o.o.p.q.(.r.s.o.t./.u.v.w.x.y.z.- A.B.> ] C.D.E.- - . . ", +". . r F.G.G.;.r H._.I.I.. . f.F.q.J.;.F.h K.. . . @ L.- - - . . ", +". . M.N.O.O.P.P.Q.M.R.S.O T.N.N.U.J.V.o.W.X.Y.. . Z.- - - - . . ", +". . P `.P P K K P P +.+ +.+n n < ++@+@+.+h.< . . . - - - - . . ", +". . P #+P P $+$+P P %+&+K . n *+J =+(.-+: ;+>+. . . - - - - . . ", +". . P ,+P ,+P P P P ,+P K . n P '+)+&.!++.+.. . . A.- - - - . . ", +". . ~+{+~+{+~+~+~+~+{+~++.. O ]+a &.^+/+;+~+. . r.(++ + + + . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" ", +" "}; --- elvis-2.2.0.orig/debian/elvis-tools.dirs +++ elvis-2.2.0/debian/elvis-tools.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/lintian/overrides --- elvis-2.2.0.orig/debian/copyright +++ elvis-2.2.0/debian/copyright @@ -0,0 +1,150 @@ +This package was debianized by Georg Neis on +Mon, 02 Aug 2004 22:11:53 +0200. + +Previous Debian maintainers were Bill Mitchell, Erik Andersen and +Martin Mitchell. + +Elvis was downloaded from . +The upstream Author is Steve Kirkendall . + +Copyright (c) 1995-2003 by Steve Kirkendall. Permission is granted to +redistribute the source or binaries under the terms of of the Perl +`Clarified Artistic License', as described below. In particular, +unmodified versions can be freely redistributed. Elvis is offered with +no warranty, to the extent permitted by law. + + + The Clarified Artistic License + + Preamble + + The intent of this document is to state the conditions under which a + Package may be copied, such that the Copyright Holder maintains some + semblance of artistic control over the development of the package, + while giving the users of the package the right to use and distribute + the Package in a more-or-less customary fashion, plus the right to + make reasonable modifications. + + Definitions: + + "Package" + refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created + through textual modification. + + "Standard Version" + refers to such a Package if it has not been modified, or has + been modified in accordance with the wishes of the Copyright + Holder as specified below. + + "Copyright Holder" + is whoever is named in the copyright or copyrights for the + package. + + "You" + is you, if you're thinking about copying or distributing this + Package. + + "Distribution fee" + is a fee you charge for providing a copy of this Package to + another party. + + "Freely Available" + means that no fee is charged for the right to use the item, + though there may be fees involved in handling the item. It also + means that recipients of the item may redistribute it under the + same conditions they received it. + _________________________________________________________________ + + 1. You may make and give away verbatim copies of the source form of + the Standard Version of this Package without restriction, provided + that you duplicate all of the original copyright notices and + associated disclaimers. + 2. You may apply bug fixes, portability fixes and other modifications + derived from the Public Domain, or those made Freely Available, or + from the Copyright Holder. A Package modified in such a way shall + still be considered the Standard Version. + 3. You may otherwise modify your copy of this Package in any way, + provided that you insert a prominent notice in each changed file + stating how and when you changed that file, and provided that you + do at least ONE of the following: + 1. place your modifications in the Public Domain or otherwise + make them Freely Available, such as by posting said + modifications to Usenet or an equivalent medium, or placing + the modifications on a major network archive site allowing + unrestricted access to them, or by allowing the Copyright + Holder to include your modifications in the Standard Version + of the Package. + 2. use the modified Package only within your corporation or + organization. + 3. rename any non-standard executables so the names do not + conflict with standard executables, which must also be + provided, and provide a separate manual page for each + non-standard executable that clearly documents how it differs + from the Standard Version. + 4. make other distribution arrangements with the Copyright + Holder. + 5. permit and encourage anyone who receives a copy of the + modified Package permission to make your modifications Freely + Available in some specific way. + 4. You may distribute the programs of this Package in object code or + executable form, provided that you do at least ONE of the + following: + 1. distribute a Standard Version of the executables and library + files, together with instructions (in the manual page or + equivalent) on where to get the Standard Version. + 2. accompany the distribution with the machine-readable source + of the Package with your modifications. + 3. give non-standard executables non-standard names, and clearly + document the differences in manual pages (or equivalent), + together with instructions on where to get the Standard + Version. + 4. make other distribution arrangements with the Copyright + Holder. + 5. offer the machine-readable source of the Package, with your + modifications, by mail order. + 5. You may charge a distribution fee for any distribution of this + Package. If you offer support for this Package, you may charge any + fee you choose for that support. You may not charge a license fee + for the right to use this Package itself. You may distribute this + Package in aggregate with other (possibly commercial and possibly + nonfree) programs as part of a larger (possibly commercial and + possibly nonfree) software distribution, and charge license fees + for other parts of that software distribution, provided that you + do not advertise this Package as a product of your own. If the + Package includes an interpreter, You may embed this Package's + interpreter within an executable of yours (by linking); this shall + be construed as a mere form of aggregation, provided that the + complete Standard Version of the interpreter is so embedded. + 6. The scripts and library files supplied as input to or produced as + output from the programs of this Package do not automatically fall + under the copyright of this Package, but belong to whoever + generated them, and may be sold commercially, and may be + aggregated with this Package. If such scripts or library files are + aggregated with this Package via the so-called "undump" or + "unexec" methods of producing a binary executable image, then + distribution of such an image shall neither be construed as a + distribution of this Package nor shall it fall under the + restrictions of Paragraphs 3 and 4, provided that you do not + represent such an executable image as a Standard Version of this + Package. + 7. C subroutines (or comparably compiled subroutines in other + languages) supplied by you and linked into this Package in order + to emulate subroutines and variables of the language defined by + this Package shall not be considered part of this Package, but are + the equivalent of input as in Paragraph 6, provided these + subroutines do not change the language in any way that would cause + it to fail the regression tests for the language. + 8. Aggregation of the Standard Version of the Package with a + commercial distribution is always permitted provided that the use + of this Package is embedded; that is, when no overt attempt is + made to make this Package's interfaces visible to the end user of + the commercial distribution. Such use shall not be construed as a + distribution of this Package. + 9. The name of the Copyright Holder may not be used to endorse or + promote products derived from this software without specific prior + written permission. + 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + PURPOSE. --- elvis-2.2.0.orig/debian/NEWS +++ elvis-2.2.0/debian/NEWS @@ -0,0 +1,33 @@ +elvis (2.2.0-2) unstable; urgency=low + + The elvis package has been split into elvis-common, elvis, + elvis-console and elvis-tools. + + elvis-common: + This package provides the common files (manual, ex scripts, + digraph files, etc.) that are needed by the packages elvis, + elvis-console and elvis-tools. + + elvis: + This package contains Elvis compiled with support for X11, Xft + and background images. If you don't need the X11 interface, + install elvis-console instead. + + elvis-console: + This package contains Elvis compiled without X11 support. If + you want to use Elvis' X11 interface then install the package + elvis instead. + + elvis-tools: + This package contains elvtags (for generating tags and refs + files), ref (for quickly locating/displaying the header of a + function) and elvfmt (for adjusting paragraphs of text). + These tools actually belong to the Elvis editor but can be used + without it. + + As a consequence of this, elvfmt, elvref and elvtags will be removed + if you're upgrading from an earlier version of the elvis package. + In this case, just install elvis-tools afterwards if you need them. + Also note that elvref is now again installed as ref. + + -- Georg Neis Tue, 04 Aug 2004 13:12:55 +0200 --- elvis-2.2.0.orig/debian/elvis-console.prerm +++ elvis-2.2.0/debian/elvis-console.prerm @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade|remove|deconfigure) + for app in editor ex input vi view; do + update-alternatives --quiet --remove "$app" /usr/bin/elvis + done + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis.preinst +++ elvis-2.2.0/debian/elvis.preinst @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" '<<' "2.2.0-2"; then + update-alternatives --quiet --remove ctags /usr/bin/elvtags + for app in editor ex input vi view; do + update-alternatives --quiet --remove "$app" /usr/bin/elvisnox + done + + if dpkg --compare-versions "$2" '<<' "2.2.0-1"; then + update-alternatives --quiet --remove ref /usr/bin/ref-elvis + else + update-alternatives --quiet --remove ref /usr/bin/elvref + fi + + [ ! -d /usr/share/doc/elvis ] || rm -rf /usr/share/doc/elvis + fi + ;; + install|abort-upgrade) + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- elvis-2.2.0.orig/debian/elvis-common.dirs +++ elvis-2.2.0/debian/elvis-common.dirs @@ -0,0 +1,4 @@ +usr/share/elvis/manual +usr/share/doc/elvis-common +usr/share/man/man1 +usr/share/pixmaps --- elvis-2.2.0.orig/debian/patches/esc-beep +++ elvis-2.2.0/debian/patches/esc-beep @@ -0,0 +1,25 @@ + + pressing escape in command mode should cause elvis to beep: +Index: elvis-2.2.0/vicmd.c +=================================================================== +--- elvis-2.2.0.orig/vicmd.c 2009-03-03 20:44:07.000000000 +0530 ++++ elvis-2.2.0/vicmd.c 2009-03-03 21:10:47.000000000 +0530 +@@ -4,7 +4,7 @@ + + #include "elvis.h" + #ifdef FEATURE_RCSID +-char id_vicmd[] = "$Id: vicmd.c,v 2.83 2003/10/19 23:13:33 steve Exp $"; ++char id_vicmd[] = "$Id: vicmd.c,v 2.84 2003/12/28 20:33:29 steve Exp $"; + #endif + + +@@ -953,6 +953,9 @@ + win->selattop = ElvFalse; + win->seltype = 'r'; + break; ++ ++ case ELVCTRL('['): ++ return RESULT_ERROR; + } + return RESULT_COMPLETE; + #endif /* FEATURE_V */ --- elvis-2.2.0.orig/debian/patches/arf-syntax-env +++ elvis-2.2.0/debian/patches/arf-syntax-env @@ -0,0 +1,16 @@ + + fix file/syntax detection for scripts that use env in their + shebang line: +Index: elvis-2.2.0/data/elvis.arf +=================================================================== +--- elvis-2.2.0.orig/data/elvis.arf 2009-03-03 20:44:07.000000000 +0530 ++++ elvis-2.2.0/data/elvis.arf 2009-03-03 21:10:48.000000000 +0530 +@@ -10,6 +10,8 @@ + if os=="unix" && buflines >= 1 + then { + try 1s/\V^#! *[^ ]*\/\([^ ]\+\).*/set! bufdisplay="syntax \1"/x ++ if bufdisplay=="syntax env" ++ then try 1s/\V^#! *[^ ]*\/[^ ]\+ \([^ ]\+\).*/set! bufdisplay="syntax \1"/x + if bufdisplay<<11=="syntax perl" + then set! bufdisplay="syntax perl" + if bufdisplay<<12=="syntax tclsh" --- elvis-2.2.0.orig/debian/patches/alias-andale-and-customize +++ elvis-2.2.0/debian/patches/alias-andale-and-customize @@ -0,0 +1,35 @@ + + backport another fix (:andale) and improvement (:customize) from + almost-2.2.1: +Index: elvis-2.2.0/data/elvis.ali +=================================================================== +--- elvis-2.2.0.orig/data/elvis.ali 2009-03-03 21:10:46.000000000 +0530 ++++ elvis-2.2.0/data/elvis.ali 2009-03-03 21:10:47.000000000 +0530 +@@ -126,7 +126,7 @@ + "Use Andale mono font for the main font, and Courier for italic (X11 only) + if !isnumber(!(14)1) + then error usage: andale [fontsize] +- set font="luxi mono*!(14)1" italicfont="courier*!(14)1i" ++ set font="andale mono*!(14)1" italicfont="courier*!(14)1i" + } + + alias! fork { +@@ -336,11 +336,18 @@ + let o = elvispath(f) + if o == "" + then error "!^" is not a known configuration file ++ "Choose a base directory + if os=="msdos" || os=="os2" || os == "win32" + then let d=$HOME/"dotelvis" + else let d=$HOME/".elvis" ++ "If the directory doesn't exist yet, then create it + if dirperm(d) == "new" + then eval !mkdir "(d)" ++ "If we need a subdirectory and it doesn't exist yet, then create it ++ let n = dirname(d/f) ++ if dirperm(n) == "new" ++ then eval !mkdir "(n)" ++ "If customized file exists, then load it; else start with the default version + let n = d / f + if exists(n) + then e (n) --- elvis-2.2.0.orig/debian/patches/script-dict +++ elvis-2.2.0/debian/patches/script-dict @@ -0,0 +1,15 @@ + + "The :dict alias (after ":load dict") doesn't handle single words + correctly.": +Index: elvis-2.2.0/data/scripts/dict.ex +=================================================================== +--- elvis-2.2.0.orig/data/scripts/dict.ex 2009-03-03 20:44:07.000000000 +0530 ++++ elvis-2.2.0/data/scripts/dict.ex 2009-03-03 21:10:48.000000000 +0530 +@@ -12,6 +12,6 @@ + alias dict { + " Show the definition of a term in a new window + local w="!*" +- let w =~ s/ /\\ /g ++ let w =~ s/ /\\ /ge + eval sp dict:(w) + } --- elvis-2.2.0.orig/debian/patches/series +++ elvis-2.2.0/debian/patches/series @@ -0,0 +1,23 @@ +doc-typos-1 +syntax-sh-return +make-sed-ver +disable-instman +doc-man-location +script-augz +cfg-undolevels +make-rm-elvfmtman +printdoc-debian +doc-vicmd-hash +segfault-fsentence +alias-features +alias-andale-and-customize +esc-beep +script-dict +arf-syntax-env +doc-tweaksection +doc-man-hyphen +config-arch-kfreebsd +ft2-nameclash-fix +martin_dietze.patch +white_on_black_term_clr +getline --- elvis-2.2.0.orig/debian/patches/cfg-undolevels +++ elvis-2.2.0/debian/patches/cfg-undolevels @@ -0,0 +1,15 @@ + + add "set undolevels=12" to the sample configuration file - very + useful: +Index: elvis-2.2.0/data/elvis.rc +=================================================================== +--- elvis-2.2.0.orig/data/elvis.rc 2009-03-03 20:44:08.000000000 +0530 ++++ elvis-2.2.0/data/elvis.rc 2009-03-03 21:10:44.000000000 +0530 +@@ -1,6 +1,7 @@ + " Here are some typical settings that you might want to try. The simplest + " way to use this file is to :source this file, and then run ":mkexrc" to + " save the settings where they can be automatically loaded. ++set undolevels=12 + set autoindent + try set spell + try set smartargs --- elvis-2.2.0.orig/debian/patches/make-rm-elvfmtman +++ elvis-2.2.0/debian/patches/make-rm-elvfmtman @@ -0,0 +1,15 @@ + + patch Makefile to remove doc/elvfmt.man: +Index: elvis-2.2.0/Makefile.in +=================================================================== +--- elvis-2.2.0.orig/Makefile.in 2009-03-03 21:10:42.000000000 +0530 ++++ elvis-2.2.0/Makefile.in 2009-03-03 21:10:44.000000000 +0530 +@@ -285,7 +285,7 @@ + $(RM) verify.elv + $(RM) gdk_imlib.h + $(RM) $(DISTRIB).tar.gz +- $(RM) doc/elvtags.man ++ $(RM) doc/elvtags.man doc/elvfmt.man + $(RM) elvis.rpm + + clean.msdos: --- elvis-2.2.0.orig/debian/patches/martin_dietze.patch +++ elvis-2.2.0/debian/patches/martin_dietze.patch @@ -0,0 +1,30 @@ +Hello, + + Elvis 2.2.0 has a bug causing it to exit 1 and not save any +files if started in a directory which contains a directory +"tags". This is fixed by the following patch: + +======================================================================== + +Index: elvis-2.2.0/tagelvis.c +=================================================================== +--- elvis-2.2.0.orig/tagelvis.c 2009-03-03 20:44:07.000000000 +0530 ++++ elvis-2.2.0/tagelvis.c 2009-03-03 21:10:51.000000000 +0530 +@@ -672,6 +672,7 @@ + CHAR *cp; /* for scanning the line */ + long offset; /* offset of the tag within this buffer */ + int i; ++ DIRPERM perm; + + /* Destroy the old list, if any */ + tefreedef(buf); +@@ -701,7 +702,8 @@ + * necessary because the ioopen() function displays an error + * message when the file it's trying to read doesn't exist. + */ +- if (dirperm("tags") == DIR_NEW) ++ perm = dirperm("tags"); ++ if (perm == DIR_NEW || perm == DIR_DIRECTORY) + return; + + /* open the file */ --- elvis-2.2.0.orig/debian/patches/doc-typos-1 +++ elvis-2.2.0/debian/patches/doc-typos-1 @@ -0,0 +1,89 @@ + fix some typos in the html manual: +Index: elvis-2.2.0/doc/elvis.man +=================================================================== +--- elvis-2.2.0.orig/doc/elvis.man 2009-03-03 20:44:09.000000000 +0530 ++++ elvis-2.2.0/doc/elvis.man 2009-03-03 21:10:40.000000000 +0530 +@@ -454,7 +454,7 @@ + .IP "LC_ALL, LC_MESSAGES, and LANG" + If LANG is defined, then + .B Elvis +-will look for for its message translations in ++will look for its message translations in + .IR $LANG/elvis.msg , + and only use just plain + .I elvis.msg +Index: elvis-2.2.0/doc/elvisopt.html +=================================================================== +--- elvis-2.2.0.orig/doc/elvisopt.html 2009-03-03 20:44:09.000000000 +0530 ++++ elvis-2.2.0/doc/elvisopt.html 2009-03-03 21:10:40.000000000 +0530 +@@ -1601,7 +1601,7 @@ +
The scrollbar, toolbar, and statusbar options + indicate whether the scrollbar, toolbar, and statusbar should be visible, + respectively. +-By default, all are are visible. ++By default, all are visible. + +
scrollwheelspeed,sws (Number, windows or x11) +
The scrollwheelspeed option controls the speed and direction of +Index: elvis-2.2.0/doc/elvisos.html +=================================================================== +--- elvis-2.2.0.orig/doc/elvisos.html 2009-03-03 20:44:09.000000000 +0530 ++++ elvis-2.2.0/doc/elvisos.html 2009-03-03 21:10:40.000000000 +0530 +@@ -45,7 +45,7 @@ + $1 in the command line to be replaced by the name of Elvis' temporary file + that contains the print data. + +-

This lead to the the second problem: ++

This lead to the second problem: + PRINT doesn't make a copy of the file, and Elvis deletes the temporary file + as soon as PRINT exits. + Since PRINT exits before the file has been printed completely, this means +@@ -606,7 +606,7 @@ + If uname reports a brand of Unix that configure doesn't recognize, + then configure will inspect the files on your system for evidence + that you're running SCO Unix/ODT or SCO Xenix. +-If that test fails, you'll need to give the OS name on the the command line ++If that test fails, you'll need to give the OS name on the command line + when invoking configure (e.g., "configure sco" + or "configure xenix"). + +Index: elvis-2.2.0/doc/elvisses.html +=================================================================== +--- elvis-2.2.0.orig/doc/elvisses.html 2009-03-03 20:44:09.000000000 +0530 ++++ elvis-2.2.0/doc/elvisses.html 2009-03-03 21:10:40.000000000 +0530 +@@ -184,7 +184,7 @@ + as readonly. +

+ Also, if the home option is unset, +-then this tries to set it to the directory containing elvis. ++then this tries to set it to the directory containing Elvis. + Generally, some OS-specific code will set home appropriately + before we get here, so this code isn't normally needed. + +@@ -194,7 +194,7 @@ + then source! (elvispath("elvis.spe")) + + This initializes the spell checker, +-if that feature is supported in this version of elvis. ++if that feature is supported in this version of Elvis. + + 

+ 	" IF ALIASES ARE SUPPORTED, THEN LOAD THE DEFAULT ALIASES
+@@ -202,7 +202,7 @@
+ 	then source! (elvispath("elvis.ali"))
+
+ This loads some standard aliases, if the alias feature is supported by +-this version of elvis, and elvis isn't being used as a "restricted" editor. ++this version of Elvis, and Elvis isn't being used as a "restricted" editor. + + 
+ 	" SYSTEM TWEAKS GO HERE
+@@ -526,7 +526,7 @@
+ described in the Tips chapter.
+ If your copy of Elvis is configured to support aliases (and all versions are,
+ except for MS-DOS) then this file will be automatically loaded via the
+-elvis.ini script, each time you run Elvis.
++elvis.ini script, each time you run Elvis.
+ 
+ 
elvis.msg
+ 
This file stores a translation table, which allows you to customize
--- elvis-2.2.0.orig/debian/patches/segfault-fsentence
+++ elvis-2.2.0/debian/patches/segfault-fsentence
@@ -0,0 +1,32 @@
+
+    fix a bug in the ) vi command code that could cause a segmentation
+    fault (patch from elvis-almost-2.2.1):
+Index: elvis-2.2.0/move.c
+===================================================================
+--- elvis-2.2.0.orig/move.c	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/move.c	2009-03-03 21:10:46.000000000 +0530
+@@ -4,7 +4,7 @@
+ 
+ #include "elvis.h"
+ #ifdef FEATURE_RCSID
+-char id_move[] = "$Id: move.c,v 2.66 2003/10/17 17:41:23 steve Exp $";
++char id_move[] = "$Id: move.c,v 2.67 2003/12/28 20:31:11 steve Exp $";
+ #endif
+ 
+ #ifdef FEATURE_G
+@@ -1620,6 +1620,7 @@
+ 	long	para;
+ 	long	offset;
+ 	long	count;
++	MARKBUF	tmp;
+ 
+ 	DEFAULT(1);
+ 
+@@ -1651,6 +1652,7 @@
+ 	else
+ 	{
+ 		para = 0;
++		scanseek(&cp, marktmp(tmp, markbuffer(win->state->cursor), 0L));
+ 	}
+ 	marksetoffset(win->state->cursor, offset);
+ 	if (para == offset)
--- elvis-2.2.0.orig/debian/patches/config-arch-kfreebsd
+++ elvis-2.2.0/debian/patches/config-arch-kfreebsd
@@ -0,0 +1,15 @@
+
+    fix build on new Debian kFreeBSD architecture:
+Index: elvis-2.2.0/configure
+===================================================================
+--- elvis-2.2.0.orig/configure	2009-03-03 21:10:42.000000000 +0530
++++ elvis-2.2.0/configure	2009-03-03 21:10:50.000000000 +0530
+@@ -644,7 +644,7 @@
+ 	TLIBS="-lcurses"
+ 	;;
+ 
+-  *linux*)
++  *linux* | *kfreebsd*)
+ 	if [ ! -f /usr/lib/libtermcap.a -a ! -f /lib/libtermcap.a ]
+ 	then
+ 		if [ -f /usr/lib/libncurses.a -o -f /usr/lib/ncurses.a ]
--- elvis-2.2.0.orig/debian/patches/doc-vicmd-hash
+++ elvis-2.2.0/debian/patches/doc-vicmd-hash
@@ -0,0 +1,18 @@
+
+    correct the description of the # vi command:
+Index: elvis-2.2.0/doc/elvisvi.html
+===================================================================
+--- elvis-2.2.0.orig/doc/elvisvi.html	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/doc/elvisvi.html	2009-03-03 21:10:45.000000000 +0530
+@@ -1316,10 +1316,8 @@
+ If no count is given, then 1 is assumed.
+ If the key is "-" then count is subtracted from the
+ number.
+-If the key is "+" or "#" then count is added to the
+-number.
+ If the key is "=" then the word is changed to count.
+-Any other key causes the command to fail.
++Any other key will add count to the number.
+ 
+ 
count &
+ 

--- elvis-2.2.0.orig/debian/patches/disable-instman
+++ elvis-2.2.0/debian/patches/disable-instman
@@ -0,0 +1,65 @@
+
+    disable the instman.sh script - we manually install the manpages
+    in debian/rules:
+Index: elvis-2.2.0/Makefile.in
+===================================================================
+--- elvis-2.2.0.orig/Makefile.in	2009-03-03 21:10:42.000000000 +0530
++++ elvis-2.2.0/Makefile.in	2009-03-03 21:10:42.000000000 +0530
+@@ -440,25 +440,25 @@
+ 	(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z_-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
+ 	-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
+ 	chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
+-	sh instman.sh -p$(PREFIX) $(ALL)
+-	-[ -d /etc/elvis ] || mkdir /etc/elvis
+-	-chmod 0755 /etc/elvis/
+-	-@ : >/etc/elvis/README && ( \
+-	  echo "This directory contains system-dependent versions of elvis' configuration" \
+-	  echo "files.  The standard versions are available in $(DATADIR)"  \
+-	  echo "To customize any of these configuration files for this system,"  \
+-	  echo "first copy the standard version of the file into /etc/elvis and" \
+-	  echo "then edit the copy.  Leave the standard version unchanged." \
+-	) >>/etc/elvis/README
+-	-chmod 0644 /etc/elvis/README
+-	@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
+-	@echo "files.  DO NOT MODIFY THESE FILES!  To perform host-specific customization," >>$(DATADIR)/README
+-	@echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
+-	@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
+-	@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
+-	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
+-	@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
+-	chmod 0644 $(DATADIR)/README
++#	sh instman.sh -p$(PREFIX) $(ALL)
++#	-[ -d /etc/elvis ] || mkdir /etc/elvis
++#	-chmod 0755 /etc/elvis/
++#	-@ : >/etc/elvis/README && ( \
++#	  echo "This directory contains system-dependent versions of elvis' configuration" \
++#	  echo "files.  The standard versions are available in $(DATADIR)"  \
++#	  echo "To customize any of these configuration files for this system,"  \
++#	  echo "first copy the standard version of the file into /etc/elvis and" \
++#	  echo "then edit the copy.  Leave the standard version unchanged." \
++#	) >>/etc/elvis/README
++#	-chmod 0644 /etc/elvis/README
++#	@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
++#	@echo "files.  DO NOT MODIFY THESE FILES!  To perform host-specific customization," >>$(DATADIR)/README
++#	@echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
++#	@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
++#	@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
++#	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
++#	@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
++#	chmod 0644 $(DATADIR)/README
+ 
+ 
+ ###############################################################################
+Index: elvis-2.2.0/configure
+===================================================================
+--- elvis-2.2.0.orig/configure	2009-03-03 20:44:09.000000000 +0530
++++ elvis-2.2.0/configure	2009-03-03 21:10:42.000000000 +0530
+@@ -886,7 +886,7 @@
+ echo "Bin dir:  "`echo "$BINDIR" |sed s,'$(PREFIX)',"$PREFIX",`
+ echo "Data dir: "`echo "$DATADIR"|sed s,'$(PREFIX)',"$PREFIX",`
+ echo "Doc dir:  "`echo "$DOCDIR" |sed s,'$(PREFIX)',"$PREFIX",`
+-echo "Man dir:  "`sh instman.sh -d -p"${PREFIX}"`
++#echo "Man dir:  "`sh instman.sh -d -p"${PREFIX}"`
+ [ "$WHY" ] || echo "To see details, run \"configure --verbose\""
+ 
+ ################################################################################
--- elvis-2.2.0.orig/debian/patches/getline
+++ elvis-2.2.0/debian/patches/getline
@@ -0,0 +1,52 @@
+Rename custom getline to mygetline to get this to build against eglibc 2.10
+Patch from Christoph Egger  to fix (#552866) 
+
+Index elvis-2.2.0/ref.c
+===================================================================
+--- elvis-2.2.0.orig/ref.c
++++ elvis-2.2.0/ref.c
+@@ -42,7 +42,7 @@
+ 
+ #if USE_PROTOTYPES
+ static void usage(char *argv0);
+-static char *getline(FILE *fp);
++static char *mygetline(FILE *fp);
+ static void store(char *line, char **list);
+ static LINECLS classify(char *line, LINECLS prev);
+ static void lookup(TAG *tag);
+@@ -171,7 +171,7 @@
+ /* This function reads a single line, and replaces the terminating newline with
+  * a '\0' byte.  The string will be in a static buffer.  Returns NULL at EOF.
+  */
+-static char *getline(fp)
++static char *mygetline(fp)
+ 	FILE	*fp;
+ {
+ 	int	ch;
+@@ -348,7 +348,7 @@
+ 	}
+ 
+ 	/* for each line... */
+-	for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
++	for (lnum = 1, lc = LC_COMPLETE; (line = mygetline(fp)) != NULL; lnum++)
+ 	{
+ 		/* is this the tag definition? */
+ 		if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
+@@ -377,7 +377,7 @@
+ 			{
+ 				if (strchr(line, '(') != NULL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = mygetline(fp)) != NULL
+ 					    && *line
+ 					    && ((*line != '#' && *line != '{')
+ 						|| line[strlen(line) - 1] == '\\'))
+@@ -387,7 +387,7 @@
+ 				}
+ 				else if ((lc = classify(line, lc)) == LC_PARTIAL)
+ 				{
+-					while ((line = getline(fp)) != NULL
++					while ((line = mygetline(fp)) != NULL
+ 					    && (lc = classify(line, lc)) == LC_PARTIAL)
+ 					{
+ 						puts(line);
--- elvis-2.2.0.orig/debian/patches/make-sed-ver
+++ elvis-2.2.0/debian/patches/make-sed-ver
@@ -0,0 +1,16 @@
+
+    fix sed command in Makefile that updates the manpages' version
+    string ("ELVIS 2.2_0"):
+Index: elvis-2.2.0/Makefile.in
+===================================================================
+--- elvis-2.2.0.orig/Makefile.in	2009-03-03 20:44:09.000000000 +0530
++++ elvis-2.2.0/Makefile.in	2009-03-03 21:10:42.000000000 +0530
+@@ -437,7 +437,7 @@
+ 	find $(DATADIR) -type f -exec chmod 0644 {} \;
+ 	find $(DOCDIR) -type f -exec chmod 0644 {} \;
+ 	(cd doc; for i in *.html; do sed 's/Elvis[^ ]*/<title>Elvis-$(VERSION)/;s/ELVIS[^ <]*</ELVIS-$(VERSION)</' $$i >$(DOCDIR)/$$i; done)
+-	(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
++	(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z_-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
+ 	-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
+ 	chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
+ 	sh instman.sh -p$(PREFIX) $(ALL)
--- elvis-2.2.0.orig/debian/patches/doc-tweaksection
+++ elvis-2.2.0/debian/patches/doc-tweaksection
@@ -0,0 +1,24 @@
+
+    fix the description of the '{' movement taking into account
+    the tweaksection variable:
+Index: elvis-2.2.0/doc/elvisvi.html
+===================================================================
+--- elvis-2.2.0.orig/doc/elvisvi.html	2009-03-03 21:10:45.000000000 +0530
++++ elvis-2.2.0/doc/elvisvi.html	2009-03-03 21:10:49.000000000 +0530
+@@ -904,10 +904,12 @@
+ <dt>[[
+ <br>]]
+ <dd><a name="obra"></a><a name="cbra"></a>
+-These commands move backward or forward to the start of a section.
+-The start of a section is defined to be '{' character in column 1 of a line;
+-or a troff section command listed in the value of the
+-<a href="elvisopt.html#sections">sections</a> option.
++These commands move backward or forward to the start of a section. The
++start of a section is defined to be a troff section command listed in
++the value of the <a href="elvisopt.html#sections">sections</a> option,
++or a '{' character that is preceded by unindented text unless the <a
++href="elvisopt.html#tweaksection">tweaksection</a> option is turned
++off, in which case the '{' character must appear in column 1.
+ 
+ <p>Note: There are also <a href="#recbegin">[key</a> and
+ <a href="#recend">]key</a>
--- elvis-2.2.0.orig/debian/patches/script-augz
+++ elvis-2.2.0/debian/patches/script-augz
@@ -0,0 +1,36 @@
+
+    replace the augz script with the better gzip script from the
+    current elvis development version and load it in elvis.ini
+    (note that it still doesn't work in some situations):
+Index: elvis-2.2.0/data/elvis.ini
+===================================================================
+--- elvis-2.2.0.orig/data/elvis.ini	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/data/elvis.ini	2009-03-03 21:10:43.000000000 +0530
+@@ -132,3 +132,6 @@
+  }
+ }
+ "
++"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
++" try to load the augz script which allows us to read/write gzipped files
++try load augz
+Index: elvis-2.2.0/data/scripts/augz.ex
+===================================================================
+--- elvis-2.2.0.orig/data/scripts/augz.ex	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/data/scripts/augz.ex	2009-03-03 21:10:43.000000000 +0530
+@@ -4,8 +4,14 @@
+   au!
+   au BufReadPre,FileReadPre	*.gz set reol=binary
+   au BufReadPost		*.gz %!gunzip
+-  au FileReadPost		*.gz '[,']!gunzip
+-  au BufReadPost,FileReadPost	*.gz set reol=text nomodified bufdisplay=normal
++  au FileReadPost		*.gz '[,']!gunzip 2>/dev/null
++  au BufReadPost,FileReadPost	*.gz {
++					set reol=text nomodified
++					file! (basename(filename))
++					source! (elvispath("elvis.arf"))
++					file! (filename).gz
++					set edited
++				     }
+   au BufReadPost		*.gz eval doau BufReadPost (basename(filename))
+   au BufWritePost,FileWritePost	*.gz eval mv (afile) (basename(afile))
+   au BufWritePost,FileWritePost	*.gz eval !gzip (basename(afile))
--- elvis-2.2.0.orig/debian/patches/printdoc-debian
+++ elvis-2.2.0/debian/patches/printdoc-debian
@@ -0,0 +1,90 @@
+
+    adapt the printdoc script and the documentation of it
+Index: elvis-2.2.0/doc/elvis.html
+===================================================================
+--- elvis-2.2.0.orig/doc/elvis.html	2009-03-03 21:10:43.000000000 +0530
++++ elvis-2.2.0/doc/elvis.html	2009-03-03 21:10:45.000000000 +0530
+@@ -121,7 +121,7 @@
+ 
+ <p>Each chapter is stored in a separate file;
+ you'll need to print each one separately.
+-A shell script/batch file named <a href="printdoc.bat">printdoc.bat</a>
++A shell script/batch file named <a href="printdoc.sh">printdoc.sh</a>
+ is provided to help you do this.
+ 
+ <h2>1.2 Overview of Elvis</h2>
+Index: elvis-2.2.0/doc/printdoc.bat
+===================================================================
+--- elvis-2.2.0.orig/doc/printdoc.bat	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/doc/printdoc.bat	2009-03-03 21:10:45.000000000 +0530
+@@ -1,34 +1,37 @@
+-REM () { :; }
+-REM This little script will print the documentation.  It does this by invoking
+-REM elvis on each documentation file in turn, telling elvis to print the file
+-REM via its :lpr command and then quit.  The complete manual should be about
+-REM 200 pages long.
+-REM
+-REM     THIS ASSUMES YOU HAVE ALREADY SET UP THE PRINTING OPTIONS!
+-REM
+-REM This script should work under DOS, Windows/NT, and the UNIX "ksh" shell or
+-REM clones such as "bash".  The first line of this file allows "sh" to accept
+-REM these REM lines without complaint, by defining it as a do-nothing function.
++#!/bin/sh
++#
++# This little script will print the documentation.  It does this by invoking
++# elvis on each documentation file in turn, telling elvis to print the file
++# via its :lpr command and then quit.  The complete manual should be about
++# 200 pages long.
++#
++#     THIS ASSUMES YOU HAVE ALREADY SET UP THE PRINTING OPTIONS!
+ 
+-elvis -Gquit -clp elvis.html
+-elvis -Gquit -clp elvisvi.html
+-elvis -Gquit -clp elvisinp.html
+-elvis -Gquit -clp elvisex.html
+-elvis -Gquit -clp elvisre.html
+-elvis -Gquit -clp elvisopt.html
+-elvis -Gquit -clp elvisdm.html
+-elvis -Gquit -clp elvisgui.html
+-elvis -Gquit -clp elvisos.html
+-elvis -Gquit -clp elvisses.html
+-elvis -Gquit -clp elviscut.html
+-elvis -Gquit -clp elvismsg.html
+-elvis -Gquit -clp elvisexp.html
+-elvis -Gquit -clp elvistag.html
+-elvis -Gquit -clp elvisnet.html
+-elvis -Gquit -clp elvistip.html
+-elvis -Gquit -clp elvistrs.msg
+-elvis -Gquit -clp elvisqr.html
+-elvis -Gquit -clp elvis.man
+-elvis -Gquit -clp ctags.man
+-elvis -Gquit -clp ref.man
+-elvis -Gquit -clp fmt.man
++HTMLDIR="/usr/share/elvis/manual"
++MANDIR="/usr/share/elvis/manual"
++#MANDIR="/usr/share/man/man1"
++MANEXT="man"
++#MANEXT="1.gz"
++
++elvis -Gquit -clp "$HTMLDIR"/elvis.html
++elvis -Gquit -clp "$HTMLDIR"/elvisvi.html
++elvis -Gquit -clp "$HTMLDIR"/elvisinp.html
++elvis -Gquit -clp "$HTMLDIR"/elvisex.html
++elvis -Gquit -clp "$HTMLDIR"/elvisre.html
++elvis -Gquit -clp "$HTMLDIR"/elvisopt.html
++elvis -Gquit -clp "$HTMLDIR"/elvisdm.html
++elvis -Gquit -clp "$HTMLDIR"/elvisgui.html
++elvis -Gquit -clp "$HTMLDIR"/elvisos.html
++elvis -Gquit -clp "$HTMLDIR"/elvisses.html
++elvis -Gquit -clp "$HTMLDIR"/elviscut.html
++elvis -Gquit -clp "$HTMLDIR"/elvismsg.html
++elvis -Gquit -clp "$HTMLDIR"/elvisexp.html
++elvis -Gquit -clp "$HTMLDIR"/elvistag.html
++elvis -Gquit -clp "$HTMLDIR"/elvisnet.html
++elvis -Gquit -clp "$HTMLDIR"/elvistip.html
++elvis -Gquit -clp "$HTMLDIR"/elvistrs.msg
++elvis -Gquit -clp "$HTMLDIR"/elvisqr.html
++elvis -Gquit -clp "$MANDIR"/elvis."$MANEXT"
++elvis -Gquit -clp "$MANDIR"/elvtags."$MANEXT"
++elvis -Gquit -clp "$MANDIR"/ref."$MANEXT"
++elvis -Gquit -clp "$MANDIR"/elvfmt."$MANEXT"
--- elvis-2.2.0.orig/debian/patches/white_on_black_term_clr
+++ elvis-2.2.0/debian/patches/white_on_black_term_clr
@@ -0,0 +1,19 @@
+
+Upstream was probably really thinking of classic "black on white"
+xterms while creating the color scheme. Using "default" as the colour
+for colored terminals seems a better option so that color reversal
+(which happens for su) does not create invisible test. (See #474202)
+
+Index: elvis/data/elvis.clr
+===================================================================
+--- elvis.orig/data/elvis.clr	2009-03-04 08:23:22.000000000 +0530
++++ elvis/data/elvis.clr	2009-03-04 08:26:40.000000000 +0530
+@@ -32,7 +32,7 @@
+ }
+ case vio
+ case termcap {
+-  color normal yellow or black
++  color normal default
+   color char like string
+   color comment italic light green or green
+   color fixed white or gray
--- elvis-2.2.0.orig/debian/patches/alias-features
+++ elvis-2.2.0/debian/patches/alias-features
@@ -0,0 +1,15 @@
+
+    add region and stdin to the features alias (in elvis.ali):
+Index: elvis-2.2.0/data/elvis.ali
+===================================================================
+--- elvis-2.2.0.orig/data/elvis.ali	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/data/elvis.ali	2009-03-03 21:10:46.000000000 +0530
+@@ -312,7 +312,7 @@
+  calc "Network protocols: ";(f ? f : "none")
+ 
+  set f="" l="Other features:    "
+- for i in alias array autocmd backtick browse cachedesc calc complete equaltilde fold g hlobject hlsearch image incsearch listchars litre lpr make mapdb misc mkexrc normal proto ram rcsid showtag smartargs spell split tags textobj v xft
++ for i in alias array autocmd backtick browse cachedesc calc complete equaltilde fold g hlobject hlsearch image incsearch listchars litre lpr make mapdb misc mkexrc normal proto ram rcsid region showtag smartargs spell split stdin tags textobj v xft
+  do {
+   if feature(i)
+   then {
--- elvis-2.2.0.orig/debian/patches/doc-man-location
+++ elvis-2.2.0/debian/patches/doc-man-location
@@ -0,0 +1,20 @@
+
+    debianize some links in the manual:
+Index: elvis-2.2.0/doc/elvis.html
+===================================================================
+--- elvis-2.2.0.orig/doc/elvis.html	2009-03-03 20:44:08.000000000 +0530
++++ elvis-2.2.0/doc/elvis.html	2009-03-03 21:10:43.000000000 +0530
+@@ -29,10 +29,10 @@
+    <li><a href="elvistrs.msg">		 A. List of terse messages</a>
+    <li><a href="elvisqr.html">           B. Quick Reference</a>
+    <li><a href="howto.html">		 C. How To...</a>
+-   <li><a href="elvis.man">		elvis(1) Man-page for Elvis</a>
+-   <li><a href="ctags.man">		ctags(1) Man-page for ctags (or elvtags)</a>
++   <li><a href="elvis.man">		elvis(1) Man-page for elvis</a>
++   <li><a href="elvtags.man">		elvtags(1) Man-page for ctags (or elvtags)</a>
+    <li><a href="ref.man">		ref(1) Man-page for ref</a>
+-   <li><a href="fmt.man">		fmt(1) Man-page for fmt</a>
++   <li><a href="elvfmt.man">		elvmt(1) Man-page for fmt (or elvfmt)</a>
+ </menu>
+ 
+ <p><strong>HINT:</strong> If you're reading this via Elvis' built-in
--- elvis-2.2.0.orig/debian/patches/doc-man-hyphen
+++ elvis-2.2.0/debian/patches/doc-man-hyphen
@@ -0,0 +1,97 @@
+
+    fix hyphen-used-as-minus-sign:
+Index: elvis-2.2.0/doc/ctags.man
+===================================================================
+--- elvis-2.2.0.orig/doc/ctags.man	2009-03-03 20:44:07.000000000 +0530
++++ elvis-2.2.0/doc/ctags.man	2009-03-03 21:10:50.000000000 +0530
+@@ -84,7 +84,7 @@
+ .IP \fB-g\fR
+ For static tags, generate entries that look like global tags.
+ (I.e., never generate an extra "file:" attribute.)
+-This implies -s and -h.
++This implies \-s and \-h.
+ .IP \fB-i\fR
+ Include inline definitions.
+ A tag will be generated for each function which is declared as being
+Index: elvis-2.2.0/doc/elvis.man
+===================================================================
+--- elvis-2.2.0.orig/doc/elvis.man	2009-03-03 21:10:40.000000000 +0530
++++ elvis-2.2.0/doc/elvis.man	2009-03-03 21:10:50.000000000 +0530
+@@ -150,7 +150,7 @@
+ permanently paranoid, for the duration of this process.
+ .IP \fB-SS\fR
+ Sets security=restricted.
+-This is more extreme security than "-S".
++This is more extreme security than "\-S".
+ The intent is to protect the system against reading by malicious users.
+ .IP "\fB-f \fIsession\fR"
+ Makes
+@@ -163,13 +163,13 @@
+ .I logfile
+ instead of going to stdout/stderr as usual.
+ This is useful under Windows95, where stdout/stderr don't show anywhere.
+-If you're having trouble configuring WinElvis, try running "WinElvis -VVV -o log"
++If you're having trouble configuring WinElvis, try running "WinElvis \-VVV \-o log"
+ and then you can find the trace and error messages in the file "log".
+ .IP "\fB-G \fIgui\fR"
+ Makes
+ .B Elvis
+ use the named \fIgui\fR user interface instead of the default.
+-To see a list of supported user interfaces, give the command "elvis -?".
++To see a list of supported user interfaces, give the command "elvis \-?".
+ .IP "\fB-c \fIcommand\fR"
+ After loading the first file, interpret \fIcommand\fR as an ex command line.
+ Several ex command lines can be sent in one line, separated by "|".
+@@ -334,7 +334,7 @@
+ temporarily sets security=safer while the
+ command is executed, for security reasons.
+ Second, the command is executed by the server's existing window, not the
+-new one, so (for example) "elvis -client -c 20 foo" creates a new window for the file
++new one, so (for example) "elvis \-client \-c 20 foo" creates a new window for the file
+ "foo", and then moves the OLD WINDOW's cursor to line 20 of whatever file
+ it was showing.
+ .SS "X11 Mouse"
+@@ -500,7 +500,7 @@
+ .IP TERM
+ For the termcap interface, this is the name of the terminal's termcap/terminfo
+ entry.
+-Also, if its value is "kvt" or ends with "-r" or "-rv", then the background
++Also, if its value is "kvt" or ends with "\-r" or "\-rv", then the background
+ option will be "light" by default; else it will be "dark".
+ .IP TERMCAP
+ For the termcap interface, this can either store the name of a termcap file
+Index: elvis-2.2.0/doc/ref.man
+===================================================================
+--- elvis-2.2.0.orig/doc/ref.man	2009-03-03 20:44:07.000000000 +0530
++++ elvis-2.2.0/doc/ref.man	2009-03-03 21:10:50.000000000 +0530
+@@ -28,7 +28,7 @@
+ The tag info consists of the three standard fields from each tag.
+ The fields will be separated by tab characters, just like records from the
+ traditional tags file format.
+-Consequently, you can use "ref -t -a >oldtags" to convert a new-style tags file
++Consequently, you can use "ref \-t \-a >oldtags" to convert a new-style tags file
+ back to an old-style tags file.
+ .IP \fB-v\fR
+ Output verbose tag info, instead of the function header.
+@@ -160,10 +160,10 @@
+ To find the global function headers, I used the command...
+ .nf
+ 
+-		ref -a kind:f file:dummy
++		ref \-a kind:f file:dummy
+ .fi
+ .PP
+-The "-a" causes
++The "\-a" causes
+ .B ref
+ to output all headers, instead of just the first one that it finds.
+ "kind:f" causes it to exclude any non-functions.
+@@ -184,7 +184,7 @@
+ there, so for each "file.c" I used the command...
+ .nf
+ 
+-		ref -a kind:f file:=file.c
++		ref \-a kind:f file:=file.c
+ .fi
+ .PP
+ This is very similar to the earlier command.
--- elvis-2.2.0.orig/debian/patches/ft2-nameclash-fix
+++ elvis-2.2.0/debian/patches/ft2-nameclash-fix
@@ -0,0 +1,62 @@
+Index: elvis-2.2.0/guix11/xdialog.c
+===================================================================
+--- elvis-2.2.0.orig/guix11/xdialog.c	2009-03-03 20:44:07.000000000 +0530
++++ elvis-2.2.0/guix11/xdialog.c	2009-03-03 21:10:51.000000000 +0530
+@@ -387,7 +387,7 @@
+ 			  case 'o': ft = FT_ONEOF, limit = scan;	break;
+ 			  case 'n': ft = FT_NUMBER, limit = scan;	break;
+ 			  case 's': ft = FT_STRING;			break;
+-			  case 'f': ft = FT_FILE;			break;
++			  case 'f': ft = FT_FILE_;			break;
+ 			  case 'l': ft = FT_LOCKED;			break;
+ 			}
+ 
+@@ -556,7 +556,7 @@
+ 			break;
+ 
+ 		  case FT_STRING:
+-		  case FT_FILE:
++		  case FT_FILE_:
+ 			button = addbutton(dia, "<", 'l', ELVCTRL('L'));
+ 			button->y = dia->y0 + dia->rowh * i;
+ 			button->x = dia->x0 + 3;
+@@ -1111,7 +1111,7 @@
+ 			newvalue = keystring(dia, key);
+ 			break;
+ 
+-		  case FT_FILE:
++		  case FT_FILE_:
+ #ifdef FEATURE_COMPLETE
+ 			if (key == '\t')
+ 			{
+@@ -1179,7 +1179,7 @@
+ 	switch (dia->field[row].ft)
+ 	{
+ 	  case FT_STRING:
+-	  case FT_FILE:
++	  case FT_FILE_:
+ 	  case FT_NUMBER:
+ 	  case FT_LOCKED:
+ 		drawtext(dia, row);
+@@ -1207,7 +1207,7 @@
+ 			break;
+ 
+ 		  case FT_STRING:
+-		  case FT_FILE:
++		  case FT_FILE_:
+ 			if (button->shape == 'l')
+ 				if (row == dia->current
+ 				    ? dia->shift > 0
+Index: elvis-2.2.0/guix11/xdialog.h
+===================================================================
+--- elvis-2.2.0.orig/guix11/xdialog.h	2009-03-03 20:44:07.000000000 +0530
++++ elvis-2.2.0/guix11/xdialog.h	2009-03-03 21:10:51.000000000 +0530
+@@ -5,7 +5,7 @@
+ 	FT_ONEOF,	/* one of a preset list; includes boolean */
+ 	FT_NUMBER,	/* numeric field */
+ 	FT_STRING,	/* string field */
+-	FT_FILE,	/* string field where <Tab> does filename completion */
++	FT_FILE_,	/* string field where <Tab> does filename completion */
+ 	FT_LOCKED	/* non-editable field */
+ } X_FIELDTYPE;
+ typedef struct
--- elvis-2.2.0.orig/debian/patches/syntax-sh-return
+++ elvis-2.2.0/debian/patches/syntax-sh-return
@@ -0,0 +1,18 @@
+
+    add "return" to the syntax file as a keyword for shell scripts
+    (suggested by Herbert Xu):
+Index: elvis-2.2.0/data/elvis.syn
+===================================================================
+--- elvis-2.2.0.orig/data/elvis.syn	2009-03-03 20:44:09.000000000 +0530
++++ elvis-2.2.0/data/elvis.syn	2009-03-03 21:10:41.000000000 +0530
+@@ -209,8 +209,8 @@
+ keyword alias autoload bg break case cd continue do done echo elif else esac
+ keyword eval exec exit export false fc fg fi for getopts hash history
+ keyword if in integer jobs kill let newgrp nohup print pwd r read readonly
+-keyword select set shift source stop suspend test then time times trap type
+-keyword typeset ulimit umask unalias unset until wait whence while
++keyword return select set shift source stop suspend test then time times trap
++keyword type typeset ulimit umask unalias unset until wait whence while
+ function (
+ comment #
+ startword /?-*!.
--- elvis-2.2.0.orig/debian/lintian/elvis-tools
+++ elvis-2.2.0/debian/lintian/elvis-tools
@@ -0,0 +1,5 @@
+# Manpages are all in elvis-common which
+# this package depends on.
+elvis-tools: binary-without-manpage usr/bin/elvfmt
+elvis-tools: binary-without-manpage usr/bin/elvtags
+elvis-tools: binary-without-manpage usr/bin/ref
--- elvis-2.2.0.orig/debian/lintian/elvis-console
+++ elvis-2.2.0/debian/lintian/elvis-console
@@ -0,0 +1,3 @@
+# Manpages are all in elvis-common which
+# this package depends on.
+elvis-console: binary-without-manpage usr/bin/elvis
--- elvis-2.2.0.orig/debian/lintian/elvis
+++ elvis-2.2.0/debian/lintian/elvis
@@ -0,0 +1,4 @@
+# Manpages are all in elvis-common which
+# this package depends on.
+elvis: binary-without-manpage usr/bin/elvis
+elvis: binary-without-manpage usr/bin/elvisnox