Merge lp:~timo-jyrinki/ubuntu/trusty/mozvoikko/new_upstream_signed_release into lp:ubuntu/trusty/mozvoikko
- Trusty (14.04)
- new_upstream_signed_release
- Merge into trusty
Proposed by
Timo Jyrinki
Status: | Work in progress |
---|---|
Proposed branch: | lp:~timo-jyrinki/ubuntu/trusty/mozvoikko/new_upstream_signed_release |
Merge into: | lp:ubuntu/trusty/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/trusty/mozvoikko/new_upstream_signed_release |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+271645@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)
Description of the change
To post a comment you must log in.
- 28. By Timo Jyrinki
-
Use a more proper install method and only use the signatures from the upstream xpi
Unmerged revisions
- 28. By Timo Jyrinki
-
Use a more proper install method and only use the signatures from the upstream xpi
- 27. By Timo Jyrinki
-
* 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
-
Import upstream version 2.2
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2012-01-13 11:38:44 +0000 |
3 | +++ ChangeLog 2015-09-18 14:05:19 +0000 |
4 | @@ -1,3 +1,22 @@ |
5 | +2015-08-16 Harri Pitkänen <hatapitk@iki.fi> |
6 | + * Add a separate user oriented README.user and include it in the extension |
7 | + instead of README. |
8 | + |
9 | +2015-07-27 Harri Pitkänen <hatapitk@iki.fi> |
10 | + * Support loading optional dependent libraries. |
11 | + |
12 | +2015-04-18 Harri Pitkänen <hatapitk@iki.fi> |
13 | + * Support languages other than Finnish. |
14 | + |
15 | +2014-08-23 Harri Pitkänen <hatapitk@iki.fi> |
16 | + * Add icon. |
17 | + |
18 | +2012-03-20 Marko Wallin <marko.wallin@iki.fi> |
19 | + * Support for 64-bit Windows |
20 | + |
21 | +2012-01-22 Marko Wallin <marko.wallin@iki.fi> |
22 | + * Support TenFourFox on PPC Mac OS X. |
23 | + |
24 | 2011-12-29 Andris Pavenis <andris.pavenis@iki.fi> |
25 | * Throw an exception when specified dictionary is not 'fi_FI' |
26 | |
27 | |
28 | === modified file 'Makefile' |
29 | --- Makefile 2011-11-15 21:53:22 +0000 |
30 | +++ Makefile 2015-09-18 14:05:19 +0000 |
31 | @@ -1,8 +1,8 @@ |
32 | |
33 | VERSION=$(shell grep -E -o '<em.version>(.*)</em.version>' install.rdf | sed -e 's/<[a-z:/]*>//g') |
34 | |
35 | -XPI_FILES=README COPYING ChangeLog install.rdf chrome.manifest components/MozVoikko2.js |
36 | -SOURCE_FILES=$(XPI_FILES) Makefile |
37 | +XPI_FILES=README.user COPYING ChangeLog install.rdf chrome.manifest components/MozVoikko2.js skin/icon.png |
38 | +SOURCE_FILES=$(XPI_FILES) Makefile README |
39 | |
40 | .PHONY: dist-gzip mozvoikko2 clean all |
41 | |
42 | @@ -24,4 +24,5 @@ |
43 | rm -f mozvoikko-$(VERSION).tar.gz mozvoikko2.xpi |
44 | rm -f $(patsubst %,mozvoikko-$(VERSION)/%, $(sort $(SOURCE_FILES))) |
45 | test ! -d mozvoikko-$(VERSION)/components || rmdir mozvoikko-$(VERSION)/components |
46 | + test ! -d mozvoikko-$(VERSION)/skin || rmdir mozvoikko-$(VERSION)/skin |
47 | test ! -d mozvoikko-$(VERSION) || rmdir mozvoikko-$(VERSION) |
48 | |
49 | === modified file 'README' |
50 | --- README 2011-11-15 21:53:22 +0000 |
51 | +++ README 2015-09-18 14:05:19 +0000 |
52 | @@ -1,5 +1,4 @@ |
53 | -This is test version of mozvoikko2, an extension for Mozilla programs |
54 | -for using Finnish Language spell-checker Voikko |
55 | +This is Mozvoikko, an extension for Mozilla programs for using Voikko spell checker. |
56 | |
57 | Supported versions are: |
58 | ======================= |
59 | @@ -11,23 +10,26 @@ |
60 | Supported targets: |
61 | ================== |
62 | - 32-bit Windows (WINNT_x86-msvc) |
63 | +- 64-bit Windows (WINNT_x86_64-msvc) |
64 | - 32-bit Linux (Linux_ix86-gcc3) |
65 | - 64-bit Linux (Linux_x86_64-gcc3) |
66 | -- 32- and 64-bit OS X 10.5 and 10.6 (Darwin_x86-gcc3) |
67 | +- 32-bit Mac OS X (Darwin_x86-gcc3) |
68 | +- 64-bit Mac OS X (Darwin_x86_64-gcc3) |
69 | +- 32-bit Mac OS X (Darwin_ppc-gcc3) |
70 | |
71 | Binary packages for targets mentioned above are included in the extension package. |
72 | Also suomi-malaga data are included. Extension works however with system installations |
73 | of these packages (libvoikko and suomi-malaga) if the files are not found inside |
74 | the extension package. |
75 | |
76 | -movoikko2 itself is written completely in JavaScript and does not contain |
77 | +Version 2 of Mozvoikko is written completely in JavaScript and does not contain |
78 | any binary components. |
79 | |
80 | -One can include libvoikko shared libraries and suomi-malaga files into an extension. |
81 | -For that one must put these files in the subdirectories of directory voikko as |
82 | -shown below: |
83 | +One can include libvoikko shared libraries and suomi-malaga (or other dictionaries) |
84 | +into an extension. For that one must put these files in the subdirectories of |
85 | +directory voikko as shown below: |
86 | |
87 | -[andris@ap mozvoikko2]$ find voikko -type f | sort |
88 | +$ find voikko -type f | sort |
89 | voikko/2/mor-standard/voikko-fi_FI.all_l |
90 | voikko/2/mor-standard/voikko-fi_FI.lex_l |
91 | voikko/2/mor-standard/voikko-fi_FI.mor_l |
92 | @@ -39,6 +41,14 @@ |
93 | voikko/Linux_x86-gcc3/libvoikko.so.1 |
94 | voikko/README |
95 | voikko/WINNT_x86-msvc/libvoikko-1.dll |
96 | +voikko/WINNT_x86_64-msvc/libvoikko-1.dll |
97 | |
98 | +On PPC Mac OS X: |
99 | +$ find voikko -type f | sort |
100 | +voikko/2/mor-standard/voikko-fi_FI.lex_b |
101 | +voikko/2/mor-standard/voikko-fi_FI.mor_b |
102 | +voikko/2/mor-standard/voikko-fi_FI.pro |
103 | +voikko/2/mor-standard/voikko-fi_FI.sym_b |
104 | +voikko/Darwin_ppc-gcc3/libvoikko.1.dylib |
105 | |
106 | Andris Pavenis <andris.pavenis@iki.fi> |
107 | |
108 | === added file 'README.user' |
109 | --- README.user 1970-01-01 00:00:00 +0000 |
110 | +++ README.user 2015-09-18 14:05:19 +0000 |
111 | @@ -0,0 +1,24 @@ |
112 | +This is Mozvoikko, an extension for Mozilla programs for using Voikko spell checker. |
113 | + |
114 | +Adding new languages |
115 | +==================== |
116 | + |
117 | +This extension may include spelling dictionaries for one or more languages. It is not |
118 | +possible to install multiple Mozvoikko extensions simultaneously but you can add |
119 | +dictionaries into an already installed extension by placing the dictionaries in any |
120 | +of the following locations and restarting Firefox: |
121 | + |
122 | +- Under the Firefox profile folder: |
123 | + Firefox profile folder can be located by following these instructions: |
124 | + https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data |
125 | + Additional ZHFST speller dictionaries can be placed in the sub-folder |
126 | + extensions\{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a}\voikko\3 |
127 | + Note that if you remove or re-install your Mozvoikko extension these |
128 | + additional dictionaries may need to be installed again. |
129 | +- On Windows: |
130 | + ZHFST speller dictionaries can be placed under c:\voikko\3 |
131 | +- On OS X: |
132 | + ZHFST speller dictionaries can be placed under /Library/Spelling/voikko/3 |
133 | + or similarly named folder under user's home folder. |
134 | +- On Linux: |
135 | + ZHFST speller dictionaries can be placed under /etc/voikko/3 |
136 | |
137 | === modified file 'chrome.manifest' |
138 | --- chrome.manifest 2011-11-15 21:53:22 +0000 |
139 | +++ chrome.manifest 2015-09-18 14:05:19 +0000 |
140 | @@ -1,3 +1,4 @@ |
141 | component {89630d4c-c64d-11e0-83d8-00508d9f364f} components/MozVoikko2.js |
142 | contract @mozilla.fi/mozvoikko2;1 {89630d4c-c64d-11e0-83d8-00508d9f364f} |
143 | category spell-check-engine @mozilla.fi/mozvoikko2;1 mozvoikko2 |
144 | +skin voikko classic/1.0 skin/ |
145 | |
146 | === modified file 'components/MozVoikko2.js' |
147 | --- components/MozVoikko2.js 2012-01-13 11:38:44 +0000 |
148 | +++ components/MozVoikko2.js 2015-09-18 14:05:19 +0000 |
149 | @@ -21,7 +21,7 @@ |
150 | |
151 | const mozISpellCheckingEngine = Components.interfaces.mozISpellCheckingEngine; |
152 | const CLASS_ID = Components.ID("89630d4c-c64d-11e0-83d8-00508d9f364f"); |
153 | -const CLASS_NAME = "Finnish language spell-check"; |
154 | +const CLASS_NAME = "Spell checker based on Voikko"; |
155 | const CONTRACT_ID = "@mozilla.org/mozvoikko2;1"; |
156 | |
157 | const VOIKKO_OPT_IGNORE_DOT = 0; |
158 | @@ -29,12 +29,42 @@ |
159 | const VOIKKO_OPT_IGNORE_UPPERCASE = 3; |
160 | const VOIKKO_OPT_ACCEPT_MISSING_HYPHENS = 12; |
161 | |
162 | +const OPTIONAL_DEPENDENCIES = { |
163 | + "WINNT_x86-msvc" : ["libgcc_s_sjlj-1.dll", "libstdc++-6.dll", "zlib1.dll", "libarchive-13.dll", "libhfstospell-4.dll"], |
164 | + "WINNT_x86_64-msvc" : ["libgcc_s_seh-1.dll", "libstdc++-6.dll", "zlib1.dll", "libarchive-13.dll", "libhfstospell-4.dll"], |
165 | + "Darwin_x86_64-gcc3" : ["libtinyxml2.3.dylib", "libarchive.13.dylib", "libhfstospell.4.dylib"], |
166 | + "Darwin_x86-gcc3" : ["libtinyxml2.3.dylib", "libarchive.13.dylib", "libhfstospell.4.dylib"] |
167 | +}; |
168 | + |
169 | +function tryLoadLibrary(abi, lib_name) { |
170 | + // Try to locate the library inside extension directory and |
171 | + // replace value |
172 | + var extension_dir = __LOCATION__.parent.parent; |
173 | + var library_loc = extension_dir.clone(); |
174 | + library_loc.append("voikko"); |
175 | + library_loc.append(abi); |
176 | + library_loc.append(lib_name); |
177 | + if (library_loc.exists() && library_loc.isFile()) |
178 | + { |
179 | + var handle = ctypes.open(library_loc.path); |
180 | + aConsoleService.logStringMessage("MozVoikko2: loaded bundled library " + library_loc.path); |
181 | + return handle; |
182 | + } |
183 | + else |
184 | + { |
185 | + var handle = ctypes.open(lib_name); |
186 | + aConsoleService.logStringMessage("MozVoikko2: loaded system library " + library_loc.path); |
187 | + return handle; |
188 | + } |
189 | +} |
190 | + |
191 | function LibVoikko() |
192 | { |
193 | } |
194 | |
195 | LibVoikko.prototype = { |
196 | libvoikko: null, |
197 | + optional_deps: [], |
198 | |
199 | data_loc: "", |
200 | |
201 | @@ -46,6 +76,7 @@ |
202 | fn_voikko_suggest_cstr: null, |
203 | fn_voikko_free_cstr_array: null, |
204 | fn_voikko_set_boolean_option: null, |
205 | + fn_voikkoListSupportedSpellingLanguages: null, |
206 | |
207 | init : function() |
208 | { |
209 | @@ -59,16 +90,16 @@ |
210 | //================================================================== |
211 | // Detect shared library name to load |
212 | //================================================================== |
213 | - if (abi == "Linux_x86-gcc3" || abi == "Linux_x86_64-gcc3") |
214 | + if (abi.indexOf("Linux_") == 0) |
215 | { |
216 | lib_name = "libvoikko.so.1"; |
217 | } |
218 | - else if (abi == "WINNT_x86-msvc") |
219 | + else if (abi == "WINNT_x86-msvc" || abi == "WINNT_x86_64-msvc") |
220 | { |
221 | lib_name = "libvoikko-1.dll"; |
222 | this.call_abi = ctypes.winapi_abi; |
223 | } |
224 | - else if (abi == "Darwin_x86_64-gcc3" || abi == "Darwin_x86-gcc3") |
225 | + else if (abi == "Darwin_x86_64-gcc3" || abi == "Darwin_x86-gcc3" || abi == "Darwin_ppc-gcc3") |
226 | { |
227 | lib_name = "libvoikko.1.dylib"; |
228 | } |
229 | @@ -77,36 +108,32 @@ |
230 | throw "Unsupported ABI " + abi; |
231 | } |
232 | |
233 | - // Try to locate libvoikko inside extension directory and |
234 | - // replace value |
235 | - var extension_dir = __LOCATION__.parent.parent; |
236 | - var libvoikko_loc = extension_dir.clone(); |
237 | - libvoikko_loc.append("voikko"); |
238 | - libvoikko_loc.append(abi); |
239 | - libvoikko_loc.append(lib_name); |
240 | - if (libvoikko_loc.exists() && libvoikko_loc.isFile()) |
241 | - { |
242 | - this.libvoikko = ctypes.open(libvoikko_loc.path); |
243 | - aConsoleService.logStringMessage("MozVoikko2: loaded " + libvoikko_loc.path); |
244 | + try { |
245 | + this.libvoikko = tryLoadLibrary(abi, lib_name); |
246 | } |
247 | - else |
248 | - { |
249 | - this.libvoikko = ctypes.open(lib_name); |
250 | - aConsoleService.logStringMessage("MozVoikko2: loaded system libvoikko"); |
251 | - aConsoleService.logStringMessage("MozVoikko2: libvoikko_loc = " + libvoikko_loc.path); |
252 | + catch (err) { |
253 | + aConsoleService.logStringMessage("MozVoikko2: Failed to load libvoikko (" + lib_name + "), maybe we need optional dependencies"); |
254 | + if (abi in OPTIONAL_DEPENDENCIES) { |
255 | + for (var i = 0; i < OPTIONAL_DEPENDENCIES[abi].length; i++) { |
256 | + var dep = OPTIONAL_DEPENDENCIES[abi][i]; |
257 | + try { |
258 | + var h = tryLoadLibrary(abi, dep); |
259 | + this.optional_deps.push(h); |
260 | + } |
261 | + catch (e2) { |
262 | + aConsoleService.logStringMessage("MozVoikko2: Failed to load optional dependency " + dep); |
263 | + } |
264 | + } |
265 | + this.libvoikko = tryLoadLibrary(abi, lib_name); |
266 | + } |
267 | + else { |
268 | + throw err; |
269 | + } |
270 | } |
271 | |
272 | - var data_loc = extension_dir.clone(); |
273 | + var data_loc = __LOCATION__.parent.parent.clone(); |
274 | data_loc.append("voikko"); |
275 | - var data_loc_test = data_loc.clone(); |
276 | - data_loc_test.append("2"); |
277 | - data_loc_test.append("mor-standard"); |
278 | - data_loc_test.append("voikko-fi_FI.pro"); |
279 | - if (data_loc_test.exists() && data_loc_test.isFile()) |
280 | - { |
281 | - this.data_loc = data_loc.path; |
282 | - aConsoleService.logStringMessage("MozVoikko2: Found suomi-malaga data at " + this.data_loc); |
283 | - } |
284 | + this.data_loc = data_loc.path; |
285 | |
286 | /* Detect used libvoikko version and output a message to Javascript console. */ |
287 | var fn_voikkoGetVersion = this.libvoikko.declare( |
288 | @@ -178,6 +205,16 @@ |
289 | ctypes.voidptr_t, |
290 | ctypes.int, |
291 | ctypes.int); |
292 | + |
293 | + // |
294 | + // char ** voikkoListSupportedSpellingLanguages(const char * path) |
295 | + // |
296 | + this.fn_voikkoListSupportedSpellingLanguages = this.libvoikko.declare( |
297 | + "voikkoListSupportedSpellingLanguages", |
298 | + this.call_abi, |
299 | + ctypes.char.ptr.array(50).ptr, |
300 | + ctypes.char.ptr); |
301 | + |
302 | }, |
303 | |
304 | finalize : function() |
305 | @@ -185,6 +222,9 @@ |
306 | this.fn_voikko_init = null; |
307 | this.fn_voikko_terminate = null; |
308 | this.libvoikko.close(); |
309 | + while (this.optional_deps.length > 0) { |
310 | + this.optional_deps.pop().close(); |
311 | + } |
312 | } |
313 | }; |
314 | |
315 | @@ -211,7 +251,6 @@ |
316 | VoikkoHandle.prototype = { |
317 | handle: null, |
318 | libvoikko: null, |
319 | - lang_code: null, |
320 | |
321 | open : function(libvoikko, lang_code) |
322 | { |
323 | @@ -228,8 +267,12 @@ |
324 | |
325 | this.handle = this.libvoikko.fn_voikko_init( |
326 | message_ptr, |
327 | - "fi_FI", |
328 | + lang_code, |
329 | data_loc); |
330 | + if (this.handle.isNull()) { |
331 | + this.handle = null; |
332 | + throw "Could not load dictionary that should exists: " + lang_code; |
333 | + } |
334 | |
335 | this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_DOT, 1); |
336 | this.libvoikko.fn_voikko_set_boolean_option(this.handle, VOIKKO_OPT_IGNORE_NUMBERS, 1); |
337 | @@ -239,7 +282,7 @@ |
338 | |
339 | finalize : function() |
340 | { |
341 | - if (handle) |
342 | + if (this.handle) |
343 | { |
344 | this.libvoikko.fn_voikko_terminate(this.handle); |
345 | this.handle = null; |
346 | @@ -250,16 +293,6 @@ |
347 | |
348 | function MozVoikko2() |
349 | { |
350 | - try |
351 | - { |
352 | - this.voikko_handle = new VoikkoHandle; |
353 | - this.voikko_handle.open(libvoikko); |
354 | - } |
355 | - catch (err) |
356 | - { |
357 | - Components.utils.reportError(err); |
358 | - throw err; |
359 | - } |
360 | } |
361 | |
362 | MozVoikko2.prototype = { |
363 | @@ -267,23 +300,44 @@ |
364 | classID: CLASS_ID, |
365 | contractID: CONTRACT_ID, |
366 | |
367 | - data_loc : null, |
368 | voikko_handle : null, |
369 | + supportedDicts : null, |
370 | + currentDict: null, |
371 | mPersonalDictionary : null, |
372 | |
373 | QueryInterface: XPCOMUtils.generateQI([mozISpellCheckingEngine, Components.interfaces.nsISupport]), |
374 | |
375 | get dictionary() |
376 | { |
377 | - return "fi_FI"; |
378 | + return this.currentDict; |
379 | }, |
380 | |
381 | set dictionary(dict) |
382 | { |
383 | - if (dict != "fi_FI") |
384 | + if (dict == this.currentDict) |
385 | + { |
386 | + return; |
387 | + } |
388 | + var availableDict = this.getSupportedDictionaryCodeInternal(dict); |
389 | + if (availableDict == null) |
390 | { |
391 | throw "mozvoikko2: dictionary '" + dict + "' is not supported by this component (but may be supported by others)"; |
392 | } |
393 | + try |
394 | + { |
395 | + if (this.voikko_handle) |
396 | + { |
397 | + this.voikko_handle.finalize(); |
398 | + } |
399 | + this.voikko_handle = new VoikkoHandle; |
400 | + this.voikko_handle.open(libvoikko, availableDict); |
401 | + this.currentDict = dict; |
402 | + } |
403 | + catch (err) |
404 | + { |
405 | + Components.utils.reportError(err); |
406 | + throw err; |
407 | + } |
408 | }, |
409 | |
410 | get providesPersonalDictionary() |
411 | @@ -316,10 +370,53 @@ |
412 | this.mPersonalDictionary = mPersonalDictionary; |
413 | }, |
414 | |
415 | + getSupportedDictionariesInternal : function() |
416 | + { |
417 | + if (this.supportedDicts == null) { |
418 | + var data_loc = null; |
419 | + if (libvoikko.data_loc) { |
420 | + data_loc = libvoikko.data_loc; |
421 | + } |
422 | + var cSpellingLangs = libvoikko.fn_voikkoListSupportedSpellingLanguages(data_loc); |
423 | + if (!cSpellingLangs.isNull()) |
424 | + { |
425 | + var spellingLangs = []; |
426 | + for (i = 0; i < 200 && !cSpellingLangs.contents[i].isNull(); i++) |
427 | + { |
428 | + spellingLangs.push(cSpellingLangs.contents[i].readString()); |
429 | + } |
430 | + libvoikko.fn_voikko_free_cstr_array(cSpellingLangs); |
431 | + this.supportedDicts = spellingLangs; |
432 | + } |
433 | + } |
434 | + }, |
435 | + |
436 | + getSupportedDictionaryCodeInternal : function(dict) |
437 | + { |
438 | + this.getSupportedDictionariesInternal(); |
439 | + if (this.supportedDicts == null) |
440 | + { |
441 | + return; |
442 | + } |
443 | + if (this.supportedDicts.indexOf(dict) != -1) |
444 | + { |
445 | + return dict; |
446 | + } |
447 | + if (dict.indexOf("_") > -1) |
448 | + { |
449 | + var d = dict.substr(0, dict.indexOf("_")); |
450 | + if (this.supportedDicts.indexOf(d) != -1) |
451 | + { |
452 | + return d; |
453 | + } |
454 | + } |
455 | + }, |
456 | + |
457 | getDictionaryList : function(dicts, count) |
458 | { |
459 | - dicts.value = ["fi_FI"]; |
460 | - count.value = 1; |
461 | + this.getSupportedDictionariesInternal(); |
462 | + dicts.value = this.supportedDicts; |
463 | + count.value = this.supportedDicts.length; |
464 | }, |
465 | |
466 | check : function(word) |
467 | @@ -332,7 +429,7 @@ |
468 | |
469 | if (result == 0 && this.mPersonalDictionary) |
470 | { |
471 | - return this.mPersonalDictionary.check(word, "fi_FI"); |
472 | + return this.mPersonalDictionary.check(word, this.currentDict); |
473 | } |
474 | else |
475 | { |
476 | |
477 | === modified file 'debian/changelog' |
478 | --- debian/changelog 2012-01-13 11:38:44 +0000 |
479 | +++ debian/changelog 2015-09-18 14:05:19 +0000 |
480 | @@ -1,3 +1,11 @@ |
481 | +mozvoikko (2.2-0ubuntu0.14.04.1) trusty; urgency=medium |
482 | + |
483 | + * New upstream release. |
484 | + * Include the signed upstream version of the XPI (otherwise identical), so |
485 | + that it continues to work with Firefox 41 and newer. (LP: #1482219) |
486 | + |
487 | + -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 18 Sep 2015 16:23:21 +0300 |
488 | + |
489 | mozvoikko (2.0.1-0ubuntu1) precise; urgency=low |
490 | |
491 | * New upstream release 2.0.1 |
492 | |
493 | === modified file 'debian/rules' |
494 | --- debian/rules 2011-11-15 21:53:22 +0000 |
495 | +++ debian/rules 2015-09-18 14:05:19 +0000 |
496 | @@ -5,3 +5,4 @@ |
497 | |
498 | override_dh_auto_install: |
499 | install-xpi mozvoikko2.xpi |
500 | + unzip -d $(CURDIR)/debian/xul-ext-mozvoikko/usr/share/xul-ext/mozvoikko/ mozvoikko-2.2.xpi META-INF/* |
501 | |
502 | === added file 'debian/source/include-binaries' |
503 | --- debian/source/include-binaries 1970-01-01 00:00:00 +0000 |
504 | +++ debian/source/include-binaries 2015-09-18 14:05:19 +0000 |
505 | @@ -0,0 +1,1 @@ |
506 | +mozvoikko-2.2.xpi |
507 | |
508 | === modified file 'install.rdf' |
509 | --- install.rdf 2012-01-13 11:38:44 +0000 |
510 | +++ install.rdf 2015-09-18 14:05:19 +0000 |
511 | @@ -6,26 +6,38 @@ |
512 | <Description about="urn:mozilla:install-manifest"> |
513 | <em:id>{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a}</em:id> |
514 | <em:name>Mozilla-laajennus Voikon käyttöön</em:name> |
515 | - <em:version>2.0.1</em:version> |
516 | + <em:version>2.2</em:version> |
517 | <em:description>Mozilla-laajennus Voikko-oikoluvun käyttöön</em:description> |
518 | + <em:localized> |
519 | + <Description> |
520 | + <em:locale>en-US</em:locale> |
521 | + <em:name>Spell checker based on Voikko</em:name> |
522 | + <em:description>Open source spell checker Voikko for Mozilla and needed libraries.</em:description> |
523 | + </Description> |
524 | + </em:localized> |
525 | <em:creator>Andris.Pavenis <andris.pavenis@iki.fi></em:creator> |
526 | <em:contributor>Marko Wallin <marko.wallin@iki.fi></em:contributor> |
527 | - <em:contributor>http://voikko.sourceforge.net - Voikon kehitys</em:contributor> |
528 | + <em:contributor>Harri Pitkänen <hatapitk@iki.fi></em:contributor> |
529 | + <em:contributor>http://voikko.puimula.org - Voikon kehitys</em:contributor> |
530 | + <em:iconURL>chrome://voikko/skin/icon.png</em:iconURL> |
531 | |
532 | <em:unpack>true</em:unpack> |
533 | - <em:homepageURL>https://sourceforge.net/apps/trac/voikko/wiki/mozvoikko</em:homepageURL> |
534 | + <em:type>2</em:type> |
535 | + <em:homepageURL>https://github.com/voikko/mozvoikko/wiki</em:homepageURL> |
536 | <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform> |
537 | <em:targetPlatform>Linux_x86_64-gcc3</em:targetPlatform> |
538 | <em:targetPlatform>Darwin_x86-gcc3</em:targetPlatform> |
539 | <em:targetPlatform>Darwin_x86_64-gcc3</em:targetPlatform> |
540 | + <em:targetPlatform>Darwin_ppc-gcc3</em:targetPlatform> |
541 | <em:targetPlatform>WINNT_x86-msvc</em:targetPlatform> |
542 | + <em:targetPlatform>WINNT_x86_64-msvc</em:targetPlatform> |
543 | |
544 | <em:targetApplication> |
545 | <!-- Mozilla Firefox --> |
546 | <Description> |
547 | <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> |
548 | <em:minVersion>4.0</em:minVersion> |
549 | - <em:maxVersion>12.0a1</em:maxVersion> |
550 | + <em:maxVersion>33.0</em:maxVersion> |
551 | </Description> |
552 | </em:targetApplication> |
553 | |
554 | @@ -34,7 +46,7 @@ |
555 | <Description> |
556 | <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> |
557 | <em:minVersion>5.0</em:minVersion> |
558 | - <em:maxVersion>12.0a1</em:maxVersion> |
559 | + <em:maxVersion>33.0</em:maxVersion> |
560 | </Description> |
561 | </em:targetApplication> |
562 | |
563 | @@ -43,7 +55,7 @@ |
564 | <Description> |
565 | <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id> |
566 | <em:minVersion>2.2</em:minVersion> |
567 | - <em:maxVersion>2.9a1</em:maxVersion> |
568 | + <em:maxVersion>2.30</em:maxVersion> |
569 | </Description> |
570 | </em:targetApplication> |
571 | |
572 | |
573 | === added file 'mozvoikko-2.2.xpi' |
574 | Binary files mozvoikko-2.2.xpi 1970-01-01 00:00:00 +0000 and mozvoikko-2.2.xpi 2015-09-18 14:05:19 +0000 differ |
575 | === added directory 'skin' |
576 | === added file 'skin/icon.png' |
577 | Binary files skin/icon.png 1970-01-01 00:00:00 +0000 and skin/icon.png 2015-09-18 14:05:19 +0000 differ |