Add libapp alternative for bullseye (#24735)

keybase · Dec 17, 2021 · 29bfd9d · 29bfd9d
1 parent 9b33c92
commit 29bfd9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packaging/linux/deb/package_binaries.sh b/packaging/linux/deb/package_binaries.sh
@@ -30,12 +30,13 @@ if [ "$mode" = "production" ] ; then
   repo_url="http://dist.keybase.io/linux/deb/repo"
 elif [ "$mode" = "prerelease" ] ; then
   repo_url="http://prerelease.keybase.io/deb"
+  # debian bullseye removed libappindicator1 in favor of libayatana-appindicator1, so allow both.
   # "psmisc" provides "killall", which is used in run_keybase and
   # post_install.sh.
   # lsof used in post_install.sh
   # systemd-container provides machinectl, which is used in post_install.sh
   # 'libasound2, libnss3, libxss1, libxtst6' is required by the GUI (issue #9872 and #17365)
-  dependencies="Depends: libappindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
+  dependencies="Depends: libappindicator1 | libayatana-appindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
 elif [ "$mode" = "staging" ] ; then
   # Note: This doesn't exist yet. But we need to be distinct from the
   # production URL, because we're moving to a model where we build a clean repo

diff --git a/packaging/linux/smoketest/debian-stable/Vagrantfile b/packaging/linux/smoketest/debian-stable/Vagrantfile
@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "debian/buster64"
+  config.vm.box = "debian/bullseye64"
   config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync"
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "4096"