From d64ef39bd19da96886ef3c6f79c50c5fd44aefc1 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 19 Nov 2023 21:04:58 +0000
Subject: [PATCH] build: minor fixes.

---
 dists/build.sh             | 2 +-
 dists/docker.sh            | 2 +-
 tests/packer/src/aa-update | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dists/build.sh b/dists/build.sh
index 4e8ddaa6..cd9aa59e 100644
--- a/dists/build.sh
+++ b/dists/build.sh
@@ -22,7 +22,7 @@ main() {
     dpkg)
         dch --newversion="$VERSION-1" --urgency=medium --distribution=stable --controlmaint "Release $VERSION-1"
         dpkg-buildpackage -b -d --no-sign
-        mv ../"${PKGNAME}_${VERSION}-1"_*.deb "$OUTPUT"
+        mv ../"${PKGNAME}_${VERSION}-1"_*.deb .
         ;;
 
     rpm)
diff --git a/dists/docker.sh b/dists/docker.sh
index 514f03d6..3b523d94 100644
--- a/dists/docker.sh
+++ b/dists/docker.sh
@@ -79,7 +79,7 @@ build_in_docker_dpkg() {
 			--env DEBIAN_FRONTEND=noninteractive --env DISTRIBUTION="$dist" \
 			"$BASEIMAGE/$dist"
 		docker exec "$img" sudo apt-get update -q
-        docker exec "$img" sudo apt-get install -y config-package-dev rsync
+		docker exec "$img" sudo apt-get install -y config-package-dev rsync
 		[[ "$COMMAND" == debian ]] && aptopt=(-t bookworm-backports)
 		docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go
 	fi
diff --git a/tests/packer/src/aa-update b/tests/packer/src/aa-update
index b8e3491f..f2cd5ff1 100644
--- a/tests/packer/src/aa-update
+++ b/tests/packer/src/aa-update
@@ -13,7 +13,10 @@ DISTRIBUTION="$(_lsb_release)"
 cd "$HOME/Projects/apparmor.d"
 case "$DISTRIBUTION" in
 arch)						make pkg ;;
-debian | ubuntu | whonix)	make dpkg ;;
+debian | ubuntu | whonix)
+	make dpkg
+	sudo rm -rf debian/.debhelper/
+	;;
 opensuse*)					make rpm ;;
 *) ;;
 esac