r30752 - /desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 18 22:54:29 2011
New Revision: 30752

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30752
Log:
Removing obsolete conffile is not optional

and squeeze has a recent enough version, so remove the check

Modified:
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst

Modified: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst?rev=30752&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst [utf-8] Tue Oct 18 22:54:29 2011
@@ -2,15 +2,13 @@
 
 set -e
 
-if dpkg-maintscript-helper supports rm_conffile; then
-  dpkg-maintscript-helper rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 2.26.1 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/xrdb 2.24.1 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/Editres.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/Tk.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/Emacs.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/Motif.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/General.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-  dpkg-maintscript-helper rm_conffile /etc/gnome/config/Xaw.ad 3.0.3-2 gnome-settings-daemon -- "$@"
-fi
+dpkg-maintscript-helper rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 2.26.1 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/xrdb 2.24.1 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/Editres.ad 3.0.3-2 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/Tk.ad 3.0.3-2 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/Emacs.ad 3.0.3-2 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/Motif.ad 3.0.3-2 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/General.ad 3.0.3-2 gnome-settings-daemon -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/gnome/config/Xaw.ad 3.0.3-2 gnome-settings-daemon -- "$@"
 
 #DEBHELPER#