Commit e3c0434f authored by Michael Biebl's avatar Michael Biebl Committed by Tollef Fog Heen
Browse files

Use new dh_installdeb maintscript facility to handle obsolete conffiles.

Bump Build-Depends on debhelper accordingly.

Conflicts:

	debian/changelog
parent 2f5b2d81
......@@ -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 <tfheen@debian.org> Tue, 07 Feb 2012 21:36:34 +0100
......
......@@ -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
......
File mode changed from 100644 to 100755
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
......@@ -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#
......@@ -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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment