r52831 - in /packages/unstable/xdg-user-dirs/debian: patches/01_add-autostart-file.patch patches/series rules xdg-user-dirs-Xsession

[mak at users.alioth.debian.org]

Author: mak
Date: Thu Aug 17 17:35:45 2017
New Revision: 52831

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52831
Log:
Use .desktop file to start dir update instead of Xsession file

This is required for Wayland support and used in this configuration
by all distributions I've checked.


Added:
    packages/unstable/xdg-user-dirs/debian/patches/01_add-autostart-file.patch
Removed:
    packages/unstable/xdg-user-dirs/debian/xdg-user-dirs-Xsession
Modified:
    packages/unstable/xdg-user-dirs/debian/patches/series
    packages/unstable/xdg-user-dirs/debian/rules

Added: packages/unstable/xdg-user-dirs/debian/patches/01_add-autostart-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs/debian/patches/01_add-autostart-file.patch?rev=52831&op=file
==============================================================================
--- packages/unstable/xdg-user-dirs/debian/patches/01_add-autostart-file.patch	(added)
+++ packages/unstable/xdg-user-dirs/debian/patches/01_add-autostart-file.patch	[utf-8] Thu Aug 17 17:35:45 2017
@@ -0,0 +1,46 @@
+From 5609ba23f16880dd59cd9e2445730779476d614d Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Thu, 17 Aug 2017 04:05:46 +0200
+Subject: [PATCH] Add autostart .desktop file for user-dirs-update
+
+The user-dirs update was traditionally done by an Xsession.d snippet,
+which does not work in a Wayland session.
+To avoid duplicating the .desktop file in every distribution, we ship it
+upstream.
+---
+ Makefile.am           | 3 +++
+ xdg-user-dirs.desktop | 8 ++++++++
+ 2 files changed, 11 insertions(+)
+ create mode 100644 xdg-user-dirs.desktop
+
+diff --git a/Makefile.am b/Makefile.am
+index 9a40e68..a3ef127 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,6 +19,9 @@ EXTRA_DIST= config.rpath translate.c autogen.sh \
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
++xdgautostartdir=$(xdgdir)/autostart
++xdgautostart_DATA = xdg-user-dirs.desktop
++
+ libraries = $(LIBINTL)
+ 
+ bin_PROGRAMS =					\
+diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop
+new file mode 100644
+index 0000000..f87ad58
+--- /dev/null
++++ b/xdg-user-dirs.desktop
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Type=Application
++Name=User folders update
++Exec=xdg-user-dirs-update
++StartupNotify=false
++NoDisplay=true
++X-GNOME-Autostart-Phase=Initialization
++X-KDE-autostart-phase=1
+-- 
+2.14.1
+

Modified: packages/unstable/xdg-user-dirs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs/debian/patches/series?rev=52831&op=diff
==============================================================================
--- packages/unstable/xdg-user-dirs/debian/patches/series	[utf-8] (original)
+++ packages/unstable/xdg-user-dirs/debian/patches/series	[utf-8] Thu Aug 17 17:35:45 2017
@@ -0,0 +1 @@
+01_add-autostart-file.patch

Modified: packages/unstable/xdg-user-dirs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs/debian/rules?rev=52831&op=diff
==============================================================================
--- packages/unstable/xdg-user-dirs/debian/rules	[utf-8] (original)
+++ packages/unstable/xdg-user-dirs/debian/rules	[utf-8] Thu Aug 17 17:35:45 2017
@@ -10,11 +10,6 @@
 
 LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-binary-post-install/xdg-user-dirs::
-	mkdir -p debian/xdg-user-dirs/etc/X11/Xsession.d
-	cp debian/xdg-user-dirs-Xsession \
-		debian/xdg-user-dirs/etc/X11/Xsession.d/60xdg-user-dirs-update
-
 build/xdg-user-dirs::
 	make -C po update-gmo