On Sun, May 01, 2011 at 11:51:14AM +0200, Agustin Martin wrote:
> I have a been working in a NMU dealing with above bugs. It is mostly
> ready and only pending of final tests. Unless I hear from maintainer
> before or find any last-minute problem I will upload it on Tuesday
> with *no-delay*. In the mean time I am tagging these bug reports as
> pending, Current status for diff is attached.
>
> It should deal with
>
> #551284: wfinnish: Most lines in /usr/share/dict/finnish end with $\
> for some reason
> #581458: ispell-fi: bashism in debian/rules
> #619269: myspell-fi: Remove unconditional call to soon to disappear
> 'update-openoffice-dicts.
> #623072: ifinnish: uninstallable in sid
Uploaded.
It also fixed some other issues. See final diff attached. For my convenience
I used a temporary git repo set at
git://git.debian.org/users/agmartin/NMU/ispell-fi.git
where you can find more detailed info about every change.
Ragards,
--
Agustin
diff -wu ispell-fi-0.7/debian/postrm.ifinnish-small ispell-fi-0.7/debian/postrm.ifinnish-small
--- ispell-fi-0.7/debian/postrm.ifinnish-small
+++ ispell-fi-0.7/debian/postrm.ifinnish-small
@@ -9,8 +9,16 @@
# The dictionaries-common stuff
-case "$1" in remove|deconfigure)
- /usr/sbin/remove-default-ispell ${package}
+rmscript="remove-default-ispell"
+
+case "$1" in abort-install|remove)
+ if which $rmscript > /dev/null 2>&1; then
+ $rmscript ${package}
+ else
+ echo "Warning: $rmscript not present or executable." >&2
+ 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
diff -wu ispell-fi-0.7/debian/postrm.myspell-fi ispell-fi-0.7/debian/postrm.myspell-fi
--- ispell-fi-0.7/debian/postrm.myspell-fi
+++ ispell-fi-0.7/debian/postrm.myspell-fi
@@ -4,4 +3,0 @@
-
-if [ "$1" = "remove" ]; then
- update-openoffice-dicts
-fi
diff -wu ispell-fi-0.7/debian/postinst.wfinnish ispell-fi-0.7/debian/postinst.wfinnish
--- ispell-fi-0.7/debian/postinst.wfinnish
+++ ispell-fi-0.7/debian/postinst.wfinnish
@@ -7,7 +7,7 @@
if [ "$1" = configure ]; then
. /usr/share/debconf/confmodule
- /usr/sbin/update-default-wordlist --rebuild
+ update-default-wordlist --rebuild
fi
# FHS transition
#if [ -d /usr/doc ]; then
diff -wu ispell-fi-0.7/debian/postrm.ifinnish-large ispell-fi-0.7/debian/postrm.ifinnish-large
--- ispell-fi-0.7/debian/postrm.ifinnish-large
+++ ispell-fi-0.7/debian/postrm.ifinnish-large
@@ -9,8 +9,16 @@
# The dictionaries-common stuff
-case "$1" in remove|deconfigure)
- /usr/sbin/remove-default-ispell ${package}
+rmscript="remove-default-ispell"
+
+case "$1" in abort-install|remove)
+ if which $rmscript > /dev/null 2>&1; then
+ $rmscript ${package}
+ else
+ echo "Warning: $rmscript not present or executable." >&2
+ 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
diff -wu ispell-fi-0.7/debian/copyright ispell-fi-0.7/debian/copyright
--- ispell-fi-0.7/debian/copyright
+++ ispell-fi-0.7/debian/copyright
@@ -21,2 +21,2 @@
-A copy of the GNU General Public License is located in
-/usr/share/common-licenses/GPL in a Debian system.
+A copy of the GNU General Public License version 2 is located in
+/usr/share/common-licenses/GPL-2 in a Debian system.
diff -wu ispell-fi-0.7/debian/postinst.ifinnish-large ispell-fi-0.7/debian/postinst.ifinnish-large
--- ispell-fi-0.7/debian/postinst.ifinnish-large
+++ ispell-fi-0.7/debian/postinst.ifinnish-large
@@ -8,7 +8,7 @@
if [ "$1" = configure ]; then
. /usr/share/debconf/confmodule
- /usr/sbin/update-default-ispell --rebuild
+ update-default-ispell --rebuild
fi
# FHS transition
diff -wu ispell-fi-0.7/debian/rules ispell-fi-0.7/debian/rules
--- ispell-fi-0.7/debian/rules
+++ ispell-fi-0.7/debian/rules
@@ -146,7 +146,7 @@
$(prebinary)
( echo `cat finnish.dict | wc -l`; cat finnish.dict ) > fi_FI.mydict
- ispellaff2myspell --charset=latin1 --split=200 --myheader=debian/fi_FI.myheader finnish.large.aff > fi_FI.myaff
+ ispellaff2myspell --charset=latin1 --myheader=debian/fi_FI.myheader finnish.large.aff > fi_FI.myaff
$(install_dir) $(myspellwordlistdir)
$(install_dir) $(oldmyspellwordlistdir)
$(install_nonex) fi_FI.mydict $(myspellwordlistdir)/fi_FI.dic
@@ -196,7 +196,7 @@
finnish.data : finnish.small.hash
set -e ; cat finnish.dict debian/extrawords | ispell -d ./finnish.small -e | \
- sed s/\ /$$'\\\n'/g | sort -f | uniq > finnish.data.new
+ tr -s ' ' '\n' | sort -f | uniq > finnish.data.new
mv finnish.data.new finnish.data
%.hash : %.aff finnish.dict
diff -wu ispell-fi-0.7/debian/postrm.ifinnish ispell-fi-0.7/debian/postrm.ifinnish
--- ispell-fi-0.7/debian/postrm.ifinnish
+++ ispell-fi-0.7/debian/postrm.ifinnish
@@ -9,8 +9,16 @@
# The dictionaries-common stuff
-case "$1" in remove|deconfigure)
- /usr/sbin/remove-default-ispell ${package}
+rmscript="remove-default-ispell"
+
+case "$1" in abort-install|remove)
+ if which $rmscript > /dev/null 2>&1; then
+ $rmscript ${package}
+ else
+ echo "Warning: $rmscript not present or executable." >&2
+ 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
diff -wu ispell-fi-0.7/debian/postinst.myspell-fi ispell-fi-0.7/debian/postinst.myspell-fi
--- ispell-fi-0.7/debian/postinst.myspell-fi
+++ ispell-fi-0.7/debian/postinst.myspell-fi
@@ -5,3 +4,0 @@
-if [ "$1" = "configure" ]; then
- update-openoffice-dicts
-fi
diff -wu ispell-fi-0.7/debian/postrm.wfinnish ispell-fi-0.7/debian/postrm.wfinnish
--- ispell-fi-0.7/debian/postrm.wfinnish
+++ ispell-fi-0.7/debian/postrm.wfinnish
@@ -1,9 +1,16 @@
#!/bin/sh -e
package=wfinnish
+rmscript="remove-default-wordlist"
-case "$1" in remove|deconfigure)
- /usr/sbin/remove-default-wordlist ${package}
+case "$1" in abort-install|remove)
+ if which $rmscript > /dev/null 2>&1; then
+ $rmscript ${package}
+ else
+ echo "Warning: $rmscript not present or executable." >&2
+ 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
diff -wu ispell-fi-0.7/debian/changelog ispell-fi-0.7/debian/changelog
--- ispell-fi-0.7/debian/changelog
+++ ispell-fi-0.7/debian/changelog
@@ -1,3 +1,22 @@
+ispell-fi (0.7-17.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * post{inst,rm}.myspell-fi: Disable unconditional call of
+ useless and soon to not be shipped update-openoffice-dicts
+ (Closes: #619269).
+ * debian/control: Rebuild against newer ispell (Closes: #623072).
+ * debian/rules:
+ - Use tr to fix problems with bashism in sed expression
+ (Closes: #551284, #581458).
+ - Do not split myspell flags. hunspell does not support it
+ and gives 'multiple definitions of an affix flag' errors.
+ * debian/copyright: Add version to usr/share/common-licenses/GPL.
+ * debian/{ifinnish*,wfinnish}.post{inst,rm}:
+ - Do not use full paths for {remove,update}-default-* scripts.
+ - Check for remove-default-* existence before running it.
+
+ -- Agustin Martin Domingo <[email protected]> Mon, 02 May 2011 15:00:31 +0200
+
ispell-fi (0.7-17.3) unstable; urgency=low
* Non-maintainer upload.
diff -wu ispell-fi-0.7/debian/control ispell-fi-0.7/debian/control
--- ispell-fi-0.7/debian/control
+++ ispell-fi-0.7/debian/control
@@ -3,11 +3,11 @@
Section: text
Priority: optional
Standards-Version: 3.6.1.0
-Build-Depends: aspell (>= 0.60.4), ispell (>= 3.1.20.0-4), dictionaries-common-dev (>= 0.25), hunspell-tools | myspell-tools, bzip2
+Build-Depends: aspell (>= 0.60.4), ispell (>= 3.3.02), dictionaries-common-dev (>= 0.25), hunspell-tools | myspell-tools, bzip2
Package: ifinnish-large
Architecture: any
-Depends: dictionaries-common (>=0.25), ispell, debconf | debconf-2.0
+Depends: dictionaries-common (>=0.25), ispell (>= 3.3.02), debconf | debconf-2.0
Suggests: wfinnish
Provides: ispell-dictionary
Description: A large Finnish dictionary for Ispell
@@ -26,7 +26,7 @@
Package: ifinnish
Architecture: any
-Depends: dictionaries-common (>=0.25), ispell, debconf | debconf-2.0
+Depends: dictionaries-common (>=0.25), ispell (>= 3.3.02), debconf | debconf-2.0
Suggests: wfinnish
Provides: ispell-dictionary
Description: A medium-size Finnish dictionary for Ispell
@@ -43,7 +43,7 @@
Package: ifinnish-small
Architecture: any
-Depends: dictionaries-common (>=0.25), ispell, debconf | debconf-2.0
+Depends: dictionaries-common (>=0.25), ispell (>= 3.3.02), debconf | debconf-2.0
Suggests: wfinnish
Provides: ispell-dictionary
Description: A small Finnish dictionary for Ispell
diff -wu ispell-fi-0.7/debian/postinst.ifinnish ispell-fi-0.7/debian/postinst.ifinnish
--- ispell-fi-0.7/debian/postinst.ifinnish
+++ ispell-fi-0.7/debian/postinst.ifinnish
@@ -6,7 +6,7 @@
if [ "$1" = configure ]; then
. /usr/share/debconf/confmodule
- /usr/sbin/update-default-ispell --rebuild
+ update-default-ispell --rebuild
fi
# FHS transition
diff -wu ispell-fi-0.7/debian/postinst.ifinnish-small ispell-fi-0.7/debian/postinst.ifinnish-small
--- ispell-fi-0.7/debian/postinst.ifinnish-small
+++ ispell-fi-0.7/debian/postinst.ifinnish-small
@@ -8,7 +8,7 @@
if [ "$1" = configure ]; then
. /usr/share/debconf/confmodule
- /usr/sbin/update-default-ispell --rebuild
+ update-default-ispell --rebuild
fi
# FHS transition
