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

Side by Side Diff: chrome/installer/linux/debian/build.sh

Issue 1286743002: Revert of Linux: Depend on liberation-fonts package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/installer/linux/rpm/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # TODO(mmoss) This currently only works with official builds, since non-official 7 # TODO(mmoss) This currently only works with official builds, since non-official
8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
9 9
10 set -e 10 set -e
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 echo "chrome/installer/linux/debian/expected_deps_ia32" 283 echo "chrome/installer/linux/debian/expected_deps_ia32"
284 echo "chrome/installer/linux/debian/expected_deps_x64" 284 echo "chrome/installer/linux/debian/expected_deps_x64"
285 echo 285 echo
286 exit $BAD_DIFF 286 exit $BAD_DIFF
287 fi 287 fi
288 rm -rf "$DUMMY_STAGING_DIR" 288 rm -rf "$DUMMY_STAGING_DIR"
289 289
290 # Additional dependencies not in the dpkg-shlibdeps output. 290 # Additional dependencies not in the dpkg-shlibdeps output.
291 # - Pull a more recent version of NSS than required by runtime linking, for 291 # - Pull a more recent version of NSS than required by runtime linking, for
292 # security and stability updates in NSS. 292 # security and stability updates in NSS.
293 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, libcurl3, \ 293 ADDITION_DEPS="ca-certificates, libappindicator1, libcurl3, \
294 libnss3 (>= 3.14.3), lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget" 294 libnss3 (>= 3.14.3), lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget"
295 295
296 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 296 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
297 # exists, but it was moved to "universe" repository, which isn't installed by 297 # exists, but it was moved to "universe" repository, which isn't installed by
298 # default). 298 # default).
299 DPKG_SHLIB_DEPS=$(sed \ 299 DPKG_SHLIB_DEPS=$(sed \
300 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 300 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
301 <<< $DPKG_SHLIB_DEPS) 301 <<< $DPKG_SHLIB_DEPS)
302 302
303 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}" 303 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}"
(...skipping 14 matching lines...) Expand all
318 ;; 318 ;;
319 * ) 319 * )
320 echo 320 echo
321 echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'." 321 echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'."
322 echo 322 echo
323 exit 1 323 exit 1
324 ;; 324 ;;
325 esac 325 esac
326 326
327 do_package 327 do_package
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/linux/rpm/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698