Merge lp:~rohangarg/firefox/firefox.xenial into lp:~mozillateam/firefox/firefox.xenial

[Rohan Garg]

Unmerged revisions

1160. By Rohan Garg on 2016-05-17

Update debian/config/searchplugins.conf now that ja uses the en-US version
of the Google search plugin

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-04 21:31:27 +0000
+++ debian/changelog	2016-05-17 20:55:55 +0000
@@ -1,8 +1,11 @@
-firefox (46.0.1+build1-0ubuntu0.16.04.1) xenial-security; urgency=medium
+firefox (46.0.1+build1-0ubuntu0.16.04.2) xenial-security; urgency=medium
 
   * New upstream stable release (46.0.1build1)
     - see USN-2936-2
 
+  * Update debian/config/searchplugins.conf now that ja uses the en-US version
+    of the Google search plugin
+
  -- Chris Coulson <[e-mail]>  Wed, 04 May 2016 22:18:44 +0100
 
 firefox (46.0+build5-0ubuntu0.16.04.2) xenial-security; urgency=medium

=== modified file 'debian/config/searchplugins.conf'
--- debian/config/searchplugins.conf	2016-03-02 20:39:40 +0000
+++ debian/config/searchplugins.conf	2016-05-17 20:55:55 +0000
@@ -71,11 +71,6 @@
           "source": "en-ZA/google.xml"
         },
         {
-          "locales": [ "ja" ],
-          "match": "google-jp.xml",
-          "source": "ja/google-jp.xml"
-        },
-        {
           "locales": [ "ku" ],
           "match": "google.xml",
           "source": "ku/google-ku.xml"

=== removed file 'debian/searchplugins/ja/google-jp.xml'
--- debian/searchplugins/ja/google-jp.xml	2013-01-08 12:48:17 +0000
+++ debian/searchplugins/ja/google-jp.xml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Google</ShortName>
-<Description>Google Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg==</Image>
-<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;hl=ja&amp;q={searchTerms}"/>
-<Url type="text/html" method="GET" template="https://www.google.co.jp/search">
-  <Param name="client" value="ubuntu"/>
-  <Param name="channel" value="fs"/>
-  <Param name="q" value="{searchTerms}"/>
-  <!-- <Param name="lr" value="lang_ja"/> -->
-  <!-- <Param name="num" value="100"/> -->
-  <Param name="ie" value="utf-8"/>
-  <Param name="oe" value="utf-8"/>
-  <Param name="hl" value="ja"/>
-</Url>
-<SearchForm>https://www.google.co.jp/</SearchForm>
-</SearchPlugin>