From 29bfd9d39f6a403eb1142d228b0b8a5cc7b149af Mon Sep 17 00:00:00 2001 From: heronhaye Date: Fri, 17 Dec 2021 12:15:34 -0500 Subject: [PATCH] Add libapp alternative for bullseye (#24735) --- packaging/linux/deb/package_binaries.sh | 3 ++- packaging/linux/smoketest/debian-stable/Vagrantfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/linux/deb/package_binaries.sh b/packaging/linux/deb/package_binaries.sh index 1cd6b0f7858f..606cea48e85d 100755 --- 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 index 7b81393e3b9d..0db9bd4182e8 100644 --- 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"