SeaMonkey

Merge lp:~bkerensa/seamonkey/seamonkey-dev into lp:seamonkey

  1. seamonkey-dev
  2. Merge into seamonkey.head
Proposed by Benjamin Kerensa
Status: Needs review
Proposed branch: lp:~bkerensa/seamonkey/seamonkey-dev
Merge into: lp:seamonkey
Diff against target: 124 lines (+100/-4)
3 files modified
debian/changelog (+15/-0)
debian/syspref.js (+0/-4)
debian/vendor.js (+85/-0)
To merge this branch: bzr merge lp:~bkerensa/seamonkey/seamonkey-dev
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+111992@code.launchpad.net

Commit message

Brought debian/vendor.js up to date

To post a comment you must log in.
lp:~bkerensa/seamonkey/seamonkey-dev updated
265. By Benjamin Kerensa

Removed obsolete debian/syspref.js

Unmerged revisions

265. By Benjamin Kerensa

Removed obsolete debian/syspref.js

264. By Benjamin Kerensa

Brought debian/vendor.js up to date

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-12-29 08:16:01 +0000
+++ debian/changelog 2012-06-26 22:55:21 +0000
@@ -1,3 +1,18 @@
1seamonkey (2.6.1-0ubuntu3) UNRELEASED; urgency=low
2
3 * Removed obsolete debian/syspref.js
4
5 -- Benjamin Kerensa <bkerensa@ubuntu.com> Tue, 26 Jun 2012 15:52:08 -0700
6
7seamonkey (2.6.1-0ubuntu2) precise; urgency=low
8
9 * Brought debian/vendor.js prefs up to date
10 - Added pref's to prevent disable of bundled extensions in application
11 - Added pref's for mapping to hyphenation patterns of openoffice.org-
12 hyphenation and openoffice.org-dictionaries
13
14 -- Benjamin Kerensa <bkerensa@ubuntu.com> Mon, 25 Jun 2012 19:21:03 -0700
15
1seamonkey (2.6.1-0ubuntu1) precise; urgency=low16seamonkey (2.6.1-0ubuntu1) precise; urgency=low
217
3 * New upstream release from the stable channel (SEAMONKEY_2_6_1_RELEASE)18 * New upstream release from the stable channel (SEAMONKEY_2_6_1_RELEASE)
419
=== removed file 'debian/syspref.js'
--- debian/syspref.js 2011-09-10 07:29:03 +0000
+++ debian/syspref.js 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1// This file can be used to configure global preferences for Firefox
2// Example: Homepage
3//pref("browser.startup.homepage", "http://www.weebls-stuff.com/wab/");
4
50
=== modified file 'debian/vendor.js'
--- debian/vendor.js 2011-09-10 07:29:03 +0000
+++ debian/vendor.js 2012-06-26 22:55:21 +0000
@@ -4,3 +4,88 @@
4// Disable default mailer checking.4// Disable default mailer checking.
5pref("mail.shell.checkDefaultMail", false);5pref("mail.shell.checkDefaultMail", false);
66
7// identify default locale to use for searchplugins
8pref("distribution.searchplugins.defaultLocale", "en-US");
9
10// Don't disable our bundled extensions in the application directory
11pref("extensions.autoDisableScopes", 0);
12pref("extensions.shownSelectionUI", true);
13
14// Map to hyphenation patterns from openoffice.org-hyphenation and openoffice.org-dictionaries
15pref("intl.hyphenation-alias.af", "af-za");
16pref("intl.hyphenation-alias.af-*", "af-za");
17pref("intl.hyphenation-alias.bn", "bn-in");
18pref("intl.hyphenation-alias.bn-*", "bn-in");
19pref("intl.hyphenation-alias.ca-*", "ca");
20pref("intl.hyphenation-alias.cs", "cs-cz");
21pref("intl.hyphenation-alias.cs-*", "cs-cz");
22pref("intl.hyphenation-alias.da", "da-dk");
23pref("intl.hyphenation-alias.da-*", "da-dk");
24pref("intl.hyphenation-alias.de", "de-de");
25pref("intl.hyphenation-alias.de-*", "de-de");
26pref("intl.hyphenation-alias.de-AT-1901", "de-de");
27pref("intl.hyphenation-alias.de-CH-*", "de-de");
28pref("intl.hyphenation-alias.de-DE-1901", "de-de");
29pref("intl.hyphenation-alias.el", "el-gr");
30pref("intl.hyphenation-alias.el-*", "el-gr");
31pref("intl.hyphenation-alias.en", "en-us");
32pref("intl.hyphenation-alias.en-*", "en-us");
33pref("intl.hyphenation-alias.es", "es-es");
34pref("intl.hyphenation-alias.es-*", "es-es");
35pref("intl.hyphenation-alias.et", "et-ee");
36pref("intl.hyphenation-alias.et-*", "et-ee");
37pref("intl.hyphenation-alias.fi", "fi-fi");
38pref("intl.hyphenation-alias.fi-*", "fi-fi");
39pref("intl.hyphenation-alias.fr-*", "fr");
40pref("intl.hyphenation-alias.ga", "ga-ie");
41pref("intl.hyphenation-alias.ga-*", "ga-ie");
42pref("intl.hyphenation-alias.gu", "gu-in");
43pref("intl.hyphenation-alias.gu-*", "gu-in");
44pref("intl.hyphenation-alias.hi", "hi-in");
45pref("intl-hyphenation-alias.hi-in", "hi-in");
46pref("intl.hyphenation-alias.hr", "hr-hr");
47pref("intl.hyphenation-alias.hr-*", "hr-hr");
48pref("intl.hyphenation-alias.hu", "hu-hu");
49pref("intl.hyphenation-alias.hu-*", "hu-hu");
50pref("intl.hyphenation-alias.id", "id-id");
51pref("intl-hyphenation-alias.id-*", "id-id");
52pref("intl.hyphenation-alias.is", "is-is");
53pref("intl.hyphenation-alias.is-*", "is-is");
54pref("intl.hyphenation-alias.it", "it-it");
55pref("intl.hyphenation-alias.it-*", "it-it");
56pref("intl.hyphenation-alias.kn", "kn-in");
57pref("intl.hyphenation-alias.kn-*", "kn-in");
58pref("intl.hyphenation-alias.lt", "lt-lt");
59pref("intl.hyphenation-alias.lt-*", "lt-lt");
60pref("intl.hyphenation-alias.lv", "lv-lv");
61pref("intl.hyphenation-alias.lv-*", "lv-lv");
62pref("intl.hyphenation-alias.nb", "nb-no");
63pref("intl.hyphenation-alias.nb-*", "nb-no");
64pref("intl.hyphenation-alias.nl", "nl-nl");
65pref("intl.hyphenation-alias.nl-*", "nl-nl");
66pref("intl.hyphenation-alias.nn", "nn-no");
67pref("intl.hyphenation-alias.nn-*", "nn-no");
68pref("intl.hyphenation-alias.pa", "pa-in");
69pref("intl.hyphenation-alias.pa-*", "pa-in");
70pref("intl.hyphenation-alias.pl", "pl-pl");
71pref("intl.hyphenation-alias.pl-*", "pl-pl");
72pref("intl.hyphenation-alias.pt", "pt-pt");
73pref("intl.hyphenation-alias.pt-*", "pt-pt");
74pref("intl.hyphenation-alias.ro", "ro-ro");
75pref("intl.hyphenation-alias.ro-*", "ro-ro");
76pref("intl.hyphenation-alias.ru", "ru-ru");
77pref("intl.hyphenation-alias.ru-*", "ru-ru");
78pref("intl.hyphenation-alias.sh-*", "sh");
79pref("intl.hyphenation-alias.sk", "sk-sk");
80pref("intl.hyphenation-alias.sk-*", "sk-sk");
81pref("intl.hyphenation-alias.sl", "sl-si");
82pref("intl.hyphenation-alias.sl-*", "sl-si");
83pref("intl.hyphenation-alias.sr-*", "sr");
84pref("intl.hyphenation-alias.sv", "sv-se");
85pref("intl.hyphenation-alias.sv-*", "sv-se");
86pref("intl.hyphenation-alias.uk", "uk-ua");
87pref("intl.hyphenation-alias.uk-*", "uk-ua");
88pref("intl.hyphenation-alias.zu", "zu-za");
89pref("intl.hyphenation-alias.zu-*", "zu-za");
90
91

Subscribers

People subscribed via source and target branches