Use new dh_installdeb maintscript facility to handle obsolete conffiles.

Bump Build-Depends on debhelper accordingly.

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ce73b9ea93e9aabc2b3e3fff289cc6cb303dcb4e..e29a54790963a9ee1576964e28f97cf19aab2666 100644 (file)
--- 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 <tfheen@debian.org>  Tue, 07 Feb 2012 21:36:34 +0100
 

diff --git a/debian/control b/debian/control
index 6364f6bade3cf9b4df27aa16747d93e37ce26385..7e8d92d02f29ecbbe3be10a2bf043f24c23d1894 100644 (file)
--- 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 (file)
new mode 100755 (executable)

diff --git a/debian/systemd.maintscript b/debian/systemd.maintscript
new file mode 100644 (file)
index 0000000..1c58815
--- /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 a0cfab0f40fcab602415c80ed7f1d4953d1a5d17..bfff5f0563354b085ee7b747c4d494204f43e494 100644 (file)
--- 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 dfa97dc6a7410efa51bf35445cfb289eb12b63a3..c7fe8a60774b2d347604d064278a7b16b64f4966 100644 (file)
--- 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 3028dadffe3a71b244db74db4e5e925f993dec66..0e8d30d0e8055d1f4e87e51fd0d265db2c583bde 100644 (file)
--- 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