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

[Benjamin Kerensa]

Brought debian/vendor.js up to date

[lp:~bkerensa/seamonkey/seamonkey-dev]

265. By Benjamin Kerensa on 2012-06-26

Removed obsolete debian/syspref.js

Unmerged revisions

265. By Benjamin Kerensa on 2012-06-26

Removed obsolete debian/syspref.js

264. By Benjamin Kerensa on 2012-06-26

Brought debian/vendor.js up to date

=== 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 @@
+seamonkey (2.6.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * Removed obsolete debian/syspref.js 
+
+ -- Benjamin Kerensa <[e-mail]>  Tue, 26 Jun 2012 15:52:08 -0700
+
+seamonkey (2.6.1-0ubuntu2) precise; urgency=low
+
+  * Brought debian/vendor.js prefs up to date
+    - Added pref's to prevent disable of bundled extensions in application
+    - Added pref's for mapping to hyphenation patterns of openoffice.org-
+      hyphenation and openoffice.org-dictionaries 
+
+ -- Benjamin Kerensa <[e-mail]>  Mon, 25 Jun 2012 19:21:03 -0700
+
 seamonkey (2.6.1-0ubuntu1) precise; urgency=low
 
   * New upstream release from the stable channel (SEAMONKEY_2_6_1_RELEASE)

=== 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 @@
-// This file can be used to configure global preferences for Firefox
-// Example: Homepage
-//pref("browser.startup.homepage", "http://www.weebls-stuff.com/wab/");
-

=== 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 @@
 // Disable default mailer checking.
 pref("mail.shell.checkDefaultMail", false);
 
+// identify default locale to use for searchplugins
+pref("distribution.searchplugins.defaultLocale", "en-US");
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 0);
+pref("extensions.shownSelectionUI", true);
+
+// Map to hyphenation patterns from openoffice.org-hyphenation and openoffice.org-dictionaries
+pref("intl.hyphenation-alias.af", "af-za");
+pref("intl.hyphenation-alias.af-*", "af-za");
+pref("intl.hyphenation-alias.bn", "bn-in");
+pref("intl.hyphenation-alias.bn-*", "bn-in");
+pref("intl.hyphenation-alias.ca-*", "ca");
+pref("intl.hyphenation-alias.cs", "cs-cz");
+pref("intl.hyphenation-alias.cs-*", "cs-cz");
+pref("intl.hyphenation-alias.da", "da-dk");
+pref("intl.hyphenation-alias.da-*", "da-dk");
+pref("intl.hyphenation-alias.de", "de-de");
+pref("intl.hyphenation-alias.de-*", "de-de");
+pref("intl.hyphenation-alias.de-AT-1901", "de-de");
+pref("intl.hyphenation-alias.de-CH-*", "de-de");
+pref("intl.hyphenation-alias.de-DE-1901", "de-de");
+pref("intl.hyphenation-alias.el", "el-gr");
+pref("intl.hyphenation-alias.el-*", "el-gr");
+pref("intl.hyphenation-alias.en", "en-us");
+pref("intl.hyphenation-alias.en-*", "en-us");
+pref("intl.hyphenation-alias.es", "es-es");
+pref("intl.hyphenation-alias.es-*", "es-es");
+pref("intl.hyphenation-alias.et", "et-ee");
+pref("intl.hyphenation-alias.et-*", "et-ee");
+pref("intl.hyphenation-alias.fi", "fi-fi");
+pref("intl.hyphenation-alias.fi-*", "fi-fi");
+pref("intl.hyphenation-alias.fr-*", "fr");
+pref("intl.hyphenation-alias.ga", "ga-ie");
+pref("intl.hyphenation-alias.ga-*", "ga-ie");
+pref("intl.hyphenation-alias.gu", "gu-in");
+pref("intl.hyphenation-alias.gu-*", "gu-in");
+pref("intl.hyphenation-alias.hi", "hi-in");
+pref("intl-hyphenation-alias.hi-in", "hi-in");
+pref("intl.hyphenation-alias.hr", "hr-hr");
+pref("intl.hyphenation-alias.hr-*", "hr-hr");
+pref("intl.hyphenation-alias.hu", "hu-hu");
+pref("intl.hyphenation-alias.hu-*", "hu-hu");
+pref("intl.hyphenation-alias.id", "id-id");
+pref("intl-hyphenation-alias.id-*", "id-id");
+pref("intl.hyphenation-alias.is", "is-is");
+pref("intl.hyphenation-alias.is-*", "is-is");
+pref("intl.hyphenation-alias.it", "it-it");
+pref("intl.hyphenation-alias.it-*", "it-it");
+pref("intl.hyphenation-alias.kn", "kn-in");
+pref("intl.hyphenation-alias.kn-*", "kn-in");
+pref("intl.hyphenation-alias.lt", "lt-lt");
+pref("intl.hyphenation-alias.lt-*", "lt-lt");
+pref("intl.hyphenation-alias.lv", "lv-lv");
+pref("intl.hyphenation-alias.lv-*", "lv-lv");
+pref("intl.hyphenation-alias.nb", "nb-no");
+pref("intl.hyphenation-alias.nb-*", "nb-no");
+pref("intl.hyphenation-alias.nl", "nl-nl");
+pref("intl.hyphenation-alias.nl-*", "nl-nl");
+pref("intl.hyphenation-alias.nn", "nn-no");
+pref("intl.hyphenation-alias.nn-*", "nn-no");
+pref("intl.hyphenation-alias.pa", "pa-in");
+pref("intl.hyphenation-alias.pa-*", "pa-in");
+pref("intl.hyphenation-alias.pl", "pl-pl");
+pref("intl.hyphenation-alias.pl-*", "pl-pl");
+pref("intl.hyphenation-alias.pt", "pt-pt");
+pref("intl.hyphenation-alias.pt-*", "pt-pt");
+pref("intl.hyphenation-alias.ro", "ro-ro");
+pref("intl.hyphenation-alias.ro-*", "ro-ro");
+pref("intl.hyphenation-alias.ru", "ru-ru");
+pref("intl.hyphenation-alias.ru-*", "ru-ru");
+pref("intl.hyphenation-alias.sh-*", "sh");
+pref("intl.hyphenation-alias.sk", "sk-sk");
+pref("intl.hyphenation-alias.sk-*", "sk-sk");
+pref("intl.hyphenation-alias.sl", "sl-si");
+pref("intl.hyphenation-alias.sl-*", "sl-si");
+pref("intl.hyphenation-alias.sr-*", "sr");
+pref("intl.hyphenation-alias.sv", "sv-se");
+pref("intl.hyphenation-alias.sv-*", "sv-se");
+pref("intl.hyphenation-alias.uk", "uk-ua");
+pref("intl.hyphenation-alias.uk-*", "uk-ua");
+pref("intl.hyphenation-alias.zu", "zu-za");
+pref("intl.hyphenation-alias.zu-*", "zu-za");
+
+