← 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-03-08 11:50:00 UTC
  • Revision ID: ricotz@ubuntu.com-20170308115000-1wrt5h8i66xu8ph4
releasing package firefox version 53.0~b1+build1-0ubuntu0.17.04.1

[ Chris Coulson ]
* Update unity-menubar.patch with the latest version submitted upstream
* Build with --disable-rust for now
* Stop installing the NPAPI headers and make firefox-dev a transitional
  package
  - update debian/build/rules.mk
  - update debian/rules
  - update debian/control{,.in}
  - remove debian/firefox-dev.install.in
  - remove debian/firefox-dev.links.in
  - remove debian/pkgconfig/mozilla-plugin.pc.in
* Add Urdu language pack
* Refresh patches
  - update debian/patches/revert-upstream-search-engine-changes.patch
  - update debian/patches/unity-menubar.patch

[ Rico Tzschichholz ]
* New upstream release from the beta channel (FIREFOX_53_0b1_BUILD1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-upstream-search-engine-changes.patch
1
 
Index: firefox-trunk-52.0~a1~hg20161106r321308/browser/locales/search/list.json
 
1
Index: firefox-53.0~a2~hg20170302r359591/browser/locales/search/list.json
2
2
===================================================================
3
 
--- firefox-trunk-52.0~a1~hg20161106r321308.orig/browser/locales/search/list.json
4
 
+++ firefox-trunk-52.0~a1~hg20161106r321308/browser/locales/search/list.json
5
 
@@ -13,12 +13,12 @@
6
 
       },
7
 
       "US": {
8
 
         "visibleDefaultEngines": [
9
 
-          "yahoo", "google-nocodes", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
10
 
+          "yahoo", "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
11
 
         ]
12
 
       },
13
 
       "CA": {
14
 
         "visibleDefaultEngines": [
15
 
-          "google-nocodes", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
16
 
+          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
17
 
         ]
18
 
       },
19
 
       "experimental-hidden": {
20
 
@@ -399,27 +399,27 @@
21
 
       },
22
 
       "KZ": {
23
 
         "visibleDefaultEngines": [
24
 
-          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
25
 
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
26
 
         ]
27
 
       },
28
 
       "BY": {
29
 
         "visibleDefaultEngines": [
30
 
-          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
31
 
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
32
 
         ]
33
 
       },
34
 
       "RU": {
35
 
         "visibleDefaultEngines": [
36
 
-          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
37
 
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
38
 
         ]
39
 
       },
40
 
       "TR": {
41
 
         "visibleDefaultEngines": [
42
 
-          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
43
 
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
44
 
         ]
45
 
       },
46
 
       "UA": {
47
 
         "visibleDefaultEngines": [
48
 
-          "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
49
 
+          "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk"
50
 
         ]
51
 
       }
52
 
     },
53
 
@@ -599,27 +599,27 @@
54
 
       },
55
 
       "RU": {
56
 
         "visibleDefaultEngines": [
57
 
-          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
58
 
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
59
 
         ]
60
 
       },
61
 
       "BY": {
62
 
         "visibleDefaultEngines": [
63
 
-          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
64
 
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
65
 
         ]
66
 
       },
67
 
       "KZ": {
68
 
         "visibleDefaultEngines": [
69
 
-          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
70
 
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
71
 
         ]
72
 
       },
73
 
       "TR": {
74
 
         "visibleDefaultEngines": [
75
 
-          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
76
 
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
77
 
         ]
78
 
       },
79
 
       "UA": {
80
 
         "visibleDefaultEngines": [
81
 
-          "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
82
 
+          "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru"
83
 
         ]
84
 
       }
85
 
     },
86
 
@@ -708,27 +708,27 @@
87
 
       },
88
 
       "TR": {
89
 
         "visibleDefaultEngines": [
90
 
-          "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
91
 
+          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
92
 
         ]
93
 
       },
94
 
       "BY": {
95
 
         "visibleDefaultEngines": [
96
 
-          "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
97
 
+          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
98
 
         ]
99
 
       },
100
 
       "KZ": {
101
 
         "visibleDefaultEngines": [
102
 
-          "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
103
 
+          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
104
 
         ]
105
 
       },
106
 
       "RU": {
107
 
         "visibleDefaultEngines": [
108
 
-          "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
109
 
+          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
110
 
         ]
111
 
       },
