r45534 - in /desktop/unstable/gnome-screensaver/debian: changelog patches/01_no_autostart.patch

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Mon Jul 13 10:40:47 2015
New Revision: 45534

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45534
Log:
debian/patches/01_no_autostart.patch: Only autostart in GNOME Flashback
sessions (closes: #790632).

Modified:
    desktop/unstable/gnome-screensaver/debian/changelog
    desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch

Modified: desktop/unstable/gnome-screensaver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/changelog?rev=45534&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/changelog	[utf-8] Mon Jul 13 10:40:47 2015
@@ -1,3 +1,10 @@
+gnome-screensaver (3.6.1-6) UNRELEASED; urgency=medium
+
+  * debian/patches/01_no_autostart.patch: Only autostart in GNOME Flashback
+    sessions (closes: #790632).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 13 Jul 2015 13:35:28 +0300
+
 gnome-screensaver (3.6.1-5) unstable; urgency=medium
 
   * Build against the new systemd library (closes: #779746).

Modified: desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch?rev=45534&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch	[utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch	[utf-8] Mon Jul 13 10:40:47 2015
@@ -1,36 +1,17 @@
-From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim at feathertop.org>
-Date: Fri, 19 Oct 2012 10:08:56 +1100
-Subject: move gnome-screensaver desktop file out of autostart
+Description: update autostart file for new GNOME Flashback
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2015-07-13
 
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=683060
-Origin: upstream
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1dd5d46..97ffa07 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,7 +47,7 @@ noinst_PROGRAMS = 	\
- 	test-window	\
- 	$(NULL)
- 
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/applications
- desktop_in_files = gnome-screensaver.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
-index fae80c4..82d6d6f 100644
 --- a/src/gnome-screensaver.desktop.in.in
 +++ b/src/gnome-screensaver.desktop.in.in
-@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+@@ -4,8 +4,7 @@
+ _Comment=Launch screensaver and locker program
  Icon=preferences-desktop-screensaver
  Exec=gnome-screensaver
- OnlyShowIn=GNOME;
+-OnlyShowIn=GNOME;
 -AutostartCondition=GNOME3 if-session gnome-fallback
++OnlyShowIn=GNOME-Flashback;
  NoDisplay=true
  X-GNOME-Autostart-Phase=Application
  X-GNOME-Autostart-Notify=true
--- 
-cgit v0.10.1
-