Debian packaging: drop Xenial support and bump debhelper compat

Discussed in #10453
fish-shell · Apr 30, 2024 · 5871dee · 5871dee
1 parent cc2fb5c
commit 5871dee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/debian/control b/debian/control
@@ -3,8 +3,7 @@ Section: shells
 Priority: optional
 Maintainer: ridiculous_fish <[email protected]>
 Uploaders: David Adam <[email protected]>
-# 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
@@ -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