From 90b0d81ef80f8fdd0806fd984afdbb06cf2749c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jeremy=20B=C3=ADcha?= Date: Fri, 22 Sep 2023 08:57:16 -0400 Subject: [PATCH] Build-Depend on fonts-noto-core instead of fonts-dejavu-core & ttf-bitstream-vera These days, fontconfig defaults to Noto instead of DejaVu Also needed to adapt to 53cb64351d081e4c20fcea905370d49ff39636dd --- debian/control | 3 +-- debian/control.in | 3 +-- debian/tests/control | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index 153e3a2c70..70c1cf43b6 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: adwaita-icon-theme , debhelper-compat (= 13), dh-exec, fonts-cantarell , - fonts-dejavu-core , + fonts-noto-core , gnome-pkg-tools, gobject-introspection (>= 1.76.0), gsettings-desktop-schemas , @@ -65,7 +65,6 @@ Build-Depends: adwaita-icon-theme , python3-docutils , python3-gi (>= 3.40), sassc, - ttf-bitstream-vera , wayland-protocols (>= 1.32) [linux-any], weston [linux-any] , xauth , diff --git a/debian/control.in b/debian/control.in index 224121177d..b05f748358 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: adwaita-icon-theme , debhelper-compat (= 13), dh-exec, fonts-cantarell , - fonts-dejavu-core , + fonts-noto-core , gnome-pkg-tools, gobject-introspection (>= 1.76.0), gsettings-desktop-schemas , @@ -65,7 +65,6 @@ Build-Depends: adwaita-icon-theme , python3-docutils , python3-gi (>= 3.40), sassc, - ttf-bitstream-vera , wayland-protocols (>= 1.32) [linux-any], weston [linux-any] , xauth , diff --git a/debian/tests/control b/debian/tests/control index 727c1650a3..4ed0273791 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -27,25 +27,25 @@ Restrictions: superficial Test-Command: env GDK_BACKEND=x11 debian/tests/installed-tests Features: test-name=installed-tests-x11 Classes: desktop, x11 -Depends: dbus-daemon (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb +Depends: dbus-daemon (>= 1.8), fonts-noto-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb Restrictions: allow-stderr Test-Command: env GDK_BACKEND=wayland debian/tests/installed-tests Features: test-name=installed-tests-wayland Classes: desktop, wayland, linux-only -Depends: dbus-daemon (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, weston +Depends: dbus-daemon (>= 1.8), fonts-noto-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, weston # Architecture: linux-any Restrictions: allow-stderr Test-Command: env GDK_BACKEND=x11 debian/tests/installed-tests-flaky Features: test-name=installed-tests-flaky-x11 Classes: desktop, x11 -Depends: dbus-daemon (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, xauth, xvfb +Depends: dbus-daemon (>= 1.8), fonts-noto-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, xauth, xvfb Restrictions: allow-stderr, flaky Test-Command: env GDK_BACKEND=wayland debian/tests/installed-tests-flaky Features: test-name=installed-tests-flaky-wayland Classes: desktop, wayland, linux-only -Depends: dbus-daemon (>= 1.8), fonts-dejavu-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, ttf-bitstream-vera, weston +Depends: dbus-daemon (>= 1.8), fonts-noto-core, gnome-desktop-testing (>= 2018.1-1~), gtk-4-tests, locales | locales-all, weston # Architecture: linux-any Restrictions: allow-stderr, flaky -- 2.30.2