Merge lp://staging/~cmiller/firefox/googapi into lp://staging/firefox
Status: | Rejected |
---|---|
Rejected by: | Nathan Teodosio |
Proposed branch: | lp://staging/~cmiller/firefox/googapi |
Merge into: | lp://staging/firefox |
Diff against target: |
21407 lines (+20306/-132) (has conflicts) 140 files modified
.bzrignore (+4/-0) debian/README.Debian.in (+15/-0) debian/README.source (+5/-0) debian/apport/blacklist.in (+4/-0) debian/apport/native-origins.in (+3/-0) debian/apport/source_firefox.py.in.OTHER (+1482/-0) debian/build/Expression.py (+188/-0) debian/build/Preprocessor.py (+452/-0) debian/build/config.mk (+57/-0) debian/build/create-tarball.py (+334/-0) debian/build/dump-langpack-control-entries.pl (+51/-0) debian/build/fix-mozinfo-appname.py (+42/-0) debian/build/keepalive-wrapper.py (+91/-0) debian/build/refresh-supported-locales.pl (+156/-0) debian/build/rules.mk (+423/-0) debian/build/testsuite.mk (+74/-0) debian/build/xpi-id.py (+22/-0) debian/changelog (+3879/-125) debian/compat (+4/-0) debian/config/branch.mk (+10/-0) debian/config/locales.all (+78/-0) debian/config/locales.blacklist (+10/-0) debian/config/locales.shipped (+82/-0) debian/config/mozconfig.in (+83/-0) debian/config/searchplugins.conf (+83/-0) debian/config/tarball.conf (+36/-0) debian/control (+927/-0) debian/control.in.OTHER (+182/-0) debian/control.langpacks (+10/-0) debian/control.langpacks.unavail (+11/-0) debian/copyright (+741/-0) debian/distribution.ini.OTHER (+9/-0) debian/firefox-dev.install.in (+11/-0) debian/firefox-dev.links.in (+12/-0) debian/firefox-locale.preinst.in (+23/-0) debian/firefox-mozsymbols.install.in (+3/-0) debian/firefox-testsuite.install.in (+14/-0) debian/firefox-testsuite.links.in (+1/-0) debian/firefox-testsuite.lintian-overrides.in (+1/-0) debian/firefox.1.in (+71/-0) debian/firefox.desktop.in (+226/-0) debian/firefox.dirs.in.OTHER (+8/-0) debian/firefox.install.in.OTHER (+44/-0) debian/firefox.links.in (+22/-7) debian/firefox.lintian-overrides.in (+6/-0) debian/firefox.manpages.in (+1/-0) debian/firefox.postinst.in (+130/-0) debian/firefox.preinst.in (+112/-0) debian/firefox.prerm.in (+8/-0) debian/firefox.sh.in.OTHER (+117/-0) debian/ga (+1/-0) debian/go (+1/-0) debian/install-distribution-searchplugins.py (+116/-0) debian/patches/allow-lockPref-everywhere.patch (+125/-0) debian/patches/disable-geo-specific-search-defaults-for-us.patch (+18/-0) debian/patches/dont-override-general-useragent-locale.patch (+22/-0) debian/patches/fix-make-package-tests-without-webrtc.patch (+17/-0) debian/patches/normalize-distribution-searchplugins.patch (+35/-0) debian/patches/revert-upstream-search-engine-changes.patch (+15/-0) debian/patches/series.OTHER (+24/-0) debian/patches/set-prgname-to-remoting-name.patch (+19/-0) debian/patches/support-coinstallable-trunk-build.patch (+38/-0) debian/patches/test-fixes/mochitest-content-reset-permissions-when-done.patch (+18/-0) debian/patches/test-fixes/xpcshell-chrome-fix-test_bug848297-with-locale-matchOS.patch (+17/-0) debian/patches/test-fixes/xpcshell-exthandler-no-writes-to-appdir.patch (+67/-0) debian/patches/test-fixes/xpcshell-search-fix-tests-when-plugins-are-not-in-appdir.patch (+110/-0) debian/patches/test-fixes/xpcshell-xunit-output-no-bell.patch (+17/-0) debian/patches/test-integration/automation-output-junit-xml.patch (+449/-0) debian/patches/test-integration/mochitest-allow-test-manifest-for-browser-chrome.patch (+43/-0) debian/patches/test-integration/xpcshell-disable-addon-select-dialog-test-for-adt.patch (+31/-0) debian/patches/test-integration/xpcshell-disable-tests-which-need-appdir-write-access.patch (+40/-0) debian/patches/test-integration/xpcshell-dont-return-nonzero-on-test-failure.patch (+44/-0) debian/patches/test-integration/xpcshell-output-valid-junit-xml.patch (+30/-0) debian/patches/test-integration/xpcshell-write-time-for-failed-test.patch (+28/-0) debian/patches/ubuntu-bookmarks.patch.OTHER (+37/-0) debian/patches/ubuntu-search-defaults.patch (+55/-0) debian/patches/ubuntu-ua-string-changes.patch (+78/-0) debian/patches/unity-menubar.patch (+5707/-0) debian/pkgconfig/mozilla-plugin.pc.in (+8/-0) debian/rules (+127/-0) debian/searchplugins/de/amazondotcom-de.xml (+13/-0) debian/searchplugins/en-GB/amazon-en-GB.xml (+13/-0) debian/searchplugins/en-GB/google.xml (+16/-0) debian/searchplugins/en-US/amazondotcom.xml (+17/-0) debian/searchplugins/en-US/duckduckgo.xml (+10/-0) debian/searchplugins/en-US/google.xml (+15/-0) debian/searchplugins/en-ZA/google.xml (+16/-0) debian/searchplugins/fr/amazon-france.xml (+13/-0) debian/searchplugins/it/amazon-it.xml (+13/-0) debian/searchplugins/ja/amazon-jp.xml (+27/-0) debian/searchplugins/ku/google-ku.xml (+16/-0) debian/searchplugins/sq/amazon-en-GB.xml (+13/-0) debian/searchplugins/zh-CN/amazondotcn.xml (+17/-0) debian/searchplugins/zh-CN/baidu.xml (+14/-0) debian/source/format (+4/-0) debian/source/options (+3/-0) debian/syspref.js (+4/-0) debian/testing/extra/mochitest/mochitest-a11y.json (+7/-0) debian/testing/extra/mochitest/mochitest-browser-chrome.json (+23/-0) debian/testing/extra/mochitest/mochitest-chrome.json (+7/-0) debian/testing/extra/mochitest/mochitest.json (+18/-0) debian/testing/extra/xpcshell/package-tests/head_package_tests.js (+192/-0) debian/testing/extra/xpcshell/package-tests/test_langpack_chrome.js (+50/-0) debian/testing/extra/xpcshell/package-tests/test_langpack_load.js (+41/-0) debian/testing/extra/xpcshell/package-tests/test_locale_matchOS.js (+39/-0) debian/testing/extra/xpcshell/package-tests/test_locale_matchOS_real.js (+34/-0) debian/testing/extra/xpcshell/package-tests/test_searchplugins_valid.js (+30/-0) debian/testing/extra/xpcshell/package-tests/test_searchplugins_valid_real.js (+36/-0) debian/testing/extra/xpcshell/package-tests/test_ubuntu_searchplugins.js (+30/-0) debian/testing/extra/xpcshell/package-tests/test_ubuntu_searchplugins_real.js (+259/-0) debian/testing/extra/xpcshell/package-tests/test_ubuntu_useragent.js (+16/-0) debian/testing/extra/xpcshell/package-tests/xpcshell.ini (+11/-0) debian/testing/filter_results (+244/-0) debian/testing/results-filter-manifest.json (+123/-0) debian/testing/run_mochitest.in (+73/-0) debian/testing/run_reftest.in (+41/-0) debian/testing/run_xpcshell_tests (+67/-0) debian/testing/testrunhelper.py (+262/-0) debian/testing/xpcshell-build.ini (+20/-0) debian/tests/control.in (+2/-0) debian/tests/crashtest (+11/-0) debian/tests/jstestbrowser (+14/-0) debian/tests/mochitest-1 (+12/-0) debian/tests/mochitest-2 (+12/-0) debian/tests/mochitest-3 (+12/-0) debian/tests/mochitest-4 (+12/-0) debian/tests/mochitest-5 (+12/-0) debian/tests/mochitest-a11y (+12/-0) debian/tests/mochitest-browser (+12/-0) debian/tests/mochitest-chrome (+12/-0) debian/tests/mochitest-ipcplugins (+12/-0) debian/tests/post-process (+8/-0) debian/tests/reftest (+11/-0) debian/tests/xpcshell-package-tests (+11/-0) debian/tests/xpcshell-tests (+11/-0) debian/usr.bin.firefox.apparmor.12.04 (+170/-0) debian/usr.bin.firefox.apparmor.13.10 (+173/-0) debian/usr.bin.firefox.apparmor.14.10 (+227/-0) debian/vendor-firefox.js (+10/-0) debian/vendor-gre.js (+8/-0) Text conflict in .bzrignore Conflict adding files to debian/apport. Created directory. Conflict because debian/apport is not versioned, but has versioned children. Versioned directory. Contents conflict in debian/apport/source_firefox.py.in Text conflict in debian/changelog Text conflict in debian/compat Text conflict in debian/config/branch.mk Text conflict in debian/config/locales.all Text conflict in debian/config/locales.blacklist Text conflict in debian/config/locales.shipped Text conflict in debian/config/mozconfig.in Text conflict in debian/config/tarball.conf Text conflict in debian/control Contents conflict in debian/control.in Text conflict in debian/copyright Contents conflict in debian/distribution.ini Path conflict: debian/firefox.desktop / debian/firefox.desktop.in Text conflict in debian/firefox.desktop.in Contents conflict in debian/firefox.dirs.in Contents conflict in debian/firefox.install.in Text conflict in debian/firefox.links.in Path conflict: debian/firefox.lintian-overrides / debian/firefox.lintian-overrides.in Text conflict in debian/firefox.lintian-overrides.in Path conflict: debian/firefox.postinst / debian/firefox.postinst.in Text conflict in debian/firefox.postinst.in Path conflict: debian/firefox.preinst / debian/firefox.preinst.in Text conflict in debian/firefox.preinst.in Path conflict: debian/firefox.prerm / debian/firefox.prerm.in Text conflict in debian/firefox.prerm.in Contents conflict in debian/firefox.sh.in Conflict adding files to debian/patches. Created directory. Conflict because debian/patches is not versioned, but has versioned children. Versioned directory. Contents conflict in debian/patches/series Contents conflict in debian/patches/ubuntu-bookmarks.patch Text conflict in debian/rules Text conflict in debian/source/format |
To merge this branch: | bzr merge lp://staging/~cmiller/firefox/googapi |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mozilla Team | Pending | ||
Review via email: mp+434281@code.staging.launchpad.net |
Description of the change
Welll
Oh well
Unmerged revisions
- 2054. By Chad Miller
-
Update GOOG API keys for Ubuntu distro.
- 2053. By Rico Tzschichholz
-
* Add Kaqchikel language pack
- update debian/config/ locales. all
- update debian/config/ locales. shipped
- update debian/control
- update debian/config/ searchplugins. conf - 2052. By Chris Coulson
-
releasing package firefox-trunk version 50.0~a1~
hg20160801r3075 08-0ubuntu1 - 2051. By Chris Coulson
-
* Refresh patches:
- update debian/patches/ allow-lockPref- everywhere. patch
- update debian/patches/ support- coinstallable- trunk-build. patch - 2050. By Chris Coulson
-
* Disable startup notification for now
- update debian/config/ mozconfig. in - 2049. By Chris Coulson
-
Remove google-jp searchplugin
- 2048. By Chris Coulson
-
releasing package firefox-trunk version 49.0~a1~
hg20160602r3000 71-0ubuntu1 - 2047. By Chris Coulson
-
Update debian/
config/ searchplugins. conf now that ja uses the en-US version
of the Google search plugin - 2046. By Chris Coulson
-
update debian/
patches/ unity-menubar. patch - 2045. By Chris Coulson
-
* Refresh patches:
- update debian/patches/ allow-lockPref- everywhere. patch