112
 
       "UA": {
113
 
         "visibleDefaultEngines": [
114
 
-          "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr"
115
 
+          "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr"
116
 
         ]
117
 
       }
118
 
     },
119
 
@@ -740,27 +740,27 @@
120
 
       },
121
 
       "UA": {
122
 
         "visibleDefaultEngines": [
123
 
-          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
124
 
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
125
 
         ]
126
 
       },
127
 
       "TR": {
128
 
         "visibleDefaultEngines": [
129
 
-          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
130
 
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
131
 
         ]
132
 
       },
133
 
       "BY": {
134
 
         "visibleDefaultEngines": [
135
 
-          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
136
 
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
137
 
         ]
138
 
       },
139
 
       "KZ": {
140
 
         "visibleDefaultEngines": [
141
 
-          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
142
 
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
143
 
         ]
144
 
       },
145
 
       "RU": {
146
 
         "visibleDefaultEngines": [
147
 
-          "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
148
 
+          "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket"
149
 
         ]
150
 
       }
151
 
     },
152
 
@@ -807,52 +807,52 @@
153
 
       },
154
 
       "CN": {
155
 
         "visibleDefaultEngines": [
156
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
157
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
158
 
         ]
159
 
       },
160
 
       "TW": {
161
 
         "visibleDefaultEngines": [
162
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
163
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
164
 
         ]
165
 
       },
166
 
       "HK": {
167
 
         "visibleDefaultEngines": [
168
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
169
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
170
 
         ]
171
 
       },
172
 
       "US": {
173
 
         "visibleDefaultEngines": [
174
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
175
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
176
 
         ]
177
 
       },
178
 
       "CA": {
179
 
         "visibleDefaultEngines": [
180
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
181
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
182
 
         ]
183
 
       },
184
 
       "KZ": {
185
 
         "visibleDefaultEngines": [
186
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
187
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
188
 
         ]
189
 
       },
190
 
       "BY": {
191
 
         "visibleDefaultEngines": [
192
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
193
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
194
 
         ]
195
 
       },
196
 
       "RU": {
197
 
         "visibleDefaultEngines": [
198
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
199
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
200
 
         ]
201
 
       },
202
 
       "TR": {
203
 
         "visibleDefaultEngines": [
204
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
205
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
206
 
         ]
207
 
       },
208
 
       "UA": {
209
 
         "visibleDefaultEngines": [
210
 
-          "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
211
 
+          "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
212
 
         ]
213
 
       }
214
 
     },
215
 
@@ -864,12 +864,12 @@
216
 
       },
217
 
       "TW": {
218
 
         "visibleDefaultEngines": [
219
 
-          "yahoo-zh-TW", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
220
 
+          "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
221
 
         ]
222
 
       },
223
 
       "HK": {
224
 
         "visibleDefaultEngines": [
225
 
-          "yahoo-zh-TW-HK", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
226
 
+          "yahoo-zh-TW-HK", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
227
 
         ]
228
 
       }
229
 
     }
 
3
--- firefox-53.0~a2~hg20170302r359591.orig/browser/locales/search/list.json
 
4
+++ firefox-53.0~a2~hg20170302r359591/browser/locales/search/list.json
 
5
@@ -5,36 +5,6 @@
 
6
     ]
 
7
   },
 
8
   "regionOverrides": {
 
9
-    "US": {
 
10
-      "google": "google-nocodes"
 
11
-    },
 
12
-    "CA": {
 
13
-      "google": "google-nocodes"
 
14
-    },
 
15
-    "KZ": {
 
16
-      "google": "google-nocodes"
 
17
-    },
 
18
-    "BY": {
 
19
-      "google": "google-nocodes"
 
20
-    },
 
21
-    "RU": {
 
22
-      "google": "google-nocodes"
 
23
-    },
 
24
-    "TR": {
 
25
-      "google": "google-nocodes"
 
26
-    },
 
27
-    "UA": {
 
28
-      "google": "google-nocodes"
 
29
-    },
 
30
-    "CN": {
 
31
-      "google": "google-nocodes"
 
32
-    },
 
33
-    "TW": {
 
34
-      "google": "google-nocodes"
 
35
-    },
 
36
-    "HK": {
 
37
-      "google": "google-nocodes"
 
38
-    }
 
39
   },
 
40
   "locales": {
 
41
     "en-US": {