Improve native (.deb) packaging for Debian/Ubuntu 24.04 (#1041)

thanks @jpwarren

.gitignore

@@ -13,3 +13,14 @@
 /build
 /tests/postfixadmin.sqlite.*.test
 /phpstorm-docker-dev/
+debian/files
+debian/postfixadmin/
+debian/postfixadmin.substvars
+debian/postfixadmin.postinst.debhelper
+debian/postfixadmin.postrm.debhelper
+debian/postfixadmin.preinst.debhelper
+debian/postfixadmin.prerm.debhelper
+build-stamp
+debian/.debhelper/
+.pc/
+.devcontainer/

composer.json

@@ -16,7 +16,7 @@
         ],
         "check-format": "@php vendor/bin/php-cs-fixer fix --ansi --dry-run --diff",
         "format": "@php vendor/bin/php-cs-fixer fix --ansi",
-        "lint": "@php ./vendor/bin/parallel-lint --exclude vendor/ .",
+        "lint": "@php ./vendor/bin/parallel-lint --exclude vendor/ --exclude debian/ .",
         "test": "@php ./vendor/bin/phpunit --coverage-clover ./clover.xml --do-not-cache-result tests/",
         "test-fixup": "mkdir -p templates_c ; test -f config.local.php || touch config.local.php",
         "psalm": "@php ./vendor/bin/psalm.phar --no-cache --show-info=false ",

debian/changelog

@@ -1,3 +1,11 @@
+postfixadmin (4.0.1-1) unstable; urgency=medium
+
+  * Remove debian/compat that is no longer needed
+  * Swap unused lib/ for composer's vendor/ path in debian install rules
+  * Update debian/rules to make prep more readable
+
+ -- Justin Warren <justin@eigenmagic.com>  Mon, 13 Apr 2026 06:47:48 +1000
+
 postfixadmin (3.3.10-2) unstable; urgency=medium
 
   * remove unnessesary fix for mysqli instead of mysql

debian/compat

@@ -1 +0,0 @@
-7

debian/postfixadmin.install

@@ -2,10 +2,10 @@
 public		usr/share/postfixadmin
 configs		usr/share/postfixadmin
 languages	usr/share/postfixadmin
-lib		usr/share/postfixadmin
 model		usr/share/postfixadmin
 scripts		usr/share/postfixadmin
 templates	usr/share/postfixadmin
 configs     usr/share/postfixadmin
+vendor      usr/share/postfixadmin
 debian/lighttpd/90-postfixadmin.conf	etc/lighttpd/conf-available
 debian/apache/postfixadmin.conf		etc/apache2/conf-available

debian/rules

@@ -8,10 +8,14 @@ export VERSION 		= $(shell grep -E "version = '.*';" functions.inc.php |sed -e "
 export DEBVERSION	= $(shell grep -E "postfixadmin .([0-9]+|\.)+" debian/changelog |head -1 |sed -e "s/postfixadmin .//" |sed -e "s/-.*//")
 
 
-# Create a needed tar.gz file to build a non-nativ .dpkg
+# Create a needed tar.gz file to build a non-native .dpkg
 prep:
 	rm -f ../postfixadmin_*orig.tar.gz
-	cd ..; tar --exclude-vcs --exclude=$(notdir ${CURDIR})/debian  --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR})
+	cd ..; tar cvzf \
+	  --exclude-vcs \
+	  --exclude=$(notdir ${CURDIR})/debian \
+	  --exclude=$(notdir ${CURDIR})/.pc \
+	  postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR})
 
 build: build-arch build-indep
 build-arch: build-stamp