← Back to branch summary

~ubuntu-branches/ubuntu/precise/firefox/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu-codes-google.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson, Chris Coulson, Ben Collins
  • Date: 2012-07-13 22:28:50 UTC
  • mfrom: (1.3.9)
  • Revision ID: package-import@ubuntu.com-20120713222850-rn76wll756c5hw8r
Tags: 14.0.1+build1-0ubuntu0.12.04.1
https://launchpad.net/bugs/1024562
https://launchpad.net/bugs/1010580
https://launchpad.net/bugs/1002590
https://launchpad.net/bugs/1000820
https://launchpad.net/bugs/1013186
* New upstream stable release (FIREFOX_14_0_1_BUILD1)
  - see LP: #1024562 for USN information

[ Chris Coulson <chris.coulson@canonical.com> ]
* Update globalmenu-extension to 3.2.5
  - Fix LP: #1010580 - No choice of folder when adding a bookmark from
    the bookmark menu
  - Fix a crash in uGlobalMenu::RecycleList::~RecycleList()
* Refresh patches
  - update debian/patches/ubuntu-codes-google.patch
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/plugin-for-mimetype-pref.patch
  - update debian/patches/add-syspref-dir.patch
* Drop patches fixed upstream
  - remove debian/patches/revert-bmo621446-investigation.patch
* Add Keywords to the desktop file
  - update debian/firefox.desktop.in
* Update desktop file translations
  - update debian/firefox.sh.in
* Ensure that additional actions in the desktop file match the fd.o spec
  in precise and newer
  - update debian/firefox.desktop.in
  - update debian/rules
* Drop the application/vnd.mozilla.xul+xml mimetype from the desktop file.
  Firefox hasn't been able to view XUL files from non-chrome URI's since
  version 4.0
  - update debian/firefox.desktop.in
* Add application/x-xpinstall to the MimeType field of the desktop file
  - update debian/firefox.desktop.in
* Drop the ability to select between tree/system libraries using a single
  option in debian/rules. It adds additional complexity and was never used
  - update debian/config/mozconfig.in
  - update debian/control.in
  - update debian/firefox-dev.install.in
  - update debian/firefox-dev.links.in
  - update debian/pkgconfig/libxul.pc.in
  - update debian/rules
* Fix make-makefile test failure when the build directory contains
  perl regexp control characters
  - add debian/patches/make-makefile-test-fix.patch
  - update debian/patches/series
