debian/0000755000000000000000000000000012061457324007172 5ustar debian/NEWS0000644000000000000000000000207512061456715007700 0ustar ispell (3.3.02-4) unstable; urgency=low This is the latest, and most probably the last, upstream version of ispell. Support for HTML or TeX files checking was slightly improved, limited support for UTF-8 in American and British dictionaries was added (`ispell -T utf8'), and plenty of old bugs were fixed. Small, large, huge and insane versions of American and British ispell dictionaries are now available. They are contained in packages which names start with the `iamerican-' or `ibritish-' prefixes (for example iamerican-large, ibritish-small). The medium-sized versions of the dictionaries are included in `iamerican' and `ibritish' packages. Unfortunately, ispell seems to be no longer maintained by its upstream authors, so you should try switching to alternate spell-checkers like aspell or hunspell. -- Robert Luberda Tue, 29 Mar 2011 20:18:06 +0200 ispell (0.0-0) unstable; urgency=low An dummy entry to work-around apt-listchanges bug#590541. -- Robert Luberda Mon, 28 Mar 2011 19:14:47 +0200 debian/README.source0000644000000000000000000000063112061456715011354 0ustar Most of debhelper config files like debian/*.dirs, debian/*.install, debian/*.doc-base* are generated at build-time from the debian/packages.d/$package.in or debian/packages.d/dictionaries.in files, which are in the following format: %# comment %filename1% contents of filename1 %filename2% %# another comment contents of filename2 At build-time the files will be installed as debian/$package.filename debian/TODO.Debian0000644000000000000000000000233212061456715011046 0ustar $Id: TODO.Debian,v 1.13 2001/09/03 04:05:37 david Exp $ Now that ibritish doesn't contain american words (as of package 3.1.20-10), do we need a new ibritish+american dictionary that does? Should ispell have the ability to specify an alternate wordlist from the command line? Currently can only do that for the ispell dictionary. Build and test ispell 3.2.04 [or whatever] packages. Investigate the old (pre 3.1.20-1) source patches and send the appropriate ones upstream: ispell.c patch: don't allow -b and -x at the same time ispell.texinfo patch: moved '@node Top, Emacs, (dir), (dir)', and changed some (all?) '@kbd{@ctrl{G}}' to '@kbd{@key{Ctrl}-g}' various patches to .X files for temporary file handling sq.c patch (gets -> fgets) 61956: =?iso-8859-1?Q?ispell_don't_recognizes_=E9_=E8_=E0_and_=E7_caracters=2C_?= =?iso-8859-1 77234: Missing changelog entries 102607: hash files should be 128 character pers string 100925: spins if ctrl-z'd * disabled the termios patch to see if that fixes the problem -- it doesn't. Try it in ispell 3.2.x? Ispell 3.1.20 unmodified on BSD systems handles ^Z correctly. ^^^ and that version ispell-3.1.20.tar.gz is identical to ispell-3.1.20.orig.tar.gz. debian/addons/0000755000000000000000000000000012061456715010445 5ustar debian/addons/strix.py0000644000000000000000000000663512061456715012202 0ustar #!/usr/bin/python # $Id: strix.py,v 1.4 2001/12/11 04:12:24 david Exp $ # copyright 2000, Drew Parsons # released under General Public Licence (GPL) etc etc # python script for transforming ispell word lists (with affix data) # into plain wordlists (for /usr/share/dict), resolving affix data into # derivative words # case has not been carefully accounted for: # affix rules are assumed Upper Case, words are assumed to be in lower case from re import * # read in each line from stdin until EOF reached while 1: try: entry = raw_input() except EOFError: break # [to do: break line into words if necessary? if more than one word per line ] # assume one word per line for now word = entry # find '/' character in word, dividing root word from prefix and suffix rules base = split('/',word) # from re # print root word root = base[0] print root # prefix and suffix rules are defined in ispell's english.aff in language/english # (take care to be sure these rules are consistent with the dictionaries used) # [ if you want to get really clever, you could read those rules from the affix files ] if len(base) > 1 : affices = base[1] # affix rules from ispell v 3.1.20 if 'A' in affices: print 're'+root if 'I' in affices: print 'in'+root if 'U' in affices: print 'un'+root if 'V' in affices: if root[-1]=='e': print root[:-1]+'ive' else: print root+'ive' if 'N' in affices: if root[-1]=='e': print root[:-1]+'ion' elif root[-1]=='y': print root[:-1]+'ication' else: print root+'en' if 'X' in affices: if root[-1]=='e': print root[:-1]+'ions' elif root[-1]=='y': print root[:-1]+'ications' else: print root+'ens' if 'H' in affices: if root[-1]=='y': print root[:-1]+'ieth' else: print root+'th' if 'Y' in affices: print root+'ly' if 'G' in affices: if root[-1]=='e': print root[:-1]+'ing' else: print root+'ing' if 'J' in affices: if root[-1]=='e': print root[:-1]+'ings' else: print root+'ings' if 'D' in affices: if root[-1]=='e': print root+'d' elif root[-1]=='y': if match('[aeiou]',root[-2]): print root+'ed' else: print root[:-1]+'ied' else: print root+'ed' if 'T' in affices: if root[-1]=='e': print root+'st' elif root[-1]=='y': if match('[aeiou]',root[-2]): print root+'est' else: print root[:-1]+'iest' else: print root+'est' if 'R' in affices: if root[-1]=='e': print root+'r' elif root[-1]=='y': if match('[aeiou]',root[-2]): print root+'er' else: print root[:-1]+'ier' else: print root+'er' if 'Z' in affices: if root[-1]=='e': print root+'rs' elif root[-1]=='y': if match('[aeiou]',root[-2]): print root+'ers' else: print root[:-1]+'iers' else: print root+'ers' if 'S' in affices: if root[-1]=='y': if match('[aeiou]',root[-2]): print root+'s' else: print root[:-1]+'ies' elif match('[sxzh]',root[-1]): print root+'es' else: print root+'s' if 'P' in affices: if root[-1]=='y': if match('[aeiou]',root[-2]): print root+'ness' else: print root[:-1]+'iness' else: print root+'ness' # if 'M' in affices: # print root+"'s" debian/changelog0000644000000000000000000013500712061456715011055 0ustar ispell (3.3.02-6) unstable; urgency=low * debian/control: + mark ispell package as `Multi-Arch: foreign' (closes: #695102); + update VCS fields. -- Robert Luberda Mon, 10 Dec 2012 22:56:16 +0100 ispell (3.3.02-5) unstable; urgency=low * Fix a typo in ibritish-huge description (closes: #630240). * Replace `The package also recommends' with `The package also suggests' in packages' descriptions (closes: #630243). * Standards-Version: 3.9.2 (no changes). -- Robert Luberda Wed, 15 Jun 2011 07:58:21 +0200 ispell (3.3.02-4) unstable; urgency=low * Upload to unstable. * Add a debian/NEWS file for the recent changes. * gen_debhelper_files.pl: remove the ` - medium' part from iamerican and ibritish debconf prompts (closes: #619651). * debian/control: + make sure ienglish-common recommends' include both iamerican* and ibritish* packages (closes: #619922); + fix a typo in iamerican-huge description (closes: #619924); + bump (build-)dependencies on dictionaries-common(-dev) to >= 1.10.6~ to have #619620 fixed; + add VCS fields; + make dictionary packages to depend on ispell and dictionaries-common-dev to have their versions included in reportbug(1) generated reports. -- Robert Luberda Tue, 29 Mar 2011 20:18:06 +0200 ispell (3.3.02-3) experimental; urgency=low * debian/rules: add a work-around for autobuilders not obeying Policy (see #619284). If not all build-dependencies are installed, then postpone building arch-independent stuff until binary(-indep) target is called. * 0029-Generate-hex-in-fix8bit.patch: Make `fix8bit -7' to generate hexadecimal sequences instead of octal ones. * 0030-Display-whole-multibyte-character.patch: Display all bytes from multi-byte characters instead of converting them into `cat -v' format. -- Robert Luberda Wed, 23 Mar 2011 08:17:00 +0100 ispell (3.3.02-2) experimental; urgency=low * Provide small, large, huge and insane version of American and British ispell dictionaries (closes: #261611), that include words from the appropriate word list packages. The new {ibritish,iamerican}-{small,large, huge,insane} packages were added together with ienglish-common, the base one. With the new dictionaries (especially with the large or huge ones), ispell is able to accept more American or British words: + words accepted by `ispell -d british': neighbour (closes: #282934); + words accepted by `ispell -d british-large': Cambridgeshire, Hertfordshire and other counties (closes: #151470); + words accepted by `ispell -d american': Oedipus (closes: #442089); Wiki (closes: #417097); bidirectional (closes: #440211); decompiler (closes: #404870); glitz (closes: #434709); looseness (closes: #464162); misestimate (closes: #354301); one's (closes: #586600); online (closes: #405125); public's (closes: #415049); spottily (closes: #307235); submitters (closes: #440052); talkies (closes: #294262); timestamp (closes: #402781); unencrypted (closes: #389899); uninterruptible (closes: #366895); faceted, facetted (closes: #417096); wildcards, wildcards (closes: #394271); analyses, analyzes, analysis (closes: #602055); + words accepted by `ispell -d american-large': Los Angeles (closes: #431913); Singaporean (closes: #440132); backgrounder (closes: #380568); basketful (closes: #325252); cadastral (closes: #309000); carful (closes: #417166); colorization (closes: #307410); congresspeople (closes: #448389); cowbells (closes: #356744); cutover (closes: #454338); dumplings (closes: #317483); examinee (closes: #305077); fetchers (closes: #447912); gappy (closes: #349100); godawful (closes: #392444); halftone (closes: #305585); hammerers (closes: #458591); hotline (closes: #312268); hunky (closes: #471116); infract (closes: #451732); jackfruit (closes: #413711); jittering (closes: #413763); kindergartener (closes: #324212); lakefront (closes: #314366); landmine (closes: #456445); milkshakes (closes: #464942); mindset (closes: #312944); mislabeled (closes: #451730); motorless (closes: #386566); mugshot (closes: #437441); nutcase (closes: #443527); oldfangled (closes: #393833); polycarbonate (closes: #336963); reacquiring (closes: #466488); reconfirm (closes: #447820); reprogrammable (closes: #368142); retitle (closes: #372674); screenful (closes: #348825); searchable (closes: #426620); seatbelt (closes: #326974); seeable (closes: #382219); serration (closes: #434009); signage (closes: #395975); smorgasbord (closes: #442023); sordine (closes: #356743); stakeholder (closes: #471914); standalone (closes: #341646); stearate (closes: #366894); subaudible (closes: #398934); switchover (closes: #348787); syllabary (closes: #307430); tinnitus (closes: #438916); torturous (closes: #356741); triangulating (closes: #333619); uncompetitive (closes: #451429); unconverted (closes: #316153); unpresentable (closes: #313268); untethered (closes: #470199); wack (closes: #293231); ISP, boonies, ft(feet), remodelers (closes: 292789); biramous, uniramous (closes: #433207); breathalyser, Breathalyzer, breathings (closes: #303911); builtin, built-in (closes: #415614); demonization, demonized, demonize (closes: #367561); electable, unelectable (closes: #282569); fearer, fearers, fear (closes: #404869); gawkers, transgender (closes: #454068); heartbreaker, heartbreaker's, heartburning's (closes: #302446); ideologue, ideologues (closes: #270734); lossless, gainless (closes: #392443); marginalization, marginalize, marginate (closes: #284684); misconfiguration, misconfigure (closes: #358549); mortifications, messianic, thuggish (closes: #416305); nitty, gritty (closes: #273409); redacting, redacted, redaction's (closes: #311539); subcategories, subcategory (closes: #438434); systemically, systematical (closes: #359022); designee, detainees, impermissibility, huh, unclarity (closes: #405475); + words accepted by `ispell -d american-huge': Freemasonic (closes: #356740); canistel (closes: #354758); citizenships (closes: #437759); commenters (closes: #445118); expirable (closes: #312264); formularies (closes: #362022); juried (closes: #451004); mishmosh (closes: #360834); multiline (closes: #394272); overnighting (closes: #307849); spellcheck (closes: #409287); telecom (closes: #368387); uncheck (closes: #364825); wishlist (closes: #305758); Folate, Folacin, Folic Acid (closes: #324211); cardioid, ignorable, unignorable (closes: #295464); checkmark, checkmarked (closes: #471123); fundraiser, fundraise, fundraising (closes: #314862); maneuver, maneuverability, maneuverer's, manoeuvrings (closes: #336962); misconnection, misconnect (closes: #436951); sectionize, sectionizing, sectionalizing (closes: #323696); subversions, unapologetic, detainees (closes: #434219); unglue, ungluing (closes: #440930); + words accepted by `ispell -d american-insane': conformant (closes: #460184); enmass (closes: #260178); recompensated (closes: #450727); unmowed (closes: #443754); obfuscator, obfuscater, obfuscate (closes: #404520); * Added debian/local/Makefile.languages.inc: + prepare backgrounds for using ispell-autobuildhash in ibritish and iamerican packages and providing several variants of the packages by installing compressed munchlist word lists and skipping builds of hashes; + two special Debian-specific values are added into the LANGUAGES variable, EXTRADICT is overridden per each target which allows us to use word list appropriate to the target; + pass -T utf8 to munchlist to avoid the `illegal characters' warnings. * 0027-Include-Debian-Makefile.languages.inc.patch: new patch that includes debian/local/Makefile.languages.inc file from languages/ {american,british,english}/Makefile. * 0028-Fix-hardening-warnings.patch: fix warnings given by gcc with the hardening options turned on. * 0001-Configuration.patch: updated to build all available dictionaries. * Use ispell-autobuildhash for all the British and American dictionary packages to make them architecture independent. * Update various debhelper files for multi-dictionaries support: + add debian/packages.d directory and make the debhelper files automatically generated at build time. + debian/control: - switch architecture of ibritish/iamerican packages to all; - add all wamerican-*/wbritish-* packages into Build-Depends-Indep; - (build-)depend on dictionaries-common (>= 1.10.4~); - make all our dictionary packages depend on ienglish-common, which in turn depends on appropriate versions of dictionaries-common and ispell. + debian/rules: - build the insane versions of dictionaries; - split builds for architecture-dependent and independent packages. * Write a simple man page for defmt-sh and defmt-c deformatters. * Re-add README.source documenting that debhelper files are generated. -- Robert Luberda Sun, 20 Mar 2011 09:26:32 +0100 ispell (3.3.02-1) experimental; urgency=low * New upstream version (closes: #217393): + texinfo file is gone (closes: #528874); + the ispell's `-x' option is correctly documented (closes: #189188); + munchlist no longer ignores `-w' option (closes: #5379); + `ispell -p' doesn't require $HOME to be set anymore (closes: #354014); + ispell can be suspended with Ctrl-Z now (closes: #100925), however it still needs Ctrl-L after resuming to redraw the screen; + more asmlatex constructs are recognised and ignored (closes: #8585); + HTML entities are supported at least in English dicts (closes: #69186); + the new `-k' option allows ispell to ignore arbitrary TeX commands or HTML elements (closes: #343415); + unsafe type casts warnings got fixed (closes: #13820). * Merge patches for new upstream version: + 0002-ISO-more.patch removed as it seems to be applied upstream (except for HTSPECIAL part that hasn't be used since ver. 3.1.20-17); + 0004-mktemp-security.patch seems to be applied upstream, removed; + 0014-Fix-texinfo.patch removed as upstream no longer provides texinfo file; + 0001-Conglomeration.patch: update local.h.linux instead of local.h.samp. + 0006-Fix-gets-regression replaced with 0006-Fix-sq-and-unsq from OpenSUSE; + 0007-Use-termios.patch updated based on the similar patch from OpenSUSE; + refresh remaining patches. * Added patches: + 0017-DESTDIR-support.patch: Add support for $(DESTDIR) to Makefile; + 0018-Dont-strip-binaries.patch: Fix Makefile not to strip binaries (closes: #437235) + 0019-Section-of-english-5.patch: Fix section of the english(5) man page; + 0020-Mark-Rcs_Id-as-unused.patch: Fix Rcs_Id unused warnings; + 0021-Fix-gcc-warnings.patch: Fix other gcc warnings; + 0026-POSIX-sort.patch: Force POSIX sort options (closes: #204899). * Split 0001-Conglomeration.patch into the following patches: + 0001-Configuration.patch: Debian ispell configuration; + 0022-Ispell-man-page.patch: Fix example in ispell man page; + 0023-Exclusive-options.patch: Make options -x and -b mutually exclusive; + 0024-Check-tempdir-creation.patch: Fail if temporary directory cannot i be created; + 0025-Languages.patch: Fix English dictionaries. + move sq man page changes into 0006-Fix-sq-and-unsq.patch; + move ijoin.c changes into 0011-Missing-prototypes.patch. * debian/rules: + use DESTDIR and upstream install target for installing the package; + update other debhelper files for the above change; + don't overwrite ispell.1 generated by upstream Makefile by a script that does not support all of the `!!' variables (closes: #324226). * debian/control: + add wamerican as an default recommendation for wordlist (closes: #595749); + break circular dependency by moving iamerican | ispell-dictionary to Recommends from Depends (closes: #529069); + add versioned `Breaks' for all packages providing ispell-dictionary that are not architecture `all'; + remove dependencies on `debconf | debconf-2.0' as they should be automatically re-added by debhelper. * 0001-Configuration.patch: use higher, upstream-provided values for MAXAFFIXLEN and MAXSTRINGCHARS (closes: #176926). * Remove update-ispell-dictionary script and its man page. The script has been marked as obsolete for more than 10 years. * debian/copyright: updated for new upstream version. * debian/ispell.doc-base, debian/ispell.info: removed, neither HTML nor info documentation is no longer provided by upstream. * debian/watch: update the download URL. * Really remove the debian/README.source file. -- Robert Luberda Sat, 12 Mar 2011 19:45:12 +0100 ispell (3.1.20.0-9) unstable; urgency=low * Change patches descriptions and names to be compatible with gbp-pq: + rename 01-conglomeration.patch to 0001-Conglomeration.patch; + rename 02-iso-more-html.patch to 0002-ISO-more.patch; + rename 03-lookup-hurd.patch to 0003-Fix-FTBFS-on-Hurd.patch; + rename 04-mktemp-security.patch to 0004-mktemp-security.patch; + rename 05-reorder-word.patch to 0005-Do-not-reorder-words.patch; + rename 06-sq-unsq.patch to 0006-Fix-gets-regression.patch; + rename 07-termios.patch to 0007-Use-termios.patch; + rename 08-tex-backslash.patch to 0008-Tex-backslash.patch; + rename 09-usg-glibc.patch to 0009-Fix-FTBFS-on-glibc.patch; + rename 10-dctrl.patch to 0010-Debian-control-file.patch; + rename 11-missing-prototypes.patch to 0011-Missing-prototypes.patch; + rename 12-fix_getline.patch to 0012-Fix-getline.patch; + rename 13-fix_manpages.patch to 0013-Fix-man-pages.patch; + rename 14-fix_info.patch to 0014-Fix-texinfo.patch; + rename 15_cflags_from_env.patch to 0015-CFLAGS-from-environment.patch. * Refresh the patches with gbp-pq import/export. * debian/rules: remove --parallel from options passed to dh_auto_*, added by mistake in previous upload. This should fix FTBFS on some archs. -- Robert Luberda Sat, 05 Mar 2011 20:30:28 +0100 ispell (3.1.20.0-8) unstable; urgency=low * Adopt package (closes: #543878). * Switch to the `3.0 (quilt)' source format: + drop build dependency on quilt; + refresh patches to update diff offsets; + drop debian/README.source; + modified the 01_conglomeration.patch to patch local.h.samp, because local.h is removed in debian/rules. * 15_cflags_from_env.patch: new patch to set value of CFLAGS from environment instead of being hardcoded in local.h. * 01_conglomeration.patch: remove patches that create new files: + move the man pages links created by .so requests to debian/ispell.links; + move addons/strix.py to debian/addons/strix.py, the file doesn't seem to be used however. * debian/rules: call dpkg-buildflags for initial value of CFLAGS and LDFLAGS. * debian/control: + Standards-Version: 3.9.1 (no changes); + remove articles from short descriptions (lintian); + sort dependency fields with wrap-and-sort from the ubuntu-dev-tools package. * Bump debhelper compat level to 8. -- Robert Luberda Sat, 05 Mar 2011 16:34:20 +0100 ispell (3.1.20.0-7) unstable; urgency=low * QA upload. * debian/patches/: - 12-fix_getline.patch added, thanks to Stefan Potyra (Closes: #549401) - 13-fix_manpages.patch added - 14-fix_info.patch added, contains fixes split from 01-conglomeration.patch * debian/watch added * debian/control: - debhelper Build-Dependency bumped to >= 7.0.50~ * debian/README.source: added info about quilt -- David Paleino Mon, 09 Nov 2009 10:22:12 +0100 ispell (3.1.20.0-6) unstable; urgency=low * Updating to standards version 3.8.3. * Removing vcs fields. * Orphaning package. -- Daniel Baumann Thu, 27 Aug 2009 10:27:57 +0200 ispell (3.1.20.0-5) unstable; urgency=medium * New maintainer (Closes: #487732). * Revert direct upstream modifications. * Using quilt rather than homebrew patch management. * Using correct rfc-2822 date formats in changelog. * Removing useless whitespaces at EOL and EOF. * Updating package to debhelper 7. * Updating package to standards version 3.8.2. * Cleaning up build-depends. * Adding homepage field in control. * Adding vcs fields in control. * Cleaning up depends. * Rewrapping package long-descriptions. * Unifying all copyright files into one and rewriting it in machine- interpretable format. * Moving local debian additions to dedicated subdirectory. * Using dedicated debhelper manpages file to install manpages. * Symlinking manpage alias rather than including a redirecting stub. * Updating debhelper links files. * Updating doc-base file. * Updating docs file. * Using dedicated debhelper install files to install files. * Minimizing rules file. * Not calling update-alternatives with absolute path in update-ispell- dictionary (Closes: #510946). * Downgrading package to priority optional (Closes: #416572). * Downgrading dictionaries recommends to suggests (Closes: #456537). * Removing todo entry about new debhelper. -- Daniel Baumann Mon, 03 Aug 2009 16:34:42 +0200 ispell (3.1.20.0-4.5) unstable; urgency=low * Non-maintainer upload for FTBFS RC bug. * Build Depend on coreutils instead of textutils (Closes: #521533). -- Agustin Martin Domingo Tue, 05 May 2009 12:09:08 +0200 ispell (3.1.20.0-4.4) unstable; urgency=medium * Non-maintainer upload for release critical bugs, policy issues and doc typos, during BSP. * Fix doc-base entry that caused postinst to fail when doc-base is installed (Closes: #364535, #366100, #384157, #384173, #386846, #401639, #409132). * Add debconf-2.0 alternate to debconf depends (Closes: #415689). * Fix typo in manpages (Closes: #274435, #274437, #326525) and description (Closes: #334420). * Do not depend on essential package sed (policy). * Fix parse errors in changelog. -- Thijs Kinkhorst Thu, 17 May 2007 21:11:38 +0200 ispell (3.1.20.0-4.3) unstable; urgency=low * NMU with the permission of the maintainer. * Apply a patch from upstream so words in a personal dictionary don't get reordered. (Closes: #305750). -- Martin Michlmayr Thu, 09 Mar 2006 14:51:10 +0000 ispell (3.1.20.0-4.2) unstable; urgency=high * Non-Maintainer Upload. * Fix the behaviour of munchlist, which was modified/broken with the previous patch. This version still uses the new "sort -k" syntax but reverts to the munchlist behaviour of 3.1.20.0-4 (Closes: #352360). -- Roland Rosenfeld Sat, 11 Feb 2006 16:29:05 +0100 ispell (3.1.20.0-4.1) unstable; urgency=low * Non-Maintainer Upload. * Give -k to sort instead of + and -, fixes FTBFS. Patch from Matt Kraai. (Closes: #339414) -- Steinar H. Gunderson Thu, 19 Jan 2006 00:33:17 +0100 ispell (3.1.20.0-4) unstable; urgency=low * debian/control: changed wordlist name in the ibritish description from 'british' to 'wbritish'; thanks to ippei1@bb.mbn.or.jp for noticing and reporting the mistake. Closes: #200166: ibritish: Typo in the package description. * debian/control: depend [and build-depend] on newer dictionaries-common[-dev] (>=0.20). Closes: #232142 "Please update your ... package(s) to new .config system" * debian/control; bump standards-version; no changes required. * debian/control: add missing debconf dependencies. -- David Coe Mon, 16 Feb 2004 03:08:13 -0500 ispell (3.1.20.0-3) unstable; urgency=low * ispell now Depends on an ispell-dictionary rather than just Recommending it; see this bug report for my reasoning: #197852: ispell-dictionaries don't purge cleanly * the iamerican and ibritish dictionary packages now Recommend rather than Suggest wamerican and wbritish wordlists, respectively, because most users need them (ispell's (L)ookup command requires a word list). * Revised the descriptions in light of the above changes. * thanks to Agustin Martin Domingo for testing and enabling ispell-autobuildhash (part of dictionaries-common): -- Added debian/ispell.postinst to test ispell-autobuildhash existence and run it if present. Closes: #41741: consider update-ispell-hash * thanks also to Agustin Martin Domingo for chasing down a debhelper bug (or misdocumented feature) and filing a separate bug report about that, and for testing the workaround: -- dh_clean --package=package will clean all *.debhelper snippets even if they do not belong to the selected package. Hacking around this (Commenting all dh_clean --package= lines) Closes: #199859: debhelper snippets get uninstalled during build * as a temporary solution to the -x problem, I've corrected the man page -- I will revisit this bug report in relation to ispell 3.2, so I'm leaving it open: #189188: Effect of -x flag differs from what is documented * changes in scowl 5-2 (and hence the word lists merged into the ispell american and british dictionaries) have added many common variant spellings, including "judgement". Closes: #146341: add "judgement"; knows only about "judgment" * chopsticks (and variants) are in the ispell iamerican and ibritish dictionaries since version 3.1.20.0-2, and in the wbritish, wamerican, and wcanadian word lists since version 5-1. If you still have this problem with those (or later) versions, please re-open the bug report and provide version details. Thanks. Closes: #199706: iamerican/ibritish: (no "chopsticks") -- David Coe Thu, 03 Jul 2003 23:58:18 -0400 ispell (3.1.20.0-2) unstable; urgency=low * Standards version update to 3.5.10: - compile with -g regardless of DEB_BUILD_OPTIONS 'debug' - add support for DEB_BUILD_OPTIONS 'noopt' * We no longer build the wbritish package here; that's now done (much better) by the scowl source package. * The dictionaries depend on dictionaries-common, no longer need to pre-depend. * Removed most of our patches from config.X and put them in local.h where they belong. * Correct a syntax error in parse.y and adjust Build-Depends; thanks to Daniel Schepler Closes: #168412: ispell: Build-Depends still not right * The ibritish and iamerican dictionaries now include the words from the SCOWL-derived wbritish and wamerican packages. Closes: #69068: ibritish: Isn't 'energise' a word? Closes: #134128: iamerican: doesn't know how to spell "nefarious" Closes: #151234: ibritish is missing towards, forwards, etc Closes: #165142: iamerican: please add "animus", "conflate", "opine", "politicize" Note: "conflate" is only int the "large" ispell dictionaries and in the "large" wamerican/wbritish word lists -- I presume it's there for good reason (infrequently used?). If you feel strongly it belongs in the regular dictionaries, please reopen this bug report and I'll consult with upstream and consider moving it. I also have meant for a while to package the large ispell dictionaries (I have already packaged the large English wordlists) -- I *will* get to that one of these years. * Provide a better example for use of the -d parameter Closes: #192400: ispell: Manpage not up to date * Accept NMUs from the dictionaries-common transition; thanks again, Agustin. Closes: #102607: hash files should be 128 character pers string Closes: #123641: ispell: ispell does not use debconf Closes: #164239: Please update your iamerican package to IDWP new policy Closes: #164248: Please update your ibritish package to IDWP new policy * Removed all the control file and rules file weridness created to get us through the dictionaries-common transition; life is so much simpler now. * Debhelper compat 4 allowed me to simplify some more weird stuff in rules, particularly regarding the man pages (thanks, Joey). -- David Coe Tue, 17 Jun 2003 19:46:59 -0400 ispell (3.1.20.0-1.6) unstable; urgency=low * Non-Maintainer Upload * This is really (3.1.20.0-1.5), but with the change below done where it should have been done, in debian/control.top. - Changed bison build dependency to 'byacc | bison (<= 1:1.35-3)'. Otherwise sbuild fails loading bison 1.75 in any case and breaking buid later because of unsatisfied dependencies. -- Agustin Martin Domingo Wed, 23 Oct 2002 10:50:33 +0200 ispell (3.1.20.0-1.4) unstable; urgency=low * Non-Maintainer Upload * Changed bison build dependency to 'bison (<= 1:1.35-3) | byacc' and changed yacc call in local.h from 'byacc -y' to 'yacc'. This should fix the problems derived from the new bison that is making ispell compilation break. -- Agustin Martin Domingo Tue, 22 Oct 2002 12:17:40 +0200 ispell (3.1.20.0-1.3) unstable; urgency=low * Non-Maintainer Upload * Also missed here to add dictionaries-common-dev to the Build-Depends line. Added now. Also removed words-american-english from debian/control.top -- Agustin Martin Domingo Mon, 21 Oct 2002 13:55:26 +0200 ispell (3.1.20.0-1.2) unstable; urgency=low * Non-Maintainer Upload * New policy compliant package uploaded to Debian for the first time (closes: #164239, #164248, #164257): - Using hash files 128 character pers string (closes: #102607) - Using debconf (closes: #123641) -- Agustin Martin Domingo Fri, 18 Oct 2002 16:43:22 +0200 ispell (3.1.20.0-1.1) unstable; urgency=low * This is really experimental new policy 3.1.20-30.3 version with changes in 3.1.20.0-1 merged from the official branch * debian/update-ispell-dictionary: Changed 'NEWERSCRIPT' name to /usr/sbin/select-default-ispell * debian/rules: Now will remove 'british-english' on clean target. -- Agustin Martin Domingo Mon, 22 Jul 2002 16:37:50 +0200 ispell (3.1.20.0-1) unstable; urgency=medium * Release manager: urgency medium because this removes non-free source files from main -- should go into woody if possible. * Removed three non-free files ("for non-profit use") from the upstream source. This has no effect on the binary packages. Ispell dictionary maintainers note: the following files are gone (from source languages/): `dansk/dansk.7bit' `nederlands/nederlands.7bit' `portugues/portugues.aff' Contact me if you'd like an ispell-nonfree-src package (and note that you'll have to make the dictionaries you create using those files non-free). Closes: #148601: DFSG-violation in ispell/languages/nederlands * accepted the patch from previous NMU; thanks to Petter Reinholdtsen and Tollef Fog Heen. Closes: #143161: Fail to install dictionaries using DEBIAN_FRONTEND=noninteractive -- David Coe Fri, 19 Jul 2002 12:59:37 -0400 ispell (3.1.20-30.3) unstable; urgency=low * Added experimental Locale fields to iamerican (en_us) and ibritish (en_gb) to test for experimental autogeneration of pspell region_to_spelling.map file. (3.1.20-30.2) Tue, 11 Jun 2002 17:25:07 * Added a Pspell-Ispell field to iamerican.info-ispell file with contents 'en-american iso8859-1'. Added a Pspell-Ispell field to ibritish.info-ispell file with contents 'en-british iso8859-1'. Since we use installdeb-ispell this will autogenerate the appropiate pspell-ispell pwli files. -- Agustín Martín Domingo Fri, 21 Jun 2002 16:03:07 +0200 ispell (3.1.20-30.1) unstable; urgency=low * Make ispell package depend on dictionaries-common, where the Conflicts with old dictionaries are. -- Agustín Martín Domingo Thu, 28 Feb 2002 18:55:46 +0100 ispell (3.1.20-30) unstable; urgency=low * Bumped debian revision to 30 to leave room for more official releases. This is really 3.1.20-21 with debian/rules fix below. * debian/rules: fixed to revert patches in the opposite order they were applied. Otherwise html and debian description patches conflict when reverting. * Copied debian/README and debian/z50_missing_prototypes.dpatch from official branch 3.1.20-21 (Was in official branch: added some missing prototypes, thanks to a patch from Doug Porter. Closes: #130405: implicit declarations) * Added debian/maxstringchars_128.dpatch to build ispell with MAXSTRINGCHARS=128. This forces us to rebuild all dictionaries. -- Agustín Martín Domingo Thu, 28 Feb 2002 15:20:01 +0100 ispell (3.1.20-21.1) unstable; urgency=medium * Non-Maintainer Upload * update-ispell-dictionary: skip if DEBIAN_FRONTEND=noninteractive. (Patch is in #143161, closes: #143161) -- Tollef Fog Heen Sat, 20 Apr 2002 18:29:55 +0200 ispell (3.1.20-21) unstable; urgency=low * added some missing prototypes, thanks to a patch from Doug Porter. Closes: #130405: implicit declarations -- David Coe Tue, 22 Jan 2002 13:08:35 -0500 ispell (3.1.20-20.1) unstable; urgency=low * Experimental release after the dictionaries policy proposal. * David, THIS BREAK OLD STYLE DICTIONARIES BUILDING, since the name for the new style dictionaries is also iamerican, ibritish, wbritish. In particular, PATCHES ARE NOT REVERTED. So, do not use this file for nothing but testing. * Removed postinst and prerm from dictionaries and wordlistpackages. They will be autogenerated by installdeb-ispell or installdeb-wordlist -- Agustín Martín Domingo Fri, 30 Nov 2001 17:24:47 +0100 ispell (3.1.20-20) unstable; urgency=medium * removed one more bashism (or non-ashism) from update-ispell-dictionary, hopefully (apparently) the last. Closes: #121399: ispellconfig doesn't set any default.hash link -- David Coe Tue, 27 Nov 2001 21:22:24 -0500 ispell (3.1.20-19) unstable; urgency=medium * change (Build-Depends) python-base to python Closes: #121360: [Serious] failed to autobuild on m68k -- David Coe Tue, 27 Nov 2001 12:25:49 -0500 ispell (3.1.20-18) unstable; urgency=low * Corrected the upstream english dictionary to properly pluralize eighth, metalsmith, myth, tenth, and youth; this was a long-unnoticed bug, causing (e.g.) "eighthes" to be accepted instead of "eighths." Thanks to Paul Martin for noticing the problem. Closes: #114763: Odd words in list -- David Coe Sun, 25 Nov 2001 22:25:36 -0500 ispell (3.1.20-17) unstable; urgency=low * undefined the 'HTSPECIAL' option of the html-mode patch, which causes ispell to make changes unrelated to spelling -- I agree that feature is a bug. (If you need that behavior, compile ispell with 'HTSPECIAL' #defined, or (perhaps better) preprocess your html files with something else to do the conversions for you.) Closes: #113503: Converts all high-bit characters to entities on save in HTML mode * added 'artefact' to british; left 'artifact' valid for both american and british, per another developer's interpretation of the OED. Closes: #117552: Missing british spelling of "artefact" * added ispell-dctrl patch provided by Matt Zimmerman , which adds an option (-g) which checks only the Description: sections of Debian control files. Closes: #119782: (wishlist) Debian control file mode * removed posessive (...'s) words from the wbritish word list (a minor fix to strix.py). * added all I could find in the way of previous debian ispell changelogs, to the bottom of this changlog. Closes: #77234: Missing changelog entries * Not a bug -- these words are already handled properly by ispell, but are not included in the "medium" sized dictionaries which Debian distributes -- you'd have to create a "large" ispell dictionary if you want them, as described in /usr/share/doc/ispell/README.gz . Closes: #69068: Isn't 'energise' a word? -- David Coe Sun, 25 Nov 2001 18:01:35 -0500 ispell (3.1.20-16) unstable; urgency=low * fixed a thinko in old-style dictionary .prerm scripts. Closes: #102440 "doesn't remove symlink /usr/doc/iamerican on purge." * applied a small patch from Marcus Brinkmann so it will build correctly for the hurd. Closes: #101515 "[hurd] doesn't build." * added documentation for each of the patches (see README.Debian). * a newer, improved, html-mode patch now supports ISO characters and more HTML entities. * the patches added in this release and in 3.1.20-13 seem to have resolved these bugs -- please reopen or resubmit if I've missed something: Closes: #14929: "ispell "\macro\ itself" sometimes goes wrong." Closes: #32726: "ispell -t doesn't handle macros like \, or \\ correctly." Closes: #37997: "ispell stops." * changed update-ispell-dictionary to use "/bin/echo -e" instead of the shell's builtin "echo -e", hoping to become posix-shell compliant. Closes: #98479: "the update-ispell-dictionnary sh script includes bash- specific constructs." * postinst will now remove any stray /usr/doc/ispell/.dhelp left by old versions of ispell, dhelp, doc-base, or whatever. Closes: #107234: "Documentation in /usr/doc." * Added brief text to the ispell man page about using -h (html mode) for XML and SGML too. Closes: #94120: "The manpage should say something about xml and sgml." * unable to reproduce (was probably an early woody X problem) Closes: #81424: ispell: Does not handle backspace under X * updated standards to policy version 3.5.6 (added support for DEB_BUILD_OPTIONS). * changed ispell priority from optional to standard, to agree with the Debian override file. * corrected the description and info index location of the ispell info file (thanks to a new lintian warning). * added a new binary package "wbritish" (british word list), built from the british ispell dictionary using strix.py, a user-contributed (GPL'd) tool by Drew Parsons ; strix.py has been added to the ispell source "addons" directory. Closes: #54015 "wordlist only provided for American English, not British" -- David Coe Tue, 04 Sep 2001 18:15:23 -0400 ispell (3.1.20-15) unstable; urgency=medium * patched config.X as suggested by Richard Braakman, to also test for __GLIBC__ when USG is defined. Closes: #75377 "ispell source package doesn't compile on woody" * lintian clean again (added dh_strip, removed dh_testversion) * clarified description of (current) old-style and (future) new-style dictionaries. Closes: #72111 "New-style dictionaries vs. old-style dictionaries" * updated TODO.Debian -- David Coe Wed, 21 Feb 2001 17:40:17 -0500 ispell (3.1.20-14) unstable; urgency=low * added texi2html to Build-Depends; closes: #67345. -- David Coe Sun, 23 Jul 2000 23:16:56 -0400 ispell (3.1.20-13) unstable; urgency=low * applied patch by Roland Rosenfeld to fix segfault and extra-CR bugs in unsq and sq. Closes: #60318 "sq and unsq heavyly broken" Closes: #65714 "unsq gives segmentation fault" * increased the maximum temporary backup file name length and maximum pathname length (to 1024 and 4096, respectively), to allow ispell to behave correctly with long names. Closes: #62214 "Ispell leave tmp file behide." * applied backslash-handling patch from http://www.kdstevens.com/%7Estevens/ispell-faq.html#bslash Closes: #62334 "please apply kdstevens patch for TeX parsing" * Compiled with libncurses5 instead of libncurses4. Closes: #63348 "ispell: Incorrect Dependancy" Closes: #64699 "Recompile with libncurses5" * Built american english dictionary referencing a newer word list Closes: #65620 "hullabaloo not in dictionary" * ispell(4) mentioned in ispell(1) is now (correctly) ispell(5) Closes: #66449 "Wrong section listed in man page" * previously closed but still open in bts: Closes: #28321, #35287 -- David Coe Sat, 15 Jul 2000 22:10:53 -0400 ispell (3.1.20-12) frozen unstable; urgency=low * fix postinst to let debhelper do the FHS symlink correctly; closes: #58342 * add build-dependency for libncurses5-dev; closes: #58291 -- David Coe Fri, 18 Feb 2000 12:50:37 -0500 ispell (3.1.20-11) frozen unstable; urgency=medium * 3.1.20-10 wasn't uploaded, so this still closes: #35287, #57777 * corrected upstream location in the upstream README file * updated TODO.Debian -- David Coe Sat, 12 Feb 2000 16:52:20 -0500 ispell (3.1.20-10) frozen unstable; urgency=low * removed american words from british dictionary -- closes: #35287, #57777 * improved rules in the absence of dictionaries-common -- David Coe Sat, 12 Feb 2000 01:09:28 -0500 ispell (3.1.20-9) unstable; urgency=low * same as 3.1.20-8 but also with the new-style dictionaries. -- David Coe Wed, 26 Jan 2000 17:48:43 -0500 ispell (3.1.20-8) frozen unstable; urgency=medium * removed two temp file race conditions (possible security holes), thanks to a patch by Colin Phipps . Closes: Bug#56266. * maintainer convenience hack: changed debian/rules to avoid creating the new-style dictionaries when the changelog says this build is for 'frozen'. -- David Coe Wed, 26 Jan 2000 17:06:33 -0500 ispell (3.1.20-7) unstable; urgency=low * corrected a mistake in the new-style dictionaries' emacsen-startup files. * marked those emacsen-startup files as conffiles, since a user might want to edit them. -- David Coe Wed, 01 Dec 1999 05:25:20 +0000 ispell (3.1.20-6) unstable; urgency=low * this test version was not released * new-style dictionaries are now made iff the build system has dictionaries-common installed; old-style dictionaries are made regardless. * uses dictionaries-common's idict_debinst for the new-style dictionaries. * debian-policy upgrade 3.1.0 -> 3.1.1 (no changes required) -- David Coe Fri, 26 Nov 1999 04:32:22 +0000 ispell (3.1.20-5) unstable; urgency=low * this test version was not released * this version introduces new-style dictionaries (idict-american-english, idict-british-english) which depend on dictionaries-common, q.v.; there are no changes to ispell itself or to the old-style (iamerican, ibritish) dictionaries, and the words in new-style and old-style dictionaries are the same. See the ispell 3.1.20-2 changelog notes and dictionaries-common for more details. -- David Coe Wed, 24 Nov 1999 06:33:53 +0000 ispell (3.1.20-4) unstable; urgency=low * (old-style) dictionaries still depend on ispell (closes: Bug#49959). * standards version 3.1.0 (added build dependencies). -- David Coe Fri, 12 Nov 1999 23:21:15 +0000 ispell (3.1.20-3) unstable; urgency=low * corrected a problem in rules that caused 'binary-arch' and 'binary-common' targets to fail; only 'binary' succeeded. Closes: Bug#49487 -- David Coe Tue, 09 Nov 1999 09:19:07 +0000 ispell (3.1.20-2) unstable; urgency=low * applied the unofficial ispell patch from Gerry Tierney that adds an HTML mode (-h), which works for XML and SGML too; thanks to debian-users Peter Karlsson and Brian Moore for bringing that patch to my attention. * made some changes in support of dictionaries-common and new-style Debian dictionary packages (note that dictionaries-common and new-style dictionaries are still being developed and tested): - ispell now supports and properly manages either old-style (i) or new-style (idict-) Debian dictionary packages. - the ``update-ispell-dictionaries'' command properly invokes the new ``select-ispell-default'' command (part of the dictionaries-common package) iff dictionaries-common has been installed. - the ispell source package will only create new-style Debian dictionaries (idict-american-english and idict-british-english) if you export ``NewStyleDictionaries'' in the build environment. These dictionaries contain the same words as the corresponding old-style dictionaries. - regardless of the above, the old-style dictionaries (iamerican and ibritish) are still created and are unchanged from previous releases (except for the location of their documentation files). * removed some unnecessary files from debian ``changes'' (thanks to a suggestion from my sponsor, Tony Mancill). * added ispellconfig as a symlink to update-ispell-dictionary, for convenience and consistency (thanks again, Tony). * abandoned yada in favor of debhelper, and so: - moved all docs from /usr/doc to /usr/share/doc - added FHS compatibility doc symlinks. - added md5sums. - automatically handle emacsen, debconf, doc-base, and (soon-to-be) dictionaries-common stuff. * changed update-ispell-dictionary to just advise the user and stop, when it is run by non-root, so now we install it with standard executable permissions. * updated TODO.Debian; it's significantly shorter now. -- David Coe Tue, 02 Nov 1999 07:39:38 +0000 ispell (3.1.20-1) unstable; urgency=low * new maintainer * updated to current policy (3.0.1), except for /usr/doc * built with yada 0.7.4 (with minor changes for policy 3.0.1) * changed architecture from i386 to any (with my fingers crossed) * improved description in update-ispell-dictionary(8) * ispell now also recommends wordlist (needed for ispell's L command) * ispell now suggests spell * the ispell dictionaries no longer require ispell, just suggest it * added more of the upstream doc files (WISHES, Contributors, ispell.texinfo) * added additional copyright from the texinfo file * added patch provided by Nikita Schmidt to use termios instead of termio; closes: #35288 * changed documentation control from dhelp to doc-base -- David L. Coe Wed, 18 Aug 1999 06:03:52 +0000 ispell (3.1.20-0.6) unstable; urgency=low * Non-maintainer upload. * Handle -w correctly (fixes bug #33384). * Built against libncurses4-dev (fixes bug #32599). -- Mark Brown Sun, 14 Mar 1999 15:45:55 +0000 ispell (3.1.20-0.5) unstable; urgency=low * NMU: * Bug #2425 has been fixed. * Unnoticed fixed bugs: #3196 * Forwarding bugs #5379,#13820, #14929, #31822 upstream. * Reassigning #8221 on debian-policy. * Close bug #11416 (This location is not valid anymore). * Bugs already fixed by previous uploads: #15024,#18369,#19795,#22754,#22755,#23455, #23723, #25046, #25052. #17878,#23713. * Write a patch to fix #19126. * Add dhelp support (Bug #31175). * Fix post{inst,rm} scripts. * s;/usr/dict/words;/usr/share/dict/words; in many files to fix bug #31474. * Refused change asked in wishlist bug #24946: Reason: this is why ispell allows each user to use a personal ~/.ispell_defaut file. * lintian cleaned: - ispell: get rid of lengthy symlinks. - ibritish,iamerican: made the copyright file be a real file instead of a symlink. * Guess what? the bug #9702 was in fact the same problem than #31474. * Orphaned the package with the permission of the last Debian maintainer (Kenneth MacDonald ). -- Vincent Renardias Tue, 26 Jan 1999 01:43:23 +0100 ispell (3.1.20-0.4) unstable; urgency=low * Fixed lintian errors, except copyright-file-is-symlink. (#23723) * During uppgrade of iamerican and ibritish, don't ask for default dictionary (#17878, #23713) * Minor fixes to the shell scripts. (#23723) -- Stefan Bjornelund Sat, 20 Jun 1998 18:32:50 +0200 ispell (3.1.20-0.3) unstable; urgency=low * Non-maintainer release. * Fixed munchspell, findaffix, subset, tryaffix and zapdups. They started with ': Use /bin/sh' rather than '#! /bin/sh' (#15024) * Fixed use of /tmp/*$$ in an insecure fashion. Munchlist and subset now creates their own subdirectorys in /tmp. (#19795) * TMPDIR now defaults to /tmp in {munchspell,findaffix,tryaffix} scripts. (#18369,#22755,#23455) * Texinfo page and ijoin.c fixed (#23455) * Source-depends on wenglish noted in debian/README.built (#22754,#23455) * Fixed insecure use of gets in sq.c and unsq.c -- Stefan Bjornelund Thu, 18 Jun 1998 13:32:17 +0200 ispell (3.1.20-0.2) unstable; urgency=low * Non-maintainer release. * Libc6 compile. (#11693) * Remove hardcoded -m486. (#8255,#13819) * Change update-ispell-dictionary to use /bin/sh. (#13446) * Change iamerican, ibritish packages to architecture any. (#9442,#13821) * Fix permissions for /usr/doc/ispell/* (#14173) * Check manpage permissions are correct. (#5802) -- Martin Mitchell Wed, 29 Oct 1997 04:02:06 +1100 ispell (3.1.20-0.1) unstable; urgency=low * added html version of info manual. * build using debmake. * new upstream version. -- Fabrizio Polacco Mon, 17 Feb 1997 00:11:35 +0200 ispell (3.1.18-11) unstable; urgency=low * (these two changelog entries were copied from the bo and rex debian ispell source package, ispell_3.1.18-11.tar.gz, by David Coe on 10 September 2001.) * debian-ispell.control : Moved virtual package from RECOMMENDS to SUGGESTS control line. * languages/english/english.4l: Changed okspell to ispell, changed section 4 to section 5 -- Kenneth MacDonald Mon, 23 Oct 1995 12:11:28 +0000 debian/compat0000644000000000000000000000000212061456715010373 0ustar 8 debian/control0000644000000000000000000002652112061456715010606 0ustar Source: ispell Section: text Priority: optional Maintainer: Robert Luberda Build-Depends: bison, debhelper (>= 8), dictionaries-common-dev (>= 1.10.6~), libncurses5-dev Build-Depends-Indep: wamerican (>= 6-3~), wamerican-huge (>= 6-3~), wamerican-insane (>= 6-3~), wamerican-large (>= 6-3~), wamerican-small (>= 6-3~), wbritish (>= 6-3~), wbritish-huge (>= 6-3~), wbritish-insane (>= 6-3~), wbritish-large (>= 6-3~), wbritish-small (>= 6-3~) Standards-Version: 3.9.2 Homepage: http://www.lasr.cs.ucla.edu/geoff/ispell.html Vcs-Git: git://anonscm.debian.org/users/robert/ispell.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/robert/ispell.git;a=summary Package: ispell Architecture: any Multi-Arch: foreign Depends: dictionaries-common, ${misc:Depends}, ${shlibs:Depends} Recommends: iamerican | ispell-dictionary, wamerican | wordlist Breaks: iamerican (<= 3.1.20.0-9), ibritish (<= 3.1.20.0-9), ibulgarian (<= 3.0-12), iczech (<= 20040229-5), idanish (<= 1.6.25-1), iestonian (<= 1:20030606-12.1), ifinnish (<= 0.7-17.3), ifinnish-large (<= 0.7-17.3), ifrench (<= 1.4-25), ifrench-gut (<= 1:1.0-27), igaelic (<= 0.50-7), ihungarian (<= 0.99.4-2), iirish (<= 2.0-20), iitalian (<= 1:2.3-2), imanx (<= 0.50-8), inorwegian (<= 2.0.10-3.2), iogerman (<= 1:2-26), ipolish (<= 20100612-1), irussian (<= 0.99g5-8.1), iswedish (<= 1.4.5-2), iukrainian (<= 1.6.0-1) Suggests: spell Description: International Ispell (an interactive spelling corrector) Ispell corrects spelling in plain text, LaTeX, sgml/html/xml, and nroff files. [x]Emacs and jed have nice interfaces to ispell, and ispell works from many other tools and from the command line as well. . No ispell dictionaries are included in this package; you must install at least one of them ("iamerican" is recommended by default for no good reason); install the "ispell-dictionary" package(s) for the language(s) you and your users will want to spell-check. . It's a good idea to install "word list" package(s) for the same language(s), because they'll be used by ispell's (L)ookup command. Package: ienglish-common Architecture: all Depends: dictionaries-common (>= 1.10.6~), ispell (>= 3.3.02), ${misc:Depends} Recommends: iamerican | iamerican-small | iamerican-large | iamerican-huge | iamerican-insane | ibritish | ibritish-small | ibritish-large | ibritish-huge | ibritish-insane Description: Common files for British and American ispell dictionaries This package provides common files and dependencies for all American and British ispell dictionary packages. The package is useless if none of the dictionaries is also installed. Package: iamerican Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wamerican Provides: ispell-dictionary Description: American English dictionary for ispell (standard version) This package provides the standard, medium-sized American English dictionary, based on the americanmed+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wamerican word list package. . There are also -small, -large, -huge, and -insane versions of this dictionary, and there are ibritish* packages as well. . The package also suggests wamerican because ispell's (L)ookup command needs a word list. Package: ibritish Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wbritish Provides: ispell-dictionary Description: British English dictionary for ispell (standard version) This package provides the standard, medium-sized British English dictionary, based on the britishmed+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wbritish word list package. . There are also -small, -large, -huge, and -insane versions of this dictionary, and there are iamerican* packages as well. . The package also suggests wbritish because ispell's (L)ookup command needs a word list. Package: iamerican-small Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wamerican-small Provides: ispell-dictionary Description: American English dictionary for ispell (small) This package provides the american-small dictionary, based on the americansml+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wamerican-small word list package. . This is smaller dictionary than the one installed by iamerican. Nothing prevents you installing both (and others) at the same time. . There are also -large, -huge, -insane, and standard versions of this dictionary, and there are ibritish* packages as well. . The package also suggests wamerican-small because ispell's (L)ookup command needs a word list. Package: ibritish-small Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wbritish-small Provides: ispell-dictionary Description: British English dictionary for ispell (small) This package provides the british-small dictionary, based on the britishsml+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wbritish-small word list package. . This is smallr dictionary than the one installed by ibritish. Nothing prevents you installing both (and others) at the same time. . There are also -large, -huge, -insane, and standard versions of this dictionary, and there are iamerican* packages as well. . The package also suggests wbritish-small because ispell's (L)ookup command needs a word list. Package: iamerican-large Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wamerican-large Provides: ispell-dictionary Description: American English dictionary for ispell (large) This package provides the american-large dictionary, based on the americanlrg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wamerican-large word list package. . This is larger dictionary than the one installed by iamerican. Nothing prevents you installing both (and others) at the same time. . There are also -small, -huge, -insane, and standard versions of this dictionary, and there are ibritish* packages as well. . The package also suggests wamerican-large because ispell's (L)ookup command needs a word list. Package: ibritish-large Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wbritish-large Provides: ispell-dictionary Description: British English dictionary for ispell (large) This package provides the british-large dictionary, based on the britishlrg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wbritish-large word list package. . This is larger dictionary than the one installed by ibritish. Nothing prevents you installing both (and others) at the same time. . There are also -small, -huge, -insane, and standard versions of this dictionary, and there are iamerican* packages as well. . The package also suggests wbritish-large because ispell's (L)ookup command needs a word list. Package: iamerican-huge Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wamerican-huge Provides: ispell-dictionary Description: American English dictionary for ispell (huge) This package provides the american-huge dictionary, based on the americanxlg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wamerican-huge word list package. . This is an even larger dictionary than the one installed by iamerican-large. Nothing prevents you installing both (and others) at the same time. . There are also -small, -large, -insane, and standard versions of this dictionary, and there are ibritish* packages as well. . The package also suggests wamerican-huge because ispell's (L)ookup command needs a word list. Package: ibritish-huge Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wbritish-huge Provides: ispell-dictionary Description: British English dictionary for ispell (huge) This package provides the british-huge dictionary, based on the britishxlg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wbritish-huge word list package. . This is an even larger dictionary than the one installed by ibritish-large. Nothing prevents you installing both (and others) at the same time. . There are also -small, -large, -insane, and standard versions of this dictionary, and there are iamerican* packages as well. . The package also suggests wbritish-huge because ispell's (L)ookup command needs a word list. Package: iamerican-insane Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wamerican-insane Provides: ispell-dictionary Description: American English dictionary for ispell (insane version) This package provides the american-insane dictionary, based on the americanxlg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wamerican-insane word list package. . This is an even larger dictionary than the one installed by iamerican-huge, and possibly contains invalid words (as well as words that are very uncommon). Nothing prevents you installing both (and others) at the same time. . There are also -small, -large, -huge, and standard versions of this dictionary, and there are ibritish* packages as well. . The package also suggests wamerican-huge because ispell's (L)ookup command needs a word list. Package: ibritish-insane Architecture: all Depends: dictionaries-common, ienglish-common (= ${source:Version}), ispell, ${misc:Depends} Suggests: wbritish-insane Provides: ispell-dictionary Description: British English dictionary for ispell (insane version) This package provides the british-insane dictionary, based on the britishxlg+ dictionary supplied with the source for ispell, with additional words added from the more comprehensive wbritish-insane word list package. . This is an even larger dictionary than the one installed by ibritish-huge, and possibly contains invalid words (as well as words that are very uncommon). Nothing prevents you installing both (and others) at the same time. . There are also -small, -large, -huge, and standard versions of this dictionary, and there are iamerican* packages as well. . The package also suggests wbritish-huge because ispell's (L)ookup command needs a word list. debian/copyright0000644000000000000000000000753512061456715011142 0ustar Author: Geoff Kuenning Download: http://www.lasr.cs.ucla.edu/geoff/ispell.html Files: * Copyright: (C) 1983 Pace Willisson (C) 1987, 1988, 1990-1995 Geoff Kuennin , Claremont, CA. (C) 1999, 2001, 2002, 2005 Geoff Kuennin , Claremont, CA. License: BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. All modifications to the source code must be clearly marked as such. Binary redistributions based on modified source code must be clearly marked as modified versions in the documentation and/or other materials provided with the distribution. 4. The code that causes the 'ispell -v' command to display a prominent link to the official ispell Web site may not be removed. 5. The name of Geoff Kuenning may not be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED Files: debian/* Copyright: (C) 1995 Kenneth MacDonald (C) 1997 Fabrizio Polacco (C) 1997 Martin Mitchell (C) 1998 Stefan Bjornelund (C) 1999 Vincent Renardias (C) 1999 Mark Brown (C) 1999-2004 David Coe (C) 2001, 2002, 2009 Agustin Martin Domingo (C) 2002 Tollef Fog Heen (C) 2006 Steinar H. Gunderson (C) 2006 Roland Rosenfeld (C) 2006 Martin Michlmayr (C) 2007 Thijs Kinkhorst (C) 2009 Daniel Baumann (C) 2009 David Paleino (C) 2011 Robert Luberda License: BSD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/local/0000755000000000000000000000000012061456715010267 5ustar debian/local/Makefile.languages.inc0000644000000000000000000000334212061456715014446 0ustar # vim: ft=make:ts=4 # The Makefile is included from languages/{american,british,english}/Makefile # and adds two special values for LANGUAGES setting into English languages: # # + `debian-none' for HASHFILES, what causes none *.hash file to be build # or installed; only the generated munched word lists are installed instead # into $(DESTDIR)/usr/share/ispell by the `install' target; # # + `debian-auto' for EXTRADICT, what causes appropriate extra dictionary file # (like american-small or american-huge, etc) from /usr/share/dict to be choosen # when the munched list are generated. # # Also it overwrites install target for Debian ISHAREDIR := $(DESTDIR)/usr/share/ispell ifeq (debian-none,$(HASHFILES)) override INSTALL_TARGET := install-orig install: override HASHFILES := install: install-orig @. $(CONFIG); \ set -ex; \ for dict in $(MASTERDICTS); do \ [ -d $(ISHAREDIR) ] || mkdir -p -m 0755 $(ISHAREDIR) ; \ rm -f $(ISHAREDIR)/$$dict.mwl $(ISHAREDIR)/$$dict.mwl.gz; \ cp -a $$dict $(ISHAREDIR)/$$dict.mwl ; \ gzip -9 $(ISHAREDIR)/$$dict.mwl ; \ done endif ifeq (debian-auto,$(EXTRADICT)) ifneq (,$(VARIANTS)) EXTRDBASE := /usr/share/dict/$(VARIANTS)-english %.med+: $(EXTRDBASE) %.med+: override EXTRADICT := $(EXTRDBASE) %.lrg+: $(EXTRDBASE)-large %.lrg+: override EXTRADICT := $(EXTRDBASE)-large %.xlg+: $(EXTRDBASE)-huge %.xlg+: override EXTRADICT := $(EXTRDBASE)-huge %.sml+: $(EXTRDBASE)-small %.sml+: override EXTRADICT := $(EXTRDBASE)-small endif endif .PHONY: debian-auto debian-none all install install-orig # Pass -T utf8 to munchlist to avoid `illegal character' warnings given # on UTF8-encoded files from /usr/share/dict override MUNCHLIST := $(MUNCHLIST) -T utf8 debian/local/defmt-c.10000644000000000000000000000163012061456715011670 0ustar .TH DEFMT\-C 1 "March 19th, 2011" "ispell 3.3.02" .\" Please adjust this date whenever revising the manpage. .SH NAME defmt\-c, defmt\-sh - a sample ispell deformatter for C, C++, and shell sources .SH SYNOPSIS .B ispell \-F defmt\-c .RI [ ispell_options ] .br .B ispell \-F defmt\-sh .RI [ ispell_options ] .SH DESCRIPTION The .B defmt\-c and .B defmt\-sh programs are sample deformatter provided primarily to show how to write filters for use with .BR ispell (1)'s .I \-F switch. They allow .BR ispell (1) to be used to check C and C++ programs as well as shell scripts (and any other languages that use # for comments and both quote styles for strings). .SH SEE ALSO .BR ispell (1) .SH AUTHOR Geoff Kuennin .PP This manual page was written by Robert Luberda (based on deformatters/README file from the ispell source package) for the Debian project (and may be used by others). debian/packages.d/0000755000000000000000000000000012061456715011175 5ustar debian/packages.d/dictionaries.in0000644000000000000000000000301612061456715014202 0ustar %links% usr/share/ispell/#MUNCHLIST#.mwl.gz usr/share/ispell/#DICTIONARY#.mwl.gz usr/share/ispell/english.aff usr/lib/ispell/#DICTIONARY#.aff usr/share/man/man5/english.5.gz usr/share/man/man5/#DICTIONARY#.5.gz %# %# %install% usr/share/ispell/#MUNCHLIST#.mwl.gz %# %# %info-ispell% Language: #DICTIONARY# (#DESCRIPTION#) Hash-Name: #DICTIONARY# Emacsen-Name: #DICTIONARY# Casechars: [A-Za-z] Not-Casechars: [^A-Za-z] Otherchars: ['] Many-Otherchars: Additionalchars: Ispell-Args: -B -d #DICTIONARY# Extended-Character-Mode: Coding-System: iso-8859-1 Pspell-Ispell: en-#DICTIONARY# iso8859-1 auto-compat: #DICTIONARY# Locale: #LOCALE# %# %# the following postinst will be installed into ibritish and iamerican only %postinst: ibritish iamerican% #!/bin/sh set -e # Added in 3.3.02-2 to move directory into symlink docdir="/usr/share/doc/#PACKAGE#" target="ienglish-common" if [ -e "$docdir" ] && [ ! -L "$docdir" ]; then [ ! -d "$docdir" ] || rmdir --ignore-fail-on-non-empty "$docdir" if [ -e "$docdir" ]; then echo "The old $docdir directory contains locally modified files" >&2 echo "and will be saved as $docdir.SAVED_BY_POSTINST.$$" >&2 if ! mv "$docdir" "$docdir.SAVED_BY_POSTINST.$$"; then echo "Failed to rename $docdir, please remove it manually" >&2 echo "and then retry the upgrade" >&2 fi fi ln -sf "$target" "$docdir" fi #DEBHELPER# exit 0 debian/packages.d/gen_debhelper_files.pl0000755000000000000000000000660212061456715015506 0ustar #!/usr/bin/perl # vim:ts=4:et:sts=4:sw=4:ai use strict; use warnings; # Script reads debian/control to get list of the binary packages. Then # for each package reads or debian/packages.d/${package}.in # it at the line which are equal to %filename%, where filename can be any file name. # # When called without "generate" argument, the text between that line and the next %filename% # are written to the file debian/package.filename # # When called with the "clean" argument it removes debian/package.filename files my %descriptions = ( 'ibritish' => 'British English', 'ibritish-small' => 'British English - small', 'ibritish-large' => 'British English - large', 'ibritish-huge' => 'British English - huge', 'ibritish-insane' => 'British English - insane', 'iamerican' => 'American English', 'iamerican-small' => 'American English - small', 'iamerican-large' => 'American English - large', 'iamerican-huge' => 'American English - huge', 'iamerican-insane' => 'American English - insane' ); my %suffixes = ( '' => 'med+', 'small' => 'sml+', 'large' => 'lrg+', 'huge' => 'xlg+', 'insane' => 'xxl+' ); my %locales = ( 'british' => 'en_GB', 'american' => 'en_US' ); die "Usage: $0 clean | generate\n" if $#ARGV != 0; my $action = $ARGV[0]; my $builddirval = $ARGV[1]; my $cleanonly = $action eq "clean"; die "Invalid action $action" unless $cleanonly or $action eq "generate"; my @debdirs = grep { -d $_ } ("./debian", "../debian", "../../debian"); die "Cannot find debian dir" unless $#debdirs < 1; chdir "$debdirs[0]/.." or die "Cannot chdir to $debdirs[0]/..: $!\n"; my $dir="debian/packages.d"; my @packages=`dh_listpackages`; while (@packages) { chomp (my $package = shift(@packages)); my ($locale, $dictionary, $description, $munchlist); if (exists $descriptions{$package} && $package =~ /^i(([^-]+)-?([^-]+)?)$/) { ($locale, $dictionary, $description, $munchlist) = ($locales{$2}, $1, $descriptions{$package}, $2.'.'.$suffixes{$3 ? $3 :''}); } my $master_file = $description ? "$dir/dictionaries.in" : "$dir/$package.in"; my $fh = undef; open IN, "<", $master_file or die "Cannot open $master_file: $!\n"; print $cleanonly ? "Removing" : "Generating"; while () { next if /^\%#/; if (/^\%([^:]*):?(.*)\%$/) { close $fh if $fh; $fh = undef; my $file="debian/$package.$1"; if ($2) { next unless grep { $_ eq $package } split(' ', $2); } print " $file"; unlink $file or die "Cannot unlink $file: $!\n" if -e $file; next if $cleanonly; open $fh, ">", $file or die "Cannot open $file for writing: $!\n"; chmod 0444, $file or die "Cannot chmod $file: $!\n"; print $fh "### Generated from $master_file for $package ###\n" unless $file =~ /(info-ispell|inst|rm)$/; } elsif ($fh && !$cleanonly) { s/#PACKAGE#/$package/g; if ($description) { s/#DICTIONARY#/$dictionary/g ; s/#DESCRIPTION#/$description/g ; s/#MUNCHLIST#/$munchlist/g ; s/#LOCALE#/$locale/g ; } print $fh $_; } } print "\n"; close $fh if $fh; close IN; } debian/packages.d/ienglish-common.in0000644000000000000000000000010412061456715014610 0ustar %install% usr/share/man/man5/english.5 usr/share/ispell/english.aff debian/packages.d/ispell.in0000644000000000000000000000107312061456715013016 0ustar %docs% Contributors README WISHES %# %# %links% usr/share/man/man1/ispell.1.gz usr/share/man/man1/icombine.1.gz usr/share/man/man1/ispell.1.gz usr/share/man/man1/ijoin.1.gz usr/share/man/man1/defmt-c.1.gz usr/share/man/man1/defmt-sh.1.gz %# %install% usr/bin usr/share/man/man1 usr/share/man/man5/ispell.5 %# %# %manpages% debian/local/defmt-c.1 %# %# %postinst% #!/bin/sh set -e if [ "$1" = "configure" ] ; then if [ -x /usr/sbin/ispell-autobuildhash ]; then ispell-autobuildhash fi fi #DEBHELPER# exit 0 debian/patches/0000755000000000000000000000000012061456715010624 5ustar debian/patches/0001-Configuration.patch0000644000000000000000000000375712061456715015046 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 20:23:57 +0100 Subject: 0001 Configuration Update local.h.linux defines for Debian --- local.h.linux | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 deletions(-) diff --git a/local.h.linux b/local.h.linux index 1bbef48..a5b4312 100644 --- a/local.h.linux +++ b/local.h.linux @@ -66,20 +66,39 @@ #define MINIMENU /* Display a mini-menu at the bottom of the screen */ #define USG /* Define on System V or if term.c won't compile */ #define GENERATE_LIBRARY_PROTOS -#define EGREPCMD "grep -Ei" #define HAS_RENAME +#define EGREPCMD "grep -Ei" +#define INSTALL "install" + +#define CC "gcc" + +#define YACC "yacc" +#define TERMLIB "-lncurses" + /* * Important directory paths. If you change MAN45DIR from man5 to * something else, you probably also want to set MAN45SECT and * MAN45EXT (but not if you keep the man pages in section 5 and just * store them in a different place). */ -#define BINDIR "/usr/local/bin" -#define LIBDIR "/usr/local/lib" -#define MAN1DIR "/usr/local/man/man1" -#define MAN45DIR "/usr/local/man/man5" -#define MAN45EXT ".5" +#define BINDIR "/usr/bin" +#define LIBDIR "/usr/lib/ispell" +#define ELISPDIR "/usr/lib/emacs/site-lisp" +#define TEXINFODIR "/usr/share/info" +#define MAN1DIR "/usr/share/man/man1" +#define MAN45DIR "/usr/share/man/man5" +#define MAN45EXT ".5" + +#define LANGUAGES "{british,MASTERDICTS=british.sml+ british.med+ british.lrg+ british.xlg+,HASHFILES=debian-none,EXTRADICT=debian-auto} {american,MASTERDICTS=american.sml+ american.med+ american.lrg+ american.xlg+,HASHFILES=debian-none,EXTRADICT=debian-auto}" +#define DEFHASH "default.hash" +#define DEFLANG "default.aff" + +#define WORDS "/usr/share/dict/words" +#define MAXPATHLEN 4096 +#define MAXNAMLEN 1024 + +#define SPELL_XREF ".IR spell (1)," /* * Place any locally-required #include statements here -- debian/patches/0003-Fix-FTBFS-on-Hurd.patch0000644000000000000000000000137612061456715015136 0ustar From: Marcus Brinkmann Date: Tue, 19 Jun 2001 22:28:36 +0200 Subject: 0003 Fix FTBFS on Hurd Fixes FTBFS on Hurd (Closes: #101515). --- lookup.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lookup.c b/lookup.c index 41322f0..648f9c8 100644 --- a/lookup.c +++ b/lookup.c @@ -85,6 +85,8 @@ static char Rcs_Id[] = * */ +#include + #include "config.h" #include "ispell.h" #include "proto.h" @@ -112,7 +114,7 @@ int linit () if (inited) return 0; - if ((hashfd = open (hashname, 0 | MSDOS_BINARY_OPEN)) < 0) + if ((hashfd = open (hashname, O_RDONLY | MSDOS_BINARY_OPEN)) < 0) { (void) fprintf (stderr, CANT_OPEN, hashname, MAYBE_CR (stderr)); return (-1); -- debian/patches/0005-Do-not-reorder-words.patch0000644000000000000000000000341712061456715016170 0ustar From: Geoff Kuenning Date: Thu, 3 Nov 2005 14:14:15 -0800 Subject: 0005 Do not reorder words ispell reorders words in personal dictionary without good reason. The correct approach is to build the internal data structure with variant spellings stored in the same order as they appear in the personal dictionary. Fortunately, this is easy, though the patch is to a different file. This one has been tested (That's what I get for trying to rush out a fix before a meeting!). --- makedent.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/makedent.c b/makedent.c index 0453d11..d121345 100644 --- a/makedent.c +++ b/makedent.c @@ -447,9 +447,10 @@ int combinecaps (hdrp, newp) if (retval == 0) { /* - ** Couldn't combine the two entries. Add a new variant. For - ** ease, we'll stick it right behind the header, rather than - ** at the end of the list. + ** Couldn't combine the two entries. Add a new variant. We + ** stick it at the end of the variant list because it's + ** important to maintain order; this causes the personal + ** dictionary to have a stable ordering. */ forcevheader (hdrp, oldp, newp); tdent = (struct dent *) mymalloc (sizeof (struct dent)); @@ -460,10 +461,13 @@ int combinecaps (hdrp, newp) return -1; } *tdent = *newp; - tdent->next = hdrp->next; - hdrp->next = tdent; - tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS); - hdrp->flagfield |= MOREVARIANTS; + for (oldp = hdrp; + oldp->next != NULL && oldp->flagfield & MOREVARIANTS; + oldp = oldp->next) + ; + tdent->next = oldp->next; + oldp->next = tdent; + oldp->flagfield |= MOREVARIANTS; combineaffixes (hdrp, newp); hdrp->flagfield |= (newp->flagfield & KEEP); if (captype (newp->flagfield) == FOLLOWCASE) -- debian/patches/0006-Fix-sq-and-unsq.patch0000644000000000000000000001417412061456715015132 0ustar From: Dr. Werner Fink Date: Thu, 31 May 2007 00:00:00 +0200 Subject: 0006 Fix sq and unsq Fix sq/unsq, hint from Thomas Rachel The patch is taken from ispell-3.3.02-102.1.src.rpm from OpenSUSE. --- Makefile | 9 +++++++-- sq.1 | 4 ++-- sq.c | 32 ++++++++++++++++++++------------ unsq.c | 29 ++++++++++++++++++----------- 4 files changed, 47 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 0f7f16a..007b6d7 100644 --- a/Makefile +++ b/Makefile @@ -262,6 +262,7 @@ all: all-languages programs: buildhash findaffix tryaffix ispell programs: icombine ijoin munchlist programs: subset zapdups +programs: sq unsq defmt-programs: cd deformatters; $(MAKE) all @@ -320,11 +321,15 @@ install-basic: @. ./config.sh; \ set -x; \ $$INSTALL ispell.1 $$MAN1DIR/ispell$$MAN1EXT; \ - $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT + $$INSTALL ispell.5 $$MAN45DIR/ispell$$MAN45EXT; \ + $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \ + echo .so man1/sq.1 > $$MAN1DIR/unsq$$MAN1EXT @. ./config.sh; \ set -x; \ cd $$MAN1DIR; \ chmod 644 ispell$$MAN1EXT; \ + chmod 644 sq$$MAN1EXT; \ + chmod 644 unsq$$MAN1EXT; \ cd $$MAN45DIR; \ chmod 644 ispell$$MAN45EXT @@ -357,7 +362,7 @@ install-dictbuild: @. ./config.sh; \ set -x; \ $$INSTALL buildhash icombine ijoin munchlist findaffix \ - tryaffix \ + tryaffix sq unsq \ $$BINDIR @. ./config.sh; \ set -x; \ diff --git a/sq.1 b/sq.1 index 99442a2..31c24bd 100644 --- a/sq.1 +++ b/sq.1 @@ -73,7 +73,7 @@ sq, unsq \- squeeze or unsqueeze a sorted word list compresses a sorted list of words (a dictionary). For example: .RS -sort -u /usr/dict/words | sq | gzip -9 > words.sq.Z +sort \-u /usr/share/dict/words | sq | gzip \-9 > words.sq.gz .RE will compress dict by about a factor of 5. .PP @@ -82,7 +82,7 @@ uncompress the output of .I sq. For example: .RS -gunzip < words.sq.gz | unsq | sort -f -o words +gunzip < words.sq.gz | unsq | sort \-f \-o words .RE will uncompress a dictionary compressed with .I sq. diff --git a/sq.c b/sq.c index c931421..85ebf63 100644 --- a/sq.c +++ b/sq.c @@ -59,6 +59,7 @@ static char Rcs_Id[] = */ #include +#include #ifdef __STDC__ #define P(x) x @@ -67,7 +68,7 @@ static char Rcs_Id[] = #endif /* __STDC__ */ int main P ((int argc, char * argv[])); -static void trunc P ((char * word, char * prev)); +static void sqtrunc P ((const char * word, char * prev)); /* * The following table encodes prefix sizes as a single character. A @@ -84,27 +85,34 @@ static char size_encodings[] = 'y', 'z' /* 60-61 */ }; -#define MAX_PREFIX (sizeof (size_encodings) - 1) +#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1) +#define UNSEQBUFSIZE 257 int main (argc, argv) int argc; char * argv[]; { - char word[257]; - static char prev[257] = ""; + char word[UNSEQBUFSIZE]; + char * nl; + static char prev[UNSEQBUFSIZE] = ""; - while (gets (word) != NULL) - trunc (word, prev); + while (fgets (word, UNSEQBUFSIZE, stdin) != NULL) { + if ((nl = strrchr(word, '\n'))) + *nl = '\0'; + else + word[UNSEQBUFSIZE - 1] = '\0'; + sqtrunc (word, prev); + } return 0; } -static void trunc (word, prev) - char * word; +static void sqtrunc (word, prev) + const char * word; char * prev; { - register char * wordp; - register char * prevp; - register int same_count; + const register char * wordp; + const register char * prevp; + register int same_count; wordp = word; prevp = prev; @@ -113,7 +121,7 @@ static void trunc (word, prev) if (same_count>MAX_PREFIX) same_count = MAX_PREFIX; (void) putchar (size_encodings[same_count]); - (void) puts (wordp); + (void) puts (&word[same_count]); (void) strcpy (prev, word); } diff --git a/unsq.c b/unsq.c index 125f654..b14bcf3 100644 --- a/unsq.c +++ b/unsq.c @@ -58,7 +58,9 @@ static char Rcs_Id[] = * */ +#include #include +#include #include "msgs.h" #ifdef __STDC__ @@ -68,7 +70,7 @@ static char Rcs_Id[] = #endif /* __STDC__ */ int main P ((int argc, char * argv[])); -static int expand P ((char * word, char * prev)); +static int sqexpand P ((char * word, char * prev)); /* * The following table encodes prefix sizes as a single character. A @@ -85,39 +87,40 @@ static char size_encodings[] = 'y', 'z' /* 60-61 */ }; -#define MAX_PREFIX (sizeof (size_encodings) - 1) - -extern void exit P ((int status)); +#define MAX_PREFIX ((sizeof(size_encodings)/sizeof(char)) - 1) +#define UNSEQBUFSIZE 257 int main (argc, argv) int argc; char * argv[]; { - char word[257]; - static char prev[257] = ""; + char word[UNSEQBUFSIZE]; + static char prev[UNSEQBUFSIZE] = ""; - while (!expand (word, prev)) + while (!sqexpand (word, prev)) puts (word); return 0; } -static int expand (word, prev) +static int sqexpand (word, prev) char * word; char * prev; { register char * wordp; register char * prevp; + register char * nl; register int same_count; register int count_char; + register off_t size; count_char = getchar (); if (count_char == EOF) return(1); for (same_count = 0; - same_count < MAX_PREFIX && size_encodings[same_count] != count_char; + same_count <= MAX_PREFIX && size_encodings[same_count] != count_char; same_count++) ; - if (same_count == MAX_PREFIX) + if (same_count > MAX_PREFIX) { (void) fprintf (stderr, UNSQ_C_BAD_COUNT, (unsigned int) count_char); exit (1); @@ -126,11 +129,15 @@ static int expand (word, prev) wordp = word; while (same_count--) *wordp++ = (*prevp++); - if (gets (wordp) == NULL) + size = UNSEQBUFSIZE - (wordp - word); + if (fgets(wordp, size <= UNSEQBUFSIZE ? size : 0, stdin) == NULL) { (void) fprintf (stderr, UNSQ_C_SURPRISE_EOF); exit (1); } + word[UNSEQBUFSIZE - 1] = '\0'; /* In case of no newline */ + if ((nl = strrchr(wordp, '\n'))) + *nl = '\0'; (void) strcpy (prev, word); return 0 ; } -- debian/patches/0007-Use-termios.patch0000644000000000000000000001032712061456715014450 0ustar From: Torsten Landschoff Date: Tue, 30 Mar 1999 21:05:09 +0100 Subject: 0007 Use termios Use termios instead of termio (Closes: #35288). Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm --- term.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/term.c b/term.c index 4923844..47c1aa0 100644 --- a/term.c +++ b/term.c @@ -87,13 +87,22 @@ static char Rcs_Id[] = #include "proto.h" #include "msgs.h" #ifdef USG +#if defined(__GLIBC__) && __GLIBC__ >= 2 +/* Use termios under at least glibc */ + #include + #define USE_TERMIOS +#else #include +#endif #else #ifndef __DJGPP__ #include #endif #endif #include +#include +#include +#include void ierase P ((void)); void imove P ((int row, int col)); @@ -166,8 +175,13 @@ static int iputch (c) } #ifdef USG +#ifdef USE_TERMIOS +static struct termios sbuf; +static struct termios osbuf; +#else static struct termio sbuf; static struct termio osbuf; +#endif #else static struct sgttyb sbuf; static struct sgttyb osbuf; @@ -190,9 +204,13 @@ void terminit () int tpgrp; #else #ifdef TIOCGPGRP +#ifdef USE_TERMIOS + pid_t tpgrp; +#else int tpgrp; #endif #endif +#endif #ifdef TIOCGWINSZ struct winsize wsize; #endif /* TIOCGWINSZ */ @@ -276,7 +294,11 @@ retry: (void) fprintf (stderr, TERM_C_NO_BATCH); exit (1); } +#ifdef USE_TERMIOS + (void) tcgetattr (0, &osbuf); +#else (void) ioctl (0, TCGETA, (char *) &osbuf); +#endif termchanged = 1; sbuf = osbuf; @@ -285,7 +307,11 @@ retry: sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); sbuf.c_cc[VMIN] = 1; sbuf.c_cc[VTIME] = 1; +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &sbuf); +#else (void) ioctl (0, TCSETAW, (char *) &sbuf); +#endif uerasechar = osbuf.c_cc[VERASE]; ukillchar = osbuf.c_cc[VKILL]; @@ -298,7 +324,11 @@ retry: #endif #endif #ifdef TIOCGPGRP +#ifdef USE_TERMIOS + if ((tpgrp = tcgetpgrp (0)) == -1) +#else if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0) +#endif { (void) fprintf (stderr, TERM_C_NO_BATCH); exit (1); @@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo) if (te) tputs (te, 1, iputch); #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &osbuf); +#else (void) ioctl (0, TCSETAW, (char *) &osbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo) if (te) tputs (te, 1, iputch); #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */ +#else (void) ioctl (0, TCSETAW, (char *) &osbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo) if (termchanged) { #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSANOW, &sbuf); +#else (void) ioctl (0, TCSETAW, (char *) &sbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC @@ -481,7 +523,11 @@ int shellescape (buf) argv[i] = NULL; #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &osbuf); +#else (void) ioctl (0, TCSETAW, (char *) &osbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@ -527,7 +573,11 @@ int shellescape (buf) #endif #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &sbuf); +#else (void) ioctl (0, TCSETAW, (char *) &sbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC @@ -563,7 +613,11 @@ void shescape (buf) #endif #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &osbuf); +#else (void) ioctl (0, TCSETAW, (char *) &osbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &osbuf); #ifdef TIOCSLTC @@ -611,7 +665,11 @@ void shescape (buf) #endif #ifdef USG +#ifdef USE_TERMIOS + (void) tcsetattr (0, TCSADRAIN, &sbuf); +#else (void) ioctl (0, TCSETAW, (char *) &sbuf); +#endif #else (void) ioctl (0, TIOCSETP, (char *) &sbuf); #ifdef TIOCSLTC -- debian/patches/0008-Tex-backslash.patch0000644000000000000000000000321112061456715014720 0ustar From: Ken Stevens Date: Sat, 15 Jul 2000 22:10:53 -0400 Subject: 0008 Tex backslash Version 3.1.20 contains an irritating bug when using latex that causes all sorts of problems when the backslash is used. (The backslash is a common character in latex that is used, among other things, to create a forced space similar to the tilde character.) In the current version, 3.1.20, the next TWO characters are skipped after a backslash. This can results in misspellings and the file being incorrectly parsed. (For example, if the text contains the sequence `\ $' math mode will not be entered until the matching $ which should end it, resulting in the body of the text not being spell checked and the math region being checked.) Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are using iso character sets. http://www.kdstevens.com/~stevens/ispell-faq.html#bslash --- defmt.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/defmt.c b/defmt.c index 35f93e4..7499752 100644 --- a/defmt.c +++ b/defmt.c @@ -884,6 +884,8 @@ static int TeX_math_end (bufp) return 0; } +/* Updates bufp to point to the next character to skip. */ +/* Should only be called on non-word characters. */ static int TeX_math_begin (bufp) unsigned char ** bufp; { @@ -902,10 +904,7 @@ static int TeX_math_begin (bufp) if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) return 1; else if (!isalpha(**bufp) && **bufp != '@') - { - (*bufp)++; - continue; - } + return 0; else if (TeX_strncmp (*bufp, "begin", 5) == 0) { if (TeX_math_check ('b', bufp)) -- debian/patches/0009-Fix-FTBFS-on-glibc.patch0000644000000000000000000000105612061456715015315 0ustar From: Richard Braakman Date: Fri, 2 Feb 2001 17:22:53 +0200 Subject: 0009 Fix FTBFS on glibc Fix FTBFS on glibc (Closes: #75377) --- config.X | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.X b/config.X index 18bf621..0a47cb2 100644 --- a/config.X +++ b/config.X @@ -531,7 +531,7 @@ #endif /* NO_MKSTEMP */ /* Aliases for some routines */ -#ifdef USG +#if defined (USG) && !defined(__GLIBC__) #define BCOPY(s, d, n) memcpy (d, s, n) #define BZERO(d, n) memset (d, 0, n) #define index strchr -- debian/patches/0010-Debian-control-file.patch0000644000000000000000000000727712061456715016015 0ustar From: Matt Zimmerman Date: Fri, 23 Nov 2001 14:54:38 -0500 Subject: 0010 Debian control file Adding support for debian control file mode (Closes: #119782). --- defmt.c | 34 ++++++++++++++++++++++++++++++++++ ispell.1X | 3 +++ ispell.c | 7 ++++++- ispell.h | 1 + 4 files changed, 44 insertions(+), 1 deletions(-) diff --git a/defmt.c b/defmt.c index 7499752..b5e3b59 100644 --- a/defmt.c +++ b/defmt.c @@ -240,6 +240,9 @@ static int TeX_comment = 0; */ static int save_math_mode; static char save_LaTeX_Mode; +static int dctrl_new_line = 1; +static char dctrl_field_name[128] = ""; +static int dctrl_check_this_field = 0; /* * The following variables are used by the deformatter to keep @@ -257,6 +260,36 @@ static unsigned char * skiptoword (bufp) /* Skip to beginning of a word */ unsigned char * htmlsubfield = bufp; /* Ptr to start of subfield name */ + if (dctrlflag && dctrl_new_line) + { + if (dctrl_new_line) + { + int i; + dctrl_new_line = 0; + + if (!isspace(*bufp)) { + + for( i = 0 ; + *bufp != ':' && i < sizeof(dctrl_field_name) - 1 ; + ++i, ++bufp ) + dctrl_field_name[i] = *bufp; + + dctrl_field_name[++i] = '\0'; + ++bufp; + + if (!strncmp(dctrl_field_name, "Description", 7)) + dctrl_check_this_field = 1; + else + dctrl_check_this_field = 0; + + } + if (!dctrl_check_this_field) + /* Skip to next line */ + while (*bufp++ != '\0') + ; + } + } + while (*bufp && ((!isstringch (bufp, 0) && !iswordch (chartoichar (*bufp))) || isboundarych (chartoichar (*bufp)) @@ -543,6 +576,7 @@ static unsigned char * skiptoword (bufp) /* Skip to beginning of a word */ LaTeX_Mode = save_LaTeX_Mode; TeX_comment = 0; } + dctrl_new_line = 1; } return bufp; } diff --git a/ispell.1X b/ispell.1X index 1dae440..b27b120 100644 --- a/ispell.1X +++ b/ispell.1X @@ -365,6 +365,9 @@ but for historical reasons that flag was already taken.) .IP \fB\-o\fR The input file should be treated as ordinary text. (This could be used to override DEFTEXFLAG.) +.IP \fB\-g\fR +The input file is in Debian control file format. Ispell will ignore +everything outside the Description(s). .IP \fB\-b\fR Create a backup file by appending "!!BAKEXT!!" to the name of the input file. diff --git a/ispell.c b/ispell.c index a61867c..9b509d0 100644 --- a/ispell.c +++ b/ispell.c @@ -369,7 +369,7 @@ int main (argc, argv) * ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789 * ^^^^ ^ ^ ^^^ ^ ^^ ^^ * abcdefghijklmnopqrstuvwxyz - * ^^^^^^ ^ ^^^ ^ ^^^ ^^^ + * ^^^^^^^ ^ ^^^ ^ ^^^ ^^^ */ arglen = strlen (*argv); switch ((*argv)[1]) @@ -879,6 +879,11 @@ int main (argc, argv) else minword = atoi (*argv + 2); break; + case 'g': + if (arglen > 2) + usage(); + dctrlflag = 1; + break; default: usage (); } diff --git a/ispell.h b/ispell.h index 59f2030..7c1ca3e 100644 --- a/ispell.h +++ b/ispell.h @@ -712,6 +712,7 @@ INIT (int deftflag, -1); /* Default deformatting mode, chosen */ /* ..from DEFORMAT_* values */ INIT (int tflag, DEFTEXFLAG); /* Deformatting for current file */ INIT (int prefstringchar, -1); /* Preferred string character type */ +INIT (int dctrlflag, 0); /* NZ indicates Debian control file mode */ INIT (int insidehtml, 0); /* Flag to indicate we're amid HTML */ /* 0 = normal text */ -- debian/patches/0011-Missing-prototypes.patch0000644000000000000000000000361412061456715016067 0ustar From: Doug Porter Date: Tue, 22 Jan 2002 10:28:44 -0500 Subject: 0011 Missing prototypes Fixing implicit declarations (Closes: #130405). --- correct.c | 1 + ijoin.c | 2 +- ispell.c | 2 ++ lookup.c | 2 ++ tree.c | 1 + 5 files changed, 7 insertions(+), 1 deletions(-) diff --git a/correct.c b/correct.c index e2b63c8..661bf57 100644 --- a/correct.c +++ b/correct.c @@ -201,6 +201,7 @@ static char Rcs_Id[] = */ #include +#include #include "config.h" #include "ispell.h" #include "proto.h" diff --git a/ijoin.c b/ijoin.c index edb18d1..5da039a 100644 --- a/ijoin.c +++ b/ijoin.c @@ -115,6 +115,7 @@ static char Rcs_Id[] = */ #include +#include #include "config.h" #include "ispell.h" #include "proto.h" @@ -169,7 +170,6 @@ static char * tabchar = " \t"; /* Field separator character(s) */ static int unpairable1 = 0; /* NZ if -a1 */ static int unpairable2 = 0; /* NZ if -a2 */ -extern int strcmp (); int main (argc, argv) /* Join files */ int argc; /* Argument count */ diff --git a/ispell.c b/ispell.c index 9b509d0..59fe358 100644 --- a/ispell.c +++ b/ispell.c @@ -235,6 +235,8 @@ static char Rcs_Id[] = #include #endif /* NO_FCNTL_H */ #include +#include +#include static void usage P ((void)); int main P ((int argc, char * argv[])); diff --git a/lookup.c b/lookup.c index 648f9c8..8bf1f6c 100644 --- a/lookup.c +++ b/lookup.c @@ -87,6 +87,8 @@ static char Rcs_Id[] = #include +#include +#include #include "config.h" #include "ispell.h" #include "proto.h" diff --git a/tree.c b/tree.c index 073a6a6..c26f635 100644 --- a/tree.c +++ b/tree.c @@ -94,6 +94,7 @@ static char Rcs_Id[] = #include #include +#include #include "config.h" #include "ispell.h" #include "proto.h" -- debian/patches/0012-Fix-getline.patch0000644000000000000000000000361512061456715014405 0ustar From: Stefan Potyra Date: Sat, 3 Oct 2009 04:00:34 +0200 Subject: 0012 Fix getline getline is not provided by eglibc, avoid conflict Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401 Forwarded: no --- correct.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/correct.c b/correct.c index 661bf57..ff7cb99 100644 --- a/correct.c +++ b/correct.c @@ -246,7 +246,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t * pattern, struct flagent * sufent, ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], int * nsaved)); -static char * getline P ((char * buf, int bufsize)); +static char * getline_ispell P ((char * buf, int bufsize)); void askmode P ((void)); void copyout P ((unsigned char ** cc, int cnt)); static void lookharder P ((unsigned char * string)); @@ -572,7 +572,7 @@ checkagain: imove (li - 1, 0); (void) putchar ('!'); - if (getline ((char *) buf, sizeof buf) == NULL) + if (getline_ispell ((char *) buf, sizeof buf) == NULL) { (void) putchar (7); ierase (); @@ -597,7 +597,7 @@ checkagain: (void) printf ("%s ", CORR_C_READONLY); } (void) printf (CORR_C_REPLACE_WITH); - if (getline ((char *) ctok, ctokl) == NULL) + if (getline_ispell ((char *) ctok, ctokl) == NULL) { (void) putchar (7); /* Put it back */ @@ -665,7 +665,7 @@ checkagain: unsigned char buf[100]; imove (li - 1, 0); (void) printf (CORR_C_LOOKUP_PROMPT); - if (getline ((char *) buf, sizeof buf) == NULL) + if (getline_ispell ((char *) buf, sizeof buf) == NULL) { (void) putchar (7); ierase (); @@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd, return; } -static char * getline (s, len) +static char * getline_ispell(s, len) register char * s; register int len; { -- debian/patches/0013-Fix-man-pages.patch0000644000000000000000000001560712061456715014633 0ustar From: David Paleino Date: Mon, 9 Nov 2009 09:22:12 +0000 Subject: 0013 Fix man pages Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign Forwarded: no --- ispell.1X | 26 +++++++++++++------------- ispell.5X | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ispell.1X b/ispell.1X index b27b120..79894d4 100644 --- a/ispell.1X +++ b/ispell.1X @@ -236,8 +236,8 @@ count affix-file .RB [ \-p | \-s] .RB [ \-c ] .I expanded-file -.IR affix [ +addition ] -... +.IR affix +.RI [ +addition ] .PP .B icombine .RB [ \-T @@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit. If the .B \-V flag is given, characters that are not in the 7-bit ANSI printable -character set will always be displayed in the style of "cat -v", even if +character set will always be displayed in the style of "cat \-v", even if .I ispell thinks that these characters are legal ISO Latin-1 on your system. This is useful when working with older terminals. @@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file, other than the default. If the filename does not contain a "/", the library directory for the default dictionary file is prefixed; -thus, to use a dictionary in the local directory "-d ./xxx.hash" must +thus, to use a dictionary in the local directory "\-d ./xxx.hash" must be used. This is useful to allow dictionaries for alternate languages. Unlike previous versions of @@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted. .I Ispell will typically be used with input from a file, meaning that preserving parity for possible 8 bit characters from the input text is OK. If you -specify the -l option, and actually type text from the terminal, this may +specify the \-l option, and actually type text from the terminal, this may create problems if your stty settings preserve parity. .PP It is not possible to use @@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero). The suggested derivations following the near misses are in the form: .PP .RS -[prefix+] root [-prefix] [-suffix] [+suffix] +[prefix+] root [\-prefix] [\-suffix] [+suffix] .RE .PP (e.g., "re+fry-y+ies" to get "refries") @@ -841,7 +841,7 @@ These output lines can be summarized as follows: .PP For example, a dummy dictionary containing the words "fray", "Frey", "fry", and "refried" might produce the following response to the -command "echo 'frqy refries | ispell -a -m -d ./test.hash": +command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash": .RS .nf (#) International Ispell Version 3.0.05 (beta), 08/10/91 @@ -1036,7 +1036,7 @@ script does this. As an example, the command: .PP .RS -echo BOTHER | ispell -c +echo BOTHER | ispell \-c .RE .PP produces: @@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words. For example, the command: .PP .RS -echo BOTH/R | ispell -e +echo BOTH/R | ispell \-e .RE .PP produces: @@ -1268,7 +1268,7 @@ hash file if it were added to the language table. Only affixes that generate legal roots (found in the original input) are listed. .PP -If the "-c" option is not given, the output lines are in the +If the "\-c" option is not given, the output lines are in the following format: .IP strip/add/count/bytes @@ -1298,7 +1298,7 @@ If the the output is made visually cleaner (but harder to post-process) by changing it to: .IP --strip+addcountbytes +\-strip+addcountbytes .PP where .IR strip , @@ -1313,7 +1313,7 @@ represents the ASCII tab character. The method used to generate possible affixes will also generate longer affixes which have common headers or trailers. For example, the two words "moth" and "mother" will generate not only the obvious -substitution "+er" but also "-h+her" and "-th+ther" (and possibly +substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly even longer ones, depending on the value of .IR min ). To prevent @@ -1621,7 +1621,7 @@ redirected. However, a lot of the temporary space needed is for sorting, so TMPDIR is only a partial help on systems with an uncooperative .IR sort (1). -("Cooperative" is defined as accepting the undocumented -T switch). +("Cooperative" is defined as accepting the undocumented \-T switch). At its peak usage, .I munchlist takes 10 to 40 times the original diff --git a/ispell.5X b/ispell.5X index ab526ed..7a1c2e5 100644 --- a/ispell.5X +++ b/ispell.5X @@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:) echo qqqqq > dummy.dict buildhash dummy.dict \fIaffix-file\fP dummy.hash awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e - | ispell -a -T \fIold-dict-string-type\fP \e - -d ./dummy.hash -p ./\fInew-dict-file\fP \e + | ispell \-a \-T \fIold-dict-string-type\fP \e + \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e > /dev/null rm dummy.* .fi @@ -622,7 +622,7 @@ or .B stringchar statements. For example, if the hyphen is a boundary character (useful in French), -the string "foo-bar" would be a single word, but "-foo" would be the +the string "foo-bar" would be a single word, but "\-foo" would be the same as "foo", and "foo--bar" would be two words separated by non-word characters. .PP @@ -916,7 +916,7 @@ The following (suffix) replacements: .RS .nf \&. > MENT -Y > -Y,IES +Y > \-Y,IES .fi .RE .PP @@ -956,8 +956,8 @@ Instead, you must use two separate rules: .PP .RS .nf -E > -E,IES -Y > -Y,IES +E > \-E,IES +Y > \-Y,IES .fi .RE .PP @@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write: .PP .RS .nf -E D > -ED,ING # As in covered > covering +E D > \-ED,ING # As in covered > covering .fi .RE .PP @@ -1013,7 +1013,7 @@ If you write: .PP .RS .nf -ED > -ED,ING +ED > \-ED,ING .fi .RE .PP @@ -1021,7 +1021,7 @@ the effect will be the same as: .PP .RS .nf -[ED] > -ED,ING +[ED] > \-ED,ING .fi .RE .PP @@ -1047,7 +1047,7 @@ is useful, as in the following example: .PP .RS .nf -$ munchlist -c oldaffixes -l newaffixes olddict > newdict +$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict .fi .RE .PP @@ -1070,7 +1070,7 @@ flag from the English affix file: .RS .nf flag *S: - [^AEIOU]Y > -Y,IES # As in imply > implies + [^AEIOU]Y > \-Y,IES # As in imply > implies [AEIOU]Y > S # As in convey > conveys [SXZH] > ES # As in fix > fixes [^SXZHY] > S # As in bat > bats @@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows: flag *R: E > R # As in skate > skater E > RS # As in skate > skaters - [^AEIOU]Y > -Y,IER # As in multiply > multiplier - [^AEIOU]Y > -Y,IERS # As in multiply > multipliers + [^AEIOU]Y > \-Y,IER # As in multiply > multiplier + [^AEIOU]Y > \-Y,IERS # As in multiply > multipliers [AEIOU]Y > ER # As in convey > conveyer [AEIOU]Y > ERS # As in convey > conveyers [^EY] > ER # As in build > builder -- debian/patches/0015-CFLAGS-from-environment.patch0000644000000000000000000000613612061456715016500 0ustar From: Robert Luberda Date: Sat, 5 Mar 2011 13:19:20 +0100 Subject: 0015 CFLAGS from environment Use CFLAGS from environment instead of hard-coding them in local.h. Make use of LDFLAGS when needed. --- Makefile | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 007b6d7..5f7b1e2 100644 --- a/Makefile +++ b/Makefile @@ -273,7 +273,7 @@ showversion: ispell .c.o: @. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -c $< + $$CC $$CFLAGS -DCFLAGS="\"$$CFLAGS\"" -c $< # # The funny business with y_tab.c is necessary for MS-DOS systems, @@ -284,7 +284,7 @@ showversion: ispell set -x; \ $$YACC $<; \ [ -f y_tab.c ] || mv y.tab.c y_tab.c; \ - $$CC $$CFLAGS -c y_tab.c; \ + $$CC $$CFLAGS -DCFLAGS="$$CFLAGS" -c y_tab.c; \ mv y_tab.o $@; \ rm -f y_tab.c @@ -459,22 +459,23 @@ language-subdirs: config.sh buildhash: config.sh buildhash.o hash.o makedent.o parse.o @. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o buildhash buildhash.o hash.o makedent.o parse.o \ + $$CC $(LDFLAGS) -o buildhash buildhash.o hash.o makedent.o parse.o \ $$LIBES icombine: config.sh icombine.o makedent.o parse.o @. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o icombine icombine.o makedent.o parse.o \ + $$CC $(LDFLAGS) -o icombine icombine.o makedent.o parse.o \ $$LIBES ijoin: config.sh ijoin.o fields.o @. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o ijoin ijoin.o fields.o $$LIBES + $$CC $(LDFLAGS) -o ijoin ijoin.o fields.o $$LIBES EDITFILE = notthere OUTFILE = /dev/null +CFLAGS ?= -O # # Note: we use "sed -n -e $$p" to achieve "tail -1" here because some @@ -511,7 +512,7 @@ defhash.h: config.X local.h Makefile config.sh: config.X defhash.h local.h Makefile set $(SHELLDEBUG); \ - for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \ + for var in BAKEXT BINDIR CC COUNTSUFFIX DEFDICT DEFHASH \ DEFLANG EXEEXT HASHSUFFIX INSTALL \ LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \ MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \ @@ -523,6 +524,7 @@ config.sh: config.X defhash.h local.h Makefile | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \ | sed -n -e '$$p'; \ done > config.sh; \ + echo "CFLAGS='$(CFLAGS)'" >> config.sh; \ echo 'case "$$MAKE_SORTTMP" in "") \ SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \ >> config.sh @@ -601,17 +603,17 @@ term.o: term.c ispell: config.sh $(OBJS) @. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES + $$CC $(LDFLAGS) -o ispell $(OBJS) $$TERMLIB $$REGLIB $$LIBES sq: config.sh msgs.h sq.c @@. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o sq sq.c + $$CC $$CFLAGS $(LDFLAGS) -o sq sq.c unsq: config.sh msgs.h unsq.c @@. ./config.sh; \ set -x; \ - $$CC $$CFLAGS -o unsq unsq.c + $$CC $$CFLAGS $(LDFLAGS) -o unsq unsq.c $(OBJS) buildhash.o icombine.o hash.o parse.o: config.h ispell.h local.h $(OBJS) buildhash.o icombine.o hash.o parse.o: proto.h msgs.h config.sh -- debian/patches/0017-DESTDIR-support.patch0000644000000000000000000000713612061456715015051 0ustar From: Robert Luberda Date: Mon, 7 Mar 2011 00:54:43 +0100 Subject: 0017 DESTDIR support Add support for DESTDIR to Makefile --- Makefile | 9 +++++++-- languages/american/Makefile | 4 ++-- languages/british/Makefile | 4 ++-- languages/english/Makefile | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5f7b1e2..fc1bd3a 100644 --- a/Makefile +++ b/Makefile @@ -340,8 +340,8 @@ mkdirpath: for i in `echo $(NEWDIR) | tr / ' '`; do \ path="$$path/$$i"; \ if [ ! -d $$path ]; then \ - echo mkdir $$path; \ - mkdir $$path; \ + echo mkdir -p $$path; \ + mkdir -p $$path; \ fi; \ done @@ -525,10 +525,15 @@ config.sh: config.X defhash.h local.h Makefile | sed -n -e '$$p'; \ done > config.sh; \ echo "CFLAGS='$(CFLAGS)'" >> config.sh; \ + echo 'BINDIR="$${DESTDIR}$${BINDIR}"' >> config.sh + echo 'MAN1DIR="$${DESTDIR}$${MAN1DIR}"' >> config.sh + echo 'MAN45DIR="$${DESTDIR}$${MAN45DIR}"' >> config.sh + echo 'LIBDIR="$${DESTDIR}$${LIBDIR}"' >> config.sh echo 'case "$$MAKE_SORTTMP" in "") \ SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \ >> config.sh +doedit: override DESTDIR= doedit: . ./config.sh; \ set $(SHELLDEBUG); \ diff --git a/languages/american/Makefile b/languages/american/Makefile index 4aa55d0..c586109 100644 --- a/languages/american/Makefile +++ b/languages/american/Makefile @@ -156,7 +156,7 @@ install: all $(CONFIG) $(DICTSRC)/english.5 set -x; \ cd ../..; \ [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$LIBDIR mkdirpath; \ cd $$LIBDIR; rm -f english.aff $(HASHFILES) $(LANGUAGE).hash @. $(CONFIG); \ set -x; \ @@ -174,7 +174,7 @@ install: all $(CONFIG) $(DICTSRC)/english.5 set -x; \ cd ../..; \ [ -d $$MAN45DIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$MAN45DIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$MAN45DIR mkdirpath; \ cd $$MAN45DIR; \ rm -f english$$MAN45EXT @. $(CONFIG); \ diff --git a/languages/british/Makefile b/languages/british/Makefile index a6b333a..5a961c7 100644 --- a/languages/british/Makefile +++ b/languages/british/Makefile @@ -156,7 +156,7 @@ install: all $(CONFIG) $(DICTSRC)/english.5 set -x; \ cd ../..; \ [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$LIBDIR mkdirpath; \ cd $$LIBDIR; rm -f english.aff $(HASHFILES) $(LANGUAGE).hash @. $(CONFIG); \ set -x; \ @@ -174,7 +174,7 @@ install: all $(CONFIG) $(DICTSRC)/english.5 set -x; \ cd ../..; \ [ -d $$MAN45DIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$MAN45DIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$MAN45DIR mkdirpath; \ cd $$MAN45DIR; \ rm -f english$$MAN45EXT @. $(CONFIG); \ diff --git a/languages/english/Makefile b/languages/english/Makefile index 81f8c51..79062e5 100644 --- a/languages/english/Makefile +++ b/languages/english/Makefile @@ -196,7 +196,7 @@ install: all $(CONFIG) set -x; \ cd ../..; \ [ -d $$LIBDIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$LIBDIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$LIBDIR mkdirpath; \ cd $$LIBDIR; rm -f english.aff $(HASHFILES) @. $(CONFIG); \ set -x; \ @@ -210,7 +210,7 @@ install: all $(CONFIG) set -x; \ cd ../..; [ -d $$MAN45DIR ] || \ - $(MAKE) -f ../../Makefile NEWDIR=$$MAN45DIR mkdirpath; \ + $(MAKE) -f Makefile NEWDIR=$$MAN45DIR mkdirpath; \ cd $$MAN45DIR; \ rm -f english$$MAN45EXT @. $(CONFIG); \ -- debian/patches/0018-Dont-strip-binaries.patch0000644000000000000000000000142712061456715016074 0ustar From: Robert Luberda Date: Mon, 7 Mar 2011 00:55:37 +0100 Subject: 0018 Dont strip binaries Fix Makefile not to strip binaries (closes: #437235) --- Makefile | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fc1bd3a..b54042f 100644 --- a/Makefile +++ b/Makefile @@ -308,7 +308,6 @@ install-basic: @. ./config.sh; \ set -x; \ cd $$BINDIR; \ - strip ispell$$EXEEXT; \ chmod 755 ispell$$EXEEXT @. ./config.sh; \ set -x; \ @@ -367,7 +366,6 @@ install-dictbuild: @. ./config.sh; \ set -x; \ cd $$BINDIR; \ - strip buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT; \ chmod 755 buildhash$$EXEEXT icombine$$EXEEXT ijoin$$EXEEXT \ munchlist findaffix tryaffix @. ./config.sh; \ -- debian/patches/0019-Section-of-english-5.patch0000644000000000000000000000274512061456715016043 0ustar From: Robert Luberda Date: Mon, 7 Mar 2011 20:20:10 +0100 Subject: 0019 Section of english(5) Fix section of the english(5) man page. Patch taken from OpenSUSE's ispell-3.3.02-languages.patch --- languages/english/english.5X | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/languages/english/english.5X b/languages/english/english.5X index aa08fad..28c1e2b 100644 --- a/languages/english/english.5X +++ b/languages/english/english.5X @@ -56,7 +56,7 @@ .\" Get rid of all old RCS log lines in preparation for the 3.1 release. .\" .\" -.TH ENGLISH 4 +.TH ENGLISH !!MAN45SECT!! .SH NAME english \- flag format for English \fIispell\fP dictionaries .SH DESCRIPTION @@ -66,7 +66,7 @@ supports 3 prefix and 14 suffix flags. For a detailed description of how .I ispell handles flags and capitalization, see -.IR ispell (4). +.IR ispell (!!MAN45SECT!!). This manual page only describes flags usable in dictionaries built using the .I english.aff @@ -85,7 +85,7 @@ produced by placing the "D" flag on "we". .PP In the following list, an asterisk indicates that a flag participates in cross-product formation (see -.IR ispell (4)). +.IR ispell (!!MAN45SECT!!)). .PP The meaning of the prefix flags is as follows: .IP "*A" @@ -248,7 +248,7 @@ if # .ne. s, x, z, h, or y, or (# = y and @ = a, e, i, o, or u) \&...@# --> ...@#s as in bat --> bats or convey --> conveys .in -5m -.I*P "P" +.IP "P" .in +5m .ti -5m if @ .ne. a, e, i, o, or u, -- debian/patches/0020-Mark-Rcs_Id-as-unused.patch0000644000000000000000000001723212061456715016166 0ustar From: Robert Luberda Date: Mon, 7 Mar 2011 21:04:36 +0100 Subject: 0020 Mark Rcs_Id as unused Fix `'Rcs_Id' defined but not used' warnigs given by gcc -Wall. Do the same for VersionID variable. --- buildhash.c | 2 +- correct.c | 2 +- defmt.c | 2 +- deformatters/defmt-c.c | 2 +- deformatters/defmt-sh.c | 2 +- dump.c | 2 +- exp_table.c | 2 +- fields.c | 2 +- good.c | 2 +- hash.c | 2 +- icombine.c | 2 +- ijoin.c | 2 +- ispell.c | 2 +- lookup.c | 2 +- makedent.c | 2 +- parse.y | 2 +- sq.c | 2 +- term.c | 2 +- tgood.c | 2 +- tree.c | 2 +- unsq.c | 2 +- version.h | 4 ++-- xgets.c | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 defmt-sh.c diff --git a/buildhash.c b/buildhash.c index ee43993..c440e4b 100644 --- a/buildhash.c +++ b/buildhash.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: buildhash.c,v 1.74 2005/04/28 00:26:06 geoff Exp $"; #endif diff --git a/correct.c b/correct.c index ff7cb99..79b259f 100644 --- a/correct.c +++ b/correct.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: correct.c,v 1.82 2005/04/28 14:46:51 geoff Exp $"; #endif diff --git a/defmt-sh.c b/defmt-sh.c new file mode 100644 index 0000000..e69de29 diff --git a/defmt.c b/defmt.c index b5e3b59..c14421d 100644 --- a/defmt.c +++ b/defmt.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: defmt.c,v 1.62 2005/04/20 23:16:32 geoff Exp $"; #endif diff --git a/deformatters/defmt-c.c b/deformatters/defmt-c.c index 8c5192b..70119ca 100644 --- a/deformatters/defmt-c.c +++ b/deformatters/defmt-c.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: deformat-c.c,v 1.3 2001/07/25 21:51:48 geoff Exp geoff $"; #endif diff --git a/deformatters/defmt-sh.c b/deformatters/defmt-sh.c index 27d46fc..713fec6 100644 --- a/deformatters/defmt-sh.c +++ b/deformatters/defmt-sh.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: deformat-sh.c,v 1.4 2001/07/25 21:51:48 geoff Exp geoff $"; #endif diff --git a/dump.c b/dump.c index dc11b6b..0478cfe 100644 --- a/dump.c +++ b/dump.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: dump.c,v 1.19 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/exp_table.c b/exp_table.c index 941a9ee..35addb5 100644 --- a/exp_table.c +++ b/exp_table.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: exp_table.c,v 1.4 2005/06/11 22:43:53 geoff Exp $"; #endif diff --git a/fields.c b/fields.c index d793824..93a646a 100644 --- a/fields.c +++ b/fields.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: fields.c,v 1.11 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/good.c b/good.c index 466e2ff..d9179f4 100644 --- a/good.c +++ b/good.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: good.c,v 1.51 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/hash.c b/hash.c index 0f7f1e4..d2ad1cb 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: hash.c,v 1.25 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/icombine.c b/icombine.c index 57efbd3..7ec699b 100644 --- a/icombine.c +++ b/icombine.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: icombine.c,v 2.33 2005/04/20 23:16:32 geoff Exp $"; #endif diff --git a/ijoin.c b/ijoin.c index 5da039a..f3931ff 100644 --- a/ijoin.c +++ b/ijoin.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: ijoin.c,v 1.12 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/ispell.c b/ispell.c index 59fe358..d130a0e 100644 --- a/ispell.c +++ b/ispell.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: ispell.c,v 1.161 2005/05/25 14:13:53 geoff Exp $"; #endif diff --git a/lookup.c b/lookup.c index 8bf1f6c..ce0f08e 100644 --- a/lookup.c +++ b/lookup.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: lookup.c,v 1.52 2005/04/14 21:25:52 geoff Exp $"; #endif diff --git a/makedent.c b/makedent.c index d121345..32320fe 100644 --- a/makedent.c +++ b/makedent.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: makedent.c,v 1.59 2005/04/20 23:16:32 geoff Exp $"; #endif diff --git a/parse.y b/parse.y index 358fc84..33836a9 100644 --- a/parse.y +++ b/parse.y @@ -1,6 +1,6 @@ %{ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: parse.y,v 1.65 2005/04/20 23:16:32 geoff Exp $"; #endif diff --git a/sq.c b/sq.c index 85ebf63..d7e6b42 100644 --- a/sq.c +++ b/sq.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: sq.c,v 1.16 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/term.c b/term.c index 47c1aa0..83f5383 100644 --- a/term.c +++ b/term.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: term.c,v 1.54 2005/04/14 23:11:36 geoff Exp $"; #endif diff --git a/tgood.c b/tgood.c index 5a71cb8..3cc753f 100644 --- a/tgood.c +++ b/tgood.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: tgood.c,v 1.43 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/tree.c b/tree.c index c26f635..05a6918 100644 --- a/tree.c +++ b/tree.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: tree.c,v 1.66 2005/04/14 14:43:46 geoff Exp $"; #endif diff --git a/unsq.c b/unsq.c index b14bcf3..997170e 100644 --- a/unsq.c +++ b/unsq.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: unsq.c,v 1.18 2005/04/14 14:38:23 geoff Exp $"; #endif diff --git a/version.h b/version.h index 6c84fe5..f7a1475 100644 --- a/version.h +++ b/version.h @@ -9,7 +9,7 @@ * incorrect translation. */ -static char * Version_ID[] = { +static char * Version_ID[] __attribute__ ((unused)) = { "@(#) International Ispell Version 3.3.02 12 Jun 2005", "@(#) Copyright (c), 1983, by Pace Willisson", "@(#) International version Copyright (c) 1987, 1988, 1990-1995, 1999,", @@ -62,7 +62,7 @@ static char * Version_ID[] = { NULL }; -static char RCS_Version_ID[] = +static char RCS_Version_ID[] __attribute__ ((unused)) = "$Id: version.h,v 1.59 2005/06/11 22:49:44 geoff Exp $"; #endif /* VERSION_H_INCLUDED */ diff --git a/xgets.c b/xgets.c index 44a7d51..293ec07 100644 --- a/xgets.c +++ b/xgets.c @@ -1,5 +1,5 @@ #ifndef lint -static char Rcs_Id[] = +static char Rcs_Id[] __attribute__ ((unused)) = "$Id: xgets.c,v 1.28 2005/04/14 14:38:23 geoff Exp $"; #endif -- debian/patches/0021-Fix-gcc-warnings.patch0000644000000000000000000000363212061456715015337 0ustar From: Robert Luberda Date: Mon, 7 Mar 2011 22:23:56 +0100 Subject: 0021 Fix gcc warnings Fix some gcc warnings. --- correct.c | 2 +- languages/english/msgs.h | 8 ++++---- tree.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/correct.c b/correct.c index 79b259f..982b7c6 100644 --- a/correct.c +++ b/correct.c @@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange) for (p = start; p != *curchar; p++) (void) putc (*p, logfile); (void) putc (' ', logfile); - (void) fputs (tok, logfile); + (void) fputs ((char*) tok, logfile); (void) putc ('\n', logfile); (void) fflush (logfile); } diff --git a/languages/english/msgs.h b/languages/english/msgs.h index d33b42b..f9c87ca 100644 --- a/languages/english/msgs.h +++ b/languages/english/msgs.h @@ -182,10 +182,10 @@ #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n" #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n" /* You may add HELP_6 through HELP_9 if your language needs more lines */ -#define CORR_C_HELP_6 "" -#define CORR_C_HELP_7 "" -#define CORR_C_HELP_8 "" -#define CORR_C_HELP_9 "" +#define CORR_C_HELP_6 "%s" +#define CORR_C_HELP_7 "%s" +#define CORR_C_HELP_8 "%s" +#define CORR_C_HELP_9 "%s" #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n" #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n" #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n" diff --git a/tree.c b/tree.c index 05a6918..229ae16 100644 --- a/tree.c +++ b/tree.c @@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep) struct dent * oldhtab; unsigned int oldhsize; ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN]; - int isvariant; + MASKTYPE isvariant; /* * Expand hash table when it is MAXPCT % full. -- debian/patches/0022-Ispell-man-page.patch0000644000000000000000000000202012061456715015133 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 21:09:13 +0100 Subject: 0022 Ispell man page Fix dictionary in ispell man page. --- ispell.1X | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ispell.1X b/ispell.1X index 79894d4..343223b 100644 --- a/ispell.1X +++ b/ispell.1X @@ -387,8 +387,8 @@ Sort the list of guesses by probable correctness. .IP "\fB\-d\fR file" Specify an alternate dictionary file. For example, use -.B "\-d deutsch" -to choose a German dictionary in a German installation. +.B "\-d british" +to choose /usr/lib/ispell/british.{aff|hash} instead of your default ispell dictionary. .IP "\fB\-p\fR file" Specify an alternate personal dictionary. .IP "\fB\-w\fR chars" @@ -459,7 +459,7 @@ defined. Otherwise, the bibliography will be checked but the reference key will not. .PP References for the -.IR !!TIB_XREF!! +!!TIB_XREF!! bibliography system, that is, text between a ``[.'' or ``<.'' and ``.]'' or ``.>'' will always be ignored in TeX/LaTeX mode. .PP -- debian/patches/0023-Exclusive-options.patch0000644000000000000000000000151312061456715015667 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 21:12:23 +0100 Subject: 0023 Exclusive options Make options -x and -b mutually exclusive --- ispell.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ispell.c b/ispell.c index d130a0e..cd5802a 100644 --- a/ispell.c +++ b/ispell.c @@ -279,6 +279,7 @@ int main (argc, argv) static char outbuf[BUFSIZ]; int argno; int arglen; + int bflag = 0; Cmd = *argv; @@ -728,12 +729,13 @@ int main (argc, argv) nodictflag++; break; case 'b': - if (arglen > 2) + if (arglen > 2 || xflag == 1) usage (); xflag = 0; /* Keep a backup file */ + bflag = 1; break; case 'x': - if (arglen > 2) + if (arglen > 2 || bflag == 1) usage (); xflag = 1; /* Don't keep a backup file */ break; -- debian/patches/0024-Check-tempdir-creation.patch0000644000000000000000000000352312061456715016514 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 21:00:31 +0100 Subject: 0024 Check tempdir creation Fail if temporary directory cannot be created. --- findaffix.X | 3 ++- munchlist.X | 3 ++- subset.X | 3 ++- zapdups.X | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/findaffix.X b/findaffix.X index 2c253e2..58cabab 100755 --- a/findaffix.X +++ b/findaffix.X @@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" TMP=${TEMPDIR}/faff$$ if [ "$TEMPDIR" = "$TDIR" ] then - TOREMOVE="${TMP}*" + echo "Failed to create temporary directory; exiting" + exit 1 else TOREMOVE="$TEMPDIR" fi diff --git a/munchlist.X b/munchlist.X index ada3f1d..47bb908 100755 --- a/munchlist.X +++ b/munchlist.X @@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null` || MUNCHDIR="$TDIR" TMP=${MUNCHDIR}/munch$$ if [ "$MUNCHDIR" = "$TDIR" ] then - TOREMOVE="${TMP}*" + echo "$0: Failed to create temporary directory, exiting..." + exit 1 else TOREMOVE="$MUNCHDIR" fi diff --git a/subset.X b/subset.X index cc748ec..9c904cc 100755 --- a/subset.X +++ b/subset.X @@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" TMP=${TEMPDIR}/sset$$ if [ "$TEMPDIR" = "$TDIR" ] then - TOREMOVE="${TMP}*" + echo "$0: Failed to create temporary directory, exiting..." + exit 1 else TOREMOVE="$TEMPDIR" fi diff --git a/zapdups.X b/zapdups.X index a68852a..1c610d4 100755 --- a/zapdups.X +++ b/zapdups.X @@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" TMP=${TEMPDIR}/zapd$$ if [ "$TEMPDIR" = "$TDIR" ] then - TOREMOVE="${TMP}*" + echo "$0: Failed to create temporary directory, exiting..." + exit 1 else TOREMOVE="$TEMPDIR" fi -- debian/patches/0025-Languages.patch0000644000000000000000000000311412061456715014136 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 21:02:47 +0100 Subject: 0025 Languages Fix a few words. --- languages/english/british.0 | 1 + languages/english/english.0 | 8 ++++++-- languages/english/english.1 | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/languages/english/british.0 b/languages/english/british.0 index dc4caa7..04d9177 100644 --- a/languages/english/british.0 +++ b/languages/english/british.0 @@ -46,6 +46,7 @@ armour/DGMRSZ armoured/U armourer/MS armoury/DMS +artefact/MS atomisation/MS atomise/DGRSZ authorisation/AMS diff --git a/languages/english/english.0 b/languages/english/english.0 index fc13212..f85e15a 100644 --- a/languages/english/english.0 +++ b/languages/english/english.0 @@ -3502,6 +3502,7 @@ closure/DGMS cloth/DGS clothe/DGS clothed/U +cloths cloud/DGS clouded/U cloudless/PY @@ -10019,9 +10020,10 @@ mystery/MS mystic/MS mystical/Y mysticism/S -myth/MS +myth/M mythical/Y mythology/MS +myths nag/MS nail/DGRS naive/PRY @@ -14818,6 +14820,7 @@ tent/DGRS tentacle/DS tentative/PY tented/U +tenth tenths tenure/DS tenured/U @@ -16511,8 +16514,9 @@ youngster/MS your/MS yourself yourselves -youth/MS +youth/M youthful/PY +youths yuck Yugoslavian/MS yummy/R diff --git a/languages/english/english.1 b/languages/english/english.1 index 2bfac86..78a7edf 100644 --- a/languages/english/english.1 +++ b/languages/english/english.1 @@ -7449,7 +7449,8 @@ metalloid metallurgic metallurgical/Y metallurgists -metalsmith/S +metalsmith +metalsmiths metalwork/GJR metamorphic metamorphism -- debian/patches/0026-POSIX-sort.patch0000644000000000000000000000236212061456715014124 0ustar From: Robert Luberda Date: Tue, 8 Mar 2011 21:21:49 +0100 Subject: 0026 POSIX sort Force POSIX sort options (closes: #204899) --- findaffix.X | 8 +------- munchlist.X | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/findaffix.X b/findaffix.X index 58cabab..bdc379a 100755 --- a/findaffix.X +++ b/findaffix.X @@ -146,13 +146,7 @@ # that the new syntax is bad--it's definitely easier to understand. # But that doesn't excuse breaking compatibility.) # -# Detect whether sort accepts old-style switches. -if sort +0 -1 /dev/null >/dev/null 2>&1 -then - CRETIN_SORT=false -else - CRETIN_SORT=true -fi +CRETIN_SORT=true # # The following is necessary so that some internationalized versions of diff --git a/munchlist.X b/munchlist.X index 47bb908..3272dd3 100755 --- a/munchlist.X +++ b/munchlist.X @@ -267,13 +267,7 @@ fi # that the new syntax is bad--it's definitely easier to understand. # But that doesn't excuse breaking compatibility.) # -# Detect whether sort accepts old-style switches. -if sort +0 -1 /dev/null >/dev/null 2>&1 -then - CRETIN_SORT=false -else - CRETIN_SORT=true -fi +CRETIN_SORT=true # # The following is necessary so that some internationalized versions of -- debian/patches/0027-Include-Debian-Makefile.languages.inc.patch0000644000000000000000000000604412061456715021232 0ustar From: Robert Luberda Date: Thu, 17 Mar 2011 23:17:51 +0100 Subject: 0027 Include Debian Makefile.languages.inc This patch adds include ../../debian/local/Makefile.languages.inc for american/british/english languages and allows to overwrite install target. Additionally support for a special `debian-none' value of MASTERHASH is added into top-level Makefile. --- Makefile | 2 +- languages/american/Makefile | 5 ++++- languages/british/Makefile | 5 ++++- languages/english/Makefile | 6 +++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b54042f..2503722 100644 --- a/Makefile +++ b/Makefile @@ -396,7 +396,7 @@ install-languages: [ -d $$LIBDIR ] || $(MAKE) NEWDIR=$$LIBDIR mkdirpath; \ set -x; \ cd $$LIBDIR; \ - if [ $$MASTERHASH != $$DEFHASH ]; then \ + if [ $$MASTERHASH != debian-none ] && [ $$MASTERHASH != $$DEFHASH ]; then \ rm -f $$DEFHASH; \ $$LINK $$MASTERHASH $$DEFHASH; \ fi diff --git a/languages/american/Makefile b/languages/american/Makefile index c586109..b3f7013 100644 --- a/languages/american/Makefile +++ b/languages/american/Makefile @@ -147,11 +147,14 @@ all: $(CONFIG) done $(MAKE) SHELLDEBUG=$(SHELLDEBUG) $(HASHFILES) +INSTALL_TARGET: install +include ../../debian/local/Makefile.languages.inc + # Note the fooling around with LIBDIR. It might be a relative path, # relative to the top of the ispell source tree. So we have to cd to # ../.. before referring to $LIBDIR. There must be a better way... # -install: all $(CONFIG) $(DICTSRC)/english.5 +$(INSTALL_TARGET): all $(CONFIG) $(DICTSRC)/english.5 @. $(CONFIG); \ set -x; \ cd ../..; \ diff --git a/languages/british/Makefile b/languages/british/Makefile index 5a961c7..1d4b1bd 100644 --- a/languages/british/Makefile +++ b/languages/british/Makefile @@ -147,11 +147,14 @@ all: $(CONFIG) done $(MAKE) SHELLDEBUG=$(SHELLDEBUG) $(HASHFILES) +INSTALL_TARGET := install +include ../../debian/local/Makefile.languages.inc + # Note the fooling around with LIBDIR. It might be a relative path, # relative to the top of the ispell source tree. So we have to cd to # ../.. before referring to $LIBDIR. There must be a better way... # -install: all $(CONFIG) $(DICTSRC)/english.5 +$(INSTALL_TARGET): all $(CONFIG) $(DICTSRC)/english.5 @. $(CONFIG); \ set -x; \ cd ../..; \ diff --git a/languages/english/Makefile b/languages/english/Makefile index 79062e5..acbb22f 100644 --- a/languages/english/Makefile +++ b/languages/english/Makefile @@ -187,11 +187,15 @@ all: $(CONFIG) english.5 done $(MAKE) SHELLDEBUG=$(SHELLDEBUG) $(HASHFILES) + +INSTALL_TARGET := install +include ../../debian/local/Makefile.languages.inc + # Note the fooling around with LIBDIR. It might be a relative path, # relative to the top of the ispell source tree. So we have to cd to # ../.. before referring to $LIBDIR. There must be a better way... # -install: all $(CONFIG) +$(INSTALL_TARGET): all $(CONFIG) @. $(CONFIG); \ set -x; \ cd ../..; \ -- debian/patches/0028-Fix-hardening-warnings.patch0000644000000000000000000001067112061456715016552 0ustar From: Robert Luberda Date: Thu, 17 Mar 2011 23:19:30 +0100 Subject: 0028 Fix hardening warnings Fix warnings emitted when hardening options are enabled. --- buildhash.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/buildhash.c b/buildhash.c index c440e4b..b732970 100644 --- a/buildhash.c +++ b/buildhash.c @@ -134,6 +134,10 @@ char Sfile[MAXPATHLEN]; /* Name of statistics file */ static int silent = 0; /* NZ to suppress count reports */ +#define fwrite(a,b,c,d) do { if (fwrite(a, b, c, d) != c ) { \ + fprintf(stderr, "frwite() failed"); \ + exit(1); }\ + } while (0) int main (argc, argv) int argc; char * argv[]; @@ -263,7 +267,7 @@ static void output () hashheader.stringsize = 0; hashheader.lstringsize = 0; hashheader.tblsize = hashsize; - (void) fwrite ((char *) &hashheader, sizeof hashheader, 1, houtfile); + fwrite ((char *) &hashheader, sizeof hashheader, 1, houtfile); strptr = 0; /* ** Put out the strings from the flags table. This code assumes that @@ -278,14 +282,14 @@ static void output () { if (fentry->stripl) { - (void) fwrite ((char *) fentry->strip, fentry->stripl + 1, + fwrite ((char *) fentry->strip, fentry->stripl + 1, sizeof (ichar_t), houtfile); fentry->strip = (ichar_t *) strptr; strptr += (fentry->stripl + 1) * sizeof (ichar_t); } if (fentry->affl) { - (void) fwrite ((char *) fentry->affix, fentry->affl + 1, + fwrite ((char *) fentry->affix, fentry->affl + 1, sizeof (ichar_t), houtfile); fentry->affix = (ichar_t *) strptr; strptr += (fentry->affl + 1) * sizeof (ichar_t); @@ -301,14 +305,14 @@ static void output () { if (fentry->stripl) { - (void) fwrite ((char *) fentry->strip, fentry->stripl + 1, + fwrite ((char *) fentry->strip, fentry->stripl + 1, sizeof (ichar_t), houtfile); fentry->strip = (ichar_t *) strptr; strptr += (fentry->stripl + 1) * sizeof (ichar_t); } if (fentry->affl) { - (void) fwrite ((char *) fentry->affix, fentry->affl + 1, + fwrite ((char *) fentry->affix, fentry->affl + 1, sizeof (ichar_t), houtfile); fentry->affix = (ichar_t *) strptr; strptr += (fentry->affl + 1) * sizeof (ichar_t); @@ -326,17 +330,17 @@ static void output () for (i = 0; i < hashheader.nstrchartype; i++) { n = strlen ((char *) chartypes[i].name) + 1; - (void) fwrite ((char *) chartypes[i].name, n, 1, houtfile); + fwrite ((char *) chartypes[i].name, n, 1, houtfile); strptr += n; n = strlen (chartypes[i].deformatter) + 1; - (void) fwrite (chartypes[i].deformatter, n, 1, houtfile); + fwrite (chartypes[i].deformatter, n, 1, houtfile); strptr += n; for (n = 0; chartypes[i].suffixes[n] != '\0'; n += strlen (&chartypes[i].suffixes[n]) + 1) ; n++; - (void) fwrite (chartypes[i].suffixes, n, 1, houtfile); + fwrite (chartypes[i].suffixes, n, 1, houtfile); strptr += n; } hashheader.lstringsize = strptr; @@ -356,7 +360,7 @@ static void output () else { n = strlen ((char *) dp->word) + 1; - (void) fwrite (dp->word, n, 1, houtfile); + fwrite (dp->word, n, 1, houtfile); dp->word = (unsigned char *) strptr; strptr += n; } @@ -384,23 +388,23 @@ static void output () dp->next = (struct dent *)-1; } #ifdef PIECEMEAL_HASH_WRITES - (void) fwrite ((char *) dp, sizeof (struct dent), 1, houtfile); + fwrite ((char *) dp, sizeof (struct dent), 1, houtfile); #endif /* PIECEMEAL_HASH_WRITES */ } #ifndef PIECEMEAL_HASH_WRITES - (void) fwrite ((char *) hashtbl, sizeof (struct dent), hashsize, houtfile); + fwrite ((char *) hashtbl, sizeof (struct dent), hashsize, houtfile); #endif /* PIECEMEAL_HASH_WRITES */ /* Put out the language tables */ - (void) fwrite ((char *) sflaglist, + fwrite ((char *) sflaglist, sizeof (struct flagent), numsflags, houtfile); hashheader.stblsize = numsflags; - (void) fwrite ((char *) pflaglist, + fwrite ((char *) pflaglist, sizeof (struct flagent), numpflags, houtfile); hashheader.ptblsize = numpflags; /* Finish filling in the hash header. */ hashheader.stringsize = strptr; rewind (houtfile); - (void) fwrite ((char *) &hashheader, sizeof hashheader, 1, houtfile); + fwrite ((char *) &hashheader, sizeof hashheader, 1, houtfile); (void) fclose (houtfile); } -- debian/patches/0029-Generate-hex-in-fix8bit.patch0000644000000000000000000000123012061456715016524 0ustar From: Robert Luberda Date: Mon, 21 Mar 2011 10:27:27 +0100 Subject: 0029 Generate hex in fix8bit Make fix8bit -7 generate hexadecimal sequences instead of octal ones. --- languages/fix8bit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/languages/fix8bit.c b/languages/fix8bit.c index 6090c5b..da149df 100644 --- a/languages/fix8bit.c +++ b/languages/fix8bit.c @@ -182,7 +182,7 @@ static void to7bit () /* Convert from 8-bit sequences */ { ch &= 0xFF; if (ch >= 0x80) - (void) printf ("\\%3.3o", (unsigned) ch); + (void) printf ("\\x%2.2X", (unsigned) ch); else (void) putchar (ch); } -- debian/patches/0030-Display-whole-multibyte-character.patch0000644000000000000000000000162212061456715020715 0ustar From: Robert Luberda Date: Mon, 21 Mar 2011 10:36:15 +0100 Subject: 0030 Display whole multibyte character Display all bytes from multibyte characters instead of converting them into `cat -v' format. This fixes an ugly screen content shown while checking UTF-8 files. --- correct.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/correct.c b/correct.c index 982b7c6..c91b41b 100644 --- a/correct.c +++ b/correct.c @@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw) ichar = SET_SIZE + laststringch; else ichar = chartoichar (ch); - if (!vflag && iswordch (ichar) && len == 1) + if (!vflag && iswordch (ichar) && len >= 1) { - if (output) - (void) putchar (ch); - (*cp)++; + for (i = 0; i < len; ++i) + { + if (output) + (void) putchar (**cp); + (*cp)++; + } return 1; } if (ch == '\t') -- debian/patches/series0000644000000000000000000000141612061456715012043 0ustar 0001-Configuration.patch 0003-Fix-FTBFS-on-Hurd.patch 0005-Do-not-reorder-words.patch 0006-Fix-sq-and-unsq.patch 0007-Use-termios.patch 0008-Tex-backslash.patch 0009-Fix-FTBFS-on-glibc.patch 0010-Debian-control-file.patch 0011-Missing-prototypes.patch 0012-Fix-getline.patch 0013-Fix-man-pages.patch 0015-CFLAGS-from-environment.patch 0017-DESTDIR-support.patch 0018-Dont-strip-binaries.patch 0019-Section-of-english-5.patch 0020-Mark-Rcs_Id-as-unused.patch 0021-Fix-gcc-warnings.patch 0022-Ispell-man-page.patch 0023-Exclusive-options.patch 0024-Check-tempdir-creation.patch 0025-Languages.patch 0026-POSIX-sort.patch 0027-Include-Debian-Makefile.languages.inc.patch 0028-Fix-hardening-warnings.patch 0029-Generate-hex-in-fix8bit.patch 0030-Display-whole-multibyte-character.patch debian/rules0000755000000000000000000000752312061456715010264 0ustar #!/usr/bin/make -f SHELL := sh -e CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) DH_AUTO_OPTIONS := -v -Smakefile GEN_DH_FILES := debian/packages.d/gen_debhelper_files.pl export DESTDIR := $(CURDIR)/debian/tmp build: export MISSING_BUILD_DEPS := $(shell dpkg-checkbuilddeps 2>&1) binary binary-arch binary-indep build build-arch build-indep: debian/packages.stamp dh ${@} clean: dh ${@} ifneq ($(shell dh_listpackages),$(shell dh_listpackages -i)) # arch:any packages are built override_dh_auto_build: debian/build-arch.stamp override_dh_auto_install: install-arch endif ifneq ($(shell dh_listpackages),$(shell dh_listpackages -a)) # arch:all packages are built ifneq (,$(MISSING_BUILD_DEPS)) $(warning $(MISSING_BUILD_DEPS)) $(warning Postponing build of architecture independent files until binary or binary-indep target is called) else override_dh_auto_build: debian/build-indep.stamp endif override_dh_auto_install: install-indep endif override_dh_auto_clean: rm -f debian/*.stamp debian/*.config debian/*.templates *.mwl* for dir in . languages/*; do \ [ ! -d $$dir ] || $(MAKE) -C $$dir clean dictclean; \ done [ ! -f Makefile ] || $(MAKE) realclean -find . -name "*~" | xargs rm -f rm -f local.h defhash.h languages/english/english.5 $(GEN_DH_FILES) clean override_dh_installdocs: dh_installdocs -a dh_installdocs -i --link-doc=ienglish-common debian/packages.stamp: $(wildcard debian/packages.d/*.in) $(GEN_DH_FILES) debian/rules debian/control perl $(GEN_DH_FILES) generate touch "$@" debian/build-common.stamp: debian/packages.stamp @echo "*** Building common files" ln -sf local.h.linux local.h dh_auto_build $(DH_AUTO_OPTIONS) -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ config.sh \ programs defmt-programs showversion ispell.1 ispell.5 touch "$@" debian/build-arch.stamp: debian/build-common.stamp touch "$@" debian/build-indep.stamp: debian/build-common.stamp @echo "*** Building arch:all files" dh_auto_build $(DH_AUTO_OPTIONS) -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all-languages $(MAKE) -f debian/rules american.xxl+.mwl british.xxl+.mwl touch "$@" install-arch: debian/build-arch.stamp @echo "*** Installing data into arch:any packages" $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ DESTDIR="$(DESTDIR)" install-basic install-deformatters install-dictbuild install-indep: debian/build-indep.stamp @echo "*** Installing data into arch:all packages" $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ DESTDIR="$(DESTDIR)" install-languages mv $(DESTDIR)/usr/lib/ispell/english.aff $(DESTDIR)/usr/share/ispell/english.aff set -e; \ for lang in american british ; do \ cp -a $$lang.xxl+.mwl $(DESTDIR)/usr/share/ispell/$$lang.xxl+.mwl; \ gzip -9f $(DESTDIR)/usr/share/ispell/$$lang.xxl+.mwl; \ done set -e; \ for infofile in debian/*.info-ispell; do \ installdeb-ispell --package=`basename $$infofile .info-ispell`; \ done american.xxl+.mwl british.xxl+.mwl : languages/english/english.aff american.xxl+.mwl : languages/american/american.xlg+ /usr/share/dict/american-english-insane british.xxl+.mwl : languages/british/british.xlg+ /usr/share/dict/british-english-insane %.mwl: # Note: assumes that affix file is the first prerequisite ./munchlist -v -T utf8 -l $^ > $@.tmp mv -f $@.tmp $@ .PHONY: binary binary_arch binary_indep build build_arch build_indep clean \ override_dh_auto_build override_dh_auto_install override_dh_auto_clean \ override_dh_installdocs \ install-arch install-indep debian/source/0000755000000000000000000000000012061456715010475 5ustar debian/source/format0000644000000000000000000000001412061456715011703 0ustar 3.0 (quilt) debian/source/options0000644000000000000000000000003312061456715012107 0ustar --diff-ignore --tar-ignore debian/watch0000644000000000000000000000011112061456715010217 0ustar version=3 http://www.lasr.cs.ucla.edu/geoff/tars/ispell-(\d+.*)\.tar\.gz