Version in base suite: 1.4.2

Base version: logcheck_1.4.2
Target version: logcheck_1.4.2+deb12u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/l/logcheck/logcheck_1.4.2.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/l/logcheck/logcheck_1.4.2+deb12u1.dsc

 changelog         |   13 +++++++++++++
 gbp.conf          |    4 ++--
 logcheck.postinst |    8 ++++++++
 logcheck.preinst  |   10 ++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff -Nru logcheck-1.4.2/debian/changelog logcheck-1.4.2+deb12u1/debian/changelog
--- logcheck-1.4.2/debian/changelog	2023-03-01 22:49:39.000000000 +0000
+++ logcheck-1.4.2+deb12u1/debian/changelog	2025-05-04 16:43:20.000000000 +0000
@@ -1,3 +1,16 @@
+logcheck (1.4.2+deb12u1) bookworm; urgency=medium
+
+  [ Mathias Gibbens ]
+  * Update d/gbp.conf for debian/bookworm branch
+
+  [ Richard Lewis ]
+  * Ensure that if a user deleted /etc/logcheck/header.txt before
+    upgrading to bookworm then the file stays deleted (Closes: #1049412).
+    NB that the best way to suppress the header is to set INTRO=0 in
+    /etc/logcheck/logcheck.conf
+
+ -- Mathias Gibbens <gibmat@debian.org>  Sun, 04 May 2025 16:43:20 +0000
+
 logcheck (1.4.2) unstable; urgency=medium
 
   * More explicitly mention the default checking of the systemd journal
diff -Nru logcheck-1.4.2/debian/gbp.conf logcheck-1.4.2+deb12u1/debian/gbp.conf
--- logcheck-1.4.2/debian/gbp.conf	2023-02-10 21:19:27.000000000 +0000
+++ logcheck-1.4.2+deb12u1/debian/gbp.conf	2025-05-04 16:43:20.000000000 +0000
@@ -1,8 +1,8 @@
 [DEFAULT]
+debian-branch = debian/bookworm
+dist = DEP14
 
 [buildpackage]
-#pbuilder = true
-#export-dir = ../build-area
 sign-tags = true
 
 [import-orig]
diff -Nru logcheck-1.4.2/debian/logcheck.postinst logcheck-1.4.2+deb12u1/debian/logcheck.postinst
--- logcheck-1.4.2/debian/logcheck.postinst	2023-02-10 21:19:27.000000000 +0000
+++ logcheck-1.4.2+deb12u1/debian/logcheck.postinst	2025-05-04 16:43:20.000000000 +0000
@@ -66,6 +66,14 @@
 				chown logcheck:logcheck "$f" || true
 				chmod u=rwx,g=rx,o= "$f" || true   # drwxr-x---
 		done
+
+	# remove once trixie is stable (see also preinst)
+	if [ -f /etc/logcheck/header.txt.was-deleted-before-bookworm ]; then
+		echo "Preserving user-deletion of /etc/logcheck/header.txt -- packaged version is left at /etc/logcheck/header.txt.dpkg-new"
+		mv -f /etc/logcheck/header.txt /etc/logcheck/header.txt.dpkg-new || true
+		rm -f /etc/logcheck/header.txt.was-deleted-before-bookworm || true
+	fi
+
   ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru logcheck-1.4.2/debian/logcheck.preinst logcheck-1.4.2+deb12u1/debian/logcheck.preinst
--- logcheck-1.4.2/debian/logcheck.preinst	1970-01-01 00:00:00.000000000 +0000
+++ logcheck-1.4.2+deb12u1/debian/logcheck.preinst	2025-05-04 16:43:20.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# preserve deletion of /etc/logcheck/header.txt if upgrading from <= 1.4.1 --- see #1049412
+if [ "$1" = "upgrade" ] && [ ! -f /etc/logcheck/header.txt ] && dpkg --compare-versions "$2" le-nl 1.4.1; then
+	echo "You deleted /etc/logcheck/header.txt before bookworm: this deletion will be preserved. However, it would be better to set INTRO=0 in /etc/logcheck.conf instead."
+	touch /etc/logcheck/header.txt.was-deleted-before-bookworm || :
+fi
+
+#DEBHELPER#