[dutch-svn] r157 - in trunk: . debian

[Kurt Roeckx]

Author: kroeckx
Date: 2012-04-07 14:35:14 +0000 (Sat, 07 Apr 2012)
New Revision: 157

Modified:
   trunk/convert
   trunk/debian/changelog
   trunk/debian/rules
   trunk/debian/wdutch.install
Log:
Change the wordlist file from latin1 to UTF-8 (Closes: #651882)


Modified: trunk/convert
===================================================================
--- trunk/convert	2012-04-07 14:21:16 UTC (rev 156)
+++ trunk/convert	2012-04-07 14:35:14 UTC (rev 157)
@@ -15,7 +15,7 @@
 
 # Output files:
 # For a wordlist
-LATIN1WORDLIST=ispell/dutch
+WORDLIST=wdutch/dutch
 # myspell/hunspell
 MYSPELL_DIC=myspell/nl.dic
 MYSPELL_AFF=myspell/nl.aff
@@ -47,9 +47,7 @@
 # in the database and just exported.
 
 # Temporary files:
-# Contains the full list of correct words.  Nothing seems be able to
-# support utf8, but it's generated anyway.  The latin1 version
-# only has the subscript 2 replaced by a 2.
+# Contains the full list of correct words.
 UTF8WORDLIST=wordlist.utf8.txt
 
 # Those have all the work arounds other than those for aspell
@@ -73,8 +71,7 @@
 done
 
 # Generate word list.
-# Replace the subscript 2 with a 2.
-sed -e 's/^CO\xE2\x82\x82/CO2/' $UTF8WORDLIST | iconv -f utf8 -t latin1 > $LATIN1WORDLIST
+cp $UTF8WORDLIST $WORDLIST
 
 # Replace all ij's at the start of the line with IJ
 grep ^ij $UTF8WORDLIST | sed -e 's/^ij/IJ/' > tmp.txt

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-04-07 14:21:16 UTC (rev 156)
+++ trunk/debian/changelog	2012-04-07 14:35:14 UTC (rev 157)
@@ -1,6 +1,7 @@
 dutch (1:2.10-1) unstable; urgency=low
 
   * New upstream version (Closes: #667456)
+  * Change the wordlist file from latin1 to UTF-8 (Closes: #651882)
 
  -- Kurt Roeckx <kurt at roeckx.be>  Sat, 07 Apr 2012 15:54:29 +0200
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2012-04-07 14:21:16 UTC (rev 156)
+++ trunk/debian/rules	2012-04-07 14:35:14 UTC (rev 157)
@@ -10,6 +10,7 @@
 build-stamp:
 	dh_testdir
 	mkdir -p myspell
+	mkdir -p wdutch
 	chmod +x convert
 	./convert
 	touch build-stamp
@@ -26,8 +27,9 @@
 
 	-rm aspell/nl.cwl.gz aspell/nl.cwl aspell/nl.wl
 	-rm myspell/nl.dic myspell/nl.aff
+	-rm wdutch/dutch ispell/dutch.mwl*
 	-rmdir myspell
-	-rm ispell/dutch ispell/dutch.mwl*
+	-rmdir wdutch
 
 	dh_clean
 

Modified: trunk/debian/wdutch.install
===================================================================
--- trunk/debian/wdutch.install	2012-04-07 14:21:16 UTC (rev 156)
+++ trunk/debian/wdutch.install	2012-04-07 14:35:14 UTC (rev 157)
@@ -1 +1 @@
-ispell/dutch	/usr/share/dict/
+wdutch/dutch	/usr/share/dict/