diff -Nru xfce4-session-4.12.1/debian/changelog xfce4-session-4.12.1/debian/changelog --- xfce4-session-4.12.1/debian/changelog 2015-05-16 08:26:58.000000000 +0000 +++ xfce4-session-4.12.1/debian/changelog 2016-09-22 01:15:35.000000000 +0000 @@ -1,3 +1,33 @@ +xfce4-session (4.12.1-3ubuntu3) devel; urgency=medium + + * d/p/04-use-debian-xscreensaver-wrapper.patch: + - xscreensaver ships a wrapper that checks what DM is running, + and conditionally uses either dm-tool or gdmflexiserver. + + -- Unit 193 Wed, 21 Sep 2016 21:15:34 -0400 + +xfce4-session (4.12.1-3ubuntu2) yakkety; urgency=medium + + * Add systemd user session. Note that this is not active for the XFCE + session right now, it will just be used for xubuntu-default-setting's + Xubuntu session. + + -- Martin Pitt Mon, 25 Jul 2016 22:12:13 +0200 + +xfce4-session (4.12.1-3ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches: + + d/p/xubuntu_git_Make_verbose_logging_conditional.patch: + Backport a commit to turn off verbose logging by default. + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + - Add startxfce4.user-session.upstart + - debian/control: add alternate recommends xscreensaver | light-locker. + + -- Sean Davis Mon, 25 May 2015 20:21:16 -0400 + xfce4-session (4.12.1-3) unstable; urgency=medium * debian/rules: @@ -15,6 +45,25 @@ -- Yves-Alexis Perez Wed, 06 May 2015 16:02:10 +0200 +xfce4-session (4.12.1-1ubuntu2) vivid-proposed; urgency=medium + + * d/p/xubuntu_git_Make_verbose_logging_conditional.patch: + - Backport a commit to turn off verbose logging by default. + + -- Unit 193 Thu, 09 Apr 2015 03:24:39 -0400 + +xfce4-session (4.12.1-1ubuntu1) vivid-proposed; urgency=medium + + * Merge from Debian experimental, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + - Add startxfce4.user-session.upstart + - debian/control: add alternate recommends xscreensaver | light-locker. + + -- Jackson Doak Sat, 28 Mar 2015 06:33:18 +1100 + xfce4-session (4.12.1-1) experimental; urgency=medium [ Mateusz Łukasik ] @@ -44,6 +93,33 @@ -- Yves-Alexis Perez Sun, 08 Mar 2015 20:38:32 +0100 +xfce4-session (4.11.1-0ubuntu1) vivid; urgency=medium + + * New upstream release. + * debian/patches: + - Dropped 02_runtime-logind-support.patch and + xubuntu_set-xdg-current-desktop.patch, included upstream. + - Refreshed 01_fix-xrdb-call.patch. + + -- Sean Davis Mon, 01 Dec 2014 21:12:28 -0500 + +xfce4-session (4.11.0-1ubuntu1) utopic; urgency=medium + + * Merge from Debian experimental, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. + + xflock4-light-locker-support.patch: + Add support in xflock4 for light-locker as screen locker. + - Add startxfce4.user-session.upstart + - debian/control: add alternate recommends xscreensaver | light-locker. + + -- Unit 193 Sat, 16 Aug 2014 15:59:40 -0400 + xfce4-session (4.11.0-1) experimental; urgency=low [ Lionel Le Folgoc ] @@ -98,6 +174,30 @@ -- Yves-Alexis Perez Sat, 16 Aug 2014 12:48:09 +0200 +xfce4-session (4.12.0-0ubuntu1) vivid; urgency=medium + + * New upstream release. LP: #1424887 + + -- Jackson Doak Sun, 01 Mar 2015 13:15:05 +1100 + +xfce4-session (4.10.1-7ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. + + debian/patches/xubuntu_runtime-logind-support.patch: + Check for logind support at runtime + + xflock4-light-locker-support.patch. + - Add startxfce4.user-session.upstart + * Drop xubuntu_runtime-logind-support.patch, fixed in debian + + -- Jackson Doak Mon, 21 Jul 2014 16:51:03 +1000 + xfce4-session (4.10.1-7) unstable; urgency=medium * Check for logind support at runtime: @@ -142,6 +242,77 @@ -- Yves-Alexis Perez Thu, 16 Jan 2014 22:09:59 +0100 +xfce4-session (4.11.0-1) experimental; urgency=low + + [ Lionel Le Folgoc ] + * Check for logind support at runtime: + - debian/patches/02_runtime-logind-support.patch: added. + - debian/rules: + + call xdt-autogen after patching + + clean up autogenerated files modified by xdt-autogen. + - debian/control: + + add build-dep on libpolkit-gobject-1-dev. + + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen + after patching. + + don't recommend consolekit anymore. + * debian/control: update my email address. + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/control: + - update standards version to 3.9.5. + + -- Yves-Alexis Perez Fri, 28 Feb 2014 21:33:32 +0100 + +xfce4-session (4.10.1-3ubuntu5) trusty; urgency=medium + + * debian/control: use xscreensaver or light-locker in recommends + (LP: #1295482) + + -- Sean Davis Thu, 20 Mar 2014 23:11:51 -0500 + +xfce4-session (4.10.1-3ubuntu4) trusty; urgency=low + + * Update xflock4-light-locker-support.patch to prefer light-locker + over xscreensaver. LP: #1291019 + + -- Jan Henke Tue, 18 Mar 2014 19:36:28 +0100 + +xfce4-session (4.10.1-3ubuntu3) trusty; urgency=low + + * Add xflock4-light-locker-support.patch. LP: #1254366 + + -- Jackson Doak Sun, 24 Nov 2013 13:43:52 +1100 + +xfce4-session (4.10.1-3ubuntu2) trusty; urgency=low + + * Add mythbuntu to the list of xsessions to be potentially ran by upstart. + + -- Mario Limonciello Tue, 12 Nov 2013 21:41:29 -0600 + +xfce4-session (4.10.1-3ubuntu1) trusty; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. + + debian/patches/xubuntu_runtime-logind-support.patch: + Check for logind support at runtime + - debian/rules: + + call xdt-autogen after patching + + clean up autogenerated files modified by xdt-autogen. + - debian/control: + + add build-dep on libpolkit-gobject-1-dev (>= 0.100). + + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen + after patching. + + don't recommend consolekit anymore. + + -- Jackson Doak Thu, 31 Oct 2013 18:17:54 +0000 + xfce4-session (4.10.1-3) unstable; urgency=low [ Jackson Doak ] @@ -172,6 +343,34 @@ -- Yves-Alexis Perez Tue, 17 Sep 2013 21:56:28 +0200 +xfce4-session (4.10.1-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. lp #927172 + + * debian/patches: + - xfsm-startup-random-crash.patch: dropped, included in 4.10.1. + - xubuntu_ignore-gdm-lang.patch: updated to apply cleanly. + + * Check for logind support at runtime (lp: #1178373): + - debian/patches/xubuntu_runtime-logind-support.patch: added. + - debian/rules: + + call xdt-autogen after patching + + clean up autogenerated files modified by xdt-autogen. + - debian/control: + + add build-dep on libpolkit-gobject-1-dev (>= 0.100). + + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen + after patching. + + don't recommend consolekit anymore. + + -- Lionel Le Folgoc Mon, 01 Jul 2013 19:35:39 +0200 + xfce4-session (4.10.1-1) unstable; urgency=low * New upstream release. @@ -183,6 +382,40 @@ -- Yves-Alexis Perez Tue, 21 May 2013 23:16:10 +0200 +xfce4-session (4.10.0-2ubuntu4) saucy; urgency=low + + * Update startxfce4 job to also start for ubuntu-studio. + + -- Stéphane Graber Mon, 03 Jun 2013 10:30:03 -0400 + +xfce4-session (4.10.0-2ubuntu3) saucy; urgency=low + + * Add startxfce4 upstart user job to xfce4-session. + + -- Stéphane Graber Fri, 31 May 2013 11:45:15 -0400 + +xfce4-session (4.10.0-2ubuntu2) saucy; urgency=low + + * debian/patches/xfsm-startup-random-crash.patch: added. Fix random crashes. lp: #1104435 + + -- Ricardo F. Teixeira Wed, 01 May 2013 00:33:42 +0100 + +xfce4-session (4.10.0-2ubuntu1) raring; urgency=low + + * Merge from Debian experimental, remaining Ubuntu changes: + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. lp #927172 + + * Drop now obsolete delta wrt to gnome-keyring integration. lp: #1010409 + * The patch added by the Debian upload fixes lp: #978333. + + -- Lionel Le Folgoc Fri, 09 Nov 2012 23:05:01 +0100 + xfce4-session (4.10.0-2) experimental; urgency=low * debian/control: @@ -194,6 +427,24 @@ -- Yves-Alexis Perez Sat, 13 Oct 2012 15:42:09 +0200 +xfce4-session (4.10.0-1ubuntu1) quantal; urgency=low + + * Merge from Debian experimental, remaining Ubuntu changes: + - debian/control: build-depends on libgnome-keyring-dev to enable GNOME + Keyring services support. + - debian/rules: pass --enable-libgnome-keyring to dh_auto_configure. + - debian/patches: + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's + already an xsession script to do that, and $GDM_LANG might not contain + a valid locale code. + + * debian/patches: + - xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and + gnome-menus. lp #927172 + + -- Lionel Le Folgoc Fri, 18 May 2012 20:21:52 +0200 + xfce4-session (4.10.0-1) experimental; urgency=low * New upstream stable release. @@ -720,7 +971,7 @@ * Depend on fortune-mod for xfce4-tips -- Yves-Alexis Perez Wed, 03 May 2006 18:35:05 +0100 - + xfce4-session (4.2.3-1) unstable; urgency=low * New Upstream Release diff -Nru xfce4-session-4.12.1/debian/control xfce4-session-4.12.1/debian/control --- xfce4-session-4.12.1/debian/control 2015-05-12 18:42:31.000000000 +0000 +++ xfce4-session-4.12.1/debian/control 2015-05-26 00:28:00.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0), @@ -22,7 +23,7 @@ Pre-Depends: ${misc:Pre-Depends}, multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends}, xfce4-settings (>= 4.10.0), xfconf Recommends: xfwm4, xfdesktop4, libpam-systemd [linux-any], systemd-shim | systemd-sysv [linux-any], upower, dbus-x11, x11-xserver-utils, - xscreensaver + xscreensaver | light-locker Suggests: sudo, fortunes-mod, pm-utils Provides: x-session-manager Description: Xfce4 Session Manager diff -Nru xfce4-session-4.12.1/debian/patches/04-use-debian-xscreensaver-wrapper.patch xfce4-session-4.12.1/debian/patches/04-use-debian-xscreensaver-wrapper.patch --- xfce4-session-4.12.1/debian/patches/04-use-debian-xscreensaver-wrapper.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/04-use-debian-xscreensaver-wrapper.patch 2016-09-22 01:15:04.000000000 +0000 @@ -0,0 +1,17 @@ +Description: xscreensaver ships a wrapper that checks what DM is running, + and conditionally uses either dm-tool or gdmflexiserver. + +Author: Unit 193 +Forwarded: not-needed +Last-Update: 2016-09-21 + +--- xfce4-session-4.12.1.orig/scripts/xscreensaver.desktop.in ++++ xfce4-session-4.12.1/scripts/xscreensaver.desktop.in +@@ -4,6 +4,6 @@ Type=Application + _Name=Screensaver + _Comment=Launch screensaver and locker program + Icon=preferences-desktop-screensaver +-Exec=xscreensaver -no-splash ++Exec=/usr/share/xscreensaver/xscreensaver-wrapper.sh -no-splash + TryExec=xscreensaver + OnlyShowIn=XFCE; diff -Nru xfce4-session-4.12.1/debian/patches/series xfce4-session-4.12.1/debian/patches/series --- xfce4-session-4.12.1/debian/patches/series 2015-03-04 07:15:58.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/series 2016-09-22 01:15:04.000000000 +0000 @@ -1,2 +1,5 @@ 01_fix-xrdb-call.patch 03_add-light-locker-to-xflock4.patch +04-use-debian-xscreensaver-wrapper.patch +xubuntu_ignore-gdm-lang.patch +xubuntu_git_Make_verbose_logging_conditional.patch diff -Nru xfce4-session-4.12.1/debian/patches/xubuntu_git_Make_verbose_logging_conditional.patch xfce4-session-4.12.1/debian/patches/xubuntu_git_Make_verbose_logging_conditional.patch --- xfce4-session-4.12.1/debian/patches/xubuntu_git_Make_verbose_logging_conditional.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/xubuntu_git_Make_verbose_logging_conditional.patch 2015-04-09 07:24:06.000000000 +0000 @@ -0,0 +1,28 @@ +From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001 +From: Eric Koegel +Date: Sat, 28 Mar 2015 16:57:24 +0300 +Subject: Make verbose logging conditional (Bug #11698) + +Bug report and patch submitted by Zhihao Yuan + +Signed-off-by: Eric Koegel + +diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h +index d2e0c29..d458712 100644 +--- a/xfce4-session/xfsm-global.h ++++ b/xfce4-session/xfsm-global.h +@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen; + #if defined(G_HAVE_ISO_VARARGS) + + #define xfsm_verbose(...)\ +- xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__) ++G_STMT_START{ \ ++ if (G_UNLIKELY (verbose)) \ ++ xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \ ++}G_STMT_END + + #else + +-- +cgit v0.10.1 + diff -Nru xfce4-session-4.12.1/debian/patches/xubuntu_ignore-gdm-lang.patch xfce4-session-4.12.1/debian/patches/xubuntu_ignore-gdm-lang.patch --- xfce4-session-4.12.1/debian/patches/xubuntu_ignore-gdm-lang.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/patches/xubuntu_ignore-gdm-lang.patch 2014-08-16 20:04:51.000000000 +0000 @@ -0,0 +1,23 @@ +In natty, $GDM_LANG doesn't always contain a full valid locale. It might +contain a "short" one (e.g. "fr") that is expanded (e.g. to "fr_fr.UTF-8) +by an Xsession script shipped by gdm. So drop the compatibility code from +xfce4-session, otherwise the session locale might be set to an invalid +value. + +--- xfce4-session-4.8.1.orig/xfce4-session/main.c ++++ xfce4-session-4.8.1/xfce4-session/main.c +@@ -101,14 +101,6 @@ setup_environment (void) + /* pass correct DISPLAY to children, in case of --display in argv */ + g_setenv ("DISPLAY", gdk_display_get_name (gdk_display_get_default ()), TRUE); + +- /* this is for compatibility with the GNOME Display Manager */ +- lang = g_getenv ("GDM_LANG"); +- if (lang != NULL && strlen (lang) > 0) +- { +- g_setenv ("LANG", lang, TRUE); +- g_unsetenv ("GDM_LANG"); +- } +- + /* check access to $ICEAUTHORITY or $HOME/.ICEauthority if unset */ + if (g_getenv ("ICEAUTHORITY")) + authfile = g_strdup (g_getenv ("ICEAUTHORITY")); diff -Nru xfce4-session-4.12.1/debian/rules xfce4-session-4.12.1/debian/rules --- xfce4-session-4.12.1/debian/rules 2015-05-11 19:01:22.000000000 +0000 +++ xfce4-session-4.12.1/debian/rules 2015-05-16 16:12:07.000000000 +0000 @@ -8,6 +8,7 @@ override_dh_install: chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc + install -m 644 -D debian/startxfce4.user-session.upstart debian/xfce4-session/usr/share/upstart/sessions/startxfce4.conf dh_install --fail-missing -X .la override_dh_strip: diff -Nru xfce4-session-4.12.1/debian/startxfce4.user-session.upstart xfce4-session-4.12.1/debian/startxfce4.user-session.upstart --- xfce4-session-4.12.1/debian/startxfce4.user-session.upstart 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/startxfce4.user-session.upstart 2014-08-16 20:05:14.000000000 +0000 @@ -0,0 +1,16 @@ +description "XFCE4 session" +author "Stéphane Graber " + +start on started dbus and (xsession SESSION=xfce or xsession SESSION=xubuntu or xsession SESSION=ubuntustudio or xsession SESSION=mythbuntu) + +emits desktop-start +emits desktop-end + +exec startxfce4 + +post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION + +# Don't wait to avoid blocking the session from ending. +pre-stop exec initctl emit --no-wait desktop-end DESKTOP_SESSION=$DESKTOP_SESSION + +post-stop exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession diff -Nru xfce4-session-4.12.1/debian/systemd/run-systemd-session xfce4-session-4.12.1/debian/systemd/run-systemd-session --- xfce4-session-4.12.1/debian/systemd/run-systemd-session 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/systemd/run-systemd-session 2016-07-25 19:41:53.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +# robustness: if the previous graphical session left some failed units, +# reset them so that they don't break this startup +for unit in $(systemctl --user --no-legend --state=failed list-units | cut -f1 -d' '); do +if [ "$(systemctl --user show -p PartOf --value)" = "graphical-session.target" ]; then + systemctl --user reset-failed $unit +fi +done + +systemctl --user restart graphical-session-pre.target +systemctl --user restart "$1" + +# Wait until the session gets closed +# FIXME: replace with an event-based waiting instead of polling (needs new systemctl functionality) +while systemctl --user --quiet is-active "$1"; do sleep 1; done + +# Delay killing the X server until all graphical units stopped +# FIXME: we currently cannot make targets wait on its dependencies going to +# "inactive", only to "deactivating" +while [ -n "$(systemctl --user --no-legend --state=deactivating list-units)" ]; do sleep 0.2; done diff -Nru xfce4-session-4.12.1/debian/systemd/startxfce4.override xfce4-session-4.12.1/debian/systemd/startxfce4.override --- xfce4-session-4.12.1/debian/systemd/startxfce4.override 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/systemd/startxfce4.override 2016-07-25 19:57:29.000000000 +0000 @@ -0,0 +1 @@ +manual diff -Nru xfce4-session-4.12.1/debian/systemd/xfce4-session.service xfce4-session-4.12.1/debian/systemd/xfce4-session.service --- xfce4-session-4.12.1/debian/systemd/xfce4-session.service 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.12.1/debian/systemd/xfce4-session.service 2016-07-25 19:41:53.000000000 +0000 @@ -0,0 +1,7 @@ +[Unit] +Description=XFCE 4 Session Manager +PartOf=graphical-session.target + +[Service] +ExecStart=/usr/bin/startxfce4 +ExecStopPost=-/usr/bin/dbus-send --type=method_call --address=${UPSTART_SESSION} /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession diff -Nru xfce4-session-4.12.1/debian/xfce4-session.install xfce4-session-4.12.1/debian/xfce4-session.install --- xfce4-session-4.12.1/debian/xfce4-session.install 2013-08-25 13:40:33.000000000 +0000 +++ xfce4-session-4.12.1/debian/xfce4-session.install 2016-07-25 20:12:03.000000000 +0000 @@ -2,3 +2,6 @@ etc debian/defaults.list etc/xfce4/ debian/55xfce4-session etc/X11/Xsession.d/ +debian/systemd/xfce4-session.service /usr/lib/systemd/user/ +debian/systemd/run-systemd-session /usr/share/xfce4/scripts/ +debian/systemd/startxfce4.override /usr/share/upstart/systemd-session/upstart/