← Back to branch summary

~mozillateam/firefox/firefox.disco

« back to all changes in this revision

Viewing changes to debian/config/searchplugins.conf

  • Committer: Rico Tzschichholz
  • Date: 2018-12-13 08:12:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1248.
  • Revision ID: ricotz@ubuntu.com-20181213081217-dmr3rms4tmsvik8g
* New upstream release from the beta channel (FIREFOX_65_0b4_BUILD1)
* Drop upstreamed patches
  - remove debian/patches/fix-pixman-build-ppc64el.patch
  - remove debian/patches/extra-webrtc-build-configs.patch
  - remove debian/patches/update-gn-mozbuild.patch
* Update patches
  - debian/patches/rust-drop-dll-checksums.patch
  - debian/patches/webrtc-fix-compiler-flags-for-armhf.patch
  - debian/patches/fix-armhf-webrtc-build.patch
  - debian/patches/no-region-overrides-for-google-search.patch
  - debian/patches/ppc-no-static-sizes.patch
  - debian/patches/ubuntu-ua-string-changes.patch
* Bump build-dep on rustc >= 1.30.0 and cargo >= 0.31
* Use amazon-in override for "gu-IN", "mai", "ml", "pa-IN", "ta"
  - update debian/config/searchplugins.conf
* Do not attach Wi-Fi syslog to apport reports (LP: #1801383)
  - update debian/apport/source_firefox.py.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/config/searchplugins.conf
2
2
  "overrides": [
3
3
    {
4
4
      "name": "Amazon",
5
 
      "include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "ia", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mk", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "ur", "uz", "zh-CN", "zu"],
 
5
      "include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "gu-IN", "hr", "hsb", "hy-AM", "ia", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mai", "mk", "ml", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pa-IN", "pt-PT", "ro", "si", "son", "sq", "sr", "ta", "te", "th", "ur", "uz", "zh-CN", "zu"],
6
6
      "engines": [ "amazondotcom", "amazon-france", "amazon-en-GB", "amazondotcom-de", "amazon-it", "amazon-jp", "amazon-in", "amazondotcn" ]
7
7
    },
8
8
    {