Merge lp:~timo-jyrinki/ubuntu/precise/mozvoikko/new_upstream_signed_release into lp:ubuntu/precise/mozvoikko

Proposed by Timo Jyrinki on 2015-09-18
Status: Work in progress
Proposed branch: lp:~timo-jyrinki/ubuntu/precise/mozvoikko/new_upstream_signed_release
Merge into: lp:ubuntu/precise/mozvoikko
Diff against target: 577 lines (+239/-65)
10 files modified
ChangeLog (+19/-0)
Makefile (+3/-2)
README (+18/-8)
README.user (+24/-0)
chrome.manifest (+1/-0)
components/MozVoikko2.js (+146/-49)
debian/changelog (+8/-0)
debian/rules (+1/-0)
debian/source/include-binaries (+1/-0)
install.rdf (+18/-6)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/precise/mozvoikko/new_upstream_signed_release
Reviewer Review Type Date Requested Status
Ubuntu branches 2015-09-18 Pending
Review via email: mp+271652@code.launchpad.net

Commit message

* New upstream release.
* Include the signed upstream version of the XPI (otherwise identical), so
  that it continues to work with Firefox 41 and newer. (LP: #1482219)

To post a comment you must log in.
28. By Timo Jyrinki on 2015-09-18

Use a more proper install method and only use the signatures from the upstream xpi

Unmerged revisions

28. By Timo Jyrinki on 2015-09-18

Use a more proper install method and only use the signatures from the upstream xpi

27. By Timo Jyrinki on 2015-09-18

* New upstream release.
* Include the signed upstream version of the XPI (otherwise identical), so
  that it continues to work with Firefox 41 and newer. (LP: #1482219)

26. By Timo Jyrinki on 2015-09-18

Import upstream version 2.2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2012-01-13 11:38:44 +0000
+++ ChangeLog 2015-09-18 14:05:34 +0000
@@ -1,3 +1,22 @@
12015-08-16 Harri Pitkänen <hatapitk@iki.fi>
2 * Add a separate user oriented README.user and include it in the extension
3 instead of README.
4
52015-07-27 Harri Pitkänen <hatapitk@iki.fi>
6 * Support loading optional dependent libraries.
7
82015-04-18 Harri Pitkänen <hatapitk@iki.fi>
9 * Support languages other than Finnish.
10
112014-08-23 Harri Pitkänen <hatapitk@iki.fi>
12 * Add icon.
13
142012-03-20 Marko Wallin <marko.wallin@iki.fi>
15 * Support for 64-bit Windows
16
172012-01-22 Marko Wallin <marko.wallin@iki.fi>
18 * Support TenFourFox on PPC Mac OS X.
19
12011-12-29 Andris Pavenis <andris.pavenis@iki.fi>202011-12-29 Andris Pavenis <andris.pavenis@iki.fi>
2 * Throw an exception when specified dictionary is not 'fi_FI'21 * Throw an exception when specified dictionary is not 'fi_FI'
322
423
=== modified file 'Makefile'
--- Makefile 2011-11-15 21:53:22 +0000
+++ Makefile 2015-09-18 14:05:34 +0000
@@ -1,8 +1,8 @@
11
2VERSION=$(shell grep -E -o '<em.version>(.*)</em.version>' install.rdf | sed -e 's/<[a-z:/]*>//g')2VERSION=$(shell grep -E -o '<em.version>(.*)</em.version>' install.rdf | sed -e 's/<[a-z:/]*>//g')
33
4XPI_FILES=README COPYING ChangeLog install.rdf chrome.manifest components/MozVoikko2.js4XPI_FILES=README.user COPYING ChangeLog install.rdf chrome.manifest components/MozVoikko2.js skin/icon.png
5SOURCE_FILES=$(XPI_FILES) Makefile5SOURCE_FILES=$(XPI_FILES) Makefile README
66
7.PHONY: dist-gzip mozvoikko2 clean all7.PHONY: dist-gzip mozvoikko2 clean all
88
@@ -24,4 +24,5 @@
24 rm -f mozvoikko-$(VERSION).tar.gz mozvoikko2.xpi24 rm -f mozvoikko-$(VERSION).tar.gz mozvoikko2.xpi
25 rm -f $(patsubst %,mozvoikko-$(VERSION)/%, $(sort $(SOURCE_FILES)))25 rm -f $(patsubst %,mozvoikko-$(VERSION)/%, $(sort $(SOURCE_FILES)))
26 test ! -d mozvoikko-$(VERSION)/components || rmdir mozvoikko-$(VERSION)/components26 test ! -d mozvoikko-$(VERSION)/components || rmdir mozvoikko-$(VERSION)/components
27 test ! -d mozvoikko-$(VERSION)/skin || rmdir mozvoikko-$(VERSION)/skin
27 test ! -d mozvoikko-$(VERSION) || rmdir mozvoikko-$(VERSION)28 test ! -d mozvoikko-$(VERSION) || rmdir mozvoikko-$(VERSION)
2829
=== modified file 'README'
--- README 2011-11-15 21:53:22 +0000
+++ README 2015-09-18 14:05:34 +0000
@@ -1,5 +1,4 @@
1This is test version of mozvoikko2, an extension for Mozilla programs1This is Mozvoikko, an extension for Mozilla programs for using Voikko spell checker.
2for using Finnish Language spell-checker Voikko
32
4Supported versions are:3Supported versions are:
5=======================4=======================
@@ -11,23 +10,26 @@
11Supported targets:10Supported targets:
12==================11==================
13- 32-bit Windows (WINNT_x86-msvc)12- 32-bit Windows (WINNT_x86-msvc)
13- 64-bit Windows (WINNT_x86_64-msvc)
14- 32-bit Linux (Linux_ix86-gcc3)14- 32-bit Linux (Linux_ix86-gcc3)
15- 64-bit Linux (Linux_x86_64-gcc3)15- 64-bit Linux (Linux_x86_64-gcc3)
16- 32- and 64-bit OS X 10.5 and 10.6 (Darwin_x86-gcc3)16- 32-bit Mac OS X (Darwin_x86-gcc3)
17- 64-bit Mac OS X (Darwin_x86_64-gcc3)
18- 32-bit Mac OS X (Darwin_ppc-gcc3)
1719
18Binary packages for targets mentioned above are included in the extension package.20Binary packages for targets mentioned above are included in the extension package.
19Also suomi-malaga data are included. Extension works however with system installations21Also suomi-malaga data are included. Extension works however with system installations
20of these packages (libvoikko and suomi-malaga) if the files are not found inside22of these packages (libvoikko and suomi-malaga) if the files are not found inside
21the extension package.23the extension package.
2224
23movoikko2 itself is written completely in JavaScript and does not contain25Version 2 of Mozvoikko is written completely in JavaScript and does not contain
24any binary components.26any binary components.
2527
26One can include libvoikko shared libraries and suomi-malaga files into an extension.28One can include libvoikko shared libraries and suomi-malaga (or other dictionaries)
27For that one must put these files in the subdirectories of directory voikko as29into an extension. For that one must put these files in the subdirectories of
28shown below:30directory voikko as shown below:
2931
30[andris@ap mozvoikko2]$ find voikko -type f | sort32$ find voikko -type f | sort
31voikko/2/mor-standard/voikko-fi_FI.all_l33voikko/2/mor-standard/voikko-fi_FI.all_l
32voikko/2/mor-standard/voikko-fi_FI.lex_l34voikko/2/mor-standard/voikko-fi_FI.lex_l
33voikko/2/mor-standard/voikko-fi_FI.mor_l35voikko/2/mor-standard/voikko-fi_FI.mor_l
@@ -39,6 +41,14 @@
39voikko/Linux_x86-gcc3/libvoikko.so.141voikko/Linux_x86-gcc3/libvoikko.so.1
40voikko/README42voikko/README
41voikko/WINNT_x86-msvc/libvoikko-1.dll43voikko/WINNT_x86-msvc/libvoikko-1.dll
44voikko/WINNT_x86_64-msvc/libvoikko-1.dll
4245
46On PPC Mac OS X:
47$ find voikko -type f | sort
48voikko/2/mor-standard/voikko-fi_FI.lex_b
49voikko/2/mor-standard/voikko-fi_FI.mor_b
50voikko/2/mor-standard/voikko-fi_FI.pro
51voikko/2/mor-standard/voikko-fi_FI.sym_b
52voikko/Darwin_ppc-gcc3/libvoikko.1.dylib
4353
44Andris Pavenis <andris.pavenis@iki.fi>54Andris Pavenis <andris.pavenis@iki.fi>
4555
=== added file 'README.user'
--- README.user 1970-01-01 00:00:00 +0000
+++ README.user 2015-09-18 14:05:34 +0000
@@ -0,0 +1,24 @@
1This is Mozvoikko, an extension for Mozilla programs for using Voikko spell checker.
2
3Adding new languages
4====================
5
6This extension may include spelling dictionaries for one or more languages. It is not
7possible to install multiple Mozvoikko extensions simultaneously but you can add
8dictionaries into an already installed extension by placing the dictionaries in any
9of the following locations and restarting Firefox:
10
11- Under the Firefox profile folder:
12 Firefox profile folder can be located by following these instructions:
13 https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data
14 Additional ZHFST speller dictionaries can be placed in the sub-folder
15 extensions\{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a}\voikko\3
16 Note that if you remove or re-install your Mozvoikko extension these
17 additional dictionaries may need to be installed again.
18- On Windows:
19 ZHFST speller dictionaries can be placed under c:\voikko\3
20- On OS X:
21 ZHFST speller dictionaries can be placed under /Library/Spelling/voikko/3
22 or similarly named folder under user's home folder.
23- On Linux:
24 ZHFST speller dictionaries can be placed under /etc/voikko/3
025
=== modified file 'chrome.manifest'
--- chrome.manifest 2011-11-15 21:53:22 +0000
+++ chrome.manifest 2015-09-18 14:05:34 +0000
@@ -1,3 +1,4 @@
1component {89630d4c-c64d-11e0-83d8-00508d9f364f} components/MozVoikko2.js1component {89630d4c-c64d-11e0-83d8-00508d9f364f} components/MozVoikko2.js
2contract @mozilla.fi/mozvoikko2;1 {89630d4c-c64d-11e0-83d8-00508d9f364f}2contract @mozilla.fi/mozvoikko2;1 {89630d4c-c64d-11e0-83d8-00508d9f364f}
3category spell-check-engine @mozilla.fi/mozvoikko2;1 mozvoikko23category spell-check-engine @mozilla.fi/mozvoikko2;1 mozvoikko2
4skin voikko classic/1.0 skin/
45
=== modified file 'components/MozVoikko2.js'
--- components/MozVoikko2.js 2012-01-13 11:38:44 +0000
+++ components/MozVoikko2.js 2015-09-18 14:05:34 +0000
@@ -21,7 +21,7 @@
2121
22const mozISpellCheckingEngine = Components.interfaces.mozISpellCheckingEngine;22const mozISpellCheckingEngine = Components.interfaces.mozISpellCheckingEngine;
23const CLASS_ID = Components.ID("89630d4c-c64d-11e0-83d8-00508d9f364f");23const CLASS_ID = Components.ID("89630d4c-c64d-11e0-83d8-00508d9f364f");
24const CLASS_NAME = "Finnish language spell-check";24const CLASS_NAME = "Spell checker based on Voikko";
25const CONTRACT_ID = "@mozilla.org/mozvoikko2;1";25const CONTRACT_ID = "@mozilla.org/mozvoikko2;1";
2626
27const VOIKKO_OPT_IGNORE_DOT = 0;27const VOIKKO_OPT_IGNORE_DOT = 0;
@@ -29,12 +29,42 @@
29const VOIKKO_OPT_IGNORE_UPPERCASE = 3;29const VOIKKO_OPT_IGNORE_UPPERCASE = 3;
30const VOIKKO_OPT_ACCEPT_MISSING_HYPHENS = 12;30const VOIKKO_OPT_ACCEPT_MISSING_HYPHENS = 12;
3131
32const OPTIONAL_DEPENDENCIES = {
33 "WINNT_x86-msvc" : ["libgcc_s_sjlj-1.dll", "libstdc++-6.dll", "zlib1.dll", "libarchive-13.dll", "libhfstospell-4.dll"],
34 "WINNT_x86_64-msvc" : ["libgcc_s_seh-1.dll", "libstdc++-6.dll", "zlib1.dll", "libarchive-13.dll", "libhfstospell-4.dll"],
35 "Darwin_x86_64-gcc3" : ["libtinyxml2.3.dylib", "libarchive.13.dylib", "libhfstospell.4.dylib"],
36 "Darwin_x86-gcc3" : ["libtinyxml2.3.dylib", "libarchive.13.dylib", "libhfstospell.4.dylib"]
37};
38
39function tryLoadLibrary(abi, lib_name) {
40 // Try to locate the library inside extension directory and
41 // replace value
42 var extension_dir = __LOCATION__.parent.parent;
43 var library_loc = extension_dir.clone();
44 library_loc.append("voikko");
45 library_loc.append(abi);
46 library_loc.append(lib_name);
47 if (library_loc.exists() && library_loc.isFile())
48 {
49 var handle = ctypes.open(library_loc.path);
50 aConsoleService.logStringMessage("MozVoikko2: loaded bundled library " + library_loc.path);
51 return handle;
52 }
53 else
54 {
55 var handle = ctypes.open(lib_name);
56 aConsoleService.logStringMessage("MozVoikko2: loaded system library " + library_loc.path);
57 return handle;
58 }
59}
60
32function LibVoikko()61function LibVoikko()
33{62{
34}63}
3564
36LibVoikko.prototype = {65LibVoikko.prototype = {
37 libvoikko: null,66 libvoikko: null,
67 optional_deps: [],
3868
39 data_loc: "",69 data_loc: "",
4070
@@ -46,6 +76,7 @@
46 fn_voikko_suggest_cstr: null,76 fn_voikko_suggest_cstr: null,
47 fn_voikko_free_cstr_array: null,77 fn_voikko_free_cstr_array: null,
48 fn_voikko_set_boolean_option: null,78 fn_voikko_set_boolean_option: null,
79 fn_voikkoListSupportedSpellingLanguages: null,
4980
50 init : function()81 init : function()
51 {82 {
@@ -59,16 +90,16 @@
59 //==================================================================90 //==================================================================
60 // Detect shared library name to load91 // Detect shared library name to load
61 //==================================================================92 //==================================================================
62 if (abi == "Linux_x86-gcc3" || abi == "Linux_x86_64-gcc3")93 if (abi.indexOf("Linux_") == 0)
63 {94 {
64 lib_name = "libvoikko.so.1";95 lib_name = "libvoikko.so.1";
65 }96 }
66 else if (abi == "WINNT_x86-msvc")97 else if (abi == "WINNT_x86-msvc" || abi == "WINNT_x86_64-msvc")
67 {98 {
68 lib_name = "libvoikko-1.dll";99 lib_name = "libvoikko-1.dll";
69 this.call_abi = ctypes.winapi_abi;100 this.call_abi = ctypes.winapi_abi;
70 }101 }
71 else if (abi == "Darwin_x86_64-gcc3" || abi == "Darwin_x86-gcc3")102 else if (abi == "Darwin_x86_64-gcc3" || abi == "Darwin_x86-gcc3" || abi == "Darwin_ppc-gcc3")
72 {103 {
73 lib_name = "libvoikko.1.dylib";104 lib_name = "libvoikko.1.dylib";
74 }105 }
@@ -77,36 +108,32 @@
77 throw "Unsupported ABI " + abi;108 throw "Unsupported ABI " + abi;
78 }109 }
79110
80 // Try to locate libvoikko inside extension directory and111 try {
81 // replace value112 this.libvoikko = tryLoadLibrary(abi, lib_name);
82 var extension_dir = __LOCATION__.parent.parent;
83 var libvoikko_loc = extension_dir.clone();
84 libvoikko_loc.append("voikko");
85 libvoikko_loc.append(abi);
86 libvoikko_loc.append(lib_name);
87 if (libvoikko_loc.exists() && libvoikko_loc.isFile())
88 {
89 this.libvoikko = ctypes.open(libvoikko_loc.path);
90 aConsoleService.logStringMessage("MozVoikko2: loaded " + libvoikko_loc.path);
91 }113 }
92 else114 catch (err) {
93 {115 aConsoleService.logStringMessage("MozVoikko2: Failed to load libvoikko (" + lib_name + "), maybe we need optional dependencies");
94 this.libvoikko = ctypes.open(lib_name);116 if (abi in OPTIONAL_DEPENDENCIES) {
95 aConsoleService.logStringMessage("MozVoikko2: loaded system libvoikko");117 for (var i = 0; i < OPTIONAL_DEPENDENCIES[abi].length; i++) {
96 aConsoleService.logStringMessage("MozVoikko2: libvoikko_loc = " + libvoikko_loc.path);118 var dep = OPTIONAL_DEPENDENCIES[abi][i];
119 try {
120 var h = tryLoadLibrary(abi, dep);
121 this.optional_deps.push(h);
122 }
123 catch (e2) {
124 aConsoleService.logStringMessage("MozVoikko2: Failed to load optional dependency " + dep);
125 }
126 }
127 this.libvoikko = tryLoadLibrary(abi, lib_name);
128 }
129 else {
130 throw err;
131 }
97 }132 }
98133
99 var data_loc = extension_dir.clone();134 var data_loc = __LOCATION__.parent.parent.clone();
100 data_loc.append("voikko");135 data_loc.append("voikko");
101 var data_loc_test = data_loc.clone();136 this.data_loc = data_loc.path;
102 data_loc_test.append("2");
103 data_loc_test.append("mor-standard");
104 data_loc_test.append("voikko-fi_FI.pro");
105 if (data_loc_test.exists() && data_loc_test.isFile())
106 {
107 this.data_loc = data_loc.path;
108 aConsoleService.logStringMessage("MozVoikko2: Found suomi-malaga data at " + this.data_loc);
109 }
110137
111 /* Detect used libvoikko version and output a message to Javascript console. */138 /* Detect used libvoikko version and output a message to Javascript console. */
112 var fn_voikkoGetVersion = this.libvoikko.declare(139 var fn_voikkoGetVersion = this.libvoikko.declare(
@@ -178,6 +205,16 @@
178 ctypes.voidptr_t,205 ctypes.voidptr_t,
179 ctypes.int,206 ctypes.int,
180 ctypes.int);207 ctypes.int);
208
209 //
210 // char ** voikkoListSupportedSpellingLanguages(const char * path)
211 //
212 this.fn_voikkoListSupportedSpellingLanguages = this.libvoikko.declare(
213 "voikkoListSupportedSpellingLanguages",
214 this.call_abi,
215 ctypes.char.ptr.array(50).ptr,
216 ctypes.char.ptr);
217
181 },218 },
182219
183 finalize : function()220 finalize : function()
@@ -185,6 +222,9 @@
185 this.fn_voikko_init = null;222 this.fn_voikko_init = null;
186 this.fn_voikko_terminate = null;223 this.fn_voikko_terminate = null;
187 this.libvoikko.close();224 this.libvoikko.close();
225 while (this.optional_deps.length > 0) {
226 this.optional_deps.pop().close();
227 }
188 }228 }
189};229};
190230
@@ -211,7 +251,6 @@
211VoikkoHandle.prototype = {251VoikkoHandle.prototype = {
212 handle: null,252 handle: null,
213 libvoikko: null,253 libvoikko: null,
214 lang_code: null,
215254
216 open : function(libvoikko, lang_code)255 open : function(libvoikko, lang_code)
217 {256 {
@@ -228,8 +267,12 @@
228267
229 this.handle = this.libvoikko.fn_voikko_init(268 this.handle = this.libvoikko.fn_voikko_init(
230 message_ptr,269 message_ptr,
231 "fi_FI",270 lang_code,
232 data_loc);271 data_loc);
272 if (this.handle.isNull()) {
273 this.handle = null;
274 throw "Could not load dictionary that should exists: " + lang_code;
275 }
233276
234 this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_DOT, 1);277 this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_DOT, 1);
235 this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_NUMBERS, 1);278 this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_NUMBERS, 1);
@@ -239,7 +282,7 @@
239282
240 finalize : function()283 finalize : function()
241 {284 {
242 if (handle)285 if (this.handle)
243 {286 {
244 this.libvoikko.fn_voikko_terminate(this.handle);287 this.libvoikko.fn_voikko_terminate(this.handle);
245 this.handle = null;288 this.handle = null;
@@ -250,16 +293,6 @@
250293
251function MozVoikko2()294function MozVoikko2()
252{295{
253 try
254 {
255 this.voikko_handle = new VoikkoHandle;
256 this.voikko_handle.open(libvoikko);
257 }
258 catch (err)
259 {
260 Components.utils.reportError(err);
261 throw err;
262 }
263}296}
264297
265MozVoikko2.prototype = {298MozVoikko2.prototype = {
@@ -267,23 +300,44 @@
267 classID: CLASS_ID,300 classID: CLASS_ID,
268 contractID: CONTRACT_ID,301 contractID: CONTRACT_ID,
269302
270 data_loc : null,
271 voikko_handle : null,303 voikko_handle : null,
304 supportedDicts : null,
305 currentDict: null,
272 mPersonalDictionary : null,306 mPersonalDictionary : null,
273307
274 QueryInterface: XPCOMUtils.generateQI([mozISpellCheckingEngine, Components.interfaces.nsISupport]),308 QueryInterface: XPCOMUtils.generateQI([mozISpellCheckingEngine, Components.interfaces.nsISupport]),
275309
276 get dictionary()310 get dictionary()
277 {311 {
278 return "fi_FI";312 return this.currentDict;
279 },313 },
280314
281 set dictionary(dict)315 set dictionary(dict)
282 {316 {
283 if (dict != "fi_FI")317 if (dict == this.currentDict)
318 {
319 return;
320 }
321 var availableDict = this.getSupportedDictionaryCodeInternal(dict);
322 if (availableDict == null)
284 {323 {
285 throw "mozvoikko2: dictionary '" + dict + "' is not supported by this component (but may be supported by others)";324 throw "mozvoikko2: dictionary '" + dict + "' is not supported by this component (but may be supported by others)";
286 }325 }
326 try
327 {
328 if (this.voikko_handle)
329 {
330 this.voikko_handle.finalize();
331 }
332 this.voikko_handle = new VoikkoHandle;
333 this.voikko_handle.open(libvoikko, availableDict);
334 this.currentDict = dict;
335 }
336 catch (err)
337 {
338 Components.utils.reportError(err);
339 throw err;
340 }
287 },341 },
288342
289 get providesPersonalDictionary()343 get providesPersonalDictionary()
@@ -316,10 +370,53 @@
316 this.mPersonalDictionary = mPersonalDictionary;370 this.mPersonalDictionary = mPersonalDictionary;
317 },371 },
318372
373 getSupportedDictionariesInternal : function()
374 {
375 if (this.supportedDicts == null) {
376 var data_loc = null;
377 if (libvoikko.data_loc) {
378 data_loc = libvoikko.data_loc;
379 }
380 var cSpellingLangs = libvoikko.fn_voikkoListSupportedSpellingLanguages(data_loc);
381 if (!cSpellingLangs.isNull())
382 {
383 var spellingLangs = [];
384 for (i = 0; i < 200 && !cSpellingLangs.contents[i].isNull(); i++)
385 {
386 spellingLangs.push(cSpellingLangs.contents[i].readString());
387 }
388 libvoikko.fn_voikko_free_cstr_array(cSpellingLangs);
389 this.supportedDicts = spellingLangs;
390 }
391 }
392 },
393
394 getSupportedDictionaryCodeInternal : function(dict)
395 {
396 this.getSupportedDictionariesInternal();
397 if (this.supportedDicts == null)
398 {
399 return;
400 }
401 if (this.supportedDicts.indexOf(dict) != -1)
402 {
403 return dict;
404 }
405 if (dict.indexOf("_") > -1)
406 {
407 var d = dict.substr(0, dict.indexOf("_"));
408 if (this.supportedDicts.indexOf(d) != -1)
409 {
410 return d;
411 }
412 }
413 },
414
319 getDictionaryList : function(dicts, count)415 getDictionaryList : function(dicts, count)
320 {416 {
321 dicts.value = ["fi_FI"];417 this.getSupportedDictionariesInternal();
322 count.value = 1;418 dicts.value = this.supportedDicts;
419 count.value = this.supportedDicts.length;
323 },420 },
324421
325 check : function(word)422 check : function(word)
@@ -332,7 +429,7 @@
332429
333 if (result == 0 && this.mPersonalDictionary)430 if (result == 0 && this.mPersonalDictionary)
334 {431 {
335 return this.mPersonalDictionary.check(word, "fi_FI");432 return this.mPersonalDictionary.check(word, this.currentDict);
336 }433 }
337 else434 else
338 {435 {
339436
=== modified file 'debian/changelog'
--- debian/changelog 2012-01-13 11:38:44 +0000
+++ debian/changelog 2015-09-18 14:05:34 +0000
@@ -1,3 +1,11 @@
1mozvoikko (2.2-0ubuntu0.12.04.1) precise; urgency=medium
2
3 * New upstream release.
4 * Include the signed upstream version of the XPI (otherwise identical), so
5 that it continues to work with Firefox 41 and newer. (LP: #1482219)
6
7 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 18 Sep 2015 16:23:21 +0300
8
1mozvoikko (2.0.1-0ubuntu1) precise; urgency=low9mozvoikko (2.0.1-0ubuntu1) precise; urgency=low
210
3 * New upstream release 2.0.111 * New upstream release 2.0.1
412
=== modified file 'debian/rules'
--- debian/rules 2011-11-15 21:53:22 +0000
+++ debian/rules 2015-09-18 14:05:34 +0000
@@ -5,3 +5,4 @@
55
6override_dh_auto_install:6override_dh_auto_install:
7 install-xpi mozvoikko2.xpi7 install-xpi mozvoikko2.xpi
8 unzip -d $(CURDIR)/debian/xul-ext-mozvoikko/usr/share/xul-ext/mozvoikko/ mozvoikko-2.2.xpi META-INF/*
89
=== added file 'debian/source/include-binaries'
--- debian/source/include-binaries 1970-01-01 00:00:00 +0000
+++ debian/source/include-binaries 2015-09-18 14:05:34 +0000
@@ -0,0 +1,1 @@
1mozvoikko-2.2.xpi
02
=== modified file 'install.rdf'
--- install.rdf 2012-01-13 11:38:44 +0000
+++ install.rdf 2015-09-18 14:05:34 +0000
@@ -6,26 +6,38 @@
6 <Description about="urn:mozilla:install-manifest">6 <Description about="urn:mozilla:install-manifest">
7 <em:id>{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a}</em:id>7 <em:id>{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a}</em:id>
8 <em:name>Mozilla-laajennus Voikon käyttöön</em:name>8 <em:name>Mozilla-laajennus Voikon käyttöön</em:name>
9 <em:version>2.0.1</em:version>9 <em:version>2.2</em:version>
10 <em:description>Mozilla-laajennus Voikko-oikoluvun käyttöön</em:description>10 <em:description>Mozilla-laajennus Voikko-oikoluvun käyttöön</em:description>
11 <em:localized>
12 <Description>
13 <em:locale>en-US</em:locale>
14 <em:name>Spell checker based on Voikko</em:name>
15 <em:description>Open source spell checker Voikko for Mozilla and needed libraries.</em:description>
16 </Description>
17 </em:localized>
11 <em:creator>Andris.Pavenis &lt;andris.pavenis@iki.fi&gt;</em:creator>18 <em:creator>Andris.Pavenis &lt;andris.pavenis@iki.fi&gt;</em:creator>
12 <em:contributor>Marko Wallin &lt;marko.wallin@iki.fi&gt;</em:contributor>19 <em:contributor>Marko Wallin &lt;marko.wallin@iki.fi&gt;</em:contributor>
13 <em:contributor>http://voikko.sourceforge.net - Voikon kehitys</em:contributor>20 <em:contributor>Harri Pitkänen &lt;hatapitk@iki.fi&gt;</em:contributor>
21 <em:contributor>http://voikko.puimula.org - Voikon kehitys</em:contributor>
22 <em:iconURL>chrome://voikko/skin/icon.png</em:iconURL>
1423
15 <em:unpack>true</em:unpack>24 <em:unpack>true</em:unpack>
16 <em:homepageURL>https://sourceforge.net/apps/trac/voikko/wiki/mozvoikko</em:homepageURL>25 <em:type>2</em:type>
26 <em:homepageURL>https://github.com/voikko/mozvoikko/wiki</em:homepageURL>
17 <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>27 <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>
18 <em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform>28 <em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform>
19 <em:targetPlatform>Darwin_x86-gcc3</em:targetPlatform>29 <em:targetPlatform>Darwin_x86-gcc3</em:targetPlatform>
20 <em:targetPlatform>Darwin_x86_64-gcc3</em:targetPlatform>30 <em:targetPlatform>Darwin_x86_64-gcc3</em:targetPlatform>
31 <em:targetPlatform>Darwin_ppc-gcc3</em:targetPlatform>
21 <em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>32 <em:targetPlatform>WINNT_x86-msvc</em:targetPlatform>
33 <em:targetPlatform>WINNT_x86_64-msvc</em:targetPlatform>
22 34
23 <em:targetApplication>35 <em:targetApplication>
24 <!-- Mozilla Firefox -->36 <!-- Mozilla Firefox -->
25 <Description>37 <Description>
26 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>38 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
27 <em:minVersion>4.0</em:minVersion>39 <em:minVersion>4.0</em:minVersion>
28 <em:maxVersion>12.0a1</em:maxVersion>40 <em:maxVersion>33.0</em:maxVersion>
29 </Description>41 </Description>
30 </em:targetApplication>42 </em:targetApplication>
31 43
@@ -34,7 +46,7 @@
34 <Description>46 <Description>
35 <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>47 <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
36 <em:minVersion>5.0</em:minVersion>48 <em:minVersion>5.0</em:minVersion>
37 <em:maxVersion>12.0a1</em:maxVersion>49 <em:maxVersion>33.0</em:maxVersion>
38 </Description>50 </Description>
39 </em:targetApplication>51 </em:targetApplication>
40 52
@@ -43,7 +55,7 @@
43 <Description>55 <Description>
44 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>56 <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
45 <em:minVersion>2.2</em:minVersion>57 <em:minVersion>2.2</em:minVersion>
46 <em:maxVersion>2.9a1</em:maxVersion>58 <em:maxVersion>2.30</em:maxVersion>
47 </Description>59 </Description>
48 </em:targetApplication>60 </em:targetApplication>
4961
5062
=== added file 'mozvoikko-2.2.xpi'
51Binary files mozvoikko-2.2.xpi 1970-01-01 00:00:00 +0000 and mozvoikko-2.2.xpi 2015-09-18 14:05:34 +0000 differ63Binary files mozvoikko-2.2.xpi 1970-01-01 00:00:00 +0000 and mozvoikko-2.2.xpi 2015-09-18 14:05:34 +0000 differ
=== added directory 'skin'
=== added file 'skin/icon.png'
52Binary files skin/icon.png 1970-01-01 00:00:00 +0000 and skin/icon.png 2015-09-18 14:05:34 +0000 differ64Binary files skin/icon.png 1970-01-01 00:00:00 +0000 and skin/icon.png 2015-09-18 14:05:34 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: