r42730 - in /desktop/unstable/gnome-screensaver/debian: changelog control control.in patches/01_fallback_session.patch patches/01_no_autostart.patch patches/series rules
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Thu Sep 11 20:44:20 UTC 2014
Author: smcv
Date: Thu Sep 11 20:44:20 2014
New Revision: 42730
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42730
Log:
Enable gnome-screensaver to be started by non-GNOME sessions
* Add patch from upstream to enable gnome-screensaver to be included
in the autostart list for non-GNOME sessions, by requiring session files
to include it in RequiredComponents if desired and removing its
AutostartCondition (Closes: #733059)
- depend on dh-autoreconf and gnome-common so we can autoreconfiscate
- remove fallback -> flashback patch, no longer relevant
- Breaks versions of gnome-session-flashback that do not explicitly pull
it in
Added:
desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch
Removed:
desktop/unstable/gnome-screensaver/debian/patches/01_fallback_session.patch
Modified:
desktop/unstable/gnome-screensaver/debian/changelog
desktop/unstable/gnome-screensaver/debian/control
desktop/unstable/gnome-screensaver/debian/control.in
desktop/unstable/gnome-screensaver/debian/patches/series
desktop/unstable/gnome-screensaver/debian/rules
Modified: desktop/unstable/gnome-screensaver/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/changelog?rev=42730&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/changelog [utf-8] Thu Sep 11 20:44:20 2014
@@ -2,8 +2,16 @@
* Add missing permissive license to debian/copyright (Closes: #749519)
* Add a missing copyright holder while I'm there
-
- -- Simon McVittie <smcv at debian.org> Thu, 11 Sep 2014 20:29:38 +0100
+ * Add patch from upstream to enable gnome-screensaver to be included
+ in the autostart list for non-GNOME sessions, by requiring session files
+ to include it in RequiredComponents if desired and removing its
+ AutostartCondition (Closes: #733059)
+ - depend on dh-autoreconf and gnome-common so we can autoreconfiscate
+ - remove fallback -> flashback patch, no longer relevant
+ - Breaks versions of gnome-session-flashback that do not explicitly pull
+ it in
+
+ -- Simon McVittie <smcv at debian.org> Thu, 11 Sep 2014 21:26:06 +0100
gnome-screensaver (3.6.1-1) unstable; urgency=low
Modified: desktop/unstable/gnome-screensaver/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/control?rev=42730&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/control [utf-8] Thu Sep 11 20:44:20 2014
@@ -2,7 +2,6 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gnome-screensaver
Section: gnome
Priority: optional
@@ -10,7 +9,9 @@
Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: cdbs,
debhelper (>= 8.1.0~),
+ dh-autoreconf,
autotools-dev,
+ gnome-common,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libdbus-glib-1-dev (>= 0.30),
@@ -47,6 +48,7 @@
gnome-icon-theme (>= 2.15.90),
gnome-session-bin (>= 3.0),
gsettings-desktop-schemas (>= 2.91.92)
+Breaks: gnome-session-flashback (<< 3.8.1-1~)
Recommends: gnome-power-manager,
libpam-gnome-keyring
Description: GNOME screen saver and locker
Modified: desktop/unstable/gnome-screensaver/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/control.in?rev=42730&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/control.in [utf-8] Thu Sep 11 20:44:20 2014
@@ -5,7 +5,9 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
debhelper (>= 8.1.0~),
+ dh-autoreconf,
autotools-dev,
+ gnome-common,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
libdbus-glib-1-dev (>= 0.30),
@@ -42,6 +44,7 @@
gnome-icon-theme (>= 2.15.90),
gnome-session-bin (>= 3.0),
gsettings-desktop-schemas (>= 2.91.92)
+Breaks: gnome-session-flashback (<< 3.8.1-1~)
Recommends: gnome-power-manager,
libpam-gnome-keyring
Description: GNOME screen saver and locker
Added: 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=42730&op=file
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch (added)
+++ desktop/unstable/gnome-screensaver/debian/patches/01_no_autostart.patch [utf-8] Thu Sep 11 20:44:20 2014
@@ -0,0 +1,36 @@
+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
+
+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
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.10.1
+
Modified: desktop/unstable/gnome-screensaver/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/patches/series?rev=42730&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/patches/series [utf-8] Thu Sep 11 20:44:20 2014
@@ -1 +1 @@
-01_fallback_session.patch
+01_no_autostart.patch
Modified: desktop/unstable/gnome-screensaver/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-screensaver/debian/rules?rev=42730&op=diff
==============================================================================
--- desktop/unstable/gnome-screensaver/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-screensaver/debian/rules [utf-8] Thu Sep 11 20:44:20 2014
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
@@ -14,6 +15,4 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
binary-post-install/gnome-screensaver::
- mv debian/gnome-screensaver/etc/xdg/autostart \
- debian/gnome-screensaver/usr/share/gnome/autostart
rm -rf debian/gnome-screensaver/usr/share/doc/gnome-screensaver-*
More information about the pkg-gnome-commits
mailing list