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

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

Issue 300063014: linux_aura: Update Debian packaging to Depend: on libappindicator1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: alpha 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 unified diff | Download patch | Annotate | Revision Log
« 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 echo "If this is intentional, please update:" 282 echo "If this is intentional, please update:"
283 echo "chrome/installer/linux/debian/expected_deps" 283 echo "chrome/installer/linux/debian/expected_deps"
284 echo 284 echo
285 exit $BAD_DIFF 285 exit $BAD_DIFF
286 fi 286 fi
287 rm -rf "$DUMMY_STAGING_DIR" 287 rm -rf "$DUMMY_STAGING_DIR"
288 288
289 # Additional dependencies not in the dpkg-shlibdeps output. 289 # Additional dependencies not in the dpkg-shlibdeps output.
290 # Pull a more recent version of NSS than required by runtime linking, for 290 # Pull a more recent version of NSS than required by runtime linking, for
291 # security and stability updates in NSS. 291 # security and stability updates in NSS.
292 ADDITION_DEPS="ca-certificates, libcurl3, libnss3 (>= 3.14.3), \ 292 ADDITION_DEPS="ca-certificates, libappindicator1, libcurl3, \
293 lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget" 293 libnss3 (>= 3.14.3), lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget"
294 294
295 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 295 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
296 # exists, but it was moved to "universe" repository, which isn't installed by 296 # exists, but it was moved to "universe" repository, which isn't installed by
297 # default). 297 # default).
298 DPKG_SHLIB_DEPS=$(sed \ 298 DPKG_SHLIB_DEPS=$(sed \
299 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 299 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
300 <<< $DPKG_SHLIB_DEPS) 300 <<< $DPKG_SHLIB_DEPS)
301 301
302 # Fix-up libudev dependency because Ubuntu 13.04 has libudev1 instead of 302 # Fix-up libudev dependency because Ubuntu 13.04 has libudev1 instead of
303 # libudev0. 303 # libudev0.
(...skipping 18 matching lines...) Expand all
322 ;; 322 ;;
323 * ) 323 * )
324 echo 324 echo
325 echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'." 325 echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'."
326 echo 326 echo
327 exit 1 327 exit 1
328 ;; 328 ;;
329 esac 329 esac
330 330
331 do_package 331 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