Revert of M59: Linux: Make manual libnss3 version dependency work again.

chrome/installer/linux/debian/build.sh

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(mmoss) This currently only works with official builds, since non-official
 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
 
 set -e
@@ skipping 95 matching lines @@
   PROVIDES="www-browser"
   gen_changelog
   process_template "${SCRIPTDIR}/control.template" "${DEB_CONTROL}"
   export DEB_HOST_ARCH="${ARCHITECTURE}"
   if [ -f "${DEB_CONTROL}" ]; then
     gen_control
   fi
   fakeroot dpkg-deb -Zxz -z9 -b "${STAGEDIR}" .
 }
 
-verify_package() {
-  DEPENDS="${COMMON_DEPS}"  # This needs to match do_package() above.
-  echo ${DEPENDS} | sed 's/, /\n/g' | LANG=C sort > expected_deb_depends
-  dpkg -I "${PACKAGE}-${CHANNEL}_${VERSIONFULL}_${ARCHITECTURE}.deb" | \
-      grep '^ Depends: ' | sed 's/^ Depends: //' | sed 's/, /\n/g' | \
-      LANG=C sort > actual_deb_depends
-  BAD_DIFF=0
-  diff -u expected_deb_depends actual_deb_depends || BAD_DIFF=1
-  if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
-    echo
-    echo "ERROR: bad dpkg dependencies!"
-    echo
-    exit $BAD_DIFF
-  fi
-}
-
 # Remove temporary files and unwanted packaging output.
 cleanup() {
   echo "Cleaning..."
   rm -rf "${STAGEDIR}"
   rm -rf "${TMPFILEDIR}"
 }
 
 usage() {
   echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir'] "
   echo "                      [-b 'dir'] -d branding"
@@ skipping 172 matching lines @@
   echo
   exit $BAD_DIFF
 fi
 
 # Additional dependencies not in the dpkg-shlibdeps output.
 # ca-certificates: Make sure users have SSL certificates.
 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
 # libappindicator1: Make systray icons work in Unity.
 # libnss3: Pull a more recent version of NSS than required by runtime linking,
 #          for security and stability updates in NSS.
+# libstdc++6: For C++11 support.
 # lsb-base: Implies many other dependencies.
 # xdg-utils: For OS integration.
 # wget: For uploading crash reports with Breakpad.
-ADDITIONAL_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
-  libnss3 (>= 3.17.2), lsb-base (>=4.1), xdg-utils (>= 1.0.2), wget"
+ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
+  libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \
+  xdg-utils (>= 1.0.2), wget"
 
 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
 # exists, but it was moved to "universe" repository, which isn't installed by
 # default).
-# TODO(thestig): This is probably no longer needed. Verify and remove.
 DPKG_SHLIB_DEPS=$(sed \
     's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
     <<< $DPKG_SHLIB_DEPS)
 
-# Remove libnss dependency so the one in $ADDITIONAL_DEPS can supercede it.
-DPKG_SHLIB_DEPS=$(sed 's/\(libnss3 ([^)]*)\), //g' <<< $DPKG_SHLIB_DEPS)
-
-COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITIONAL_DEPS}"
+COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}"
 COMMON_PREDEPS="dpkg (>= 1.14.0)"
 
 
 # Make everything happen in the OUTPUTDIR.
 cd "${OUTPUTDIR}"
 
 case "$TARGETARCH" in
   ia32 )
     export ARCHITECTURE="i386"
     ;;
@@ skipping 11 matching lines @@
 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
 # set it to an empty string)
 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
 # Allowed configs include optional HTTPS support and explicit multiarch
 # platforms.
 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
 stage_install_debian
 
 do_package
-verify_package