--- Begin Message ---
Package: wamerican
Version: 6-2.1
Severity: normal
Tags: patch
Tagging this bug report as normal instead of wishlist, since fixing it is
one of the pre-requisites for dictionaries-common priority being changed
to optional, as well as for having standalone wamerican installed without
the need of dictionaries-common.
I have been playing with the possiblity of wamerican being the only standard
ispell dict and wordlist package, thus allowing dictionaries-common to be of
optional priority.
There are two things for that,
* On the one hand, the idea is that wamerican (the only package that is
really intended to be priority Standard) should be installable and
usable either if dictionaries-common is installed or not.
dictionaries-common 0.98 installs a /usr/share/dict/words diversion so
wamerican can have, as in attached patch, a /usr/share/dict/words symlink
to american-english, that will be used if /dictionaries-common is not
installed, or diverted otherwise. Attached patch also sets the
appropriate
relationships ansd make maintainer scripts not fail if
dictionaries-common is not installed.
* On the other hand, if dictionaries-common is made optional and wamerican
remains standard, wamerican may be pre-configured first, reproducing
(see #465233: Weird debconf prompt misses input value). In recent
dictionaries-common I include an empty 'elanguages' file intended to be a
check for a recent dictionaries-common already installed. In my wamerican
patch I have put a hard-coded config that will check for that
'elanguages'
file and only call dictionaries-common initialization if present.
Attached patch tries to take care of this. Please consider. (Sorry, tons of
trailing whitespace removal slipped into it)
David, since SCOWL is currently orphaned I will NMU unless you object.
Please let me know ASAP,
Best wishes,
--
Agustin
diff -u scowl-6/debian/rules scowl-6/debian/rules
--- scowl-6/debian/rules
+++ scowl-6/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# -*- Makefile -*- $Id: rules,v 1.18 2005/10/15 03:03:48 david Exp $
-# Sample debian/rules that uses debhelper.
+# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
# Customized 27 Oct 1999 by David Coe for wenglish, later moved to scowl
# This version is for packages that are architecture independent.
@@ -79,13 +79,19 @@
install: DH_OPTIONS=
-install: install-scowl install-wamerican install-wamerican-small install-wamerican-large install-wamerican-huge install-wbritish install-wbritish-small install-wbritish-large install-wbritish-huge install-wcanadian install-wcanadian-small install-wcanadian-large install-wcanadian-huge
+install: install-scowl \
+ install-wamerican install-wamerican-small install-wamerican-large install-wamerican-huge \
+ install-wbritish install-wbritish-small install-wbritish-large install-wbritish-huge \
+ install-wcanadian install-wcanadian-small install-wcanadian-large install-wcanadian-huge
+ installdeb-wordlist -pwamerican --noscripts
+ dh_installdebconf -pwamerican
+ installdeb-wordlist --no-package=wamerican --no-package=scowl
.PHONY: install-scowl
install-scowl: PKG=scowl
-install-scowl:
+install-scowl:
dh_testdir
dh_testroot
dh_installdirs --package=$(PKG)
@@ -105,8 +111,6 @@
dh_installdocs --package=$(PKG) $(PKG).scowl-word-lists-used debian/README.Debian
- installdeb-wordlist --package=$(PKG) # This internally uses dh_installdebcon
-
sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5
dh_installman --package=$(PKG) $(WORDLIST).5
diff -u scowl-6/debian/control scowl-6/debian/control
--- scowl-6/debian/control
+++ scowl-6/debian/control
@@ -2,8 +2,9 @@
Maintainer: David Coe <[EMAIL PROTECTED]>
Section: text
Priority: standard
-Standards-Version: 3.7.2
-Build-Depends-Indep: debhelper (>=5), dictionaries-common-dev (>=0.20)
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>=5)
+Build-Depends-Indep: dictionaries-common-dev (>=0.20)
Package: scowl
Architecture: all
@@ -12,8 +13,8 @@
Depends: ${misc:Depends}
Description: Spell-Checker Oriented Word Lists
The SCOWL is a collection of word lists organized by word popularity,
- language, word class, and other factors. These lists can be
- combined in various ways (or used individually) for spell checking
+ language, word class, and other factors. These lists can be
+ combined in various ways (or used individually) for spell checking
and similar purposes.
.
The Debian wamerican*, wbritish*, and wcanadian* wordlist packages
@@ -22,20 +23,20 @@
install scowl if you (also) want to pick and choose the pieces that
comprise those lists.
.
- You can learn more about SCOWL (and other English word lists) at
+ You can learn more about SCOWL (and other English word lists) at
http://wordlist.sourceforge.net/
Package: wamerican
Architecture: all
Section: text
Priority: standard
-Depends: dictionaries-common (>=0.20), ${misc:Depends}
-Conflicts: wenglish (<<5)
+Depends: ${misc:Depends}
+Conflicts: wenglish (<<5), dictionaries-common(<< 0.98)
Provides: wordlist
Description: American English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/american-english
- containing a list of English words with American spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with American spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
There are also -small, -large, and -huge versions of this word list,
@@ -49,8 +50,8 @@
Provides: wordlist
Description: American English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/american-english-small
- containing a list of English words with American spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with American spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a smaller list than the one installed by wamerican; nothing
@@ -67,8 +68,8 @@
Provides: wordlist
Description: American English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/american-english-large
- containing a list of English words with American spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with American spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a larger list than the one installed by wamerican; nothing
@@ -85,11 +86,11 @@
Provides: wordlist
Description: American English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/american-english-huge
- containing a list of English words with American spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with American spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
- This is an even larger list than the one installed by wamerican-large;
+ This is an even larger list than the one installed by wamerican-large;
nothing prevents you installing both (and others) at the same time.
.
There are also -small and standard versions of this word list,
@@ -103,8 +104,8 @@
Provides: wordlist
Description: British English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/british-english
- containing a list of English words with British spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with British spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
There are also -small, -large, and -huge versions of this word list,
@@ -118,8 +119,8 @@
Provides: wordlist
Description: British English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/british-english-small
- containing a list of English words with British spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with British spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a smaller list than the one installed by wbritish; nothing
@@ -136,8 +137,8 @@
Provides: wordlist
Description: British English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/british-english-large
- containing a list of English words with British spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with British spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a larger list than the one installed by wbritish; nothing
@@ -154,8 +155,8 @@
Provides: wordlist
Description: British English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/british-english-huge
- containing a list of English words with British spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with British spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is an even larger list than the one installed by wbritish-large;
@@ -172,8 +173,8 @@
Provides: wordlist
Description: Canadian English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/canadian-english
- containing a list of English words with Canadian spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with Canadian spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
There are also -small, -large and -huge versions of this word list,
@@ -187,8 +188,8 @@
Provides: wordlist
Description: Canadian English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/canadian-english-small
- containing a list of English words with Canadian spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with Canadian spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a smaller list than the one installed by wcanadian; nothing
@@ -205,8 +206,8 @@
Provides: wordlist
Description: Canadian English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/canadian-english-large
- containing a list of English words with Canadian spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with Canadian spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is a larger list than the one installed by wcanadian; nothing
@@ -223,8 +224,8 @@
Provides: wordlist
Description: Canadian English dictionary words for /usr/share/dict
This package provides the file /usr/share/dict/canadian-english-huge
- containing a list of English words with Canadian spellings.
- This list can be used by spelling checkers, and by programs such
+ containing a list of English words with Canadian spellings.
+ This list can be used by spelling checkers, and by programs such
as look(1).
.
This is an even larger list than the one installed by wcanadian-large;
diff -u scowl-6/debian/changelog scowl-6/debian/changelog
--- scowl-6/debian/changelog
+++ scowl-6/debian/changelog
@@ -1,3 +1,30 @@
+scowl (6-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Make wamerican no longer depend on dictionaries-common, while
+ using its features if present:
+ - wamerican.links: Install /usr/share/dict/words link to
+ american-english.
+ - wamerican.post{inst,rm}: Run dictionaries-common stuff only
+ if available.
+ - wamerican.config: Check that dictionaries-common is installed
+ and a recent version (having elanguages support) before trying
+ to use it.
+ - debian/rules: Do not auto-generate maintainer scripts for
+ wamerican, but use the new hardcoded ones. Split
+ installdeb-wordlist stuff for wamerican and the rest of the
+ wordlists, moving both to the install target.
+ - debian/control: Remove dictionaries-common dependency and
+ include a conflicts against dictionaries-common (<< 0.98) where
+ /usr/share/dict/words link diversion is included.
+ * debian/control:
+ - Bumped Standards-Version to 3.7.3. No changes needed.
+ - Moved debhelper dependency from Build-Depends-Indep to
+ Build-Depends. debhelper is required to run the clean target
+ of debian/rules (Policy Manual, section 7.6).
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Wed, 25 Jun 2008 15:07:57 +0200
+
scowl (6-2.1) unstable; urgency=low
* Non-maintainer upload.
@@ -22,28 +49,28 @@
* New upstream release.
Closes: #333207 wamerican-large: new upstream release 6 available
* debian/rules and debian/control: Added -huge versions of the
- american, canadian, and british word lists. Upstream word lists are
- now better organized; we take advantage of that by adding the new
- size "40" word lists to the standard lists, the size "55" word lists
- to the -large lists, and the size "80" word lists to the (new) -huge
+ american, canadian, and british word lists. Upstream word lists are
+ now better organized; we take advantage of that by adding the new
+ size "40" word lists to the standard lists, the size "55" word lists
+ to the -large lists, and the size "80" word lists to the (new) -huge
lists.
Closes: #317422 dictionaries-common: sightlines/metallicity
"Sightlines" is now in the -huge lists; "metallicity" is only in the
- upstream size "95" lists, so (by my policy) even the -huge lists
- won't include it. If you want that, and all the other really odd
+ upstream size "95" lists, so (by my policy) even the -huge lists
+ won't include it. If you want that, and all the other really odd
words, please install and use the Debian "scowl" package.
* Added "Debian" and "Debian's" to english-proper-names.50, which
gets them into the standard, -large, and -huge lists.
If Microsoft is there (it is), we should be too ;).
Closes: #327749: wamerican: should include "debian" in wordlist
- * debian/control:
+ * debian/control:
- standards version 3.6.2 (no changes required)
- removed the 'wenglish' dummy package
Closes: #322072 wenglish: Dummy package still needed?
Closes: #286583 wenglish: typo in package description
- * debian/copyright: updated copyright (some additions from
+ * debian/copyright: updated copyright (some additions from
latest upstream README).
-
+
-- David Coe <[EMAIL PROTECTED]> Fri, 14 Oct 2005 01:00:03 -0400
scowl (5-4) unstable; urgency=low
@@ -61,7 +88,7 @@
scowl (5-3) unstable; urgency=low
- * corrected a typo/thinko in the scowl pacakge description;
+ * corrected a typo/thinko in the scowl pacakge description;
thanks to Leonardo Rochael Almeida for noticing and reporting it.
Closes: #201564: s/wenglish/wbritish/ in package description
* added wenglish.preinst, to remove the obsolete "wenglish"
@@ -70,7 +97,7 @@
why this solution is not perfect.
Closes: #202570: typo in debconf prompt
* standards version 3.6.0; converted this changelog to UTF-8.
-
+
-- David Coe <[EMAIL PROTECTED]> Wed, 30 Jul 2003 01:48:46 -0400
scowl (5-2) unstable; urgency=low
@@ -83,25 +110,25 @@
scowl (5-1) unstable; urgency=low
* New upstream package (SCOWL) replaces previous upstream sources for
- wenglish and wbritish; wenglish had been built from a (possibly)
- non-free source (linux-words), and wbritish had been built from a
- relatively incomplete source (words extracted from the ispell british
- dictionary). SCOWL (Spell-Checker Oriented Word Lists) is a
- collection of English word lists maintained by Kevin Atkinson at
- http://wordlist.sf.net, is completely Free, is of significantly
+ wenglish and wbritish; wenglish had been built from a (possibly)
+ non-free source (linux-words), and wbritish had been built from a
+ relatively incomplete source (words extracted from the ispell british
+ dictionary). SCOWL (Spell-Checker Oriented Word Lists) is a
+ collection of English word lists maintained by Kevin Atkinson at
+ http://wordlist.sf.net, is completely Free, is of significantly
better quality, and is supported upstream.
- Thanks to Brian Nelson <[EMAIL PROTECTED]> for suggesting we use
- the SCOWL wordlists. This source package (scowl) now creates the
+ Thanks to Brian Nelson <[EMAIL PROTECTED]> for suggesting we use
+ the SCOWL wordlists. This source package (scowl) now creates the
following binary packages:
wamerican, wamerican-small, wamerican-large,
wbritish, wbritish-small, wbritish-large,
wcanadian, wcanadian-small, wcanadian-large,
- scowl,
+ scowl,
wenglish (dummy package to install wamerican, for upgrades)
Closes: #170490: wenglish: Package contains a non-DFSG-compliant list
Closes: #141707: wbritish: seems to be missing some very basic words
Closes: #165251: wbritish: Missing word ('behemoth')
- Closes: #176875: Gullible isn't in the dictionary
+ Closes: #176875: Gullible isn't in the dictionary
Closes: #147959: wenglish: Spelling "plebian" is nonstandard
Closes: #175906: wenglish: should be called wamerican
* My sincere gratitude to Agustin Martin Domingo for paying attention to
@@ -109,25 +136,25 @@
NMUs during the dictionaries-common transition.
Closes: #164257: wbritish: Please update your wbritish package to IDWP new policy
Closes: #164260: wenglish: Please update your wenglish package to IDWP new policy
- * 'Pharoah' is only in the "huge" SCOWL dictionary, which is normally
- considered unreasonable for spell checking (too many false positives);
- I suggest you add it to your own personal list, or install the scowl
+ * 'Pharoah' is only in the "huge" SCOWL dictionary, which is normally
+ considered unreasonable for spell checking (too many false positives);
+ I suggest you add it to your own personal list, or install the scowl
package and create the huge list (or one customized to your needs).
If you disagree with upstream's classification of that word, please
reopen the bug report with some explanation, and I'll happily forward
it upstream. Thanks.
- Closes: #175394: wenglish: missing word 'pharaoh'
-
+ Closes: #175394: wenglish: missing word 'pharaoh'
+
-- David Coe <[EMAIL PROTECTED]> Mon, 16 Jun 2003 22:26:28 -0400
wenglish (2.0-2.4) unstable; urgency=low
- * Just a rebuild to make sure at least dictionaries-common-dev-0.8.4
- is used,since there was a minor change in the debconf config
- files to have debconf choices properly sorted. David, no need to
- change anything in your sources, just make sure you use at least
- that version. This fix will then propagate the next time you build
- the package. Sorry for not having asked you about this upload with
+ * Just a rebuild to make sure at least dictionaries-common-dev-0.8.4
+ is used,since there was a minor change in the debconf config
+ files to have debconf choices properly sorted. David, no need to
+ change anything in your sources, just make sure you use at least
+ that version. This fix will then propagate the next time you build
+ the package. Sorry for not having asked you about this upload with
more time.
-- Agustin Martin Domingo <[EMAIL PROTECTED]> Fri, 25 Oct 2002 13:37:41 +0200
@@ -135,7 +162,7 @@
wenglish (2.0-2.3) unstable; urgency=low
* Non-Maintainer Upload
- * This time really added dictionaries-common-dev to 'Build-Depends-Indep'.
+ * This time really added dictionaries-common-dev to 'Build-Depends-Indep'.
That was missed previously in (2.0-2.2).
-- Agustin Martin Domingo <[EMAIL PROTECTED]> Mon, 21 Oct 2002 13:12:14 +0200
@@ -146,11 +173,11 @@
* New policy compliant package (closes: #164260)
* Some minor changes with respect to package in sourceforge:
+++ control files:
- - Changing 'Pre-Depends: dictionaries-common' to a simple
+ - Changing 'Pre-Depends: dictionaries-common' to a simple
Depends.
- Added dictionaries-common-dev to 'Build-Depends-Indep'
+++ words-american-english.5
- - Changed '/etc/dictionary' to '/etc/dictionaries-common/words' and
+ - Changed '/etc/dictionary' to '/etc/dictionaries-common/words' and
'update-alternatives' to 'select-default-wordlist'
-- Agustin Martin Domingo <[EMAIL PROTECTED]> Mon, 21 Oct 2002 11:52:46 +0200
@@ -158,7 +185,7 @@
wenglish (2.0-2.1) unstable; urgency=low
* Experimental release after the dictionaries policy proposal.
- * Removed postinst and prerm. So, David, DO NOT REUSE THIS PACKAGE
+ * Removed postinst and prerm. So, David, DO NOT REUSE THIS PACKAGE
FOR THE OFFICIAL BRANCH.
-- AgustÃn MartÃn Domingo <[EMAIL PROTECTED]> Fri, 30 Nov 2001 17:37:59 +0100
@@ -182,13 +209,13 @@
Closes: #87332 "dictionary alternative and wenglish's prerm"
* closing an old bug, was apparently fixed in 1.0-12 (when /etc/dictionary
was removed).
- Closes: #35098 "unknown-source: a dangling symlink."
+ Closes: #35098 "unknown-source: a dangling symlink."
* renamed american-english.5 to words-american-english.5, to minimize
confusion with similarly-named idict-american-english.5 man page;
symlink american-english.5 to words-american-english.5.
- * added the word "hullabaloo" (in support of ispell/iamerican bug
+ * added the word "hullabaloo" (in support of ispell/iamerican bug
65620).
-
+
-- David Coe <[EMAIL PROTECTED]> Sat, 24 Feb 2001 13:46:29 -0500
wenglish (1.0-12) unstable; urgency=low
only in patch2:
unchanged:
--- scowl-6.orig/debian/wamerican.templates
+++ scowl-6/debian/wamerican.templates
@@ -0,0 +1,8 @@
+Template: shared/packages-wordlist
+Type: text
+Description:
+
+Template: wamerican/languages
+Type: text
+Default: american (American English)
+Description:
only in patch2:
unchanged:
--- scowl-6.orig/debian/wamerican.config
+++ scowl-6/debian/wamerican.config
@@ -0,0 +1,23 @@
+#!/usr/bin/perl -w
+use Debconf::Client::ConfModule q(:all);
+
+version ('2.0');
+
+my $class = "wordlist";
+my $script = "/usr/share/dictionaries-common/dc-debconf-select.pl";
+my $has_elanguages = "/usr/share/dictionaries-common/elanguages";
+
+# This is not a standard dictionaries-common.config. Since dictionaries-common
+# will eventually become an optional package, we need to make sure that
+# wamerican does not run common config code unless a recent (e.g., with
+# elanguages support) dictionaries-common is installed.
+#
+# This is not a problem when the whole system is installed from scratch, but
+# can be when dictionaries-common and wamerican are upgraded together from
+# previous non elanguages dictionaries-common version. In such case $script
+# is present, so we need an extra check on $has_elanguages.
+
+if ( -e $script && -e $has_elanguages ){
+ require $script;
+ dc_debconf_select($class);
+}
only in patch2:
unchanged:
--- scowl-6.orig/debian/wamerican.links
+++ scowl-6/debian/wamerican.links
@@ -0,0 +1 @@
+usr/share/dict/american-english usr/share/dict/words
only in patch2:
unchanged:
--- scowl-6.orig/debian/wamerican.postrm
+++ scowl-6/debian/wamerican.postrm
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+# wamerican can be installed standalone, with no dictionaries-common,
+# so use remove-default-wordlist if present and do not complain
+# otherwise
+
+rmscript="/usr/sbin/remove-default-wordlist"
+
+case "$1" in abort-install|remove)
+ if [ -x $rmscript ]; then
+ $rmscript wamerican
+ fi
+ # Remove shared question stuff on package removal, not only on purge
+ if [ -e /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_purge
+ fi
+esac
+
+#DEBHELPER#
only in patch2:
unchanged:
--- scowl-6.orig/debian/wamerican.postinst
+++ scowl-6/debian/wamerican.postinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+# wamerican can be installed standalone, with no dictionaries-common,
+# so use update-default-wordlist if present and do not complain
+# otherwise
+
+SCRIPT="/usr/sbin/update-default-wordlist"
+
+if [ "$1" = "configure" ] ; then
+ if [ -x "$SCRIPT" ]; then
+ $SCRIPT --rebuild
+ fi
+fi
+
+#DEBHELPER#
--- End Message ---
