← Back to branch summary

~ubuntu-branches/ubuntu/precise/firefox/precise-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-01-05 16:43:28 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20120105164328-lq9z15wmfv0o4sy6
Tags: 10.0~b3+build2-0ubuntu1
https://launchpad.net/bugs/897794
* New upstream release from the beta channel (FIREFOX_10_0b3_BUILD2)

* "Fix" LP: #897794 - some websites expect "X11" to be the first token of
  the platform component in the UA string
  - update debian/patches/ubuntu-ua-string-changes.patch
* Defuzz ubuntu-codes-google.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu-codes-google.patch
4
4
 
5
5
Index: mozilla/browser/locales/en-US/searchplugins/google.xml
6
6
===================================================================
7
 
--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2011-09-29 00:55:28.000000000 +0100
8
 
+++ mozilla/browser/locales/en-US/searchplugins/google.xml      2011-09-29 09:42:11.771453063 +0100
 
7
--- mozilla.orig/browser/locales/en-US/searchplugins/google.xml 2012-01-05 16:41:52.120309419 +0000
 
8
+++ mozilla/browser/locales/en-US/searchplugins/google.xml      2012-01-05 16:41:54.608309374 +0000
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}"/>
24
24
 </SearchPlugin>
25
25
Index: mozilla/l10n/bg/browser/searchplugins/google.xml
26
26
===================================================================
27
 
--- mozilla.orig/l10n/bg/browser/searchplugins/google.xml       2011-09-29 01:00:40.000000000 +0100
28
 
+++ mozilla/l10n/bg/browser/searchplugins/google.xml    2011-09-29 09:42:11.771453063 +0100
 
27
--- mozilla.orig/l10n/bg/browser/searchplugins/google.xml       2012-01-05 16:41:52.216309416 +0000
 
28
+++ mozilla/l10n/bg/browser/searchplugins/google.xml    2012-01-05 16:41:54.608309374 +0000
29
29
@@ -5,13 +5,11 @@
30
30
 <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>
31
31
 <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}"/>
44
44
 </SearchPlugin>
45
45
Index: mozilla/l10n/ja/browser/searchplugins/google-jp.xml
46
46
===================================================================
47
 
--- mozilla.orig/l10n/ja/browser/searchplugins/google-jp.xml    2011-09-29 01:10:11.000000000 +0100
48
 
+++ mozilla/l10n/ja/browser/searchplugins/google-jp.xml 2011-09-29 09:42:11.771453063 +0100
 
47
--- mozilla.orig/l10n/ja/browser/searchplugins/google-jp.xml    2012-01-05 16:41:52.200309416 +0000
 
48
+++ mozilla/l10n/ja/browser/searchplugins/google-jp.xml 2012-01-05 16:41:54.608309374 +0000
49
49
@@ -6,16 +6,14 @@
50
50
 <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>
51
51
 <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 -->
67
67
 </SearchPlugin>
68
68
Index: mozilla/l10n/ku/browser/searchplugins/google-ku.xml
69
69
===================================================================
70
 
--- mozilla.orig/l10n/ku/browser/searchplugins/google-ku.xml    2011-09-29 01:12:04.000000000 +0100
71
 
+++ mozilla/l10n/ku/browser/searchplugins/google-ku.xml 2011-09-29 09:42:11.771453063 +0100
 
70
--- mozilla.orig/l10n/ku/browser/searchplugins/google-ku.xml    2012-01-05 16:41:52.236309417 +0000
 
71
+++ mozilla/l10n/ku/browser/searchplugins/google-ku.xml 2012-01-05 16:41:54.612309373 +0000
72
72
@@ -5,14 +5,12 @@
73
73
 <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>
74
74
 <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}"/>
84
84
-  <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
85
85
-  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
86
86
 </Url>
87
 
 <SearchForm>http://www.google.com/firefox?hl=en</SearchForm>
 
87
 <SearchForm>http://www.google.com/webhp?hl=en</SearchForm>
88
88
 </SearchPlugin>
89
89
Index: mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml
90
90
===================================================================
91
91
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
92
 
+++ mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml   2011-09-29 09:42:11.771453063 +0100
 
92
+++ mozilla/l10n/en-GB/browser/searchplugins/google-en-GB.xml   2012-01-05 16:41:54.612309373 +0000
93
93
@@ -0,0 +1,16 @@
94
94
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
95
95
+<ShortName>Google</ShortName>
109
109
+</SearchPlugin>
110
110
Index: mozilla/l10n/en-GB/browser/searchplugins/list.txt
111
111
===================================================================
112
 
--- mozilla.orig/l10n/en-GB/browser/searchplugins/list.txt      2011-09-29 01:03:03.000000000 +0100
113
 
+++ mozilla/l10n/en-GB/browser/searchplugins/list.txt   2011-09-29 09:42:11.771453063 +0100
 
112
--- mozilla.orig/l10n/en-GB/browser/searchplugins/list.txt      2012-01-05 16:41:52.156309417 +0000
 
113
+++ mozilla/l10n/en-GB/browser/searchplugins/list.txt   2012-01-05 16:41:54.612309373 +0000
114
114
@@ -2,6 +2,6 @@
115
115
 bing
116
116
 chambers-en-GB
122
122
Index: mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml
123
123
===================================================================
124
124
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
125
 
+++ mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml   2011-09-29 09:42:11.771453063 +0100
 
125
+++ mozilla/l10n/en-ZA/browser/searchplugins/google-en-ZA.xml   2012-01-05 16:41:54.612309373 +0000
126
126
@@ -0,0 +1,16 @@
127
127
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
128
128
+<ShortName>Google</ShortName>
142
142
+</SearchPlugin>
143
143
Index: mozilla/l10n/en-ZA/browser/searchplugins/list.txt
144
144
===================================================================
145
 
--- mozilla.orig/l10n/en-ZA/browser/searchplugins/list.txt      2011-09-29 01:03:11.000000000 +0100
146
 
+++ mozilla/l10n/en-ZA/browser/searchplugins/list.txt   2011-09-29 09:42:11.771453063 +0100
 
145
--- mozilla.orig/l10n/en-ZA/browser/searchplugins/list.txt      2012-01-05 16:41:52.180309418 +0000
 
146
+++ mozilla/l10n/en-ZA/browser/searchplugins/list.txt   2012-01-05 16:41:54.612309373 +0000
147
147
@@ -1,6 +1,6 @@
148
148
 amazondotcom
149
149
 bing