From e3c0434f4ab8725a35a87e1941d0d8f767e61042 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 12 Feb 2012 00:19:59 +0100 Subject: [PATCH] Use new dh_installdeb maintscript facility to handle obsolete conffiles. Bump Build-Depends on debhelper accordingly. Conflicts: debian/changelog --- debian/changelog | 2 ++ debian/control | 3 ++- debian/debian-fixup | 0 debian/systemd.maintscript | 4 ++++ debian/systemd.postinst | 6 ------ debian/systemd.postrm | 6 ------ debian/systemd.preinst | 6 ------ 7 files changed, 8 insertions(+), 19 deletions(-) mode change 100644 => 100755 debian/debian-fixup create mode 100644 debian/systemd.maintscript diff --git a/debian/changelog b/debian/changelog index ce73b9ea..e29a5479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ systemd (43-1) unstable; urgency=low Closes: #643699 * Disable pam_systemd for non-interactive sessions to work around an issue with sudo. + * Use new dh_installdeb maintscript facility to handle obsolete conffiles. + Bump Build-Depends on debhelper accordingly. -- Tollef Fog Heen Tue, 07 Feb 2012 21:36:34 +0100 diff --git a/debian/control b/debian/control index 6364f6ba..7e8d92d0 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.2 Vcs-Git: git://git.err.no/systemd/ Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary Homepage: http://www.freedesktop.org/wiki/Software/systemd -Build-Depends: debhelper (>= 7.0.50), +Build-Depends: debhelper (>= 8.1.0), libcap-dev, pkg-config, libudev-dev (>= 172), @@ -39,6 +39,7 @@ Section: admin Priority: extra Recommends: libpam-systemd Suggests: systemd-gui, python +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>= 2.19.1-2), initscripts (>= 2.88dsf-17), udev Breaks: lvm2 (<< 2.02.84-1) Conflicts: klogd diff --git a/debian/debian-fixup b/debian/debian-fixup old mode 100644 new mode 100755 diff --git a/debian/systemd.maintscript b/debian/systemd.maintscript new file mode 100644 index 00000000..1c58815e --- /dev/null +++ b/debian/systemd.maintscript @@ -0,0 +1,4 @@ +rm_conffile /etc/lsb-base-logging.sh 20-1 systemd +rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd +rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd +rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd diff --git a/debian/systemd.postinst b/debian/systemd.postinst index a0cfab0f..bfff5f05 100644 --- a/debian/systemd.postinst +++ b/debian/systemd.postinst @@ -49,10 +49,4 @@ fi systemd-machine-id-setup -dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@" - -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@" - #DEBHELPER# diff --git a/debian/systemd.postrm b/debian/systemd.postrm index dfa97dc6..c7fe8a60 100644 --- a/debian/systemd.postrm +++ b/debian/systemd.postrm @@ -7,12 +7,6 @@ if [ "$1" = remove ] || [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 25 --divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions fi -dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@" - -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@" - #DEBHELPER# exit 0 diff --git a/debian/systemd.preinst b/debian/systemd.preinst index 3028dadf..0e8d30d0 100644 --- a/debian/systemd.preinst +++ b/debian/systemd.preinst @@ -7,12 +7,6 @@ if [ "$1" = install ] || [ "$1" = upgrade ]; then --divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions fi -dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@" - -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@" -dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@" - #DEBHELPER# exit 0 -- 2.39.5