Bug#401666: dictl: doesn't work with DICTL_USE_KONWERT -- patch
Package: dict
Version: 1.10.2-3.1
Followup-For: Bug #401666
The attached patch fixes this bug.
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (900, 'testing'), (600, 'unstable'), (500, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.21-2-686 (SMP w/1 CPU core)
Locale: LANG=C, LC_CTYPE=pl_PL (charmap=ISO-8859-2)
Shell: /bin/sh linked to /bin/dash
Versions of packages dict depends on:
ii libc6 2.6-2GNU C Library: Shared libraries
ii netbase 4.29 Basic TCP/IP networking system
ii recode 3.6-14 Character set conversion utility
ii zlib1g 1:1.2.3.3.dfsg-5 compression library - runtime
dict recommends no packages.
-- no debconf information
--
Jakub Wilk
--- dictl.orig 2007-07-30 11:45:39.0 +0200
+++ dictl 2007-07-30 12:00:00.0 +0200
@@ -39,7 +39,21 @@
if test $DICTL_USE_ICONV; then
iconv -f $1 -t $2
else if test $DICTL_USE_KONWERT; then
- konwert $1-$2
+ sedexpr='
+/(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q }
+/8859_([1-9])/{ s//iso\1/; q }
+/ANSI_X3.4(-19(68|86))?/ { s//ascii/; q }
+/(US-)?ASCII/{ s//ascii/; q }
+/(CP|WINDOWS-)(125[0-8])/ { s//cp\1/; q }
+/ISO([-_]?8859-|8859)([1-9]|1[01345])/ { s//iso\2/; q }
+/KOI8-?R/{ s//koi8r/; q }
+/KOI8-?U/{ s//koi8u/; q }
+/UTF-?8/{ s//utf8/; q }
+/VISCII/{ s//viscii/; q }
+/.*/ { s///; q }'
+ from=`echo $1 | tr a-z A-Z | sed -r -e $sedexpr`
+ to=`echo $2 | tr a-z A-Z | sed -r -e $sedexpr`
+ konwert $from-$to
else
recode -f $1..$2
fi fi
Bug#401666: dictl: doesn't work with DICTL_USE_KONWERT
Package: dict Version: 1.10.2-3 Severity: normal $ DICTL_USE_KONWERT=yes dictl foo konwert: unknown filter -- ISO-8 konwert: unknown filter -- utf-2 $ DICTL_USE_KONWERT=yes strace -f dictl foo 21 | grep execve.*utf-8- [pid 7190] execve(/usr/bin/konwert, [konwert, utf-8-ISO-8859-2], [/* 28 vars */]) = 0 -- System Information: Debian Release: 4.0 APT prefers testing APT policy: (900, 'testing'), (600, 'unstable'), (500, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/dash Kernel: Linux 2.6.18-1-686 Locale: LANG=C, LC_CTYPE=pl_PL (charmap=ISO-8859-2) Versions of packages dict depends on: ii libc62.3.6.ds1-8 GNU C Library: Shared libraries ii netbase 4.27Basic TCP/IP networking system ii recode 3.6-12 Character set conversion utility ii zlib1g 1:1.2.3-13 compression library - runtime dict recommends no packages. -- no debconf information -- Jakub Wilk -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
