r48754 - in /desktop/unstable/gnome-session/debian: README.Debian gnome-session-common.maintscript gnome-session-common.postinst

[bigon at users.alioth.debian.org]

Author: bigon
Date: Mon May 16 23:52:31 2016
New Revision: 48754

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48754
Log:
Use and buse dpkg-maintscript-helper to move/remove /etc/gnome/defaults.list

Added:
    desktop/unstable/gnome-session/debian/gnome-session-common.maintscript
Modified:
    desktop/unstable/gnome-session/debian/README.Debian
    desktop/unstable/gnome-session/debian/gnome-session-common.postinst

Modified: desktop/unstable/gnome-session/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/README.Debian?rev=48754&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/README.Debian	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/README.Debian	[utf-8] Mon May 16 23:52:31 2016
@@ -50,5 +50,5 @@
 the GNOME desktop.
 This file is installed in /usr/share/applications/gnome-mimeapps.list.
 The system administrator can override some associations by adding a file at
-/etc/xdg/gnome-mimeapps.list or /etc/xdg/mimeapps.list if you want to apply to
+/etc/xdg/gnome-mimeapps.list or /etc/xdg/mimeapps.list if he wants to apply to
 all the desktop environment.

Added: desktop/unstable/gnome-session/debian/gnome-session-common.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-common.maintscript?rev=48754&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session-common.maintscript	(added)
+++ desktop/unstable/gnome-session/debian/gnome-session-common.maintscript	[utf-8] Mon May 16 23:52:31 2016
@@ -0,0 +1 @@
+rm_conffile /etc/gnome/defaults.list 3.20.1-2~

Modified: desktop/unstable/gnome-session/debian/gnome-session-common.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-common.postinst?rev=48754&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session-common.postinst	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome-session-common.postinst	[utf-8] Mon May 16 23:52:31 2016
@@ -2,15 +2,15 @@
 
 set -e
 
-if [ "$1" = configure ] && dpkg --compare-versions -- "$2" le-nl "3.20.1-2~"; then
-  md5sum="$(md5sum "/etc/gnome/defaults.list" | sed -e 's/ .*//')"
-  old_md5sum="$(dpkg-query -W -f='${Conffiles}' "gnome-session-common" | \
-    sed -n -e "\'^ /etc/gnome/defaults.list ' { s/ obsolete$//; s/.* //; p }")"
-  if [ "$md5sum" != "$old_md5sum" ]; then
-    mv -f "/etc/gnome/defaults.list" "/etc/xdg/gnome-mimeapps.list"
-  else
-    rm -f "/etc/gnome/defaults.list"
+# Abuse dpkg-maintscript-helper to move/remove /etc/gnome/defaults.list
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le-nl "3.20.1-2~"; then
+  if [ -f "/etc/gnome/defaults.list.dpkg-backup" ]; then
+    echo "Obsolete conffile /etc/gnome/defaults.list has been modified by you."
+    echo "Moving the file to /etc/xdg/gnome-mimeapps.list ..."
+    mv -f "/etc/gnome/defaults.list.dpkg-backup" "/etc/xdg/gnome-mimeapps.list"
   fi
 fi
 
 #DEBHELPER#
+
+exit 0