From f35b343852e56705fab5b85a06995515ecd05803 Mon Sep 17 00:00:00 2001 From: David Adam Date: Thu, 16 Sep 2021 20:54:55 +0800 Subject: [PATCH] Debian packaging: drop fish-common package Splitting fish into multiple packages was what the downstream Debian packaging does, but it provides minimal benefit to end-users installing from the fish repositories and in some cases made it harder. The only benefit was a slightly reduced size on disk for download repositories. Closes #7845. Reverts 45ae726d4f66398b10fda2c281e730fb6bda2a56 and solves #3053 through a Conflict with fish-common. --- debian/control | 19 ++++--------------- debian/fish-common.install | 2 -- debian/fish-common.lintian-overrides | 4 ---- .../{fish-common.doc-base => fish.doc-base} | 0 debian/{fish-common.docs => fish.docs} | 0 debian/fish.install | 2 ++ debian/fish.lintian-overrides | 4 ++++ debian/rules | 3 --- 8 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 debian/fish-common.install delete mode 100644 debian/fish-common.lintian-overrides rename debian/{fish-common.doc-base => fish.doc-base} (100%) rename debian/{fish-common.docs => fish.docs} (100%) create mode 100644 debian/fish.lintian-overrides diff --git a/debian/control b/debian/control index 99b85236d..17bde27cc 100644 --- a/debian/control +++ b/debian/control @@ -13,27 +13,16 @@ Vcs-Browser: https://github.com/fish-shell/fish-shell Package: fish Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, fish-common (= ${source:Version}), passwd (>= 4.0.3-10), gettext-base, man-db +Depends: ${shlibs:Depends}, ${misc:Depends}, passwd (>= 4.0.3-10), gettext-base, man-db, + python3 (>=3.5) +Conflicts: fish-common Recommends: xsel (>=1.2.0) +Suggests: xdg-utils Description: friendly interactive shell Fish is a command-line shell for modern systems, focusing on user-friendliness, sensibility and discoverability in interactive use. The syntax is simple, but not POSIX compliant. -Package: fish-common -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends} -Recommends: fish, python3 (>= 3.5) -Suggests: xdg-utils -Replaces: fish (<= 2.1.1.dfsg-2) -Description: friendly interactive shell (architecture-independent files) - Fish is a command-line shell for modern systems, focusing on user-friendliness, - sensibility and discoverability in interactive use. The syntax is simple, but - not POSIX compliant. - . - This package contains the common fish files shared by all architectures. - Package: fish-dbg Architecture: any Section: debug diff --git a/debian/fish-common.install b/debian/fish-common.install deleted file mode 100644 index bf0ea0cf1..000000000 --- a/debian/fish-common.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/etc -debian/tmp/usr/share diff --git a/debian/fish-common.lintian-overrides b/debian/fish-common.lintian-overrides deleted file mode 100644 index c6ccc2546..000000000 --- a/debian/fish-common.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# These directories are intentionally empty. -fish-common: package-contains-empty-directory usr/share/fish/vendor_completions.d/ -fish-common: package-contains-empty-directory usr/share/fish/vendor_conf.d/ -fish-common: package-contains-empty-directory usr/share/fish/vendor_functions.d/ diff --git a/debian/fish-common.doc-base b/debian/fish.doc-base similarity index 100% rename from debian/fish-common.doc-base rename to debian/fish.doc-base diff --git a/debian/fish-common.docs b/debian/fish.docs similarity index 100% rename from debian/fish-common.docs rename to debian/fish.docs diff --git a/debian/fish.install b/debian/fish.install index 451ddc0d8..e71225348 100644 --- a/debian/fish.install +++ b/debian/fish.install @@ -1 +1,3 @@ debian/tmp/usr/bin +debian/tmp/etc +debian/tmp/usr/share diff --git a/debian/fish.lintian-overrides b/debian/fish.lintian-overrides new file mode 100644 index 000000000..d45a0465c --- /dev/null +++ b/debian/fish.lintian-overrides @@ -0,0 +1,4 @@ +# These directories are intentionally empty. +fish: package-contains-empty-directory usr/share/fish/vendor_completions.d/ +fish: package-contains-empty-directory usr/share/fish/vendor_conf.d/ +fish: package-contains-empty-directory usr/share/fish/vendor_functions.d/ diff --git a/debian/rules b/debian/rules index b07fcdeed..254026fca 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,6 @@ override_dh_auto_configure: override_dh_auto_build: dh_auto_build -- all fish_tests tests_buildroot_target -override_dh_installdocs: - dh_installdocs --link-doc=fish - # Still needed until all platforms have debhelper 9.20151219 # Consider transitioning https://wiki.debian.org/DebugPackage override_dh_strip: