r19135 - in /desktop/unstable/gnome-vfs/debian: changelog libgnomevfs2-common.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Mar 19 21:36:27 2009
New Revision: 19135

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19135
Log:
* libgnomevfs2-common.preinst:
  + Remove the conffile.
  + Remove the old snippet now that lenny is out.

Modified:
    desktop/unstable/gnome-vfs/debian/changelog
    desktop/unstable/gnome-vfs/debian/libgnomevfs2-common.preinst

Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=19135&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog (original)
+++ desktop/unstable/gnome-vfs/debian/changelog Thu Mar 19 21:36:27 2009
@@ -5,6 +5,9 @@
   * 03_usr_share_gnome_applications.patch: removed, now gnome-session 
     will set XDG_DATA_DIRS.
   * Stop installing the file.
+  * libgnomevfs2-common.preinst:
+    + Remove the conffile.
+    + Remove the old snippet now that lenny is out.
 
  -- Josselin Mouette <joss at debian.org>  Thu, 19 Mar 2009 22:28:29 +0100
 

Modified: desktop/unstable/gnome-vfs/debian/libgnomevfs2-common.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/libgnomevfs2-common.preinst?rev=19135&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/libgnomevfs2-common.preinst (original)
+++ desktop/unstable/gnome-vfs/debian/libgnomevfs2-common.preinst Thu Mar 19 21:36:27 2009
@@ -20,11 +20,9 @@
     fi
 }
 
-case "$1" in
-    install|upgrade)
-    # The https method is now described in extra-modules.conf
-    rm_conffile libgnomevfs2-common /etc/gnome-vfs-2.0/modules/ssl-modules.conf
-    ;;
-esac
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 1:2.24.0-3; then
+    # The defaults.list file is now in /etc/gnome, in gnome-session
+    rm_conffile libgnomevfs2-common /etc/gnome-vfs-2.0/defaults.list
+fi
 
 #DEBHELPER#