* Shuffle the order of google-breakpad/src/common/dwarf/Makefile.in to fix a
  variable substitution issue, which was causing some objects to be built with
  the wrong compiler flags, resulting in dump_syms crashing (LP: #1002590)
  - add debian/patches/fix-makefile-substitution-bug.patch
* Update StartupWMClass to the correct name
  - update debian/firefox.desktop.in
  - update debian/rules
* Add search plugin for DuckDuckGo
* Fix LP: #1000820 - firefox-dev conflicts with xulrunner-1.9-dev for
  people with the latter still installed
  - update debian/control{,.in}
* Add Fulah to locales.blacklist
* Fix LP: #1013186 - install our vendor preferences as application
  defaults rather than GRE defaults, so that they are loaded after
  the upstream defaults again. The upstream defaults were also moved
  as part of the webapp runtime work (which has it's own application
  defaults)
  - update debian/firefox.install.in
  - update debian/firefox.links.in
* Apport hook improvements:
  - Sort preferences alphabetically in the apport data
  - Treat preferences set in default addons as default prefs so that
    they don't show up in apport data, unless the preference files have
    been modified
  - Support random pref files dropped in to the Firefox install folder, and
    preferences from application bundles
  - Fix ordering issues when loading preferences
* Drop debian/patches/plugin-for-mimetype-pref.patch. The burden of
  carrying this is starting to outweigh the benefits of it

[ Ben Collins <ben.collins@ubuntu.com> ]
* Cherry pick patch from aurora to use YARR interpreter on ppc
  - update debian/patches/fix-build-failure-without-yarr-jit.patch
  - update debian/patches/series
* Fix ppc build due to new dtoa library
  - add debian/patches/fix-dtoa-build-on-ppc.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-codes-google.patch
4
4
 
5
5
Index: mozilla/l10n/bg/browser/searchplugins/google.xml
6
6
===================================================================
7
 
--- mozilla.orig/l10n/bg/browser/searchplugins/google.xml       2012-04-25 22:44:52.000000000 +0100
8
 
+++ mozilla/l10n/bg/browser/searchplugins/google.xml    2012-04-26 10:41:21.983947363 +0100
 
7
--- mozilla.orig/l10n/bg/browser/searchplugins/google.xml       2012-06-05 21:15:12.000000000 +0100
 
8
+++ mozilla/l10n/bg/browser/searchplugins/google.xml    2012-06-05 22:16:33.907665479 +0100
9
9
@@ -5,13 +5,11 @@
10
10
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
11
11
 <Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
25
25
Index: mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml
26
26
===================================================================
27
27
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
28
 
+++ mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml   2012-04-26 10:41:21.983947363 +0100
 
28
+++ mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml   2012-06-05 22:16:33.907665479 +0100
29
29
@@ -0,0 +1,16 @@
30
30
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
31
31
+<ShortName>Google</ShortName>
46
46
Index: mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml
47
47
===================================================================
48
48
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
49
 
+++ mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml   2012-04-26 10:41:21.983947363 +0100
 
49
+++ mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml   2012-06-05 22:16:33.907665479 +0100
50
50
@@ -0,0 +1,16 @@
51
51
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
52
52
+<ShortName>Google</ShortName>
66
66
+</SearchPlugin>
67
67
Index: mozilla/l10n/en-ZA/browser/searchplugins/list.txt
68
68
===================================================================
69
 
--- mozilla.orig/l10n/en-ZA/browser/searchplugins/list.txt      2012-04-25 22:47:22.000000000 +0100
70
 
+++ mozilla/l10n/en-ZA/browser/searchplugins/list.txt   2012-04-26 10:41:21.983947363 +0100
 
69
--- mozilla.orig/l10n/en-ZA/browser/searchplugins/list.txt      2012-06-05 21:18:27.000000000 +0100
 
70
+++ mozilla/l10n/en-ZA/browser/searchplugins/list.txt   2012-06-05 22:16:33.907665479 +0100
71
71
@@ -1,6 +1,6 @@
72
72
 amazondotcom
73
73
 bing
78
78
 yahoo
79
79
Index: mozilla/browser/locales/en-US/searchplugins/google.xml
80
80
===================================================================
81
 
--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2012-04-25 22:40:11.000000000 +0100
82
 
+++ mozilla/browser/locales/en-US/searchplugins/google.xml      2012-04-26 10:41:21.983947363 +0100
83
 
@@ -1,13 +1,5 @@
 
81
--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2012-06-05 21:10:38.000000000 +0100
 
82
+++ mozilla/browser/locales/en-US/searchplugins/google.xml      2012-06-05 22:16:33.907665479 +0100
 
83
@@ -1,34 +1,15 @@
84
84
-#define GOOGLE_PARAMS <Param name="q" value="{searchTerms}"/><Param name="ie" value="utf-8"/><Param name="oe" value="utf-8"/><Param name="aq" value="t"/><Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
85
85
-#if MOZ_UPDATE_CHANNEL == beta
86
86
-#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
96
96
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
97
97
 <ShortName>Google</ShortName>
98
98
 <Description>Google Search</Description>
99
 
@@ -17,18 +9,7 @@
100
 
 <Url type="text/html" method="GET" template="http://www.google.com/search">
 
99
 <InputEncoding>UTF-8</InputEncoding>
 
100
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
 
101
-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 
102
-<Url type="text/html" method="GET" template="https://www.google.com/search">
 
103
+<Url type="application/x-suggestions+json" method="GET" template="http://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
 
104
+<Url type="text/html" method="GET" template="http://www.google.com/search">
101
105
 #expand   __GOOGLE_PARAMS__
102
106
 #expand   __GOOGLE_CLIENT_PARAM__
103
 
-</Url>
 
107
+<Param name="channel" value="fs"/>
 
108
 </Url>
104
109
-<!-- Keyword search URL is the same as the default, but with an additional parameter -->
105
 
-<Url type="application/x-moz-keywordsearch" method="GET" template="http://www.google.com/search">
 
110
-<Url type="application/x-moz-keywordsearch" method="GET" template="https://www.google.com/search">
106
111
-#expand   __GOOGLE_PARAMS__
107
112
-#expand   __GOOGLE_CLIENT_PARAM__
108
113
-  <Param name="channel" value="fflb"/>
109
114
-</Url>
110
115
-<!-- Context/Right-click search URL is the same as the default, but with an additional parameter -->
111
 
-<Url type="application/x-moz-contextsearch" method="GET" template="http://www.google.com/search">
 
116
-<Url type="application/x-moz-contextsearch" method="GET" template="https://www.google.com/search">
112
117
-#expand   __GOOGLE_PARAMS__
113
118
-#expand   __GOOGLE_CLIENT_PARAM__
114
119
-  <Param name="channel" value="rcs"/>
115
 
+<Param name="channel" value="fs"/>
116
 
 </Url>
117
 
 <SearchForm>http://www.google.com/</SearchForm>
 
120
-</Url>
 
121
-<SearchForm>https://www.google.com/</SearchForm>
 
122
+<SearchForm>http://www.google.com/</SearchForm>
118
123
 </SearchPlugin>
119
124
Index: mozilla/l10n/en-GB/browser/searchplugins/list.txt
120
125
===================================================================
121
 
--- mozilla.orig/l10n/en-GB/browser/searchplugins/list.txt      2012-04-25 22:47:09.000000000 +0100
122
 
+++ mozilla/l10n/en-GB/browser/searchplugins/list.txt   2012-04-26 10:41:21.983947363 +0100
 
126
--- mozilla.orig/l10n/en-GB/browser/searchplugins/list.txt      2012-06-05 21:18:16.000000000 +0100
 
127
+++ mozilla/l10n/en-GB/browser/searchplugins/list.txt   2012-06-05 22:16:33.911665479 +0100
123
128
@@ -2,7 +2,7 @@
124
129
 bing
125
130
 chambers-en-GB
131
136
 yahoo-en-GB
132
137
Index: mozilla/l10n/ja/browser/searchplugins/google-jp.xml
133
138
===================================================================
134
 
--- mozilla.orig/l10n/ja/browser/searchplugins/google-jp.xml    2012-04-25 22:51:37.000000000 +0100
135
 
+++ mozilla/l10n/ja/browser/searchplugins/google-jp.xml 2012-04-26 10:41:21.983947363 +0100
136
 
@@ -1,13 +1,5 @@
 
139
--- mozilla.orig/l10n/ja/browser/searchplugins/google-jp.xml    2012-06-05 21:24:02.000000000 +0100
 
140
+++ mozilla/l10n/ja/browser/searchplugins/google-jp.xml 2012-06-05 22:16:33.911665479 +0100
 
141
@@ -1,35 +1,16 @@
137
142
-#define GOOGLE_PARAMS <Param name="q" value="{searchTerms}"/><Param name="ie" value="utf-8"/><Param name="oe" value="utf-8"/><Param name="aq" value="t"/><Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/><Param name="hl" value="ja"/><!-- <Param name="lr" value="lang_ja"/><Param name="num" value="100"/> -->
138
143
-#if MOZ_UPDATE_CHANNEL == beta
139
144
-#define GOOGLE_CLIENT_PARAM <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/>
149
154
 <?xml version="1.0" encoding="UTF-8"?>
150
155
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
151
156
 <ShortName>Google</ShortName>
152
 
@@ -18,18 +10,7 @@
153
 
 <Url type="text/html" method="GET" template="http://www.google.co.jp/search">
 
157
 <Description>Google Search</Description>
 
158
 <InputEncoding>UTF-8</InputEncoding>
 
159
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
 
160
-<Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl=ja&amp;qu={searchTerms}"/><!-- suggestqueries.google.co.jp doesn't exist and suggestqueries.google.com can handle Japanese too -->
 
161
-<Url type="text/html" method="GET" template="https://www.google.co.jp/search">
 
162
+<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl=ja&amp;qu={searchTerms}"/><!-- suggestqueries.google.co.jp doesn't exist and suggestqueries.google.com can handle Japanese too -->
 
163
+<Url type="text/html" method="GET" template="http://www.google.co.jp/search">
154
164
 #expand   __GOOGLE_PARAMS__
155
165
 #expand   __GOOGLE_CLIENT_PARAM__
156
 
-</Url>
 
166
+  <Param name="channel" value="fs"/>
 
167
 </Url>
157
168
-<!-- Keyword search URL is the same as the default, but with an additional parameter -->
158
 
-<Url type="application/x-moz-keywordsearch" method="GET" template="http://www.google.co.jp/search">
 
169
-<Url type="application/x-moz-keywordsearch" method="GET" template="https://www.google.co.jp/search">
159
170
-#expand   __GOOGLE_PARAMS__
160
171
-#expand   __GOOGLE_CLIENT_PARAM__
161
172
-  <Param name="channel" value="fflb"/>
162
173
-</Url>
163
174
-<!-- Context/Right-click search URL is the same as the default, but with an additional parameter -->
164
 
-<Url type="application/x-moz-contextsearch" method="GET" template="http://www.google.co.jp/search">
 
175
-<Url type="application/x-moz-contextsearch" method="GET" template="https://www.google.co.jp/search">
165
176
-#expand   __GOOGLE_PARAMS__
166
177
-#expand   __GOOGLE_CLIENT_PARAM__
167
178
-  <Param name="channel" value="rcs"/>
168
 
+<Param name="channel" value="fs"/>
169
 
 </Url>
170
 
 <SearchForm>http://www.google.co.jp/</SearchForm>
 
179
-</Url>
 
180
-<SearchForm>https://www.google.co.jp/</SearchForm>
 
181
+<SearchForm>http://www.google.co.jp/</SearchForm>
171
182
 </SearchPlugin>
172
183
Index: mozilla/l10n/ku/browser/searchplugins/google-ku.xml
173
184
===================================================================
174
 
--- mozilla.orig/l10n/ku/browser/searchplugins/google-ku.xml    2012-04-25 22:52:44.000000000 +0100
175
 
+++ mozilla/l10n/ku/browser/searchplugins/google-ku.xml 2012-04-26 10:42:53.947945729 +0100
176
 
@@ -8,11 +8,9 @@
 
185
--- mozilla.orig/l10n/ku/browser/searchplugins/google-ku.xml    2012-06-05 21:25:40.000000000 +0100
 
186
+++ mozilla/l10n/ku/browser/searchplugins/google-ku.xml 2012-06-05 22:18:02.079662401 +0100
 
187
@@ -5,14 +5,12 @@
 
188
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
 
189
 <Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl=en&amp;q={searchTerms}"/>
 
190
 <Url type="text/html" method="GET" template="http://www.google.com/search">
 
191
+  <Param name="client" value="ubuntu"/>
 
192
+  <Param name="channel" value="fs"/>
177
193
   <Param name="q" value="{searchTerms}"/>
178
194
   <Param name="ie" value="utf-8"/>
179
195
   <Param name="oe" value="utf-8"/>
182
198
-  <!-- Dynamic parameters -->
183
199
-  <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
184
200
-  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
185
 
+  <Param name="client" value="ubuntu"/>
186
 
+  <Param name="channel" value="fs"/>
187
201
 </Url>
188
202
 <SearchForm>http://www.google.com/webhp?hl=en</SearchForm>
189
203
 </SearchPlugin>