← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/patches/revert-upstream-search-engine-changes.patch

  • Committer: Rico Tzschichholz
  • Date: 2017-11-14 11:59:37 UTC
  • Revision ID: ricotz@ubuntu.com-20171114115937-eec02juysofd8419
* New upstream release from the beta channel (FIREFOX_58_0b3_BUILD2)
* Adapt to upstream and use ./mach
  - debian/build/rules.mk
* Install EmojiOneMozilla.ttf (LP: #1644021)
  - debian/firefox.install.in
* Update patches
  - debian/patches/allow-lockPref-everywhere.patch
  - debian/patches/revert-upstream-search-engine-changes.patch
* Update revert-upstream-search-engine-changes.patch to ensure we keep the
  region overrides for non-Google plugins
* Update AppArmor profile

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-upstream-search-engine-changes.patch
1
 
Index: firefox-trunk-58.0~a1~hg20171016r386330/browser/locales/search/list.json
 
1
Index: firefox-trunk-58.0~a1~hg20171112r391436/browser/locales/search/list.json
2
2
===================================================================
3
 
--- firefox-trunk-58.0~a1~hg20171016r386330.orig/browser/locales/search/list.json
4
 
+++ firefox-trunk-58.0~a1~hg20171016r386330/browser/locales/search/list.json
5
 
@@ -5,62 +5,6 @@
 
3
--- firefox-trunk-58.0~a1~hg20171112r391436.orig/browser/locales/search/list.json
 
4
+++ firefox-trunk-58.0~a1~hg20171112r391436/browser/locales/search/list.json
 
5
@@ -5,35 +5,10 @@
6
6
     ]
7
7
   },
8
8
   "regionOverrides": {
9
9
-    "US": {
10
10
-      "google": "google-nocodes"
11
11
-    },
12
 
-    "CA": {
 
12
     "CA": {
13
13
-      "google": "google-nocodes",
14
 
-      "ebay": "ebay-ca",
15
 
-      "ebay-fr": "ebay-ca"
16
 
-    },
 
14
       "ebay": "ebay-ca",
 
15
       "ebay-fr": "ebay-ca"
 
16
     },
17
17
-    "KZ": {
18
18
-      "google": "google-nocodes"
19
19
-    },
35
35
-    "HK": {
36
36
-      "google": "google-nocodes"
37
37
-    },
38
 
-    "AT": {
39
 
-      "ebay-de": "ebay-at"
40
 
-    },
41
 
-    "AU": {
42
 
-      "ebay": "ebay-au",
43
 
-      "ebay-uk": "ebay-au"
44
 
-    },
45
 
-    "BE": {
46
 
-      "ebay": "ebay-be",
47
 
-      "ebay-nl": "ebay-be",
48
 
-      "ebay-fr": "ebay-be"
49
 
-    },
50
 
-    "CH": {
51
 
-      "ebay": "ebay-ch",
52
 
-      "ebay-de": "ebay-ch",
53
 
-      "ebay-fr": "ebay-ch"
54
 
-    },
55
 
-    "IE": {
56
 
-      "ebay": "ebay-ie",
57
 
-      "ebay-uk": "ebay-ie"
58
 
-    },
59
 
-    "NL": {
60
 
-      "ebay": "ebay-nl"
61
 
-    },
62
 
-    "GB": {
63
 
-      "ebay": "ebay-uk"
64
 
-    }
65
 
   },
66
 
   "locales": {
67
 
     "en-US": {
 
38
     "AT": {
 
39
       "ebay-de": "ebay-at"
 
40
     },
 
41
@@ -71,7 +71,7 @@
 
42
       },
 
43
       "experimental-hidden": {
 
44
         "visibleDefaultEngines": [
 
45
-          "amazon-ca", "amazon-au", "google-2018", "yahoo-en-CA", "yandex-en"
 
46
+          "yahoo-en-CA", "yandex-en"
 
47
         ]
 
48
       }
 
49
     },
 
50
@@ -274,11 +274,6 @@
 
51
         "visibleDefaultEngines": [
 
52
           "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
 
53
         ]
 
54
-      },
 
55
-      "experimental-hidden": {
 
56
-        "visibleDefaultEngines": [
 
57
-          "amazon-mx"
 
58
-        ]
 
59
       }
 
60
     },
 
61
     "et": {
 
62
@@ -328,11 +323,6 @@
 
63
         "visibleDefaultEngines": [
 
64
           "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
 
65
         ]
 
66
-      },
 
67
-      "experimental-hidden": {
 
68
-        "visibleDefaultEngines": [
 
69
-          "amazon-nl"
 
70
-        ]
 
71
       }
 
72
     },
 
73
     "ga-IE": {
 
74
@@ -592,11 +582,6 @@
 
75
         "visibleDefaultEngines": [
 
76
           "google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
 
77
         ]
 
78
-      },
 
79
-      "experimental-hidden": {
 
80
-        "visibleDefaultEngines": [
 
81
-          "amazon-nl"
 
82
-        ]
 
83
       }
 
84
     },
 
85
     "nn-NO": {
 
86
@@ -639,11 +624,6 @@
 
87
         "visibleDefaultEngines": [
 
88
           "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
 
89
         ]
 
90
-      },
 
91
-      "experimental-hidden": {
 
92
-        "visibleDefaultEngines": [
 
93
-          "amazon-br"
 
94
-        ]
 
95
       }
 
96
     },
 
97
     "pt-PT": {