diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:47:31 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:47:31 +0000 |
| commit | 364218f4029ea7cedc2a941027e0429b38c7d212 (patch) | |
| tree | 4e90420f1e68e14623e66adf158255c90e336b77 /chrome/installer | |
| parent | 49af89981e483d3458ea83813913323c449ca78c (diff) | |
| download | chromium_src-364218f4029ea7cedc2a941027e0429b38c7d212.zip chromium_src-364218f4029ea7cedc2a941027e0429b38c7d212.tar.gz chromium_src-364218f4029ea7cedc2a941027e0429b38c7d212.tar.bz2 | |
Really enable SxS for Linux
Previously we'd be getting this error:
dpkg: regarding .../google-chrome-unstable_35.0.1887.0-1_amd64.deb containing google-chrome-unstable:
google-chrome-beta conflicts with google-chrome
google-chrome-unstable provides google-chrome and is to be installed.
dpkg: error processing out/Release/google-chrome-unstable_35.0.1887.0-1_amd64.deb (--install):
conflicting packages - not installing google-chrome-unstable
BUG=38598
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/197023005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index eadee7e..b25a757 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -102,7 +102,7 @@ do_package() { DEPENDS="${COMMON_DEPS}" REPLACES="" CONFLICTS="" - PROVIDES="google-chrome, www-browser" + PROVIDES="www-browser" gen_changelog process_template "${SCRIPTDIR}/control.template" "${DEB_CONTROL}" export DEB_HOST_ARCH="${ARCHITECTURE}" |