Chromium Code Reviews| Index: chrome/installer/linux/debian/build.sh |
| diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh |
| index 4db53cb98b3dd8fa25bac913eef8a387efc4b617..b25a7573396b6a87911295e4fd149c2c3ea6f64b 100755 |
| --- a/chrome/installer/linux/debian/build.sh |
| +++ b/chrome/installer/linux/debian/build.sh |
| @@ -65,11 +65,7 @@ stage_install_debian() { |
| # Avoid file collisions between channels. |
| local INSTALLDIR="${INSTALLDIR}-${CHANNEL}" |
| - # TODO(phajdan.jr): Do that for all packages for SxS, |
| - # http://crbug.com/38598 . |
| - if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then |
| - local PACKAGE="${PACKAGE}-${CHANNEL}" |
| - fi |
| + local PACKAGE="${PACKAGE}-${CHANNEL}" |
| # Make it possible to distinguish between menu entries |
| # for different channels. |
| @@ -104,13 +100,9 @@ do_package() { |
| echo "Packaging ${ARCHITECTURE}..." |
| PREDEPENDS="$COMMON_PREDEPS" |
| DEPENDS="${COMMON_DEPS}" |
| - # Trunk is a special package, mostly for development testing, so don't make |
| - # it replace any installed release packages. |
| - if [ "$CHANNEL" != "trunk" ] && [ "$CHANNEL" != "asan" ]; then |
| - REPLACES="${PACKAGE}" |
| - CONFLICTS="${PACKAGE}" |
| - PROVIDES="${PACKAGE}, www-browser" |
|
Lei Zhang
2014/01/23 21:31:30
Can multiple packages provide "google-chrome" SXS?
Paweł Hajdan Jr.
2014/01/29 19:03:23
Done.
|
| - fi |
| + REPLACES="" |
| + CONFLICTS="" |
| + PROVIDES="www-browser" |
| gen_changelog |
| process_template "${SCRIPTDIR}/control.template" "${DEB_CONTROL}" |
| export DEB_HOST_ARCH="${ARCHITECTURE}" |