r30660 - in /desktop/unstable/gnome-settings-daemon/debian: changelog gnome-settings-daemon.postinst gnome-settings-daemon.postrm gnome-settings-daemon.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 17 15:58:15 2011
New Revision: 30660

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30660
Log:
Remove obsolete conffiles in /etc/gnome/config on upgrades. Closes: 645443

Added:
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postrm
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postinst

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=30660&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Mon Oct 17 15:58:15 2011
@@ -4,6 +4,7 @@
     - Deal with absence of gnome-session gracefully and don't crash if
       gnome-session is not running. Patch cherry-picked from upstream Git.
       Closes: #645429
+  * Remove obsolete conffiles in /etc/gnome/config on upgrades. Closes: 645443
 
  -- Michael Biebl <biebl at debian.org>  Mon, 17 Oct 2011 17:35:22 +0200
 

Modified: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postinst?rev=30660&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postinst [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postinst [utf-8] Mon Oct 17 15:58:15 2011
@@ -1,16 +1,12 @@
-#! /bin/sh
+#!/bin/sh
+
 set -e
 
-# Remove obsolete conffiles
-
-case "$1" in
-configure)
-    if dpkg --compare-versions "$2" lt-nl "2.24.1"; then
-        rm -rf /etc/gnome/config/xrdb
-    fi
-    if dpkg --compare-versions "$2" lt-nl "2.26.1"; then
-        rm -f /etc/xdg/autostart/gnome-settings-daemon.desktop
-    fi
-esac
-
-#DEBHELPER#
+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 -- "$@"

Added: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postrm?rev=30660&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postrm (added)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.postrm [utf-8] Mon Oct 17 15:58:15 2011
@@ -1,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+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 -- "$@"

Added: 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=30660&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst (added)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.preinst [utf-8] Mon Oct 17 15:58:15 2011
@@ -1,0 +1,14 @@
+#!/bin/sh
+
+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