From 2debc68ee9e68d84595a2ba10c0c4129db2c1296 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 17 Sep 2021 20:00:01 +0800
Subject: [PATCH] Debian packaging: drop debug package

The build hosts generate -dbgsym packages automatically with newer
versions of debhelper.
---
 debian/control                                       | 11 -----------
 debian/{fish.doc-base => doc-base}                   |  0
 debian/{fish.docs => docs}                           |  0
 debian/fish.install                                  |  3 ---
 debian/{fish.lintian-overrides => lintian-overrides} |  0
 debian/{fish.postinst => postinst}                   |  0
 debian/{fish.prerm => prerm}                         |  0
 debian/rules                                         |  5 -----
 8 files changed, 19 deletions(-)
 rename debian/{fish.doc-base => doc-base} (100%)
 rename debian/{fish.docs => docs} (100%)
 delete mode 100644 debian/fish.install
 rename debian/{fish.lintian-overrides => lintian-overrides} (100%)
 rename debian/{fish.postinst => postinst} (100%)
 rename debian/{fish.prerm => prerm} (100%)

diff --git a/debian/control b/debian/control
index 000927f93..6c0f089e7 100644
--- a/debian/control
+++ b/debian/control
@@ -23,14 +23,3 @@ 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-dbg
-Architecture: any
-Section: debug
-Depends: fish (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for 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.
- .
- This package contains the debugging symbols for fish.
diff --git a/debian/fish.doc-base b/debian/doc-base
similarity index 100%
rename from debian/fish.doc-base
rename to debian/doc-base
diff --git a/debian/fish.docs b/debian/docs
similarity index 100%
rename from debian/fish.docs
rename to debian/docs
diff --git a/debian/fish.install b/debian/fish.install
deleted file mode 100644
index e71225348..000000000
--- a/debian/fish.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/bin
-debian/tmp/etc
-debian/tmp/usr/share
diff --git a/debian/fish.lintian-overrides b/debian/lintian-overrides
similarity index 100%
rename from debian/fish.lintian-overrides
rename to debian/lintian-overrides
diff --git a/debian/fish.postinst b/debian/postinst
similarity index 100%
rename from debian/fish.postinst
rename to debian/postinst
diff --git a/debian/fish.prerm b/debian/prerm
similarity index 100%
rename from debian/fish.prerm
rename to debian/prerm
diff --git a/debian/rules b/debian/rules
index 37a94b6e2..0696e5070 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,3 @@ override_dh_auto_configure:
 # Build fish_tests/tests_buildroot_target by hand (remove this once Ubuntu Xenial is out of support)
 override_dh_auto_build:
 	dh_auto_build -- all fish_tests tests_buildroot_target
-
-# Still needed until all platforms have debhelper 9.20151219
-# Consider transitioning https://wiki.debian.org/DebugPackage
-override_dh_strip:
-	dh_strip --dbg-package=fish-dbg