Skip to content

Commit 8a112fb

Browse files
authored
Update debian packages (#26971)
1 parent 0c98770 commit 8a112fb

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

packaging/linux/deb/package_binaries.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ if [ "$mode" = "production" ] ; then
2929
repo_url="http://dist.keybase.io/linux/deb/repo"
3030
elif [ "$mode" = "prerelease" ] ; then
3131
repo_url="http://prerelease.keybase.io/deb"
32-
# debian bullseye removed libappindicator1 in favor of libayatana-appindicator1, so allow both.
3332
# "psmisc" provides "killall", which is used in run_keybase and
3433
# post_install.sh.
3534
# lsof used in post_install.sh
3635
# systemd-container provides machinectl, which is used in post_install.sh
3736
# 'libasound2, libnss3, libxss1, libxtst6' is required by the GUI (issue #9872 and #17365)
38-
dependencies="Depends: libappindicator1 | libayatana-appindicator1, fuse, libgconf-2-4, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
37+
dependencies="Depends: libayatana-appindicator3-1, fuse, psmisc, lsof, procps, libasound2, libnss3, libxss1, libxtst6, libgtk-3-0"
3938
elif [ "$mode" = "staging" ] ; then
4039
# Note: This doesn't exist yet. But we need to be distinct from the
4140
# 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/bullseye64"
2+
config.vm.box = "debian/bookworm64"
33
config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync"
44
config.vm.provider "virtualbox" do |vb|
55
vb.memory = "4096"

packaging/linux/smoketest/fedora/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 = "generic/fedora36"
2+
config.vm.box = "bento/fedora-40"
33
config.vm.synced_folder "../vagrantcommon/", "/vagrant", type: "rsync"
44
config.vm.provider "virtualbox" do |vb|
55
vb.memory = "4096"

packaging/linux/test/keybase-arch-test/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ MAINTAINER Keybase <[email protected]>
33

44
RUN pacman -Syy
55

6-
RUN pacman -S --noconfirm git binutils fuse gconf libxss gtk3 fakeroot lsof
6+
RUN pacman -S --noconfirm git binutils fuse libxss gtk3 fakeroot lsof

packaging/linux/test/keybase-ubuntu-systemd-test/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MAINTAINER Keybase <[email protected]>
44
RUN apt-get update
55

66
# Install dependencies for keybase
7-
RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof
7+
RUN apt-get install -y fuse psmisc procps lsof
88

99
# Nice to have
1010
RUN apt-get install -y vim less curl

packaging/linux/test/keybase-ubuntu-test/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MAINTAINER Keybase <[email protected]>
44
RUN apt-get update
55

66
# Install dependencies for keybase
7-
RUN apt-get install -y libappindicator1 fuse libgconf-2-4 psmisc procps lsof
7+
RUN apt-get install -y libappindicator1 fuse psmisc procps lsof
88

99
# Nice to have
1010
RUN apt-get install -y vim less curl sudo

0 commit comments

Comments
 (0)