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 45ae726d4f and solves #3053
through a Conflict with fish-common.
This commit is contained in:
David Adam 2021-09-16 20:54:55 +08:00
parent 05fdee1be7
commit f35b343852
8 changed files with 10 additions and 24 deletions

19
debian/control vendored
View file

@ -13,27 +13,16 @@ Vcs-Browser: https://github.com/fish-shell/fish-shell
Package: fish Package: fish
Architecture: any 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) Recommends: xsel (>=1.2.0)
Suggests: xdg-utils
Description: friendly interactive shell Description: friendly interactive shell
Fish is a command-line shell for modern systems, focusing on user-friendliness, Fish is a command-line shell for modern systems, focusing on user-friendliness,
sensibility and discoverability in interactive use. The syntax is simple, but sensibility and discoverability in interactive use. The syntax is simple, but
not POSIX compliant. 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 Package: fish-dbg
Architecture: any Architecture: any
Section: debug Section: debug

View file

@ -1,2 +0,0 @@
debian/tmp/etc
debian/tmp/usr/share

View file

@ -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/

2
debian/fish.install vendored
View file

@ -1 +1,3 @@
debian/tmp/usr/bin debian/tmp/usr/bin
debian/tmp/etc
debian/tmp/usr/share

4
debian/fish.lintian-overrides vendored Normal file
View file

@ -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/

3
debian/rules vendored
View file

@ -16,9 +16,6 @@ override_dh_auto_configure:
override_dh_auto_build: override_dh_auto_build:
dh_auto_build -- all fish_tests tests_buildroot_target 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 # Still needed until all platforms have debhelper 9.20151219
# Consider transitioning https://wiki.debian.org/DebugPackage # Consider transitioning https://wiki.debian.org/DebugPackage
override_dh_strip: override_dh_strip: