Merge lp:~maco.m/ubuntu/oneiric/espeak/oneiric-ocelot-pronunciation into lp:ubuntu/oneiric/espeak

[Mackenzie Morgan]

Created en_extra to keep organizedly different from en_rules and en_list which are default. It contains "oneiric" and "ocelot" pronunciations. Regenerated the espeak-data/en_dict file and went through the hoops debs require to modify a binary file, because the _dict files are not regenerated with each package build.

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-04 11:25:46 +0000
+++ debian/changelog	2011-09-27 00:22:32 +0000
@@ -1,3 +1,10 @@
+espeak (1.45.04-1ubuntu2) oneiric; urgency=low
+
+  * Add "oneiric" and "ocelot" to en_extra and update
+  	en_dict accordingly (LP: #852583)
+
+ -- Mackenzie Morgan <[e-mail]>  Mon, 26 Sep 2011 18:21:16 -0400
+
 espeak (1.45.04-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable, remaining changes:

=== added file 'debian/source/include-binaries'
--- debian/source/include-binaries	1970-01-01 00:00:00 +0000
+++ debian/source/include-binaries	2011-09-27 00:22:32 +0000
@@ -0,0 +1,1 @@
+espeak-data/en_dict

=== added file 'dictsource/en_extra'
--- dictsource/en_extra	1970-01-01 00:00:00 +0000
+++ dictsource/en_extra	2011-09-27 00:22:32 +0000
@@ -0,0 +1,2 @@
+oneiric		oUn'i:r@k
+ocelot		0sa#l0t

=== modified file 'espeak-data/en_dict'
Binary files espeak-data/en_dict	2011-05-04 11:25:46 +0000 and espeak-data/en_dict	2011-09-27 00:22:32 +0000 differ