r48752 - in /desktop/unstable/gnome-session/debian: README.Debian changelog defaults.list gnome-mimeapps.list gnome-session-common.dirs gnome-session-common.install gnome-session-common.links gnome-session.postinst

[bigon at users.alioth.debian.org]

Author: bigon
Date: Mon May 16 23:07:07 2016
New Revision: 48752

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48752
Log:
Drop /usr/share/gnome/applications/defaults.list symlink and install
/etc/gnome/defaults.list to /usr/share/applications/gnome-mimeapps.list
If /etc/gnome/defaults.list was modified by the system administrator, the
file is moved to /etc/xdg/gnome-mimeapps.list during the upgrade.

Added:
    desktop/unstable/gnome-session/debian/gnome-mimeapps.list
      - copied unchanged from r48751, desktop/unstable/gnome-session/debian/defaults.list
    desktop/unstable/gnome-session/debian/gnome-session-common.dirs
Removed:
    desktop/unstable/gnome-session/debian/defaults.list
    desktop/unstable/gnome-session/debian/gnome-session-common.links
Modified:
    desktop/unstable/gnome-session/debian/README.Debian
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/gnome-session-common.install
    desktop/unstable/gnome-session/debian/gnome-session.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=48752&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:07:07 2016
@@ -43,3 +43,12 @@
    /usr/share/gnome-session/sessions/*.desktop file corresponding to the 
    current session (gnome or gnome-fallback).
 
+MIME types associations
+-----------------------
+
+This package ships a list of default MIME types associations used when running
+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
+all the desktop environment.

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=48752&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog	[utf-8] Mon May 16 23:07:07 2016
@@ -1,13 +1,14 @@
 gnome-session (3.20.1-2) UNRELEASED; urgency=medium
 
-  * debian/gnome-session-common.links:
-    Drop /usr/share/gnome/applications/defaults.list symlink and link
-    /usr/share/applications/gnome-mimeapps.list to /etc/gnome/defaults.list
+  * Drop /usr/share/gnome/applications/defaults.list symlink and install
+    /etc/gnome/defaults.list to /usr/share/applications/gnome-mimeapps.list
     instead, as the xdg spec is allowing desktop specific default applications.
+    If /etc/gnome/defaults.list was modified by the system administrator, the
+    file is moved to /etc/xdg/gnome-mimeapps.list during the upgrade.
     This seems to fix default apps when running gnome-shell as a wayland
     compositor, as the 55gnome-session_gnomerc is not sourced in that case.
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 04 May 2016 00:56:31 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 17 May 2016 01:03:27 +0200
 
 gnome-session (3.20.1-1) unstable; urgency=medium
 

Added: desktop/unstable/gnome-session/debian/gnome-session-common.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-common.dirs?rev=48752&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session-common.dirs	(added)
+++ desktop/unstable/gnome-session/debian/gnome-session-common.dirs	[utf-8] Mon May 16 23:07:07 2016
@@ -0,0 +1 @@
+etc/xdg/

Modified: desktop/unstable/gnome-session/debian/gnome-session-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-common.install?rev=48752&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session-common.install	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome-session-common.install	[utf-8] Mon May 16 23:07:07 2016
@@ -1,4 +1,4 @@
 usr/share/icons
 usr/share/locale
 debian/55gnome-session_gnomerc etc/X11/Xsession.d
-debian/defaults.list etc/gnome
+debian/gnome-mimeapps.list usr/share/applications/

Modified: desktop/unstable/gnome-session/debian/gnome-session.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session.postinst?rev=48752&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.postinst	[utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome-session.postinst	[utf-8] Mon May 16 23:07:07 2016
@@ -9,4 +9,15 @@
     x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
 fi
 
+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"
+  fi
+fi
+
 #DEBHELPER#