Skip to content

Commit 29bfd9d

Browse files
authored
Add libapp alternative for bullseye (#24735)
1 parent 9b33c92 commit 29bfd9d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packaging/linux/deb/package_binaries.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ if [ "$mode" = "production" ] ; then
3030
repo_url="http://dist.keybase.io/linux/deb/repo"
3131
elif [ "$mode" = "prerelease" ] ; then
3232
repo_url="http://prerelease.keybase.io/deb"
33+
# debian bullseye removed libappindicator1 in favor of libayatana-appindicator1, so allow both.
3334
# "psmisc" provides "killall", which is used in run_keybase and
3435
# post_install.sh.
3536
# lsof used in post_install.sh
3637
# systemd-container provides machinectl, which is used in post_install.sh
3738
# 'libasound2, libnss3, libxss1, libxtst6' is required by the GUI (issue #9872 and #17365)
38-
dependencies="Depends: libappindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
39+
dependencies="Depends: libappindicator1 | libayatana-appindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
3940
elif [ "$mode" = "staging" ] ; then
4041
# Note: This doesn't exist yet. But we need to be distinct from the
4142
# production URL, because we're moving to a model where we build a clean repo

packaging/linux/smoketest/debian-stable/Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Vagrant.configure("2") do |config|
2-
config.vm.box = "debian/buster64"
2+
config.vm.box = "debian/bullseye64"
33
config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync"
44
config.vm.provider "virtualbox" do |vb|
55
vb.memory = "4096"

0 commit comments

Comments
 (0)