Package: ispell
Version: 3.1.20.0-4
Severity: normal
Tags: patch
Hi,
Attached is the diff for my ispell 3.1.20.0-4.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u ispell-3.1.20.0/munchlist.X ispell-3.1.20.0/munchlist.X
--- ispell-3.1.20.0/munchlist.X
+++ ispell-3.1.20.0/munchlist.X
@@ -357,7 +357,7 @@
cat "$@" | ispell "$wchars" -e1 -d $FAKEHASH -p /dev/null | tr " " '
'
fi \
- | sort $SORTTMP -u +0f -1 +0 \
+ | sort $SORTTMP -u -k1f,2 -k1 \
| $COMBINE $icflags $langtabs \
| sort $SORTTMP -u > $EXPANDEDINPUT
#
@@ -417,7 +417,7 @@
ispell "$wchars" -c -W0 -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT \
| tr " " '
' \
- | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" +0 -1 +1 \
+ | egrep "$flagmarker" | sort $SORTTMP -u "-t$flagmarker" -k1,2 -k2 \
| $JOIN $SIGNED "-t$flagmarker" - $EXPANDEDINPUT > $CRUNCHEDINPUT
#
# We now have a list of legal roots, and of affixes that apply to the
@@ -443,7 +443,7 @@
#
$verbose && echo 'Expanding dictionary into EXPANDEDPAIRS.' 1>&2
ispell "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CRUNCHEDINPUT \
- | sort $SORTTMP +1 > $EXPANDEDPAIRS
+ | sort $SORTTMP -k2 > $EXPANDEDPAIRS
#
# Now we want to extract the lines in EXPANDEDPAIRS in which the second field
# is *not* listed in the original dictionary EXPANDEDINPUT; these illegal
@@ -471,7 +471,7 @@
| (sed -e 's; .*$;;' ; /bin/rm -f $JOINEDPAIRS $EXPANDEDPAIRS) \
| uniq \
| (comm -13 - $CRUNCHEDINPUT ; /bin/rm -f $CRUNCHEDINPUT) \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k1f,2 -k1 \
| $COMBINE $langtabs > $LEGALFLAGLIST
#
@@ -501,7 +501,7 @@
| sort $SORTTMP \
| uniq -c \
| tr ' ' ' ' \
- | sort $SORTTMP +0rn -1 +2 > $PRODUCTLIST
+ | sort $SORTTMP -k1rn,2 -k3 > $PRODUCTLIST
if [ `egrep ' p ' $PRODUCTLIST | wc -l` -gt 0 \
-a `egrep ' s ' $PRODUCTLIST | wc -l` -gt 0 ]
@@ -616,7 +616,7 @@
#
$verbose && echo "Creating cross expansions (pass $dbnum)." 1>&2
ispell "$wchars" -e3 -d $FAKEHASH -p /dev/null < $CROSSROOTS \
- | sort $SORTTMP +1 > $CROSSEXPANDED
+ | sort $SORTTMP -k2 > $CROSSEXPANDED
#
# Now we join CROSSEXPANDED against EXPANDEDINPUT to produce
# CROSSPAIRS, and then comm that against CROSSEXPANDED to
@@ -686,7 +686,7 @@
D
}' \
| comm -23 - $ILLEGALCOMBOS \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 \
+ | sort $SORTTMP -u "-t$flagmarker" -k1f,2 -k1 \
| $COMBINE $langtabs > $CROSSROOTS
mv $CROSSROOTS $LEGALFLAGLIST
if [ "$debug" = yes ]
@@ -722,10 +722,10 @@
#
$verbose && echo 'Eliminating non-optimal affixes.' 1>&2
ispell "$wchars" -e4 -d $FAKEHASH -p /dev/null < $LEGALFLAGLIST \
- | sort $SORTTMP +1 -2 +2rn -3 +0 -1 \
- | sort $SORTTMP -um +1 -2 \
+ | sort $SORTTMP -k2,3 -k3rn,4 -k1,2 \
+ | sort $SORTTMP -um -k2,3 \
| sed -e 's; .*$;;' \
- | sort $SORTTMP -u "-t$flagmarker" +0f -1 +0 > $MINIMALAFFIXES
+ | sort $SORTTMP -u "-t$flagmarker" -k1f,2 -k1 > $MINIMALAFFIXES
/bin/rm -f $LEGALFLAGLIST
#
# Now we're almost done. MINIMALAFFIXES covers some (with luck, most)
@@ -753,10 +753,10 @@
fi
(ispell "$wchars" -l -d $FAKEHASH -p /dev/null < $STRIPPEDINPUT; \
$COMBINE $langtabs < $MINIMALAFFIXES) \
- | sort $SORTTMP "-t$flagmarker" -u +0f -1 +0
+ | sort $SORTTMP "-t$flagmarker" -u -k1f,1 -k1
else
# MINIMALAFFIXES is empty; just produce a sorted version of STRIPPEDINPUT
- sort $SORTTMP "-t$flagmarker" -u +0f -1 +0 $STRIPPEDINPUT
+ sort $SORTTMP "-t$flagmarker" -u -k1f,2 -k1 $STRIPPEDINPUT
fi
/bin/rm -rf ${TDIR}
if [ "X$MUNCHMAIL" != X ]
diff -u ispell-3.1.20.0/debian/changelog ispell-3.1.20.0/debian/changelog
--- ispell-3.1.20.0/debian/changelog
+++ ispell-3.1.20.0/debian/changelog
@@ -1,3 +1,11 @@
+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 <[EMAIL PROTECTED]> 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
