diffstat of debian/ for xfce4-session_4.13.1-2 xfce4-session_4.13.2-0ubuntu1 changelog | 347 +++++++++++++++++++++-- control | 5 patches/0001-Update-locker-list-in-xflock4.patch | 7 patches/0003-hardcode-RM_CMD-to-rm.patch | 24 - patches/series | 2 patches/xubuntu_ignore-gdm-lang.patch | 23 + rules | 1 startxfce4.user-session.upstart | 16 + systemd/run-systemd-session | 22 + systemd/startxfce4.override | 1 systemd/xfce4-session.service | 7 xfce4-session.install | 3 12 files changed, 406 insertions(+), 52 deletions(-) diff -Nru xfce4-session-4.13.1/debian/changelog xfce4-session-4.13.2/debian/changelog --- xfce4-session-4.13.1/debian/changelog 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/changelog 2019-05-20 02:05:34.000000000 +0000 @@ -1,3 +1,25 @@ +xfce4-session (4.13.2-0ubuntu1) eoan; urgency=medium + + * New upstream release. + - debian/patches/0003-hardcode-RM_CMD-to-rm.patch: + - Dropped, engines removed upstream. + * Merge from debian unstable. + * Remaining changes: + - debian/patches: + + xubuntu_git_Make_verbose_logging_conditional.patch: + Dropped, included upstream. + + 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/systemd/*, debian/xfce4-session.install: + + 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. + - d/rules, d/startxfce4.user-session.upstart, d/xfce4-session.install: + + Add Xfce upstart user session + + -- Sean Davis Sun, 19 May 2019 22:05:34 -0400 + xfce4-session (4.13.1-2) experimental; urgency=medium * d/patches: hardcode RM_CMD to fix reproducibility issues (Closes: #915423) @@ -33,6 +55,35 @@ -- Yves-Alexis Perez Mon, 21 May 2018 15:15:59 +0200 +xfce4-session (4.12.1-6ubuntu1) disco; urgency=medium + + * Merge from debian unstable. + - Recommends no longer include xscreensaver (LP: #1754872) + * Remaining changes: + - debian/patches: + + 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. + + 0001-Update-locker-list-in-xflock4.patch: Use locker list from debian + git to add support for xfce4-screensaver + + 0001-Add-DesktopNames-to-.desktop-file.patch, + 0001-Export-XDG_CURRENT_DESKTOP-Bug-11239.patch, + 02_add-light-locker-to-xflock4.patch, + 03_add-light-locker-to-xflock4.patch, + 03_runtime-logind-support.patch, + 03_xflock4-update-lockers-list.patch: + dropped, included upstream + - debian/systemd/*, debian/xfce4-session.install: + + 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. + - d/rules, d/startxfce4.user-session.upstart, d/xfce4-session.install: + + Add Xfce upstart user session + + -- Sean Davis Mon, 25 Feb 2019 20:46:14 -0500 + xfce4-session (4.12.1-6) unstable; urgency=medium * debian/control: @@ -46,7 +97,7 @@ - migrate to dbgsym packages. - refactor dh_install override si we now have only one binary package. * debian/xfce4-session.install: remove stuff now already present in - debian/xfce4-session at build time. + debian/xfce4-session at build time. -- Yves-Alexis Perez Sat, 21 Oct 2017 14:39:23 +0200 @@ -70,6 +121,42 @@ -- Yves-Alexis Perez Sun, 12 Jun 2016 17:40:48 +0200 +xfce4-session (4.12.1-3ubuntu4) devel; urgency=medium + + * No-change rebuild against libxfconf-0-3. + + -- Unit 193 Tue, 26 Jun 2018 02:17:41 -0400 + +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: @@ -87,6 +174,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 ] @@ -112,10 +218,37 @@ * debian/rules: - call dh-autoreconf to refresh config.{guess,sub}. * debian/xfce4-session.lintian-overrides - - add override for the DesktopNames key in /u/s/xsessions/xfce.desktop. + - add override for the DesktopNames key in /u/s/xsessions/xfce.desktop. -- 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 ] @@ -170,6 +303,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: @@ -214,6 +371,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 ] @@ -244,6 +472,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. @@ -255,6 +511,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: @@ -266,6 +556,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. @@ -385,7 +693,7 @@ xfce4-session (4.8.2-3) unstable; urgency=low * debian/prerm: - - don't remove the x-session-manager alternative on upgrades. + - don't remove the x-session-manager alternative on upgrades. closes: #653834 -- Yves-Alexis Perez Mon, 02 Jan 2012 07:57:30 +0100 @@ -409,11 +717,11 @@ xfce4-session (4.8.2-1) unstable; urgency=low * New upstream release. - * debian/patches: + * debian/patches: - 01_correct_shadows, dropped, we don't show splash screen by default anymore anyway.s - 03_dont-die-on-dbus-disconnect dropped, included upstream. - - 02_fix-fortune-path, 04_fix-missing-lm and + - 02_fix-fortune-path, 04_fix-missing-lm and 05_force-xfsettingsd-start refreshed. * debian/rules, debian/preinst, debian/postinst, debian/postrm: - don't start tips by default, they're completely outdated. closes: #640984 @@ -447,7 +755,7 @@ xfce4-session (4.8.1-2) unstable; urgency=low - * Upload to unstable. + * Upload to unstable. * debian/control: - drop Emanuele and Simon from Uploaders, thanks to them. - update standards version to 3.9.2. @@ -464,7 +772,7 @@ * New upstream release. * debian/patches: - 02_fix-fortune-path refreshed. - - 04_gk-dont-check-running-use-start refreshed. + - 04_gk-dont-check-running-use-start refreshed. * debian/control: - refresh build-deps for Xfce 4.7. - add build-dep on hardening-includes. @@ -536,7 +844,7 @@ * Switch to 3.0 (quilt) source format. * debian/rules: - drop quilt rules. - - switch to debhelper 7 tiny rules. + - switch to debhelper 7 tiny rules. - make intltool ignore c files in .pc quilt dir. -- Yves-Alexis Perez Sun, 23 May 2010 13:55:01 +0200 @@ -572,7 +880,7 @@ - update build deps for Xfce 4.6 alpha. - update standards version to 3.8.0. - replace recommends on xbase-clients by x11-xserver-utils. - - swap calls to dh_makeshlibs and dh_installdeb. + - swap calls to dh_makeshlibs and dh_installdeb. - remove dep on xfce4-mcs-manager and replace it by xfconf, xfce4-settings. - explicitely add build-dep on libdbus-glib-1-dev. @@ -589,7 +897,7 @@ * debian/patches: - 02_use-mice-as-default-engine dropped. - 07_parallel-startup removed, included upstream. - - other patches reordered. + - other patches reordered. * debian/xfce4-session.xml: - ship a xfconf config file for selecting the simple engine, put it in desktop-base dirs until we can ship it in desktop-base package. @@ -647,7 +955,7 @@ * switch to triggers: - debian/{postinst,prerm} dropped. - - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. + - debian/control: conflict against non-triggers-enabled xfce4-mcs-manager. * debian/control: - remove Conflicts/Replaces: xfce4-toys, since it's not in Etch. - drop Martin Loschwitz from Uploaders. @@ -678,8 +986,8 @@ - updated my email address. - add dependency on xfce4-mcs-manager because of settings plugins calling xfce-setting-show - * debian/lintian: - - override "desktop-command-not-in-package" for xfce-setting-show now we + * debian/lintian: + - override "desktop-command-not-in-package" for xfce-setting-show now we depend on it. - edit overrides for "binary-without-manpage", using complete path. * debian/copyright: use © sign. @@ -725,7 +1033,7 @@ -- Yves-Alexis Perez Sun, 15 Apr 2007 15:28:17 +0100 xfce4-session (4.4.0-1) experimental; urgency=low - + (Yves-Alexis Perez) * New upstream release. * debian/control: updated build-deps against Xfce 4.4. @@ -773,11 +1081,11 @@ -- Yves-Alexis Perez Sat, 23 Sep 2006 13:42:51 +0100 xfce4-session (4.3.90.2-1) unstable; urgency=low - + (Yves-Alexis Perez) * New upstream release. * debian/postinst: fixed install on hurd by not using pkill. - * debian/control: updated standards version to 3.7.2. + * debian/control: updated standards version to 3.7.2. (Simon Huggins) * Add rpath fixes. @@ -785,14 +1093,14 @@ xfce4-session (4.3.90.1-1) unstable; urgency=low - (Yves-Alexis Perez) + (Yves-Alexis Perez) * New Upstream Release (Simon Huggins) * Remove all pointless .la files * 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 @@ -903,4 +1211,3 @@ * Initial Package. -- Oliver M. Bolzer Tue, 9 Dec 2003 09:40:42 +0100 - diff -Nru xfce4-session-4.13.1/debian/control xfce4-session-4.13.2/debian/control --- xfce4-session-4.13.1/debian/control 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/control 2019-05-20 02:02:12.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez Build-Depends: debhelper-compat (= 10), intltool (>= 0.31), @@ -33,7 +34,7 @@ Depends: xfce4-settings (>= 4.10.0), xfconf, ${misc:Depends}, ${shlibs:Depends} Recommends: dbus-x11, libpam-systemd [linux-any], - light-locker, + light-locker | xfce4-screensaver | xscreensaver, systemd-sysv [linux-any] | systemd-shim, upower, x11-xserver-utils, diff -Nru xfce4-session-4.13.1/debian/patches/0001-Update-locker-list-in-xflock4.patch xfce4-session-4.13.2/debian/patches/0001-Update-locker-list-in-xflock4.patch --- xfce4-session-4.13.1/debian/patches/0001-Update-locker-list-in-xflock4.patch 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/patches/0001-Update-locker-list-in-xflock4.patch 2019-05-20 01:44:24.000000000 +0000 @@ -7,17 +7,14 @@ scripts/xflock4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/scripts/xflock4 b/scripts/xflock4 -index 32770b4..84ad018 100644 --- a/scripts/xflock4 +++ b/scripts/xflock4 -@@ -31,7 +31,10 @@ LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand) - for lock_cmd in \ +@@ -29,7 +29,9 @@ "$LOCK_CMD" \ + "xfce4-screensaver-command --lock" \ "xscreensaver-command -lock" \ - "gnome-screensaver-command --lock" + "light-locker-command --lock" \ -+ "xfce4-screensaver-command --lock" \ + "gnome-screensaver-command --lock" \ + "mate-screensaver-command --lock" do diff -Nru xfce4-session-4.13.1/debian/patches/0003-hardcode-RM_CMD-to-rm.patch xfce4-session-4.13.2/debian/patches/0003-hardcode-RM_CMD-to-rm.patch --- xfce4-session-4.13.1/debian/patches/0003-hardcode-RM_CMD-to-rm.patch 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/patches/0003-hardcode-RM_CMD-to-rm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Yves-Alexis Perez -Date: Thu, 3 Jan 2019 21:14:42 +0100 -Subject: hardcode RM_CMD to rm - -That fixes some reproducible build failures with usrmerge, when the -build system and the run system are not in the same situation ---- - engines/balou/config.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/engines/balou/config.c b/engines/balou/config.c -index 13709cb..8fd24d6 100644 ---- a/engines/balou/config.c -+++ b/engines/balou/config.c -@@ -352,7 +352,8 @@ config_install_theme (GtkWidget *item, - gtk_widget_destroy (chooser); - } - -- -+#undef RM_CMD -+#define RM_CMD "rm" - #ifdef RM_CMD - static void - config_remove_theme (GtkWidget *item, diff -Nru xfce4-session-4.13.1/debian/patches/series xfce4-session-4.13.2/debian/patches/series --- xfce4-session-4.13.1/debian/patches/series 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/patches/series 2019-05-20 01:45:55.000000000 +0000 @@ -1,3 +1,3 @@ 0001-Update-locker-list-in-xflock4.patch 0002-use-xscreensaver-through-the-wrapper-it-ships.patch -0003-hardcode-RM_CMD-to-rm.patch +xubuntu_ignore-gdm-lang.patch diff -Nru xfce4-session-4.13.1/debian/patches/xubuntu_ignore-gdm-lang.patch xfce4-session-4.13.2/debian/patches/xubuntu_ignore-gdm-lang.patch --- xfce4-session-4.13.1/debian/patches/xubuntu_ignore-gdm-lang.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.13.2/debian/patches/xubuntu_ignore-gdm-lang.patch 2019-05-20 01:03:32.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. + +--- a/xfce4-session/main.c ++++ b/xfce4-session/main.c +@@ -108,14 +108,6 @@ + /* 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.13.1/debian/rules xfce4-session-4.13.2/debian/rules --- xfce4-session-4.13.1/debian/rules 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/rules 2019-05-20 01:36:16.000000000 +0000 @@ -9,6 +9,7 @@ override_dh_install: chmod 755 debian/xfce4-session/etc/xdg/xfce4/xinitrc find debian/xfce4-session/usr/lib -name '*.la' -delete + install -m 644 -D debian/startxfce4.user-session.upstart debian/xfce4-session/usr/share/upstart/sessions/startxfce4.conf dh_install override_dh_strip: diff -Nru xfce4-session-4.13.1/debian/startxfce4.user-session.upstart xfce4-session-4.13.2/debian/startxfce4.user-session.upstart --- xfce4-session-4.13.1/debian/startxfce4.user-session.upstart 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.13.2/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.13.1/debian/systemd/run-systemd-session xfce4-session-4.13.2/debian/systemd/run-systemd-session --- xfce4-session-4.13.1/debian/systemd/run-systemd-session 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.13.2/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.13.1/debian/systemd/startxfce4.override xfce4-session-4.13.2/debian/systemd/startxfce4.override --- xfce4-session-4.13.1/debian/systemd/startxfce4.override 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.13.2/debian/systemd/startxfce4.override 2016-07-25 19:57:29.000000000 +0000 @@ -0,0 +1 @@ +manual diff -Nru xfce4-session-4.13.1/debian/systemd/xfce4-session.service xfce4-session-4.13.2/debian/systemd/xfce4-session.service --- xfce4-session-4.13.1/debian/systemd/xfce4-session.service 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.13.2/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.13.1/debian/xfce4-session.install xfce4-session-4.13.2/debian/xfce4-session.install --- xfce4-session-4.13.1/debian/xfce4-session.install 2019-02-21 12:53:57.000000000 +0000 +++ xfce4-session-4.13.2/debian/xfce4-session.install 2019-05-20 01:35:16.000000000 +0000 @@ -1,2 +1,5 @@ debian/55xfce4-session etc/X11/Xsession.d/ debian/defaults.list etc/xfce4/ +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/