r48488 - in /desktop/unstable/gnome-settings-daemon: ./ debian/changelog debian/control debian/gnome-settings-daemon.install debian/gnome-settings-daemon.maintscript

[bigon at users.alioth.debian.org]

Author: bigon
Date: Wed May  4 11:25:44 2016
New Revision: 48488

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48488
Log:
debian/gnome-settings-daemon.install,
debian/gnome-settings-daemon.maintscript: Move gnome-settings-daemon.desktop
back to etc/xdg/autostart. We are trying to remove the non-standard
/usr/share/gnome/autostart/ path.

Modified:
    desktop/unstable/gnome-settings-daemon/   (props changed)
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/control
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.install
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript

Propchange: desktop/unstable/gnome-settings-daemon/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/gnome-settings-daemon:45750-46410

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=48488&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] Wed May  4 11:25:44 2016
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.20.1-2) UNRELEASED; urgency=medium
+
+  * debian/gnome-settings-daemon.install,
+    debian/gnome-settings-daemon.maintscript: Move gnome-settings-daemon.desktop
+    back to etc/xdg/autostart. We are trying to remove the non-standard
+    /usr/share/gnome/autostart/ path.
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 04 May 2016 13:24:18 +0200
+
 gnome-settings-daemon (3.20.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=48488&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] Wed May  4 11:25:44 2016
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 9),
                gnome-pkg-tools,

Modified: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.install?rev=48488&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.install	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.install	[utf-8] Wed May  4 11:25:44 2016
@@ -1,4 +1,4 @@
-etc/xdg/autostart /usr/share/gnome
+etc/xdg/autostart
 usr/lib/gnome-settings-daemon*
 usr/share/icons
 usr/share/locale

Modified: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript?rev=48488&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript	[utf-8] Wed May  4 11:25:44 2016
@@ -1,4 +1,3 @@
-rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 2.26.1-1~ gnome-settings-daemon
 rm_conffile /etc/gnome/config/xrdb 2.26.1-1~ gnome-settings-daemon
 rm_conffile /etc/gnome/config/Editres.ad 3.0.3-3~ gnome-settings-daemon
 rm_conffile /etc/gnome/config/Tk.ad 3.0.3-3~ gnome-settings-daemon