Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6332)

Unified Diff: chrome_linux/installer/debian/build.sh

Issue 310483004: Roll reference builds to 35.0.1916.114. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/reference_builds/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_linux/installer/common/wrapper ('k') | chrome_linux/installer/debian/expected_deps » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_linux/installer/debian/build.sh
===================================================================
--- chrome_linux/installer/debian/build.sh (revision 273864)
+++ chrome_linux/installer/debian/build.sh (working copy)
@@ -65,11 +65,7 @@
# 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 @@
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"
- fi
+ REPLACES=""
+ CONFLICTS=""
+ PROVIDES="www-browser"
gen_changelog
process_template "${SCRIPTDIR}/control.template" "${DEB_CONTROL}"
export DEB_HOST_ARCH="${ARCHITECTURE}"
« no previous file with comments | « chrome_linux/installer/common/wrapper ('k') | chrome_linux/installer/debian/expected_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698