From 5871deeee5504693d4fafaef578a06afb98d458d Mon Sep 17 00:00:00 2001 From: David Adam Date: Sat, 27 Apr 2024 18:10:08 +0800 Subject: [PATCH] Debian packaging: drop Xenial support and bump debhelper compat Discussed in https://github.com/fish-shell/fish-shell/issues/10453 --- debian/compat | 2 +- debian/control | 3 +-- debian/rules | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/compat b/debian/compat index f599e28b8..48082f72f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/debian/control b/debian/control index abecffba8..cda0914ba 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: shells Priority: optional Maintainer: ridiculous_fish Uploaders: David Adam -# Debhelper should be bumped to >= 10 once Ubuntu Xenial is no longer supported -Build-Depends: debhelper (>= 9.20160115), cmake (>= 3.19.0) | cmake-mozilla (>= 3.19.0), gettext, +Build-Depends: debhelper (>= 12), cmake (>= 3.19.0) | cmake-mozilla (>= 3.19.0), gettext, rustc (>= 1.70), cargo (>= 0.66) | cargo-mozilla (>= 0.66), libpcre2-dev, # Test dependencies locales-all, python3 diff --git a/debian/rules b/debian/rules index c7e78706a..fb3b43cba 100755 --- a/debian/rules +++ b/debian/rules @@ -17,8 +17,3 @@ override_dh_clean: dh_clean -unlink .cargo -unlink vendor - -# On CMake 3.5 (and possibly 3.6), the test target does not pick up its dependencies properly -# Build tests_buildroot_target by hand (remove this once Ubuntu Xenial is out of support) -override_dh_auto_build: - dh_auto_build -- all tests_dir funcs_dir tests_buildroot_target