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

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

Issue 2897033004: Debian package: Add lsb-release to deps (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 exit $BAD_DIFF 299 exit $BAD_DIFF
300 fi 300 fi
301 301
302 # Additional dependencies not in the dpkg-shlibdeps output. 302 # Additional dependencies not in the dpkg-shlibdeps output.
303 # ca-certificates: Make sure users have SSL certificates. 303 # ca-certificates: Make sure users have SSL certificates.
304 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs. 304 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
305 # libappindicator1: Make systray icons work in Unity. 305 # libappindicator1: Make systray icons work in Unity.
306 # libnss3: Pull a more recent version of NSS than required by runtime linking, 306 # libnss3: Pull a more recent version of NSS than required by runtime linking,
307 # for security and stability updates in NSS. 307 # for security and stability updates in NSS.
308 # libstdc++6: For C++11 support. 308 # libstdc++6: For C++11 support.
309 # lsb-base: Implies many other dependencies. 309 # lsb-release: For lsb_release.
310 # xdg-utils: For OS integration. 310 # xdg-utils: For OS integration.
311 # wget: For uploading crash reports with Breakpad. 311 # wget: For uploading crash reports with Breakpad.
312 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, \ 312 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
313 libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \ 313 libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-release, \
314 xdg-utils (>= 1.0.2), wget" 314 xdg-utils (>= 1.0.2), wget"
315 315
316 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 316 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
317 # exists, but it was moved to "universe" repository, which isn't installed by 317 # exists, but it was moved to "universe" repository, which isn't installed by
318 # default). 318 # default).
319 DPKG_SHLIB_DEPS=$(sed \ 319 DPKG_SHLIB_DEPS=$(sed \
320 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 320 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
321 <<< $DPKG_SHLIB_DEPS) 321 <<< $DPKG_SHLIB_DEPS)
322 322
323 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}" 323 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}"
(...skipping 21 matching lines...) Expand all
345 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have 345 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
346 # set it to an empty string) 346 # set it to an empty string)
347 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 347 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
348 # Allowed configs include optional HTTPS support and explicit multiarch 348 # Allowed configs include optional HTTPS support and explicit multiarch
349 # platforms. 349 # platforms.
350 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 350 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
351 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" 351 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
352 stage_install_debian 352 stage_install_debian
353 353
354 do_package 354 do_package
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698