Add libappindicator3-1 as a dependency

This is to simplify our status icon code.

Ubuntu Zesty has been EOL'd, so that has been removed too.

Bug: 799144
Change-Id: I325144461a330b6321a087e4357e9033d7fdd880
Reviewed-on: https://chromium-review.googlesource.com/899867Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534224}

chrome/installer/linux/debian/additional_deps

-# Additional dependencies not in the dpkg-shlibdeps output.
+# Copyright 2018 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.
 #
-# 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.
-# lsb-release: For lsb_release.
-# wget: For uploading crash reports with Breakpad.
-# xdg-utils: For OS integration.
+# Additional dependencies not in the dpkg-shlibdeps output.
+
+# Make sure users have SSL certificates.
 ca-certificates
+
+# Make sure users have compatible fonts for viewing PDFs.
 fonts-liberation
-libappindicator1
+
+# Temporary entry for systray icons.
+libappindicator3-1
+
+# Pull a more recent version of NSS than required by runtime linking, for
+# security and stability updates in NSS.
 libnss3 (>= 3.26)
+
+# For lsb_release.
 lsb-release
+
+# For uploading crash reports with Breakpad.
 wget
+
+# For OS integration.
 xdg-utils (>= 1.0.2)

chrome/installer/linux/debian/dist_package_versions.json

 {
     "Debian 10 (Buster)": {
+        "libappindicator3-1": "0.4.92-5",
         "libasound2": "1.1.3-5",
-        "libatk-bridge2.0-0": "2.26.0-1",
-        "libatk1.0-0": "2.26.0-2",
-        "libc6": "2.25-3",
-        "libcairo2": "1.15.8-2",
-        "libcups2": "2.2.6-2",
+        "libatk-bridge2.0-0": "2.26.1-1",
+        "libatk1.0-0": "2.26.1-3",
+        "libc6": "2.26-4",
+        "libcairo2": "1.15.8-3",
+        "libcups2": "2.2.6-4",
         "libdbus-1-3": "1.12.2-1",
-        "libexpat1": "2.2.3-2",
-        "libgcc1": "1:7.2.0-17",
+        "libexpat1": "2.2.5-3",
+        "libgcc1": "1:7.2.0-19",
         "libgdk-pixbuf2.0-0": "2.36.11-1",
-        "libglib2.0-0": "2.54.1-1",
-        "libgtk-3-0": "3.22.24-3",
+        "libglib2.0-0": "2.54.3-2",
+        "libgtk-3-0": "3.22.26-2",
         "libnspr4": "2:4.16-1+b1",
-        "libnss3": "2:3.34-1",
-        "libpango-1.0-0": "1.40.12-1",
-        "libpangocairo-1.0-0": "1.40.12-1",
-        "libstdc++6": "7.2.0-17",
+        "libnss3": "2:3.34.1-1",
+        "libpango-1.0-0": "1.40.14-1",
+        "libpangocairo-1.0-0": "1.40.14-1",
+        "libstdc++6": "7.2.0-19",
         "libx11-6": "2:1.6.4-3",
         "libx11-xcb1": "2:1.6.4-3",
         "libxcb1": "1.12-1",
         "libxcomposite1": "1:0.4.4-2",
-        "libxcursor1": "1:1.1.14-3",
+        "libxcursor1": "1:1.1.15-1",
         "libxdamage1": "1:1.1.4-3",
         "libxext6": "2:1.3.3-1+b2",
         "libxfixes3": "1:5.0.3-1",
@@ -32,6 +33,7 @@
         "libxtst6": "2:1.2.3-1"
     },
     "Debian 8 (Jessie)": {
+        "libappindicator3-1": "0.4.92-3.1",
         "libasound2": "1.0.28-1",
         "libatk-bridge2.0-0": "2.14.0-2",
         "libatk1.0-0": "2.14.0-1",
@@ -41,7 +43,7 @@
         "libdbus-1-3": "1.8.22-0+deb8u1",
         "libexpat1": "2.1.0-6+deb8u4",
         "libgcc1": "1:4.9.2-10",
-        "libgdk-pixbuf2.0-0": "2.31.1-2+deb8u6",
+        "libgdk-pixbuf2.0-0": "2.31.1-2+deb8u7",
         "libglib2.0-0": "2.42.1-1+b1",
         "libgtk-3-0": "3.14.5-1+deb8u1",
         "libnspr4": "2:4.12-1+debu8u1",
@@ -64,6 +66,7 @@
         "libxtst6": "2:1.2.2-1+deb8u1"
     },
     "Debian 9 (Stretch)": {
+        "libappindicator3-1": "0.4.92-4",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.22.0-2",
         "libatk1.0-0": "2.22.0-1",
@@ -73,7 +76,7 @@
         "libdbus-1-3": "1.10.24-0+deb9u1",
         "libexpat1": "2.2.0-2+deb9u1",
         "libgcc1": "1:6.3.0-18",
-        "libgdk-pixbuf2.0-0": "2.36.5-2+deb9u1",
+        "libgdk-pixbuf2.0-0": "2.36.5-2+deb9u2",
         "libglib2.0-0": "2.50.3-2",
         "libgtk-3-0": "3.22.11-1",
         "libnspr4": "2:4.12-6",
@@ -96,16 +99,17 @@
         "libxtst6": "2:1.2.3-1"
     },
     "Ubuntu 14.04 (Trusty)": {
+        "libappindicator3-1": "12.10.1+13.10.20130920-0ubuntu4.1",
         "libasound2": "1.0.27.2-3ubuntu7",
         "libatk-bridge2.0-0": "2.10.2-2ubuntu1",
         "libatk1.0-0": "2.10.0-2ubuntu2",
-        "libc6": "2.19-0ubuntu6.13",
+        "libc6": "2.19-0ubuntu6.14",
         "libcairo2": "1.13.0~20140204-0ubuntu1.1",
         "libcups2": "1.7.2-0ubuntu1.7",
         "libdbus-1-3": "1.6.18-0ubuntu4.4",
         "libexpat1": "2.1.0-4ubuntu1.4",
         "libgcc1": "1:4.9.3-0ubuntu4",
-        "libgdk-pixbuf2.0-0": "2.30.7-0ubuntu1.7",
+        "libgdk-pixbuf2.0-0": "2.30.7-0ubuntu1.8",
         "libglib2.0-0": "2.40.2-0ubuntu1",
         "libgtk-3-0": "3.10.8-0ubuntu1.4",
         "libnspr4": "2:4.13.1-0ubuntu0.14.04.1",
@@ -128,16 +132,17 @@
         "libxtst6": "2:1.2.2-1"
     },
     "Ubuntu 16.04 (Xenial)": {
+        "libappindicator3-1": "12.10.1+16.04.20170215-0ubuntu1",
         "libasound2": "1.1.0-0ubuntu1",
         "libatk-bridge2.0-0": "2.18.1-2ubuntu1",
         "libatk1.0-0": "2.18.0-1",
-        "libc6": "2.23-0ubuntu9",
+        "libc6": "2.23-0ubuntu10",
         "libcairo2": "1.14.6-1",
         "libcups2": "2.1.3-4ubuntu0.3",
         "libdbus-1-3": "1.10.6-1ubuntu3.1",
         "libexpat1": "2.1.0-7ubuntu0.16.04.3",
         "libgcc1": "1:6.0.1-0ubuntu1",
-        "libgdk-pixbuf2.0-0": "2.32.2-1ubuntu1.3",
+        "libgdk-pixbuf2.0-0": "2.32.2-1ubuntu1.4",
         "libglib2.0-0": "2.48.2-0ubuntu1",
         "libgtk-3-0": "3.18.9-1ubuntu3.3",
         "libnspr4": "2:4.13.1-0ubuntu0.16.04.1",
@@ -159,49 +164,18 @@
         "libxss1": "1:1.2.2-1",
         "libxtst6": "2:1.2.2-1"
     },
-    "Ubuntu 17.04 (Zesty)": {
-        "libasound2": "1.1.3-5",
-        "libatk-bridge2.0-0": "2.22.0-1ubuntu1",
-        "libatk1.0-0": "2.22.0-1",
-        "libc6": "2.24-9ubuntu2.2",
-        "libcairo2": "1.14.8-1",
-        "libcups2": "2.2.2-1ubuntu1",
-        "libdbus-1-3": "1.10.10-1ubuntu2",
-        "libexpat1": "2.2.0-2ubuntu0.1",
-        "libgcc1": "1:6.3.0-12ubuntu2",
-        "libgdk-pixbuf2.0-0": "2.36.5-3ubuntu0.2",
-        "libglib2.0-0": "2.52.0-1",
-        "libgtk-3-0": "3.22.11-0ubuntu3",
-        "libnspr4": "2:4.13.1-0ubuntu0.17.04.1",
-        "libnss3": "2:3.28.4-0ubuntu0.17.04.3",
-        "libpango-1.0-0": "1.40.4-1",
-        "libpangocairo-1.0-0": "1.40.4-1",
-        "libstdc++6": "6.3.0-12ubuntu2",
-        "libx11-6": "2:1.6.4-3",
-        "libx11-xcb1": "2:1.6.4-3",
-        "libxcb1": "1.11.1-1ubuntu1",
-        "libxcomposite1": "1:0.4.4-2",
-        "libxcursor1": "1:1.1.14-1ubuntu0.17.04.1",
-        "libxdamage1": "1:1.1.4-2",
-        "libxext6": "2:1.3.3-1",
-        "libxfixes3": "1:5.0.3-1",
-        "libxi6": "2:1.7.9-1",
-        "libxrandr2": "2:1.5.1-1",
-        "libxrender1": "1:0.9.10-1",
-        "libxss1": "1:1.2.2-1",
-        "libxtst6": "2:1.2.3-1"
-    },
     "Ubuntu 17.10 (Artful)": {
+        "libappindicator3-1": "12.10.1+17.04.20170215-0ubuntu2",
         "libasound2": "1.1.3-5",
         "libatk-bridge2.0-0": "2.26.0-1ubuntu1",
         "libatk1.0-0": "2.26.0-2ubuntu1",
-        "libc6": "2.26-0ubuntu2",
+        "libc6": "2.26-0ubuntu2.1",
         "libcairo2": "1.14.10-1ubuntu1",
         "libcups2": "2.2.4-7ubuntu3",
         "libdbus-1-3": "1.10.22-1ubuntu1",
         "libexpat1": "2.2.3-1",
         "libgcc1": "1:7.2.0-8ubuntu3",
-        "libgdk-pixbuf2.0-0": "2.36.11-1",
+        "libgdk-pixbuf2.0-0": "2.36.11-1ubuntu0.1",
         "libglib2.0-0": "2.54.1-1ubuntu1",
         "libgtk-3-0": "3.22.25-0ubuntu0.1",
         "libnspr4": "2:4.16-1ubuntu2",

chrome/installer/linux/debian/merge_package_versions.py

@@ -18,6 +18,9 @@ input_filenames = sys.argv[2:]
 package_interval_sets = []
 for input_filename in input_filenames:
   for line in open(input_filename):
+    # Ignore blank lines
+    if not line.strip():
+      continue
     # Allow comments starting with '#'
     if line.startswith('#'):
       continue

chrome/installer/linux/debian/update_dist_package_versions.py

@@ -30,11 +30,11 @@ SUPPORTED_DEBIAN_RELEASES = {
 SUPPORTED_UBUNTU_RELEASES = {
     'Ubuntu 14.04 (Trusty)': 'trusty',
     'Ubuntu 16.04 (Xenial)': 'xenial',
-    'Ubuntu 17.04 (Zesty)': 'zesty',
     'Ubuntu 17.10 (Artful)': 'artful',
 }
 
 PACKAGE_FILTER = set([
+    "libappindicator3-1",
     "libasound2",
     "libatk1.0-0",
     "libatk-bridge2.0-0",

chrome/installer/linux/rpm/additional_deps

+# Copyright 2018 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.
+#
 # Additional dependencies not in the rpm find-requires output.
 #
 # TODO(thestig,bugzilla.redhat.com/show_bug.cgi?id=1482760): Use the
 # liberation-fonts package once it's available on all distros.
-#
-# /usr/bin/lsb_release: For lsb_release.
-# ca-certificates: Make sure users have SSL certificates.
-# liberation-*-fonts: Make sure users have compatible fonts for viewing PDFs.
-# libnss3 and libssl3: Specify a more recent version for security and
-#   stability updates. While we depend on libnss3.so and not
-#   libssl3.so, force the dependency on libssl3 to ensure the NSS
-#   version is 3.28 or later, since libssl3 should always be packaged
-#   with libnss3.
-# wget: For uploading crash reports with Breakpad.
-# xdg-utils: For OS integration.
+
+# For lsb_release.
 /usr/bin/lsb_release
+
+# Make sure users have SSL certificates.
 ca-certificates
+
+# Temporary entry for tray icons
+libappindicator3.so.1
+
+# Specify a more recent version for security and stability updates. While we
+# depend on libnss3.so and not libssl3.so, force the dependency on libssl3 to
+# ensure the NSS version is 3.28 or later, since libssl3 should always be
+# packaged with libnss3.
 libnss3.so(NSS_3.22)(64bit)
 libssl3.so(NSS_3.28)(64bit)
+
+# For uploading crash reports with Breakpad.
 wget
+
+# For OS integration.
 xdg-utils

chrome/installer/linux/rpm/dist_package_provides.json

@@ -16,6 +16,7 @@
         "libXrender.so.1()(64bit)",
         "libXss.so.1()(64bit)",
         "libXtst.so.6()(64bit)",
+        "libappindicator3.so.1()(64bit)",
         "libasound.so.2()(64bit)",
         "libasound.so.2(ALSA_0.9)(64bit)",
         "libasound.so.2(ALSA_0.9.0)(64bit)",
@@ -254,6 +255,7 @@
         "libXrender.so.1()(64bit)",
         "libXss.so.1()(64bit)",
         "libXtst.so.6()(64bit)",
+        "libappindicator3.so.1()(64bit)",
         "libasound.so.2()(64bit)",
         "libasound.so.2(ALSA_0.9)(64bit)",
         "libasound.so.2(ALSA_0.9.0)(64bit)",
@@ -498,6 +500,7 @@
         "libXrender.so.1()(64bit)",
         "libXss.so.1()(64bit)",
         "libXtst.so.6()(64bit)",
+        "libappindicator3.so.1()(64bit)",
         "libasound.so.2()(64bit)",
         "libasound.so.2(ALSA_0.9)(64bit)",
         "libasound.so.2(ALSA_0.9.0)(64bit)",
@@ -755,6 +758,7 @@
         "libXss.so.1()(64bit)",
         "libXtst.so.6",
         "libXtst.so.6()(64bit)",
+        "libappindicator3.so.1()(64bit)",
         "libasound.so.2",
         "libasound.so.2()(64bit)",
         "libasound.so.2(ALSA_0.9)",
@@ -1204,6 +1208,7 @@
         "libXss.so.1()(64bit)",
         "libXtst.so.6",
         "libXtst.so.6()(64bit)",
+        "libappindicator3.so.1()(64bit)",
         "libasound.so.2",
         "libasound.so.2()(64bit)",
         "libasound.so.2(ALSA_0.9)",

chrome/installer/linux/rpm/merge_package_deps.py

@@ -16,6 +16,9 @@ input_filenames = sys.argv[2:]
 requires = set()
 for input_filename in input_filenames:
   for line in open(input_filename):
+    # Ignore blank lines
+    if not line.strip():
+      continue
     # Allow comments starting with '#'
     if line.startswith('#'):
       continue

chrome/installer/linux/rpm/update_package_provides.py

@@ -26,6 +26,7 @@ PACKAGE_FILTER = [
     "libXrender.so",
     "libXss.so",
     "libXtst.so",
+    "libappindicator3.so",
     "libasound.so",
     "libatk-1.0.so",
     "libatk-bridge-2.0.so",