Adjust expected package dependencies for Ubuntu Precise (patch 2).

It turned out Debian dependencies are the same between 32-bit
and 64-bit. Some amd64 packages were previously installed on
the 32-bit builder and that confused the script.

BUG=170262
R=rmsousa@chromium.org

Review URL: https://codereview.chromium.org/17520003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207623 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_installer.gypi

@@ -528,8 +528,7 @@
           'installer/linux/debian/changelog.template',
           'installer/linux/debian/control.template',
           'installer/linux/debian/debian.menu',
-          'installer/linux/debian/expected_deps_ia32',
-          'installer/linux/debian/expected_deps_x64',
+          'installer/linux/debian/expected_deps',
           'installer/linux/debian/postinst',
           'installer/linux/debian/postrm',
           'installer/linux/debian/prerm',

chrome/installer/linux/debian/build.sh

@@ -276,13 +276,12 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
 
 # Compare the expected dependency list to the generate list.
 BAD_DIFF=0
-diff "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
+diff "$SCRIPTDIR/expected_deps" actual || BAD_DIFF=1
 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
   echo
   echo "ERROR: Shared library dependencies changed!"
   echo "If this is intentional, please update:"
-  echo "chrome/installer/linux/debian/expected_deps_ia32"
-  echo "chrome/installer/linux/debian/expected_deps_x64"
+  echo "chrome/installer/linux/debian/expected_deps"
   echo
   exit $BAD_DIFF
 fi