diff -Nru ulogd2-2.0.5/debian/changelog ulogd2-2.0.5/debian/changelog --- ulogd2-2.0.5/debian/changelog 2016-11-11 16:39:34.000000000 +0000 +++ ulogd2-2.0.5/debian/changelog 2016-12-17 10:28:55.000000000 +0000 @@ -1,3 +1,14 @@ +ulogd2 (2.0.5-5) unstable; urgency=medium + + * Switch to debhelper compat 10. + - debian/control: update and tidy up Build-Depends. + - debian/rules: tidy and remove implied autoreconf, systemd and parallel + options + * ulogd2.service: Add Documentation key + * Tighten ownership and permissions on /var/log/ulog. (Closes: #846843) + + -- Chris Boot Sat, 17 Dec 2016 10:28:55 +0000 + ulogd2 (2.0.5-4) unstable; urgency=medium * Run wrap-and-sort. diff -Nru ulogd2-2.0.5/debian/compat ulogd2-2.0.5/debian/compat --- ulogd2-2.0.5/debian/compat 2015-05-11 11:51:38.000000000 +0000 +++ ulogd2-2.0.5/debian/compat 2016-12-16 11:39:12.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru ulogd2-2.0.5/debian/control ulogd2-2.0.5/debian/control --- ulogd2-2.0.5/debian/control 2016-11-11 16:35:47.000000000 +0000 +++ ulogd2-2.0.5/debian/control 2016-12-16 11:48:50.000000000 +0000 @@ -3,10 +3,8 @@ Priority: optional Maintainer: Chris Boot Build-Depends: - debhelper (>= 9), + debhelper (>= 10), default-libmysqlclient-dev, - dh-autoreconf, - dh-systemd (>= 1.5), groff, libdbi-dev, libjansson-dev, diff -Nru ulogd2-2.0.5/debian/rules ulogd2-2.0.5/debian/rules --- ulogd2-2.0.5/debian/rules 2016-02-25 21:02:01.000000000 +0000 +++ ulogd2-2.0.5/debian/rules 2016-12-16 11:46:39.000000000 +0000 @@ -4,9 +4,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS - # Activate full hardening build flags export DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow @@ -16,7 +13,7 @@ TMP = $(CURDIR)/debian/$(PACKAGE) %: - dh $@ --with autoreconf,systemd --parallel + dh $@ override_dh_auto_configure: dh_auto_configure -- --disable-silent-rules --with-pgsql --with-mysql \ diff -Nru ulogd2-2.0.5/debian/ulogd2.postinst ulogd2-2.0.5/debian/ulogd2.postinst --- ulogd2-2.0.5/debian/ulogd2.postinst 2015-05-11 11:51:38.000000000 +0000 +++ ulogd2-2.0.5/debian/ulogd2.postinst 2016-12-16 13:36:32.000000000 +0000 @@ -17,5 +17,17 @@ update-rc.d -f ulogd remove >/dev/null fi +case "$1" in +configure) + # Set ownership and permissions on /var/log/ulog for new installs or + # upgrades from << 2.0.5-5 + if dpkg --compare-versions "$2" lt '2.0.5-5~'; then + mkdir -p /var/log/ulog + chown ulog:adm /var/log/ulog + chmod u=rwx,g=rx,o= /var/log/ulog + fi + ;; +esac + #DEBHELPER# diff -Nru ulogd2-2.0.5/debian/ulogd2.service ulogd2-2.0.5/debian/ulogd2.service --- ulogd2-2.0.5/debian/ulogd2.service 2015-05-11 11:51:38.000000000 +0000 +++ ulogd2-2.0.5/debian/ulogd2.service 2016-12-16 12:05:47.000000000 +0000 @@ -1,5 +1,6 @@ [Unit] Description=Netfilter Userspace Logging Daemon +Documentation=man:ulogd(8) [Service] Type=forking