Don't include apport stuff in the Debian build, it's not useful

diff --git a/debian/changelog b/debian/changelog
index 0ef1871cc0b06bfac8afeade3d9f881d780784d8..c791f5ccfd9fd83369e82edd9d9e207050d56500 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ shim-signed (1.34) UNRELEASED; urgency=medium
   * Update build-deps and Standards-Version
   * Tweak Makefile setup - do our verification testing chained from
     the "all" target, not "clean". Closes: #936002
+  * Don't include apport stuff in the Debian build, it's not useful.
 
  -- Steve McIntyre <93sam@debian.org>  Thu, 29 Apr 2021 22:04:33 +0100
 

diff --git a/debian/rules b/debian/rules
index 0276fa2c24eafdf43ec717687b7ce69266e4ab04..56e44ae1dfa16b5415b6a0ae18e404b73ae6d0c8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 SHIM_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim-unsigned)
+VENDOR := $(shell dpkg-vendor --query vendor)
 
 include /usr/share/dpkg/architecture.mk
 
@@ -30,6 +31,13 @@ override_dh_installdocs:
 override_dh_installdebconf:
        dh_installdebconf -p shim-signed-common
 
+override_dh_installdeb:
+ifeq ($(VENDOR),Debian)
+       # Remove apport files from Debian builds, they're not useful
+       find debian/shim-signed-common -name '*apport*' | xargs rm -rvf
+endif
+       dh_installdeb
+
 override_dh_gencontrol:
 ifeq ($(DEB_HOST_ARCH),arm64)
        # On arm64, substitute our package description with "not