On Mon, Dec 10, 2007 at 12:52:21PM +0100, Agustin Martin wrote:
> On Sun, Dec 09, 2007 at 09:21:44PM +0100, Agustin Martin wrote:
> > What about
> >
> > # This generates the wcatalan wordlist.
> > debian/strip_mwl | ispell -d $(CURDIR)/catala.debian -e | \
> > tr -s ' ' '\n' | sort -u > catala.words.debian
> >
> > using sort with the --unique (-u) option.
Hi Jordi and Marc,
I am attaching a patch for this and other things, some of them to be
considered by Jordi, like
* debian/rules: Take care of repeated words in wordlist (Closes: #454772).
* debian/control:
- Bumped standards version to 3.7.3. No changes needed.
- Updated to use the new iceape-browser, iceweasel and icedove names.
* Removed trailing whitespace in control, rules, copyright and changelog.
* Move reconfigure compat initialization from config to
postinst. debian/aspell-ca.overrides is no longer needed.
and after a recent discussion in debian-devel about copyright symbols and
also to keep lintian quiet, I have modified copyright to a form closer to
the usual in other packages. Jordi, please look and discard or fix at your
convenience.
I use the sort -u form and also remove those lines containing a word
starting by a number. To my surprise new catalan wordlist contains more
words than the previous one and the one by Marc, but those words (like
abacallanéssim) are considered correct by both ispell and aspell. May be
sort was buggy.
I have put the package I built at our alioth repository for further testing
Cheers,
--
Agustin
reverted:
--- ispellcat-0.5/debian/aspell-ca.overrides
+++ ispellcat-0.5.orig/debian/aspell-ca.overrides
@@ -1,4 +0,0 @@
-aspell-ca: no-debconf-templates
-aspell-ca: config-does-not-load-confmodule
-aspell-ca: postinst-does-not-load-confmodule
-aspell-ca: missing-debconf-dependency
diff -u ispellcat-0.5/debian/copyright ispellcat-0.5/debian/copyright
--- ispellcat-0.5/debian/copyright
+++ ispellcat-0.5/debian/copyright
@@ -1,3 +1,4 @@
+-*- coding: utf-8 -*-
This package was debianized by AgustÃn MartÃn Domingo <[EMAIL PROTECTED]> on
Tue, 17 Apr 2001 13:57:02 +0200.
Jordi Mallach <[EMAIL PROTECTED]> took over the package on
@@ -5,20 +6,43 @@
It was downloaded from <http://www.jmoratinos.com/>.
-Upstream Authors: Joan Moratinos <[EMAIL PROTECTED]>,
- based on the Catalan wordlist by Joan Dolç
- and other sources.
+Copyright 2001-2002 Ignasi Labastida i Juan
+Copyright 2002-2006 Joan Moratinos
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+Debian packaging copyright:
+
+ Debian changes are
+ Copyright 2001-2008 Jordi Mallach
+ Copyright 2001-2008 Agustin Martin
+ and may be redistributed and/or modified under the terms of the
+ GNU General Public License (GPL) as published by the Free
+ Software Foundation; either version 2 of the License, or (at
+ your option) any later version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+------------------------------------------------------------------------------
+
+License history:
-Copyright:
Version 0.1 of ispellcat was done by Ignasi Labastida i Pla. He agreed
to licence ispellcat under the GNU General Public Licence in a mail addressed
to AgustÃn MartÃn and Jordi Mallach. You can find an excerpt of such mail at
the end of this file.
-Starting from version 0.2, ispellcat was developed by Joan Moratinos, who also
-licenced the package under the GNU GPL. On Debian systems, you can find the
-complete text of the GNU General Public Licence in
-/usr/share/common-licenses/GPL.
+Starting from version 0.2, ispellcat was developed by Joan Moratinos,
+<[EMAIL PROTECTED]> based on the Catalan wordlist by Joan Dolç and
+other sources. He also licenced the package under the GNU GPL.
=== Ignasi's licence statement ==
reverted:
--- ispellcat-0.5/debian/aspell-ca.config
+++ ispellcat-0.5.orig/debian/aspell-ca.config
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-COMPAT="ca.compat"
-
-if [ "$1" = "reconfigure" ] ; then
- echo "0" > "/var/lib/aspell/$COMPAT"
-fi
\ No newline at end of file
diff -u ispellcat-0.5/debian/rules ispellcat-0.5/debian/rules
--- ispellcat-0.5/debian/rules
+++ ispellcat-0.5/debian/rules
@@ -26,7 +26,7 @@
# This generates the wcatalan wordlist.
debian/strip_mwl | ispell -d $(CURDIR)/catala.debian -e | \
- tr -s ' ' '\n' | uniq > catala.words.debian
+ tr -s ' ' '\n' | grep -v ^[0-9] | sort -u > catala.words.debian
# This generates aspell-ca stuff.
# As of ispellcat 0.4-5, the aspell hash is autogenerated at
@@ -49,7 +49,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp
rm -f catalan-i.debian.aff
rm -f catala.debian.hash catalan-i.dic.stat catalan-i.dic.cnt
rm -f catala.words.debian
@@ -88,10 +88,6 @@
# install -m 644 ca_phonet.dat $(ADICT_DIR)/usr/lib/aspell/ca_phonet.dat
- mkdir -p $(ADICT_DIR)/usr/share/lintian/overrides
- install -m 644 debian/aspell-ca.overrides \
- $(ADICT_DIR)/usr/share/lintian/overrides/aspell-ca
-
# myspell-ca stuff
install -m 644 catalan-m.dic $(MDICT_DIR)/usr/share/myspell/dicts/ca_ES.dic
install -m 644 catalan-m.aff $(MDICT_DIR)/usr/share/myspell/dicts/ca_ES.aff
@@ -99,15 +95,15 @@
binary-indep: build install
dh_testdir -i
- dh_testroot -i
+ dh_testroot -i
dh_installdocs -i
installdeb-aspell -paspell-ca
installdeb-ispell -picatalan
installdeb-myspell -pmyspell-ca
installdeb-wordlist -pwcatalan
dh_installdebconf -paspell-ca
- dh_link -i
- dh_installchangelogs -i
+ dh_link -i
+ dh_installchangelogs -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
diff -u ispellcat-0.5/debian/changelog ispellcat-0.5/debian/changelog
--- ispellcat-0.5/debian/changelog
+++ ispellcat-0.5/debian/changelog
@@ -1,3 +1,16 @@
+ispellcat (0.5-3amd1) unstable; urgency=low
+
+ * debian/rules: Take care of repeated words in wordlist (Closes: #454772).
+ * debian/control:
+ - Bumped standards version to 3.7.3. No changes needed.
+ - Updated to use the new iceape-browser, iceweasel and icedove names.
+ * debian/copyright improved.
+ * Removed trailing whitespace in control, rules, copyright and changelog.
+ * Move reconfigure compat initialization from config to
+ postinst. debian/aspell-ca.overrides is no longer needed.
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Fri, 22 Feb 2008 18:20:14 +0100
+
ispellcat (0.5-3) unstable; urgency=low
* debian/control:
@@ -146,7 +159,7 @@
ispellcat (0.3-2) unstable; urgency=low
- * debian/control: sync more descriptions with other dictionary packages.
+ * debian/control: sync more descriptions with other dictionary packages.
-- Jordi Mallach <[EMAIL PROTECTED]> Wed, 19 Nov 2003 16:34:31 +0100
@@ -296,7 +309,7 @@
license notice.
* Added an emacs snippet to register the Catalan dictionary under
emacs. This modifies ispell-dictionary-alist, but unfortunately
- the menus are not modified under emacs > 19. At least it can be
+ the menus are not modified under emacs > 19. At least it can be
selected with ispell-change-dictionary.
-- AgustÃn MartÃn Domingo <[EMAIL PROTECTED]> Thu, 10 May 2001 13:19:33 +0200
diff -u ispellcat-0.5/debian/control ispellcat-0.5/debian/control
--- ispellcat-0.5/debian/control
+++ ispellcat-0.5/debian/control
@@ -4,7 +4,7 @@
Build-Depends: aspell, ispell, debhelper (>= 4.0.0), dictionaries-common-dev (>= 0.40)
Maintainer: Jordi Mallach <[EMAIL PROTECTED]>
Uploaders: Agustin Martin Domingo <[EMAIL PROTECTED]>
-Standards-Version: 3.7.0.0
+Standards-Version: 3.7.3
Package: icatalan
Architecture: all
@@ -18,7 +18,7 @@
Package: wcatalan
Priority: extra
-Architecture: all
+Architecture: all
Depends: dictionaries-common (>= 0.20), debconf | debconf-2.0
Provides: wordlist
Description: Catalan dictionary words for /usr/share/dict
@@ -43,7 +43,7 @@
Architecture: all
Depends: dictionaries-common (>= 0.20)
Provides: myspell-dictionary, myspell-dictionary-ca
-Suggests: openoffice.org (>= 1.0.3-3), mozilla-spellchecker
+Suggests: openoffice.org (>= 1.0.3-3), iceape-browser | iceweasel | icedove
Conflicts: openoffice.org (<= 1.0.3-2)
Description: Catalan dictionary for myspell
This is the Catalan dictionary for use with the myspell spellchecker
only in patch2:
unchanged:
--- ispellcat-0.5.orig/debian/aspell-ca.postinst
+++ ispellcat-0.5/debian/aspell-ca.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+COMPAT="ca.compat"
+
+if [ "$1" = "reconfigure" ] || [ "$DEBCONF_RECONFIGURE" ]; then
+ echo "0" > "/var/lib/aspell/$COMPAT"
+fi
+
+#DEBHELPER#
