Bug#237745: Proper aspell-ru patch

[Eugene Konev]

The enclosed patch enables building of aspell-ru package. It also fixes
a couple of minor bugs:
1. Fix for possibly incorrect entry in russian.aff.koi (I'm not sure
about ispell, but it is supposed incorrect by aspell).
2. Fixes to i2myspell call:
   a) use ./russian. Otherwise it would use /usr/lib/ispell files, if
   irussian is installed on build system.
   b) Convert "-" to "0" in affix file as format requests "0"s.


diff -Nru rus-ispell-0.99f7/debian/aspell-ru.dirs 
rus-ispell-aspell/debian/aspell-ru.dirs
--- rus-ispell-0.99f7/debian/aspell-ru.dirs     1970-01-01 07:00:00.000000000 
+0700
+++ rus-ispell-aspell/debian/aspell-ru.dirs     2005-05-13 21:10:49.000000000 
+0800
@@ -0,0 +1,2 @@
+usr/lib/aspell-0.60
+
diff -Nru rus-ispell-0.99f7/debian/control rus-ispell-aspell/debian/control
--- rus-ispell-0.99f7/debian/control    2005-05-13 23:27:35.000000000 +0800
+++ rus-ispell-aspell/debian/control    2005-05-13 21:10:49.000000000 +0800
@@ -2,7 +2,7 @@
 Section: text
 Priority: optional
 Maintainer: Peter Novodvorsky <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 2.0.40), ispell, dictionaries-common-dev 
(>=0.20), libmyspell-dev
+Build-Depends: debhelper (>= 2.0.40), ispell, dictionaries-common-dev 
(>=0.20), libmyspell-dev, aspell-bin (>> 0.60)
 Standards-Version: 3.6.1.1
 
 Package: irussian
@@ -25,3 +25,15 @@
  This is the Russian dictionary for myspell spellchecker
  which is currently used within OpenOffice.org and the mozilla
  spellchecker. It is based on the ispell dictionary.
+
+Package: aspell-ru
+Architecture: any
+Depends: libaspell15 (>= 0.60)
+Provides: aspell6-dictionary
+Suggests: aspell-bin
+Description: Russian dictionary for GNU Aspell
+ This package contains all the required files to add support 
+ for Russian language to the GNU Aspell spell checker.
+ .
+ Dictionaries contain now over 122,200 basic words and produce over
+ 1,168,000 related words. Include complete support for :e (yo) letter.
diff -Nru rus-ispell-0.99f7/debian/rules rus-ispell-aspell/debian/rules
--- rus-ispell-0.99f7/debian/rules      2005-05-13 23:27:35.000000000 +0800
+++ rus-ispell-aspell/debian/rules      2005-05-14 15:40:01.000000000 +0800
@@ -23,8 +23,16 @@
        sed -e "s/^\#[ye]//;s/^\#koi/wordchars/" russian.aff.koi > russian.aff
        buildhash russian.dict russian.aff russian.hash
 
-       i2myspell russian KOI8-R 
ÃÃÃÃÃÃÂÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ 
ÃÃÃÃÃÃÂÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ > ru_RU.aff
-       i2myspell -d russian.dict > ru_RU.dic
+       i2myspell ./russian KOI8-R 
ÃÃÃÃÃÃÂÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ \
+                               
ÃÃÃÃÃÃÂÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃÃ | \
+               sed 's/ - / 0 /' > ru_RU.aff
+       i2myspell -d ./russian.dict > ru_RU.dic
+
+       cp ru_RU.aff ru_affix.dat
+       aspell --lang=ru create master ./ru.rws < ru_RU.dic 
+       echo "add ru.rws" > ./ru.multi
+       echo "add ru.multi" > ./russian.alias
+       cat debian/info-ispell > debian/aspell-ru.info-aspell
 
        touch build-stamp
 
@@ -34,6 +42,7 @@
        rm -f build-stamp
        -$(MAKE) clean
        rm -f ru_RU.aff ru_RU.dic rus.aff x
+       rm -f ru.rws ru.multi russian.alias debian/aspell-ru.info-aspell 
ru_affix.dat
 
        dh_clean
 
@@ -76,5 +85,20 @@
        dh_md5sums -p myspell-ru
        dh_builddeb -p myspell-ru
 
+       dh_testdir -p aspell-ru
+       dh_testroot -p aspell-ru
+       dh_install -paspell-ru ru.rws ru.multi russian.alias ru.dat 
ru_affix.dat usr/lib/aspell-0.60
+       dh_link -paspell-ru usr/lib/aspell-0.60/ru.multi 
usr/lib/aspell-0.60/russian.multi
+       installdeb-aspell -paspell-ru
+       dh_installdocs -p aspell-ru
+       dh_installchangelogs -p aspell-ru
+       dh_compress -p aspell-ru
+       dh_fixperms -p aspell-ru
+       dh_installdeb -p aspell-ru
+       dh_gencontrol -p aspell-ru
+       dh_md5sums -p aspell-ru
+       dh_builddeb -p aspell-ru
+
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff -Nru rus-ispell-0.99f7/ru.dat rus-ispell-aspell/ru.dat
--- rus-ispell-0.99f7/ru.dat    1970-01-01 07:00:00.000000000 +0700
+++ rus-ispell-aspell/ru.dat    2005-05-14 16:14:17.000000000 +0800
@@ -0,0 +1,6 @@
+name           ru
+charset                koi8-r
+special                - -*-
+soundslike     generic
+affix          ru
+affix-compress true
diff -Nru rus-ispell-0.99f7/russian.aff.koi rus-ispell-aspell/russian.aff.koi
--- rus-ispell-0.99f7/russian.aff.koi   2003-11-24 00:58:56.000000000 +0700
+++ rus-ispell-aspell/russian.aff.koi   2005-05-14 15:06:58.000000000 +0800
@@ -111,7 +111,8 @@
     Ã Ã Ã Ã Ã     >       -ÃÃÃÃÃ,ÃÃÃÃ    # ÃÃÃÃÃÃÃÃ > 
ÃÃÃÃÃÃÃ
     Ã Ã Ã Ã Ã     >       -ÃÃÃÃÃ,ÃÃÃÃ    # ÃÃÃÃÃÃÃÃ > 
ÃÃÃÃÃÃÃ
 #
-#y    Ã Ã Ã >       -ÃÃÃÃ,ÂÃ  # ÃÃÃÃÃ > ÃÂÃ
+#y    [^Ã] Ã Ã Ã   >       -ÃÃÃ,Ã              # ÃÃÃÃÃ > ÃÂÃ
+#y    Ã Ã Ã Ã      >       -ÃÃÃÃ,ÂÃ  # ÃÃÃÃÃ > ÃÂÃ
 #e    Ã Ã Ã >       -ÃÃÃ,Ã              #
     Ã Ã Ã   >       -ÃÃ,ÃÃ              # ÃÃÃÃÃ > ÃÃÃÃÃ
     Ã Ã Ã   >       -ÃÃ,ÃÃ              # ÃÃÃÃÃ > ÃÃÃÃÃ