Update debian packages (#26971)

keybase · Jun 4, 2024 · 8a112fb · 8a112fb
1 parent 0c98770
commit 8a112fb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/packaging/linux/deb/package_binaries.sh b/packaging/linux/deb/package_binaries.sh
@@ -29,13 +29,12 @@ 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 | libayatana-appindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
+  dependencies="Depends: libayatana-appindicator3-1, fuse, 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/bullseye64"
+  config.vm.box = "debian/bookworm64"
   config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync"
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "4096"

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

diff --git a/packaging/linux/test/keybase-arch-test/Dockerfile b/packaging/linux/test/keybase-arch-test/Dockerfile
@@ -3,4 +3,4 @@ MAINTAINER Keybase <[email protected]>
 
 RUN pacman -Syy
 
-RUN pacman -S --noconfirm git binutils fuse gconf libxss gtk3 fakeroot lsof
+RUN pacman -S --noconfirm git binutils fuse libxss gtk3 fakeroot lsof
diff --git a/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile b/packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Keybase <[email protected]>
 RUN apt-get update
 
 # Install dependencies for keybase
-RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof
+RUN apt-get install -y fuse psmisc procps lsof
 
 # Nice to have
 RUN apt-get install -y vim less curl

diff --git a/packaging/linux/test/keybase-ubuntu-test/Dockerfile b/packaging/linux/test/keybase-ubuntu-test/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Keybase <[email protected]>
 RUN apt-get update
 
 # Install dependencies for keybase
-RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof
+RUN apt-get install -y libappindicator1 fuse psmisc procps lsof
 
 # Nice to have
 RUN apt-get install -y vim less curl sudo