diff -Nru postgrey-1.37/debian/changelog postgrey-1.37/debian/changelog
--- postgrey-1.37/debian/changelog	2022-10-15 10:38:47.000000000 +0000
+++ postgrey-1.37/debian/changelog	2023-04-30 22:57:30.000000000 +0000
@@ -1,9 +1,13 @@
-postgrey (1.37-1.1) unstable; urgency=medium
+postgrey (1.37-2) unstable; urgency=medium
 
-  * Non-maintainer upload.
-  * No source change upload to rebuild with debhelper 13.10.
+  * Use %H in the service file to set the hostname in the rejection message
+    (closes: #1031401).
+  * Add missing ucf machinery so the default config file and whitelists get
+    installed correctly (closes: #1033231).
+  * Reinstate creation of postgrey user.
+  * Ensure /var/lib/postgrey exists and is owned by postgrey.
 
- -- Michael Biebl <biebl@debian.org>  Sat, 15 Oct 2022 12:38:47 +0200
+ -- Jordi Mallach <jordi@debian.org>  Mon, 01 May 2023 00:57:30 +0200
 
 postgrey (1.37-1) unstable; urgency=medium
 
diff -Nru postgrey-1.37/debian/postgrey.dirs postgrey-1.37/debian/postgrey.dirs
--- postgrey-1.37/debian/postgrey.dirs	2022-02-01 12:50:22.000000000 +0000
+++ postgrey-1.37/debian/postgrey.dirs	2023-04-30 22:27:12.000000000 +0000
@@ -1 +1,2 @@
 /etc/postgrey
+/var/lib/postgrey
diff -Nru postgrey-1.37/debian/postgrey.install postgrey-1.37/debian/postgrey.install
--- postgrey-1.37/debian/postgrey.install	2022-02-01 12:50:22.000000000 +0000
+++ postgrey-1.37/debian/postgrey.install	2023-03-09 13:34:47.000000000 +0000
@@ -1,6 +1,9 @@
-postgrey                             usr/sbin/
-policy-test                          usr/sbin
-contrib/postgreyreport               usr/bin
-postgrey_whitelist_clients           usr/share/postgrey
-postgrey_whitelist_recipients        usr/share/postgrey
-debian/postgrey-default              usr/share/postgrey
+postgrey                                    usr/sbin/
+policy-test                                 usr/sbin
+contrib/postgreyreport                      usr/bin
+postgrey_whitelist_clients                  usr/share/postgrey
+postgrey_whitelist_recipients               usr/share/postgrey
+debian/postgrey-default                     usr/share/postgrey
+debian/postgrey-default.md5sum              usr/share/postgrey
+debian/postgrey_whitelist_clients.md5sum    usr/share/postgrey
+debian/postgrey_whitelist_recipients.md5sum usr/share/postgrey
diff -Nru postgrey-1.37/debian/postgrey.service postgrey-1.37/debian/postgrey.service
--- postgrey-1.37/debian/postgrey.service	2022-02-26 13:07:46.000000000 +0000
+++ postgrey-1.37/debian/postgrey.service	2023-03-08 16:22:52.000000000 +0000
@@ -6,7 +6,7 @@
 
 [Service]
 Type=simple
-Environment=POSTGREY_TEXT="Greylisted, see https://postgrey.schweikert.ch/help/%r.html"
+Environment=POSTGREY_TEXT="Greylisted, see https://postgrey.schweikert.ch/help/%H.html"
 EnvironmentFile=-/etc/default/postgrey
 ExecStart=/usr/sbin/postgrey \
  $POSTGREY_OPTS \
diff -Nru postgrey-1.37/debian/postgrey.ucf postgrey-1.37/debian/postgrey.ucf
--- postgrey-1.37/debian/postgrey.ucf	1970-01-01 00:00:00.000000000 +0000
+++ postgrey-1.37/debian/postgrey.ucf	2023-03-09 15:26:18.000000000 +0000
@@ -0,0 +1,3 @@
+usr/share/postgrey/postgrey-default     /etc/default/postgrey
+usr/share/postgrey/whitelist_clients    /etc/postgrey/whitelist_clients
+usr/share/postgrey/whitelist_recipients /etc/postgrey/whitelist_recipients
diff -Nru postgrey-1.37/debian/postgrey_whitelist_clients.md5sum postgrey-1.37/debian/postgrey_whitelist_clients.md5sum
--- postgrey-1.37/debian/postgrey_whitelist_clients.md5sum	2022-02-01 12:50:22.000000000 +0000
+++ postgrey-1.37/debian/postgrey_whitelist_clients.md5sum	2023-03-09 13:39:18.000000000 +0000
@@ -15,3 +15,4 @@
 50848c8868cdc595592881c83f6b2250  1.31-1/postgrey_whitelist_clients
 cb7f6e25df39e1e05317a6dd344fc2c2  1.31-3/postgrey_whitelist_clients
 5163854ff699ed1cf00c3049b6d431b0  1.32-1/postgrey_whitelist_clients
+3a3da3cc43ab44e48b39261923a1d2da  1.37-1/postgrey_whitelist_clients
diff -Nru postgrey-1.37/debian/postgrey_whitelist_recipients.md5sum postgrey-1.37/debian/postgrey_whitelist_recipients.md5sum
--- postgrey-1.37/debian/postgrey_whitelist_recipients.md5sum	2022-02-01 12:50:22.000000000 +0000
+++ postgrey-1.37/debian/postgrey_whitelist_recipients.md5sum	2023-03-09 15:30:00.000000000 +0000
@@ -1,2 +1,3 @@
 a4db015e1db1ebcb64fe52ae1daca875  1.16-2/postgrey_whitelist_recipients
 6fc7a7b6c899bffd97c65af329837cee  1.17-2/postgrey_whitelist_recipients
+a4db015e1db1ebcb64fe52ae1daca875  1.37-1/postgrey_whitelist_recipients
diff -Nru postgrey-1.37/debian/postinst postgrey-1.37/debian/postinst
--- postgrey-1.37/debian/postinst	1970-01-01 00:00:00.000000000 +0000
+++ postgrey-1.37/debian/postinst	2023-04-30 22:40:15.000000000 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+        DBDIR='/var/lib/postgrey'
+
+        getent passwd postgrey > /dev/null || \
+            adduser --system --home "$DBDIR" --no-create-home \
+                    --disabled-password --group postgrey
+
+	chown postgrey:postgrey $DBDIR
+    ;;
+esac
+
+#DEBHELPER#